fiscal_year 0.4.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1468592d50121d359747c36cc467fac062fd25b0b50344668b612074133527d3
-  data.tar.gz: b5428700e7f8b6b256e33b854623d1079d5aa3b93ce8a1873a14c6c660b3e1fe
+  metadata.gz: '0917960fc403b45d283863bad77ac8e35fc8b5a3c216a13f1ca2cdb68c95410a'
+  data.tar.gz: 68506d80a59973356f41d5bd1c55af3164542378ec8d9bea7d31be14bd90e302
 SHA512:
-  metadata.gz: 9609eac23bd8fd86a94a7f218d1ed613ac6bc8b0b3f231ebdc0a9f90fe21653170eb996def584b6bd9cf448f9e8f4f8e78c0092fe505c542737cb7c329422711
-  data.tar.gz: 0b4f5c6f0ad8939f62964b72d0fbf10f7aab52108e9de956888b9f038a997d9f6aa458c63ee4e83990fb767157b61ab0fb2a6401b77bcb821355660c11b1f591
+  metadata.gz: 74e0c8c7ddff795d9c64754dde60b462073f45afd04892dcad3e1595970d1bc2a7ac4ebf3bc464ccc112f10bfe33393023bf008cf08b349c27839994a00c4199
+  data.tar.gz: 50c1f1e00478c28ee72bc301ab8ab5fe42c1d142e822cc2d8747ff25f631ff62aff2e3e457e8bb852cde09676b38c0826057f8dedd503e5ad8ad2c3ad37a7e90

data/.rubocop.yml

@@ -1,5 +1,5 @@
 AllCops:
-  TargetRubyVersion: 2.6
+  TargetRubyVersion: 3.1
   Exclude:
     - 'Steepfile'
     - 'vendor/**/*'

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## [0.6.0] - 2024-05-15
+- [BREAK] Ruby 3.0.x, 2.7.x and 2.6.x has no longer support.
+- add `FiscalYear.range_by` method
+
+## [0.5.0] - 2024-03-18
+- [BREAK] rename and move `FiscalYear::Half.normalize_year_by_month` to `FiscalYear.increase_year_by_month`
+- add `FiscalYear.decrease_year_by_month` method
+
+when year normalize, we may want to increase year or decrease year depending on the situation.
+therefore, rename and add decrease method.
+
 ## [0.4.0] - 2023-06-15
 - fix calculate logic of half year to date
 

data/lib/fiscal_year/half.rb

@@ -32,7 +32,7 @@ module FiscalYear
         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
@@ -45,8 +45,8 @@ module FiscalYear
         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
@@ -55,19 +55,11 @@ module FiscalYear
         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

data/lib/fiscal_year/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FiscalYear
-  VERSION = "0.4.0"
+  VERSION = "0.6.0"
 end

data/lib/fiscal_year/year_to_date.rb

@@ -21,16 +21,13 @@ module FiscalYear
         months = FiscalYear.months[(0..month_index)]
         raise StandardError if months.nil?
 
-        pair = []
-        [date.year].product(months).each do |e|
-          pair << if FiscalYear.cross_year_month?(month)
-                    (FiscalYear.cross_year_month?(e.second) ? e : [e.first - 1, e.second])
-                  else
-                    e
-                  end
+        [date.year].product(months).map do |e|
+          if FiscalYear.cross_year_month?(month)
+            (FiscalYear.cross_year_month?(e.second) ? e : [e.first - 1, e.second])
+          else
+            e
+          end
         end
-
-        pair
       end
 
       # TODO: fit to Abc size

data/lib/fiscal_year.rb

@@ -52,5 +52,29 @@ module FiscalYear
       # @type self: singleton(FiscalYear)
       months.in_groups(4)
     end
+
+    def increase_year_by_month(year, month)
+      if FiscalYear.cross_year_month?(month)
+        year + 1
+      else
+        year
+      end
+    end
+
+    def decrease_year_by_month(year, month)
+      if FiscalYear.cross_year_month?(month)
+        year - 1
+      else
+        year
+      end
+    end
+
+    def range_by(date)
+      year = date.year
+      month = date.month
+      normalized_year = decrease_year_by_month(year, month)
+
+      FiscalYear::Half.first_range_by(normalized_year).first..FiscalYear::Half.second_range_by(normalized_year).last
+    end
   end
 end

data/sig/fiscal_year/config.rbs

@@ -1,5 +1,6 @@
 module FiscalYear
   class Config
     attr_reader start_month: Integer
+    def initialize: -> Integer
   end
 end

data/sig/fiscal_year/half.rbs

@@ -7,7 +7,6 @@ module FiscalYear
     def self.first_range_by: (Integer) -> Range[Date]
     def self.second_range_by: (Integer) -> Range[Date]
     def self.range_by: (Date) -> Range[Date]
-    def self.normalize_year_by_month: (Integer, Integer) -> Integer
     def self.cross_year_in_half?: (Array[Integer]) -> bool
   end
-end
+end

data/sig/fiscal_year.rbs

@@ -10,4 +10,7 @@ module FiscalYear
   def self.cross_year_months: () -> Array[Integer]
   def self.halfs: () -> [Array[Integer], Array[Integer]]
   def self.quarters: () -> [Array[Integer], Array[Integer], Array[Integer], Array[Integer]]
+  def self.increase_year_by_month: (Integer, Integer) -> Integer
+  def self.decrease_year_by_month: (Integer, Integer) -> Integer
+  def self.range_by: (Date) -> Range
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fiscal_year
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Tsubasa Kawajiri
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-06-15 00:00:00.000000000 Z
+date: 2024-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -70,7 +70,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="