fiscali 2.3.0 → 2.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 9d186e022ab4c157c6bea6233b368582d8b60209
-  data.tar.gz: 26016d53cffee5d9fa33214d33522e4c087f13be
+SHA256:
+  metadata.gz: 81069ed1f2eb4751cf14a55df03ad0df6dabec33b87a22ab1b718c5eb09180a3
+  data.tar.gz: 50eb72e9af40e2d8974d6faca52291a448bcff138afa40331fd93e6425b1c64b
 SHA512:
-  metadata.gz: 4c74baca119cc86315439fe3d2051998a4aaf3f85f47e4b75364f947b98fe6da0e9f2ec4a08fd8e9216c447f7f0491fe983f982d4f661bdabd5605247a7c9cfa
-  data.tar.gz: 38b99fddf44dc254d770a61a750235ecb16761ec1acf48bcb51f87b2731a9d2e809eee679c61607fd3c1656fa560ec23bca0ab3eb90a8a31d11b94a54d2783b3
+  metadata.gz: 8c099b90e42efbf2e0d3698c0370113a5cb17d22bb8bd8e35f710fb913f2396d431a90d6bcc275cd386395724d58fab093fe2d14ebc34273c5f2af47bc074c1d
+  data.tar.gz: 17c5627351ee9bca5d7998f6b820677972a5baa6b9f36530e3fd446c3e63138d9414d8fed01caab7e8a75ae3bc1b4d0086c2f8c438073f90b1854e9142002327

data/.github/workflows/ci.yml

@@ -0,0 +1,22 @@
+name: 'CI'
+
+on:
+  push:
+    branches: [ master ]
+  pull_request: ~
+
+jobs:
+  run-tests:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        rubyversion: ['2.5', '2.6', '2.7', '3.0']
+    steps:
+      - uses: actions/checkout@v2
+      - name: set up ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.rubyversion }}
+          bundler-cache: true
+      - name: run tests
+        run: bundle exec rspec

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+/.idea

data/.travis.yml

@@ -1,3 +1,6 @@
 rvm:
+  - 2.4.1
+  - 2.3.4
+  - 2.2.7
   - 2.1.1
-  - 2.0.0
+  - 2.0.0

data/CHANGELOG

@@ -1,3 +1,9 @@
+v2.4.0 (Unreleased)
+=======
+* Add Add all_financial_quarter and all_financial_year to match ActiveSupport (thx @maxwell)
+* Change financial_year_start to honor @fy_forward (thx @wubr)
+* update CI + tests
+
 v2.3.0
 =======
 

data/LICENSE

@@ -1,20 +1,21 @@
-Copyright (c) 2009 asanghi
+The MIT License (MIT)
 
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
+Copyright (c) 2009 Aditya Sanghi
 
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/README.markdown

@@ -1,55 +1,67 @@
 # Fiscali: Fiscal Year based calculations
 
-Fiscali provides ONE thing:
+Fiscali provides methods on your Date and Time classes to jump around dates in your Financial Year.
 
- * Additional methods on your Date and Time classes to jump around dates in your Financial Year.
- * Not sure it's a point to be said, but YES, you can specify your financial year zone and if you dont know your zone, just provide the first month your financial year to the Date/Time class.
+You can specify your financial year zone and if you don’t know your zone, just provide the month your financial year begins.
 
 ## Quick Links
 
- * [Wiki](http://wiki.github.com/asanghi/fiscali)
- * [Bugs](http://github.com/asanghi/fiscali/issues)
- * [Donate](http://pledgie.org/campaigns/5400)
+ * [Wiki](https://github.com/asanghi/fiscali/wiki)
+ * [Bugs](https://github.com/asanghi/fiscali/issues)
+ * [Donate](https://pledgie.org/campaigns/5400)
 
 ## Installing
 
-    sudo gem install fiscali
+    gem install fiscali
 
 ## Using in your Rails project
 
-In Rails projects, include the gem in the Gemfile and run "bundle install" to install the gem.
+In Rails projects, include Fiscali in the Gemfile, and run `bundle install` to install the gem:
 
-    gem "fiscali"
+    gem 'fiscali'
 
-Next step is to provide your Date/Time class your start zone. Stick this in an initializer file. (If you didnt understand that, put it in $ENV[RAILS_ROOT]/config/initializers/fiscali.rb)
+Next, create an initializer for configuration Fiscali:
+
+    config/initializers/fiscali.rb
+
+Either provide your Date/Time class your start zone:
 
     Date.fiscal_zone = :india
-    Time.fiscal_zone = :india
-or
-    Date.start_month = 4
 
-you can also determine the default for Year Forward by adding this to the same initializer file:
+Or if set the exact start month—for example, April:
+
+    Date.fy_start_month = 4
+
+You can also determine the default for Year Forward by adding this to the same initializer file:
 
     Date.use_forward_year!
     Time.use_forward_year!
 
-or if you wish to revert back to the default
+To revert back to the default:
 
     Date.reset_forward_year!
     Time.reset_forward_year!
 
-Year Forward refers to the standard name for a fiscal year. For example:
-* If FY 2008 spans 2008 - 2009, set to false or don't include in initializer file.
-* If FY 2008 spans 2007 - 2008, set to true in initializer file.
+“Year Forward” refers to the standard name for a fiscal year. For example:
+
+* If FY 2008 spans 2008–2009, set to false or don’t include in initializer file.
+* If FY 2008 spans 2007–2008, set to true in initializer file.
+
+Note that for every configuration you make, you will need to make it to every class (Date, Time, and DateTime) independently. For example:
+
+    Date.fiscal_zone = :india
+    Time.fiscal_zone = :india
+    DateTime.fiscal_zone = :india
 
 ### Default options
 
-By default, the financial year start in January. (Correct me, but thats not a common start of financial year!)
-Known Zones are  -
+By default, the financial year start in January.
 
-    {:india => 4, :uk => 4, :us => 10, :pakistan => 7, :australia => 7, :ireland => 1, :nz => 7, :japan => 4}
+Supported zones are:
 
-By default, the Year Forward option is set to false, meaning the term FY 2008 spans 2008-2009 years.
+    { india: 4, uk: 4, us: 10, pakistan: 7, australia: 7, ireland: 1, nz: 7, japan: 4}
+
+By default, the year forward is false, meaning the term FY 2008 spans 2008–2009 years.
 
 ## Date or Time Class Methods
 
@@ -84,8 +96,6 @@ By default, the Year Forward option is set to false, meaning the term FY 2008 sp
     Date.uses_forward_year?
     => true
 
-
-
 If you want to add your own fiscal zone
 
     RisingSun::Fiscali::FISCAL_ZONE.merge!(:my_own_zone => 2)
@@ -102,15 +112,17 @@ should do the trick.
 Indian Fiscal Year starts from 1st of April
 Assume Date.today is 1st May 2009
 
-
 ##### financial_year -> Returns the financial year of the date/time
+
     Date.today.financial_year
     => 2009
     Date.today.beginning_of_year.financial_year
     => 2008
- Since 1st Jan 2009 in India falls in the 2008-09 financial year
+
+Since 1st Jan 2009 in India falls in the 2008-09 financial year
 
 ##### beginning_of_financial_year -> Returns the beginning of financial year
+
     Date.today.beginning_of_financial_year
     => 1st April 2009
     Date.today.beginning_of_year.beginning_of_financial_year
@@ -199,11 +211,17 @@ Assume Date.today is 1st May 2009
     Date.today.beginning_of_year.previous_financial_quarter
     => 1st Apr 2008
 
-
 ## Contributors
 
+* [@mxie](https://github.com/mxie)
+* [@moubry](https://github.com/moubry)
 * [@reed](https://github.com/reed)
 * [@chiperific](https://github.com/chiperific)
 * [@rshallit](https://github.com/rshallit)
 * [@asanghi](https://github.com/asanghi)
+* [@maxwell](https://github.com/maxwell)
+* [@wubr](https://github.com/wubr)
+
+## License
 
+Fiscali is released under the [MIT License](http://www.opensource.org/licenses/MIT).

data/fiscali.gemspec

@@ -5,10 +5,11 @@ Gem::Specification.new do |gem|
   gem.name          = "fiscali"
   gem.version       = RisingSun::Fiscali::VERSION
   gem.authors       = ["Aditya Sanghi"]
-  gem.email         = ["asanghi@me.com"]
+  gem.email         = ["asanghi@hey.com"]
   gem.description   = %q{Fiscal Year Date Functions}
   gem.summary       = %q{Fiscal Year Date Functions}
   gem.homepage      = "https://github.com/asanghi/fiscali"
+  gem.license       = 'MIT'
 
   gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   gem.files         = `git ls-files`.split("\n")
@@ -18,6 +19,5 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'activesupport'
 
   gem.add_development_dependency 'rake'
-  gem.add_development_dependency 'rspec', '~> 2.8'
+  gem.add_development_dependency 'rspec', '~> 3.10'
 end
-

data/lib/rising_sun/fiscali.rb

@@ -29,7 +29,7 @@ module RisingSun
       end
 
       def financial_year_start(year=Date.today.year)
-        new(year,fy_start_month,1)
+        uses_forward_year? ? new(year - 1,fy_start_month,1) : new(year,fy_start_month,1)
       end
 
       def financial_months
@@ -51,7 +51,9 @@ module RisingSun
     end
 
     def financial_year
-      if self.class.uses_forward_year?
+      if january_start_month?
+        self.year
+      elsif self.class.uses_forward_year?
         self.month < start_month ? self.year : self.year + 1
       else
         self.month < start_month ? self.year - 1 : self.year
@@ -59,8 +61,7 @@ module RisingSun
     end
 
     def beginning_of_financial_year
-      year = self.class.uses_forward_year? ? financial_year - 1 : financial_year
-      change(:year => year, :month => start_month, :day => 1).beginning_of_month
+      change(:year => year_of_financial_year_beginning, :month => start_month, :day => 1).beginning_of_month
     end
 
     def end_of_financial_year
@@ -116,6 +117,14 @@ module RisingSun
       beginning_of_financial_half.months_ago(6)
     end
 
+    def all_financial_quarter
+      beginning_of_financial_quarter..end_of_financial_quarter
+    end
+
+    def all_financial_year
+      beginning_of_financial_year..end_of_financial_year
+    end
+
     def financial_month_of(month)
       if month < start_month
         Date.new(year+1,month,1)
@@ -126,6 +135,18 @@ module RisingSun
 
     private
 
+    def year_of_financial_year_beginning
+      if self.class.uses_forward_year? && !january_start_month?
+        financial_year - 1
+      else
+        financial_year
+      end
+    end
+
+    def january_start_month?
+      start_month == 1
+    end
+
     def months_between
       soy = self.beginning_of_financial_year
       (self.month - soy.month) + 12 * (self.year - soy.year)

data/lib/rising_sun/version.rb

@@ -1,5 +1,5 @@
 module RisingSun
   module Fiscali
-    VERSION = "2.3.0"
+    VERSION = "2.4.4"
   end
 end

data/spec/fiscali_spec.rb

@@ -2,129 +2,149 @@ require 'spec_helper'
 
 describe "fiscali" do
   it "should be possible to read fiscal zone" do
-    Date.fiscal_zone.should be_nil
+    expect(Date.fiscal_zone).to be_nil
   end
 
   it "should be possible to write fiscal zone" do
     Date.fiscal_zone = :india
-    Date.fiscal_zone.should eql(:india)
+    expect(Date.fiscal_zone).to eql(:india)
   end
 
   it "should be possible to read fiscal start month" do
     Date.fy_start_month = 2
-    Date.fy_start_month.should eql(2)
+    expect(Date.fy_start_month).to eql(2)
   end
 
   it "should report financial year start" do
     Date.fiscal_zone = :india
     this_year = Date.today.year
-    Date.financial_year_start.should eql(Date.new(this_year,4,1))
+    expect(Date.financial_year_start).to eql(Date.new(this_year,4,1))
 
-    Date.financial_year_start(2009).should eql(Date.new(2009,4,1))
+    expect(Date.financial_year_start(2009)).to eql(Date.new(2009,4,1))
   end
 
   context "Forward Year settings" do
-    after(:each) do
+    after :each do
       Date.reset_forward_year!
     end
 
     it "should be possible to read year forward field" do
-      Date.uses_forward_year?.should eql(false)
+      expect(Date.uses_forward_year?).to eql(false)
     end
 
     it "should be possible to set year forward field" do
       Date.use_forward_year!
-      Date.uses_forward_year?.should eql(true)
+      expect(Date.uses_forward_year?).to eql(true)
     end
 
     it "should report the correct financial eyar if forward year is being used" do
       Date.use_forward_year!
       @d = Date.new(2009,1,1)
-      @d.financial_year.should eql(2009)
+      expect(@d.financial_year).to eql(2009)
       @d = Date.new(2009,4,1)
-      @d.financial_year.should eql(2010)
+      expect(@d.financial_year).to eql(2010)
     end
 
     it "should report the correct beginning_of_financial_year when forward year is set" do
       Date.use_forward_year!
       @d = Date.new(2009,6,1)
-      @d.beginning_of_financial_year.should eql(Date.new(2009,4,1))
+      expect(@d.beginning_of_financial_year).to eql(Date.new(2009,4,1))
+    end
+
+    it "should report financial year start" do
+      Date.fiscal_zone = :india
+      Date.use_forward_year!
+      this_year = Date.today.year
+      expect(Date.financial_year_start).to  eql(Date.new(this_year-1,4,1))
+
+      expect(Date.financial_year_start(2009)).to eql(Date.new(2008,4,1))
     end
   end
 
   context "should report correct date field" do
-    before(:each) do
+    before :each do
       Date.fiscal_zone = :india
       @d = Date.new(2009,1,1)
     end
 
     it "should report correct financial year" do
-      @d.financial_year.should eql(2008)
+      expect(@d.financial_year).to eql(2008)
     end
 
     it "should report correct beginning and of financial year" do
-      @d.beginning_of_financial_year.should eql(Date.new(2008,4,1))
-      @d.end_of_financial_year.should eql(Date.new(2009,3,31))
+      expect(@d.beginning_of_financial_year).to eql(Date.new(2008,4,1))
+      expect(@d.end_of_financial_year).to eql(Date.new(2009,3,31))
     end
 
     it "should report correct beginning of financial halves and quarters" do
-      @d.beginning_of_financial_h1.should eql(Date.new(2008,4,1))
-      @d.beginning_of_financial_h2.should eql(Date.new(2008,10,1))
-      @d.beginning_of_financial_q1.should eql(Date.new(2008,4,1))
-      @d.beginning_of_financial_q2.should eql(Date.new(2008,7,1))
-      @d.beginning_of_financial_q3.should eql(Date.new(2008,10,1))
-      @d.beginning_of_financial_q4.should eql(Date.new(2009,1,1))
+      expect(@d.beginning_of_financial_h1).to eql(Date.new(2008,4,1))
+      expect(@d.beginning_of_financial_h2).to eql(Date.new(2008,10,1))
+      expect(@d.beginning_of_financial_q1).to eql(Date.new(2008,4,1))
+      expect(@d.beginning_of_financial_q2).to eql(Date.new(2008,7,1))
+      expect(@d.beginning_of_financial_q3).to eql(Date.new(2008,10,1))
+      expect(@d.beginning_of_financial_q4).to eql(Date.new(2009,1,1))
     end
 
     it "should report correct end of financial halves and quarters" do
-      @d.end_of_financial_h1.should eql(Date.new(2008,9,30))
-      @d.end_of_financial_h2.should eql(Date.new(2009,3,31))
-      @d.end_of_financial_q1.should eql(Date.new(2008,6,30))
-      @d.end_of_financial_q2.should eql(Date.new(2008,9,30))
-      @d.end_of_financial_q3.should eql(Date.new(2008,12,31))
-      @d.end_of_financial_q4.should eql(Date.new(2009,3,31))
+      expect(@d.end_of_financial_h1).to eql(Date.new(2008,9,30))
+      expect(@d.end_of_financial_h2).to eql(Date.new(2009,3,31))
+      expect(@d.end_of_financial_q1).to eql(Date.new(2008,6,30))
+      expect(@d.end_of_financial_q2).to eql(Date.new(2008,9,30))
+      expect(@d.end_of_financial_q3).to eql(Date.new(2008,12,31))
+      expect(@d.end_of_financial_q4).to eql(Date.new(2009,3,31))
 
-      Date.fiscal_zone = :us 
+      Date.fiscal_zone = :us
 
-      @d.end_of_financial_h1.should eql(Date.new(2009,3,31))
-      @d.end_of_financial_h2.should eql(Date.new(2009,9,30))
-      @d.end_of_financial_q1.should eql(Date.new(2008,12,31))
-      @d.end_of_financial_q2.should eql(Date.new(2009,3,31))
-      @d.end_of_financial_q3.should eql(Date.new(2009,6,30))
-      @d.end_of_financial_q4.should eql(Date.new(2009,9,30))
+      expect(@d.end_of_financial_h1).to eql(Date.new(2009,3,31))
+      expect(@d.end_of_financial_h2).to eql(Date.new(2009,9,30))
+      expect(@d.end_of_financial_q1).to eql(Date.new(2008,12,31))
+      expect(@d.end_of_financial_q2).to eql(Date.new(2009,3,31))
+      expect(@d.end_of_financial_q3).to eql(Date.new(2009,6,30))
+      expect(@d.end_of_financial_q4).to eql(Date.new(2009,9,30))
     end
 
     it "should report financial quarters" do
-      @d.financial_quarter.should eql('Q4 2008')
+      expect(@d.financial_quarter).to eql('Q4 2008')
     end
 
     it "should report financial half" do
-      @d.financial_half.should eql('H2 2008')
-      Date.new(2009,11,30).financial_half.should eql("H2 2009")
+      expect(@d.financial_half).to eql('H2 2008')
+      expect(Date.new(2009, 11, 30).financial_half).to eql('H2 2009')
     end
 
     it "should report next half and quarter" do
-      @d.next_financial_half.should eql(Date.new(2009,4,1))
-      Date.new(2009,6,1).next_financial_half.should eql(Date.new(2009,10,1))
+      expect(@d.next_financial_half).to eql(Date.new(2009,4,1))
+      expect(Date.new(2009,6,1).next_financial_half).to eql(Date.new(2009,10,1))
 
-      @d.next_financial_quarter.should eql(Date.new(2009,4,1))
-      Date.new(2009,10,30).next_financial_quarter.should eql(Date.new(2010,1,1))
+      expect(@d.next_financial_quarter).to eql(Date.new(2009,4,1))
+      expect(Date.new(2009,10,30).next_financial_quarter).to eql(Date.new(2010,1,1))
     end
 
     it "should report beginning of financial half and quarter" do
-      @d.beginning_of_financial_half.should eql(Date.new(2008,10,1))
-      @d.beginning_of_financial_quarter.should eql(Date.new(2009,1,1))
-      Date.new(2009,6,1).beginning_of_financial_half.should eql(Date.new(2009,4,1))
-      Date.new(2009,10,30).beginning_of_financial_quarter.should eql(Date.new(2009,10,1))
+      expect(@d.beginning_of_financial_half).to eql(Date.new(2008,10,1))
+      expect(@d.beginning_of_financial_quarter).to eql(Date.new(2009,1,1))
+      expect(Date.new(2009,6,1).beginning_of_financial_half).to eql(Date.new(2009,4,1))
+      expect(Date.new(2009,10,30).beginning_of_financial_quarter).to eql(Date.new(2009,10,1))
     end
 
     it "should report previous financial half and quarter" do
-      @d.previous_financial_half.should eql(Date.new(2008,4,1))
-      @d.previous_financial_quarter.should eql(Date.new(2008,10,1))
-      Date.new(2009,6,1).previous_financial_half.should eql(Date.new(2008,10,1))
-      Date.new(2009,10,30).previous_financial_quarter.should eql(Date.new(2009,7,1))
+      expect(@d.previous_financial_half).to eql(Date.new(2008,4,1))
+      expect(@d.previous_financial_quarter).to eql(Date.new(2008,10,1))
+      expect(Date.new(2009,6,1).previous_financial_half).to eql(Date.new(2008,10,1))
+      expect(Date.new(2009,10,30).previous_financial_quarter).to eql(Date.new(2009,7,1))
     end
+  end
 
+  context 'when date is end of month' do
+    before do
+      Date.fiscal_zone = :india
+      @d = Date.new(2009, 3, 31)
+    end
+
+    it "should report correct beginning and of financial year" do
+      expect(@d.beginning_of_financial_year).to eql(Date.new(2008,4,1))
+      expect(@d.end_of_financial_year).to eql(Date.new(2009,3,31))
+    end
   end
 
   context "should report correct timestamp" do
@@ -134,23 +154,23 @@ describe "fiscali" do
     end
 
     it "should report beginning of year/half/quarter with timestamp at beginning of day" do
-      @t.beginning_of_financial_year.should eql(Time.new(2008,4,1,0,0,0))
-      @t.beginning_of_financial_h1.should eql(Time.new(2008,4,1,0,0,0))
-      @t.beginning_of_financial_h2.should eql(Time.new(2008,10,1,0,0,0))
-      @t.beginning_of_financial_q1.should eql(Time.new(2008,4,1,0,0,0))
-      @t.beginning_of_financial_q2.should eql(Time.new(2008,7,1,0,0,0))
-      @t.beginning_of_financial_q3.should eql(Time.new(2008,10,1,0,0,0))
-      @t.beginning_of_financial_q4.should eql(Time.new(2009,1,1,0,0,0))
+      expect(@t.beginning_of_financial_year).to eql(Time.new(2008,4,1,0,0,0))
+      expect(@t.beginning_of_financial_h1).to eql(Time.new(2008,4,1,0,0,0))
+      expect(@t.beginning_of_financial_h2).to eql(Time.new(2008,10,1,0,0,0))
+      expect(@t.beginning_of_financial_q1).to eql(Time.new(2008,4,1,0,0,0))
+      expect(@t.beginning_of_financial_q2).to eql(Time.new(2008,7,1,0,0,0))
+      expect(@t.beginning_of_financial_q3).to eql(Time.new(2008,10,1,0,0,0))
+      expect(@t.beginning_of_financial_q4).to eql(Time.new(2009,1,1,0,0,0))
     end
 
     it "should report end of year/half/quarter with timestamp at end of day" do
-      @t.end_of_financial_year.should eql(Time.new(2009,3,31).end_of_day)
-      @t.end_of_financial_h1.should eql(Time.new(2008,9,30).end_of_day)
-      @t.end_of_financial_h2.should eql(Time.new(2009,3,31).end_of_day)
-      @t.end_of_financial_q1.should eql(Time.new(2008,6,30).end_of_day)
-      @t.end_of_financial_q2.should eql(Time.new(2008,9,30).end_of_day)
-      @t.end_of_financial_q3.should eql(Time.new(2008,12,31).end_of_day)
-      @t.end_of_financial_q4.should eql(Time.new(2009,3,31).end_of_day)
+      expect(@t.end_of_financial_year).to eql(Time.new(2009,3,31).end_of_day)
+      expect(@t.end_of_financial_h1).to eql(Time.new(2008,9,30).end_of_day)
+      expect(@t.end_of_financial_h2).to eql(Time.new(2009,3,31).end_of_day)
+      expect(@t.end_of_financial_q1).to eql(Time.new(2008,6,30).end_of_day)
+      expect(@t.end_of_financial_q2).to eql(Time.new(2008,9,30).end_of_day)
+      expect(@t.end_of_financial_q3).to eql(Time.new(2008,12,31).end_of_day)
+      expect(@t.end_of_financial_q4).to eql(Time.new(2009,3,31).end_of_day)
     end
   end
 
@@ -158,7 +178,54 @@ describe "fiscali" do
     Date.fiscal_zone = :india
     thread = Thread.new { Thread.current["my_fiscal_zone"] = Date.fiscal_zone }
     thread.join
-    thread["my_fiscal_zone"].should == :india
+    expect(thread['my_fiscal_zone']).to eql(:india)
+  end
+
+  context "when the start month is January" do
+    around :each do |example|
+      old_fy_start_month = Date.fy_start_month
+      Date.fy_start_month = 1
+      @date = Date.new(2014, 1, 1)
+      example.run
+      Date.fy_start_month = old_fy_start_month
+    end
+
+    it "returns the date's year as the financial year" do
+      expect(@date.financial_year).to eql(2014)
+    end
+
+    context "when using forward year" do
+      around :each do |example|
+        Date.use_forward_year!
+        example.run
+        Date.reset_forward_year!
+      end
+
+      it "returns the date's year as the financial year" do
+        expect(@date.financial_year).to eql(2014)
+      end
+
+      it "returns the date itself as the beginning_of_financial_year" do
+        expect(@date.beginning_of_financial_year).to eql(@date)
+      end
+
+      it "returns the date itself as the end_of_financial_year" do
+        expect(@date.end_of_financial_year).to eql(Date.new(2014, 12, 31))
+      end
+    end
   end
 
-end
+  context 'all_* methods' do
+    it 'returns a range of the entire financial period' do
+      date = Date.today
+      range = date.all_financial_quarter
+      expect(range.first).to eql(date.beginning_of_financial_quarter)
+      expect(range.last).to eql(date.end_of_financial_quarter)
+
+      range = date.all_financial_year
+
+      expect(range.first).to eql(date.beginning_of_financial_year)
+      expect(range.last).to eql(date.end_of_financial_year)
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -3,3 +3,6 @@ $:.unshift File.expand_path('../../lib', __FILE__)
 require 'rspec'
 require 'fiscali'
 
+RSpec.configure do |config|
+  config.raise_errors_for_deprecations!
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fiscali
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.4
 platform: ruby
 authors:
 - Aditya Sanghi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-24 00:00:00.000000000 Z
+date: 2021-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -44,22 +44,23 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '3.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '3.10'
 description: Fiscal Year Date Functions
 email:
-- asanghi@me.com
+- asanghi@hey.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - ".document"
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".travis.yml"
 - CHANGELOG
@@ -75,7 +76,8 @@ files:
 - spec/fiscali_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/asanghi/fiscali
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -92,8 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Fiscal Year Date Functions