lib/fiscal_year/half.rb in fiscal_year-0.4.0 vs lib/fiscal_year/half.rb in fiscal_year-0.5.0

@@ -30,11 +30,11 @@
         # 99 + 1 = 100, but expect 2000 this context.
         year = 1999 if year == 99
         end_month = first.last
         raise StandardError if end_month.nil?
 
-        end_year = normalize_year_by_month(year, end_month)
+        end_year = FiscalYear.increase_year_by_month(year, end_month)
 
         Date.parse("#{year}/#{first.first}/01")..Date.parse("#{end_year}/#{end_month}/01").end_of_month
       end
 
       def second_range_by(year)
@@ -43,30 +43,22 @@
         year = 1999 if year == 99
         first_month = second.first
         end_month = second.last
         raise StandardError if first_month.nil? || end_month.nil?
 
-        start_year = normalize_year_by_month(year, first_month)
-        end_year = normalize_year_by_month(year, end_month)
+        start_year = FiscalYear.increase_year_by_month(year, first_month)
+        end_year = FiscalYear.increase_year_by_month(year, end_month)
 
         Date.parse("#{start_year}/#{first_month}/01")..Date.parse("#{end_year}/#{end_month}/01").end_of_month
       end
 
       def range_by(date)
         month = date.month
         year = date.year
         # if passed crossed year value, normalize to not crossed year value
-        year -= 1 if FiscalYear.cross_year_month?(month)
+        year = FiscalYear.decrease_year_by_month(year, month)
 
         first?(month) ? first_range_by(year) : second_range_by(year)
-      end
-
-      def normalize_year_by_month(year, month)
-        if FiscalYear.cross_year_month?(month)
-          year + 1
-        else
-          year
-        end
       end
 
       def cross_year_in_half?(half)
         FiscalYear.cross_year? && half.any? { |month| month == 12 }
       end