retail_calendar 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1650f5f1b7949233618b8380c2cfd80f6c138859
-  data.tar.gz: ff01f022beb26e8d1f7bc8071a29cd51eb5f49d6
+  metadata.gz: 2b596b4c676c6b516d7caee5653bdc18187a8969
+  data.tar.gz: d30c9dcbc1b8ff952dffee20c0af3308da3b39f2
 SHA512:
-  metadata.gz: 536e727d75424225b63802af043fe344e64f414b47c11c0149c31644dc38fd3181d7afcac8d10161a8292c3b52213389cf8b28e7d7f3c585034cf8c27f9ac0bb
-  data.tar.gz: 09552efd38ef7e5b9f57a4741de9b740544eae592c6ee88a0c4b32137e1e7375036d8a30aff7d4d24f4f60e698a9128ccc277f15ffc656b3737e2b1e02d6ff31
+  metadata.gz: 6bfc13386f7def9cedef9cd79d488b2cc7340f5a592b87774338d7932e73b5934264e49ab08490e963dacc5876e6ead134380747352c28a08df326cf5845309b
+  data.tar.gz: 9e49f270957ae2459b5d05ebdfd41f8b6ab737c13b88d322518214047d78ba35a4c615495cdd33568b6b2d72516b36c68c37e3021ce063c24fcc836fc69c7c46

data/README.md

@@ -41,8 +41,8 @@ Instantiate RetailCalendar::Finder object to get start and end dates for weeks/p
 Instantiate with time zone
 
 ```ruby
-> cal = RetailCalendar::Finder.new('+7000')
-=> #<RetailCalendar::Finder:0x000001021a3328 @offset="+7000">
+> cal = RetailCalendar::Finder.new('PST')
+=> #<RetailCalendar::Finder:0x000001021a3328 @offset="PST">
 ```
 
 ### Functions

data/lib/retail_calendar/finder.rb

@@ -71,17 +71,15 @@ module RetailCalendar
     end
 
     def last_year
-      previous_year = DateTime.now.change(:offset => @offset).year - 1
-      year(previous_year)
+      year(determine_current_year - 1)
     end
 
     def this_year
-      previous_year = DateTime.now.change(:offset => @offset).year
-      year(previous_year)
+      year(determine_current_year)
     end
 
     def last_season
-      current_year = DateTime.now.change(:offset => @offset).year
+      current_year = determine_current_year
       current_season = get_season
       if current_season == 1
         previous_year = current_year - 1
@@ -94,13 +92,13 @@ module RetailCalendar
     end
 
     def this_season
-      current_year = DateTime.now.change(:offset => @offset).year
+      current_year = determine_current_year
       current_season = get_season
       season(current_year, current_season)
     end
 
     def last_quarter
-      current_year = DateTime.now.change(:offset => @offset).year
+      current_year = determine_current_year
       current_quarter = get_quarter
       if current_quarter == 1
         previous_year = current_year - 1
@@ -113,13 +111,13 @@ module RetailCalendar
     end
 
     def this_quarter
-      current_year = DateTime.now.change(:offset => @offset).year
+      current_year = determine_current_year
       current_quarter = get_quarter
       quarter(current_year, current_quarter)
     end
 
     def last_period
-      current_year = DateTime.now.change(:offset => @offset).year
+      current_year = determine_current_year
       current_period = get_period
       if current_period == 1
         previous_year = current_year - 1
@@ -131,8 +129,19 @@ module RetailCalendar
       period(previous_year, previous_period)
     end
 
+    def determine_current_year(curr_date = DateTime.now.change(:offset => @offset))
+      curr_date_year = DateTime.now.change(:offset => @offset).year
+      if (curr_date >= year(curr_date_year).start_date && curr_date <= year(curr_date_year).end_date)
+        return curr_date_year
+      elsif curr_date < year(curr_date_year).start_date
+        return curr_date_year - 1
+      elsif curr_date > year(curr_date_year).end_date
+        return curr_date_year + 1
+      end
+    end
+
     def this_period
-      current_year = DateTime.now.change(:offset => @offset).year
+      current_year = determine_current_year
       current_period = get_period
       period(current_year, current_period)
     end
@@ -162,13 +171,13 @@ module RetailCalendar
     private
 
     def get_season(curr_date = DateTime.now.change(:offset => @offset))
-      start_date = start_time_for_year(curr_date.year)
+      start_date = start_time_for_year(determine_current_year(curr_date))
       days_passed = (curr_date.to_date - start_date.to_date).to_i
       days_passed < SEASON_LENGTH ? 1 : 2
     end
 
     def get_quarter(curr_date = DateTime.now.change(:offset => @offset))
-      start_date = start_time_for_year(curr_date.year)
+      start_date = start_time_for_year(determine_current_year(curr_date))
       days_passed = (curr_date.to_date - start_date.to_date).to_i
       case days_passed
       when 0..91
@@ -183,7 +192,7 @@ module RetailCalendar
     end
 
     def get_period(curr_date = DateTime.now.change(:offset => @offset))
-      start_date = start_time_for_year(curr_date.year)
+      start_date = start_time_for_year(determine_current_year(curr_date))
       period = 1
       while start_date < curr_date
         no_weeks = weeks_in_month(period + 1)

data/lib/retail_calendar/version.rb

@@ -1,3 +1,3 @@
 module RetailCalendar
-  VERSION = "1.1.1"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: retail_calendar
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Aditya Raghuwanshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-04 00:00:00.000000000 Z
+date: 2015-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler