fiscali 2.4.1 → 2.4.2

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YzliMjVhMjczMmVkNDc2ZGI4M2I1ZTZkMTQ3ZjZiY2JhMjJhZTgzYg==
-  data.tar.gz: !binary |-
-    OGNlMGI0MzJkMTRiYWRkYWVjOTQ3YWU5NmFlNmIyMjkyMzMwZGFjNg==
+SHA1:
+  metadata.gz: 668e7b14a08a01a3a0ccd9ade61bbfa89d8230ef
+  data.tar.gz: c3f349a09a79887b01faeaa00b004249d9574fff
 SHA512:
-  metadata.gz: !binary |-
-    OWEwMGNlNzFjNjA0MDAwZGQ0NDM2ZDJiNmMzYTZiN2I3ZTE5NjM4MTY2OTM4
-    OTRmZGVlZGE1MzNjMDE1ODgyOGEwZmQ1MThhOTZjMmU2NTlmMTM0NDMzMjYy
-    ZTZhN2ExZDVlM2E5MTAxMmFmN2U1MDZhNmFjNjZjZjFjY2JmMTA=
-  data.tar.gz: !binary |-
-    M2QwNGE2Y2JkZjU0ZWMzODJhZDI0YzViMjQ5N2EwYWQyYTNmZjcwODRjODJi
-    MjE1NjI1Y2QzZGQ3YmFlZmVhNGMwMTg0NzNkNjJiMDJmZjVjZDBmMGY0YTU5
-    YTEyMGExY2Y5Y2I1NGZjYzQ3YTM5YWE5MTM3MjlkMTM3MTNjNDI=
+  metadata.gz: 2ff65d864bce592b41bc12e17e1ebd2550d096bb403ddd32631237416019fc9f6f4992b9e408ba7475cb00db65705a3ae4193b7aed6185b03e4060d3890df2bb
+  data.tar.gz: ab80fa725440ab431b915cf49efda63491abdcbffcb0db72261b7e905794012b41c70839b4bd5f5ede15eae5d13e5a5fbfce46799c5b552fa6a6e8660451e2b8

data/lib/rising_sun/fiscali.rb

@@ -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).beginning_of_month
     end
 
     def end_of_financial_year
@@ -126,6 +127,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.4.1"
+    VERSION = "2.4.2"
   end
 end

data/spec/fiscali_spec.rb

@@ -160,4 +160,38 @@ describe "fiscali" do
     thread.join
     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

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: fiscali
 version: !ruby/object:Gem::Version
-  version: 2.4.1
+  version: 2.4.2
 platform: ruby
 authors:
 - Aditya Sanghi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-28 00:00:00.000000000 Z
+date: 2015-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.3'
 description: Fiscal Year Date Functions
@@ -59,9 +59,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .document
-- .gitignore
-- .travis.yml
+- ".document"
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG
 - Gemfile
 - LICENSE
@@ -84,17 +84,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Fiscal Year Date Functions