fiscal_year 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6cf15774708a32e8499e3228288a15749adf62d98a7dc72ccc31e9cfc0b5b842
-  data.tar.gz: 44dc1c5dc58d257bee352257abae21f5e02412d39d5aef76910ef34036a596bb
+  metadata.gz: 1468592d50121d359747c36cc467fac062fd25b0b50344668b612074133527d3
+  data.tar.gz: b5428700e7f8b6b256e33b854623d1079d5aa3b93ce8a1873a14c6c660b3e1fe
 SHA512:
-  metadata.gz: 8e38a3d7c476be3d0e2889f608e73b52f04234553f2119fa665dc19143fb0fafadd6ef832dc4c42527096e7a402136992a4e2a4e5222109364522c32fca1de1a
-  data.tar.gz: 591f594009aa1cfb7595a3c18720c8d7f88974a7510252f870f981d5518ef296ebdd2fb8b5eb8397bc040c263fc33d4ae0acd09cc76993c4f52731eac15dce36
+  metadata.gz: 9609eac23bd8fd86a94a7f218d1ed613ac6bc8b0b3f231ebdc0a9f90fe21653170eb996def584b6bd9cf448f9e8f4f8e78c0092fe505c542737cb7c329422711
+  data.tar.gz: 0b4f5c6f0ad8939f62964b72d0fbf10f7aab52108e9de956888b9f038a997d9f6aa458c63ee4e83990fb767157b61ab0fb2a6401b77bcb821355660c11b1f591

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## [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/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.4.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
 

metadata

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