fiscal_year 0.3.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6cf15774708a32e8499e3228288a15749adf62d98a7dc72ccc31e9cfc0b5b842
-  data.tar.gz: 44dc1c5dc58d257bee352257abae21f5e02412d39d5aef76910ef34036a596bb
+  metadata.gz: b2a44c87e166920493e3723924cdf5c0a20cbdca0f148fb87e32a69aee645267
+  data.tar.gz: c6a17528d17f0cb3de8143a01227b06c7e8e527eee3a7ccc5677b637b7b3c41a
 SHA512:
-  metadata.gz: 8e38a3d7c476be3d0e2889f608e73b52f04234553f2119fa665dc19143fb0fafadd6ef832dc4c42527096e7a402136992a4e2a4e5222109364522c32fca1de1a
-  data.tar.gz: 591f594009aa1cfb7595a3c18720c8d7f88974a7510252f870f981d5518ef296ebdd2fb8b5eb8397bc040c263fc33d4ae0acd09cc76993c4f52731eac15dce36
+  metadata.gz: 5ade0c96554bc2670317108bb74851ccfd485cf4932709eafe479de937db7fab43c864a8372d895b99d774cebe6bb08520191e5015ca4ef38eb1a85a19f3d8f4
+  data.tar.gz: ca421f4b2fa6fd74c319bab2eb739203391f3c71d0fcd592e78018a62900e72edfcc838e7480e1d2a80af1256266c9863e014ec2873f6e8169e1a52dfbe8d1c8

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## [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
+
 ## [0.3.0] - 2023-04-23
 - add rbs
   - fit to rbs

data/README.md

@@ -1,5 +1,5 @@
 ![build badge](https://github.com/TsubasaKawajiri/fiscal_year/actions/workflows/test.yml/badge.svg?branch=master)
-[![Gem Version](https://badge.fury.io/rb/fiscal_year.svg)](https://badge.fury.io/rb/fiscal_year)
+
 [![Maintainability](https://api.codeclimate.com/v1/badges/39fdb48501c5f53235a9/maintainability)](https://codeclimate.com/github/TsubasaKawajiri/fiscal_year/maintainability)
 [![Test Coverage](https://api.codeclimate.com/v1/badges/39fdb48501c5f53235a9/test_coverage)](https://codeclimate.com/github/TsubasaKawajiri/fiscal_year/test_coverage)
 

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/quarter.rb

@@ -34,13 +34,13 @@ module FiscalYear
 
       def range_by(date)
         year = date.year
-        this_quater = months(date.month)
-        last_year = cross_year_in_quarter?(this_quater) ? year + 1 : year
+        this_quarter = months(date.month)
+        last_year = cross_year_in_quarter?(this_quarter) ? year + 1 : year
 
-        Date.parse("#{year}/#{this_quater.first}/01")..Date.parse("#{last_year}/#{this_quater.last}/01").end_of_month
+        Date.parse("#{year}/#{this_quarter.first}/01")..Date.parse("#{last_year}/#{this_quarter.last}/01").end_of_month
       end
 
-      def quater_num(month)
+      def quarter_num(month)
         rindex = FiscalYear.quarters.rindex(months(month))
 
         rindex.nil? ? 0 : (rindex + 1)

data/lib/fiscal_year/version.rb

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

data/lib/fiscal_year/year_to_date.rb

@@ -34,7 +34,7 @@ module FiscalYear
       end
 
       # TODO: fit to Abc size
-      def half_range_by(date) # rubocop:disable Metrics/AbcSize
+      def half_range_by(date) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
         year = date.year
         month = date.month
 
@@ -45,7 +45,14 @@ module FiscalYear
         end
 
         Date.parse(
-          "#{FiscalYear::Half.cross_year_in_half?(Half.second) ? year - 1 : year}/#{Half.second.first}"
+          "#{
+              if FiscalYear::Half.cross_year_in_half?(Half.second) &&
+              FiscalYear.cross_year_month?(month)
+                year - 1
+              else
+                year
+              end
+            }/#{Half.second.first}"
         )..date.end_of_month.to_date
       end
 

data/lib/fiscal_year.rb

@@ -52,5 +52,21 @@ 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
   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,6 @@ 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
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fiscal_year
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Tsubasa Kawajiri
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-04-23 00:00:00.000000000 Z
+date: 2024-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport