Fix bug when we're accumulating on yearS

Author: radar

lib/dotiw/time_hash.rb

@@ -43,8 +43,6 @@ def to_hash
     def build_time_hash
       if accumulate_on = options[:accumulate_on]
         accumulate_on = accumulate_on.to_sym
-        return build_time_hash if accumulate_on == :years
-
         TIME_FRACTIONS.index(accumulate_on).downto(0) { |i| send("build_#{TIME_FRACTIONS[i]}") }
       else
         while distance > 0
@@ -91,11 +89,15 @@ def build_weeks
     def build_months
       build_years_months_weeks_days
 
-      if (years = output.delete(:years)) > 0
+      if options[:accumulate_on]&.to_sym == :months && (years = output.delete(:years)) > 0
         output[:months] += (years * 12)
       end
     end
 
+    def build_years
+      build_years_months_weeks_days
+    end
+
     def build_years_months_weeks_days
       months = (largest.year - smallest.year) * 12 + (largest.month - smallest.month)
       years, months = months.divmod(12)

spec/lib/dotiw_spec.rb

@@ -219,7 +219,8 @@
          START_TIME + 2.day + 10_000.hour + 10.second,
          :months,
          '13 months, 3 weeks, 1 day, 16 hours, and 10 seconds'],
-        ['2015-1-15'.to_time, '2016-3-15'.to_time, :months, '14 months']
+        ['2015-1-15'.to_time, '2016-3-15'.to_time, :months, '14 months'],
+        ['2015-1-15'.to_time, '2016-3-15'.to_time, :years, '1 year and 2 months']
       ].each do |start, finish, accumulator, output|
         it "should be #{output}" do
           expect(distance_of_time_in_words(start, finish, true, accumulate_on: accumulator)).to eq(output)