fiscaly 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83bdffbd15520ef156308840e2f87e35521b6aeaea378e36985b1b061f6c74bd
-  data.tar.gz: 762a395022ca4cbb3aeae08155cda216f971f553598349e217b882f581f09859
+  metadata.gz: '01081761f20ba665100b05af9b8a78a25fa55842814165402befca7888733083'
+  data.tar.gz: d7d519ce2ba94716502aead282c31c8985c66ab5d9a3a2e0279d74ecc3d35b53
 SHA512:
-  metadata.gz: 32c6117fc0ee86b5e193d84d08f00f55d6450c1216fc7e6cbc19f5e53b3046fac9c1e81447159267ee5ac0eef33bff010c09ff15b071e4b5b34fd8eded8089c0
-  data.tar.gz: 16b76da26db027656d57f87f453b79384213666b5a1fda9b49753ac9c7ea581a8b80fb81afc73417c8eb4edb65764a164121e5d86a8d6123b6e51905e1e08e4a
+  metadata.gz: 283253dbc0100b0dfccba65926ca3c4b6aba61694cadfd640229f27175fb10d7bafc90c19d490b31f866b7ad2e4f8879f987acf486e4acb4becfa5a1a144e4ee
+  data.tar.gz: feaa6a08ab79459935d005031cea5f9f52a7a0073fd0948c5c97ba21770e2976305d22b2e2580c3de495c34cb2856b23c21ee93acbaec68202172ae920178b7b

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## 1.2.0
+
+Features:
+
+* Add start_day option.
+
 ## 1.1.0
 
 Features:

data/lib/fiscaly.rb

@@ -5,12 +5,6 @@ require 'fiscaly/version'
 class Fiscaly
   KEY = :fiscaly_options
 
-  cattr_accessor :options
-  @@options = {
-    start_month: 4,
-    forward_fyear: false
-  }
-
   attr_reader :date
   attr_reader :options
 
@@ -31,13 +25,17 @@ class Fiscaly
     @options[:start_month]
   end
 
+  def start_day
+    @options[:start_day]
+  end
+
   def forward_fyear?
     @options[:forward_fyear]
   end
 
   def fyear
     fy = @date.year
-    fy -= 1 if @date.month < start_month
+    fy -= 1 if @date.month < start_month || (@date.month == start_month && @date.day < start_day)
     fy += 1 if forward_fyear?
     fy
   end
@@ -48,11 +46,11 @@ class Fiscaly
 
   def beginning_of_fyear
     year = forward_fyear? ? fyear - 1 : fyear
-    Date.new(year, start_month)
+    Date.new(year, start_month, start_day)
   end
 
   def end_of_fyear
-    (beginning_of_fyear + 11.months).end_of_month
+    beginning_of_fyear + 12.months - 1.days
   end
 
   def range_of_fyear
@@ -70,7 +68,7 @@ class Fiscaly
   end
 
   def end_of_fhalf(index = nil)
-    (beginning_of_fhalf(index) + 5.months).end_of_month
+    beginning_of_fhalf(index) + 6.months - 1.days
   end
 
   def range_of_fhalf(index = nil)
@@ -88,13 +86,25 @@ class Fiscaly
   end
 
   def end_of_fquarter(index = nil)
-    (beginning_of_fquarter(index) + 2.months).end_of_month
+    beginning_of_fquarter(index) + 3.months - 1.days
   end
 
   def range_of_fquarter(index = nil)
     beginning_of_fquarter(index)..end_of_fquarter(index)
   end
 
+  def beginning_of_fmonth
+    Date.new(year, month, start_day)
+  end
+
+  def end_of_fmonth
+    beginning_of_fmonth + 1.month - 1.days
+  end
+
+  def range_of_fmonth
+    beginning_of_fmonth..end_of_fmonth
+  end
+
   def range_of_month
     @date.beginning_of_month..@date.end_of_month
   end
@@ -102,6 +112,14 @@ class Fiscaly
   private
 
   class << self
+    attr_accessor :options
+
+    @@options = {
+      start_month: 4,
+      start_day: 1,
+      forward_fyear: false
+    }
+
     def today(options = {})
       date(Date.today, options)
     end
@@ -148,6 +166,10 @@ class Fiscaly
       @@options[:start_month] = val
     end
 
+    def start_day=(val)
+      @@options[:start_day] = val
+    end
+
     def forward_fyear=(val)
       @@options[:forward_fyear] = val
     end
@@ -157,7 +179,7 @@ class Fiscaly
     def normalize(fyear, month, day, options = {})
       options = global_options.merge(options)
       year = fyear
-      year += 1 if month < options[:start_month]
+      year += 1 if month < options[:start_month] || (month == options[:start_month] && day < options[:start_day])
       year -= 1 if options[:forward_fyear]
       Date.new(year, month, day)
     end

data/lib/fiscaly/version.rb

@@ -1,3 +1,3 @@
 class Fiscaly
-  VERSION = '1.1.0'
+  VERSION = '1.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fiscaly
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Yoshikazu Kaneta
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-07 00:00:00.000000000 Z
+date: 2019-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -108,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Financial date class for ruby