fiscali 2.2.1 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51022d669afa31ad0f293c538d6e6701b52169ec
-  data.tar.gz: e35e3fb6e06d9b241b0b40d0eed577868298bc1d
+  metadata.gz: 9d186e022ab4c157c6bea6233b368582d8b60209
+  data.tar.gz: 26016d53cffee5d9fa33214d33522e4c087f13be
 SHA512:
-  metadata.gz: 5e9f04ff45ee0834b172527846a4fdf50d321aa4cf59b4f8be0498ba45cd3b6648a10149d7b281f1ae6e780cee36ad6c93e1ba5b5b4c0b18b6a4ecd87c255371
-  data.tar.gz: a645e61e3b16ab56cb9f55fb5ced38ee4350764b8a2bbe55288cecad98a3359527abda72ae8f30bf5400475cb6825800226a573a8ae02f42c02ee108785adb96
+  metadata.gz: 4c74baca119cc86315439fe3d2051998a4aaf3f85f47e4b75364f947b98fe6da0e9f2ec4a08fd8e9216c447f7f0491fe983f982d4f661bdabd5605247a7c9cfa
+  data.tar.gz: 38b99fddf44dc254d770a61a750235ecb16761ec1acf48bcb51f87b2731a9d2e809eee679c61607fd3c1656fa560ec23bca0ab3eb90a8a31d11b94a54d2783b3

data/.travis.yml

@@ -1,3 +1,3 @@
 rvm:
-  - 1.8.7
-  - 1.9.3
+  - 2.1.1
+  - 2.0.0

data/CHANGELOG

@@ -1,3 +1,9 @@
+v2.3.0
+=======
+
+* Bugfix end_of_quarter, allow for timestamp types, ability to get quarters using one method
+* more tests
+
 v2.2.1
 =======
 

data/README.markdown

@@ -13,16 +13,11 @@ Fiscali provides ONE thing:
 
 ## Installing
 
-    # Install the gem (from gemcutter.org):
     sudo gem install fiscali
 
 ## Using in your Rails project
 
-It's easy to get up and running. Update your config/environment.rb file with this gem
-
-    config.gem "fiscali"
-
-In newer Rails projects, include the gem in the Gemfile and run "bundle install" to install the gem.
+In Rails projects, include the gem in the Gemfile and run "bundle install" to install the gem.
 
     gem "fiscali"
 
@@ -75,7 +70,7 @@ By default, the Year Forward option is set to false, meaning the term FY 2008 sp
     Date.fiscal_zone
     => nil
 
-### Year Forward (Assume Date.today is 1st May 2009 and the fy_start_month = 4)
+#### Year Forward (Assume Date.today is 1st May 2009 and the fy_start_month = 4)
 
     Date.uses_forward_year?
     => false
@@ -144,9 +139,9 @@ Assume Date.today is 1st May 2009
 ##### financial_quarter -> Returns Q1, Q2, Q3, Q4 depending on where the date falls
 
     Date.today.financial_quarter
-    => Q1
+    => Q1 2009
     Date.today.beginning_of_year.financial_quarter
-    => Q4
+    => Q4 2009
 
 ##### financial_half -> Returns H1, H2 depending on where the date falls
 
@@ -165,12 +160,23 @@ Assume Date.today is 1st May 2009
     Date.today.next_financial_half
     => 1st October 2009
 
-##### beginning_of_financial_quarter -> Takes you to the beginning of the current financial quarter
+##### beginning_of_financial_quarter -> Takes you to the beginning of a quarter in the current financial year (defaults to current quarter)
 
     Date.today.beginning_of_financial_quarter
     => 1st April 2009
     Date.today.beginning_of_year.beginning_of_financial_quarter
     => 1st Jan 2009
+    Date.today.beginning_of_financial_quarter(3)
+    => 1st July 2009
+
+##### end_of_financial_quarter -> Takes you to the end of a quarter in the current financial year (defaults to current quarter)
+
+    Date.today.end_of_financial_quarter
+    => 30th June 2009
+    Date.today.beginning_of_year.end_of_financial_quarter
+    => 31st March 2009
+    Date.today.end_of_financial_quarter(3)
+    => 30th September 2009
 
 ##### beginning_of_financial_half -> Takes you to the beginning of the current financial half
 
@@ -196,17 +202,8 @@ Assume Date.today is 1st May 2009
 
 ## Contributors
 
-@asanghi
-@chiperific
-Rachel Shallit
-
-
-
-
-
-
-
-
-
-
+* [@reed](https://github.com/reed)
+* [@chiperific](https://github.com/chiperific)
+* [@rshallit](https://github.com/rshallit)
+* [@asanghi](https://github.com/asanghi)
 

data/lib/rising_sun/fiscali.rb

@@ -60,39 +60,18 @@ module RisingSun
 
     def beginning_of_financial_year
       year = self.class.uses_forward_year? ? financial_year - 1 : financial_year
-      change(:year => year, :month => start_month, :day => 1)
+      change(:year => year, :month => start_month, :day => 1).beginning_of_month
     end
 
     def end_of_financial_year
       (beginning_of_financial_year + 1.year - 1.month).end_of_month
     end
 
-    alias :beginning_of_financial_q1 :beginning_of_financial_year
-    def end_of_financial_q1
-      end_of_financial_year - 9.months
+    (1..4).each do |q|
+      define_method("beginning_of_financial_q#{q}"){ beginning_of_financial_quarter q }
+      define_method("end_of_financial_q#{q}"){ end_of_financial_quarter q }
     end
 
-    def beginning_of_financial_q2
-      beginning_of_financial_year + 3.months
-    end
-
-    def end_of_financial_q2
-      end_of_financial_year - 6.months
-    end
-
-    def beginning_of_financial_q3
-      beginning_of_financial_year + 6.months
-    end
-
-    def end_of_financial_q3
-      end_of_financial_year - 3.months
-    end
-
-    def beginning_of_financial_q4
-      beginning_of_financial_year + 9.months
-    end
-    alias :end_of_financial_q4 :end_of_financial_year
-
     alias :beginning_of_financial_h1 :beginning_of_financial_year
     alias :end_of_financial_h1 :end_of_financial_q2
 
@@ -115,8 +94,14 @@ module RisingSun
       beginning_of_financial_year.months_since(((months_between / 6).floor + 1) * 6)
     end
 
-    def beginning_of_financial_quarter
-      beginning_of_financial_year.months_since(((months_between / 3).floor) * 3)
+    def beginning_of_financial_quarter(quarter = nil)
+      quarter = (months_between / 3).floor + 1 unless quarter.in? 1..4
+      beginning_of_financial_year.advance(months: (quarter - 1) * 3).beginning_of_month
+    end
+
+    def end_of_financial_quarter(quarter = nil)
+      quarter = (months_between / 3).floor + 1 unless quarter.in? 1..4
+      beginning_of_financial_year.advance(months: quarter * 3 - 1).end_of_month
     end
 
     def beginning_of_financial_half
@@ -149,6 +134,5 @@ module RisingSun
     def start_month
       self.class.fy_start_month || FY_START_MONTH
     end
-
   end
 end

data/lib/rising_sun/version.rb

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

data/spec/fiscali_spec.rb

@@ -54,8 +54,10 @@ describe "fiscali" do
 
   context "should report correct date field" 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)
     end
@@ -81,6 +83,15 @@ describe "fiscali" do
       @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))
+
+      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))
     end
 
     it "should report financial quarters" do
@@ -116,6 +127,33 @@ describe "fiscali" do
 
   end
 
+  context "should report correct timestamp" do
+    before(:each) do
+      Time.fiscal_zone = :india
+      @t = Time.new(2009,1,1,12,1,1)
+    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))
+    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)
+    end
+  end
+
   it "should not rely on app being single threaded" do
     Date.fiscal_zone = :india
     thread = Thread.new { Thread.current["my_fiscal_zone"] = Date.fiscal_zone }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fiscali
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.3.0
 platform: ruby
 authors:
 - Aditya Sanghi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-23 00:00:00.000000000 Z
+date: 2014-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport