merch_calendar 0.0.5 → 0.1.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f96df8a358dab3d900fcdcd63295f26b87b76781
-  data.tar.gz: eac675dcee19465f4f52b1a6917547aa915121fd
+  metadata.gz: eb41f5342b94855990d76a316fd9fe32a059e2ea
+  data.tar.gz: d16f77b34c7c286fae1a71795d00a2e87d034f8e
 SHA512:
-  metadata.gz: 14925ac6a035b7122c552f13aa7c795222ecc4e63866f4a4381f16e3bd7fca1b80c5450465a07553cff7d4be9af2c8e628a5393379a556935bfa271d16462e5f
-  data.tar.gz: 41fe2d24d57d8c1ab1640b386bfb89a08bf9ba28bc0960aed1108256e0aa421d7ff7dbed0dffc33036acefc81aaed6da2828a234197fb7d93f2e68dbe894bd16
+  metadata.gz: 0523a60e48200560bfe2218f7bdfb05e41fe99d83460654ccc192b2229cc0ca6fded1fd2504c10c5c053879e6c4187e59bee73bef503f67f2730e286a76e0d8b
+  data.tar.gz: 49e67aa34e6f46e62077d735fab174c6684b394c008b50377e9a451711c0b7da7fe18cace1f58790e181b518dc05759e013a58ce1d39f39abd809354e4faa7ea

data/.gitignore

@@ -2,3 +2,9 @@ coverage/
 doc
 .yardoc/
 pkg/
+
+# ctags
+tags
+
+# vim
+*.swp

data/Gemfile.lock

@@ -1,11 +1,12 @@
 PATH
   remote: .
   specs:
-    merch_calendar (0.0.5)
+    merch_calendar (0.1.0.rc1)
 
 GEM
   remote: https://www.rubygems.org/
   specs:
+    byebug (9.0.6)
     coderay (1.1.1)
     coveralls (0.8.13)
       json (~> 1.8)
@@ -21,6 +22,9 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
+    pry-byebug (3.4.2)
+      byebug (~> 9.0)
+      pry (~> 0.10)
     rake (10.5.0)
     rspec (3.4.0)
       rspec-core (~> 3.4.0)
@@ -53,9 +57,10 @@ DEPENDENCIES
   coveralls
   merch_calendar!
   pry
+  pry-byebug
   rake
   rspec (>= 3.0.0)
   simplecov
 
 BUNDLED WITH
-   1.15.0
+   1.15.1

data/lib/merch_calendar.rb

@@ -9,4 +9,5 @@ require_relative 'merch_calendar/util'
 require_relative 'merch_calendar/configurable'
 require_relative 'merch_calendar/configuration'
 require_relative 'merch_calendar/merch_week'
-require_relative 'merch_calendar/date_calculator'
+require_relative 'merch_calendar/retail_calendar'
+require_relative 'merch_calendar/fiscal_year_calendar'

data/lib/merch_calendar/fiscal_year_calendar.rb

@@ -0,0 +1,62 @@
+require "merch_calendar/retail_calendar"
+
+module MerchCalendar
+  class FiscalYearCalendar
+    def initialize
+      @retail_calendar = RetailCalendar.new
+    end
+
+    # The day after last years' end date
+    def start_of_year(year)
+      start_of_quarter(year, 1)
+    end
+
+    def end_of_year(year)
+      end_of_quarter(year, 4)
+    end
+
+    # Return the starting date for a particular quarter
+    def start_of_quarter(year, quarter)
+      @retail_calendar.start_of_quarter(*offset_quarter(year, quarter))
+    end
+
+    # Return the ending date for a particular quarter
+    def end_of_quarter(year, quarter)
+      @retail_calendar.end_of_quarter(*offset_quarter(year, quarter))
+    end
+
+    def start_of_month(year, merch_month)
+      @retail_calendar.start_of_month(*offset_month(year, merch_month))
+    end
+
+    def end_of_month(year, merch_month)
+      @retail_calendar.end_of_month(*offset_month(year, merch_month))
+    end
+
+    # Returns the date that corresponds to the first day in the merch week
+    def start_of_week(year, merch_month, merch_week)
+      @retail_calendar.start_of_week(*offset_month(year, merch_month), merch_week)
+    end
+
+    # Returns the date that corresponds to the last day in the merch week
+    def end_of_week(year, merch_month, merch_week)
+      @retail_calendar.end_of_week(*offset_month(year, merch_month), merch_week)
+    end
+
+    def weeks_in_year(year)
+      @retail_calendar.weeks_in_year(year - 1)
+    end
+
+    private
+
+    def offset_quarter(year, quarter)
+      # first quarter in fiscal calendar is Q3 of retail calendar of previous year
+      yr, qt = quarter >= 3 ? [year, quarter - 2] : [year - 1, quarter + 2]
+    end
+
+    def offset_month(year, month)
+      # first month in fiscal calendar is the sixth month in the retail calendar
+      yr, mn = month >= 7 ? [year, month - 6] : [year - 1, month + 6]
+    end
+  end
+end

data/lib/merch_calendar/merch_week.rb

@@ -88,7 +88,7 @@ module MerchCalendar
       # TODO: This is very inefficient, but less complex than strategic guessing
       # maybe switch to a binary search or something
       @merch_month ||= (1..12).detect do |num|
-        date_calc.end_of_month(start_of_year.year, num) >= date && date >= date_calc.start_of_month(start_of_year.year, num)
+        retail_calendar.end_of_month(start_of_year.year, num) >= date && date >= retail_calendar.start_of_month(start_of_year.year, num)
       end
     end
 
@@ -103,7 +103,7 @@ module MerchCalendar
     #
     # @return [Fixnum]
     def month
-      @month ||= date_calc.merch_to_julian(merch_month)
+      @month ||= MerchCalendar.merch_to_julian(merch_month)
     end
 
     # The specific quarter this week falls in
@@ -155,21 +155,21 @@ module MerchCalendar
     #
     # @return [Date]
     def end_of_year
-      @end_of_year ||= date_calc.end_of_year(year)
+      @end_of_year ||= retail_calendar.end_of_year(year)
     end
 
     # The start date of the merch month
     #
     # @return [Date]
     def start_of_month
-      @start_of_month ||= date_calc.start_of_month(year, merch_month)
+      @start_of_month ||= retail_calendar.start_of_month(year, merch_month)
     end
 
     # The end date of the merch month
     #
     # @return [Date]
     def end_of_month
-      @end_of_month ||= date_calc.end_of_month(year, merch_month)
+      @end_of_month ||= retail_calendar.end_of_month(year, merch_month)
     end
 
     # The merch season this date falls under.
@@ -209,15 +209,15 @@ module MerchCalendar
     private
 
     def year_start_date
-      start_date = date_calc.start_of_year(date.year)
+      start_date = retail_calendar.start_of_year(date.year)
       if start_date > date
-        start_date = date_calc.start_of_year(date.year - 1)
+        start_date = retail_calendar.start_of_year(date.year - 1)
       end
       start_date
     end
 
-    def date_calc
-      @date_calc ||= DateCalculator.new
+    def retail_calendar
+      @retail_calendar ||= RetailCalendar.new
     end
 
   end

data/lib/merch_calendar/{date_calculator.rb → retail_calendar.rb}

@@ -1,12 +1,9 @@
 require "date"
 
 module MerchCalendar
-
-  # @api private
-  class DateCalculator
-
+  class RetailCalendar
     def end_of_year(year)
-      year_end = Date.new (year + 1), 1, -1
+      year_end = Date.new((year + 1), 1, -1)
       wday = (year_end.wday + 1) % 7
 
       if wday > 3
@@ -53,27 +50,25 @@ module MerchCalendar
 
     # Returns the date that corresponds to the first day in the merch week
     def start_of_week(year, month, merch_week)
-      week = MerchCalendar::MerchWeek.find(year, month, merch_week) 
-      week.start_of_week
+      start_of_month(year, month) + ((merch_week - 1) * 7)
     end
 
     # Returns the date that corresponds to the last day in the merch week
     def end_of_week(year, month, merch_week)
-      week = MerchCalendar::MerchWeek.find(year, month, merch_week) 
-      week.end_of_week
+      start_of_month(year, month) + (6 + ((merch_week - 1) * 7))
     end
 
     # Return the starting date for a particular quarter
     def start_of_quarter(year, quarter)
       case quarter
       when 1
-        start_of_month(year, 7)
+        start_of_month(year, 1)
       when 2
-        start_of_month(year, 10)
+        start_of_month(year, 4)
       when 3
-        start_of_month(year, 1)
+        start_of_month(year, 7)
       when 4
-        start_of_month(year, 4)
+        start_of_month(year, 10)
       end
     end
 
@@ -81,13 +76,13 @@ module MerchCalendar
     def end_of_quarter(year, quarter)
       case quarter
       when 1
-        end_of_month(year, 9)
+        end_of_month(year, 3)
       when 2
-        end_of_month(year, 12)
+        end_of_month(year, 6)
       when 3
-        end_of_month(year, 3)
+        end_of_month(year, 9)
       when 4
-        end_of_month(year, 6)
+        end_of_month(year, 12)
       end
     end
 
@@ -96,22 +91,6 @@ module MerchCalendar
       ((start_of_year(year + 1) - start_of_year(year)) / 7).to_i
     end
 
-    def merch_to_julian(merch_month)
-      if merch_month == 12
-        1
-      else
-        merch_month + 1
-      end
-    end
-
-    def julian_to_merch(julian_month)
-      if julian_month == 1
-        12
-      else
-        julian_month - 1
-      end
-    end
-
     def merch_months_in(start_date, end_date)
       merch_months = []
       prev_date = start_date - 2

data/lib/merch_calendar/util.rb

@@ -7,22 +7,22 @@ module MerchCalendar
     #
     # @param year [Fixnum] the merch year
     # @param month [Fixnum] an integer specifying the julian month.
-    # @param month [Fixnum] an integer specifying the merch week.
+    # @param week [Fixnum] an integer specifying the merch week.
     #
     # @return [Date] the starting date of the specified week
     def start_of_week(year, month, week)
-      date_calc.start_of_week(year, month, week)
+      retail_calendar.start_of_week(year, julian_to_merch(month), week)
     end
 
     # The end date of the week
     #
     # @param year [Fixnum] the merch year
     # @param month [Fixnum] an integer specifying the julian month.
-    # @param month [Fixnum] an integer specifying the merch week.
+    # @param week [Fixnum] an integer specifying the merch week.
     #
     # @return [Date] the ending date of the specified week
     def end_of_week(year, month, week)
-      date_calc.end_of_week(year, month, week)
+      retail_calendar.end_of_week(year, julian_to_merch(month), week)
     end
 
     # The start date of the month
@@ -43,7 +43,7 @@ module MerchCalendar
     # @return [Date] the starting date of the specified month
     def start_of_month(year, month_param)
       merch_month = get_merch_month_param(month_param)
-      date_calc.start_of_month(year, merch_month)
+      retail_calendar.start_of_month(year, merch_month)
     end
 
     # The end date of the month
@@ -56,7 +56,7 @@ module MerchCalendar
     # @return [Date]
     def end_of_month(year, month_param)
       merch_month = get_merch_month_param(month_param)
-      date_calc.end_of_month(year, merch_month)
+      retail_calendar.end_of_month(year, merch_month)
     end
 
     # The start date of the year
@@ -65,7 +65,7 @@ module MerchCalendar
     #
     # @return [Date] the starting date of the specified year
     def start_of_year(year)
-      date_calc.start_of_year(year)
+      retail_calendar.start_of_year(year)
     end
 
     # The end date of the year
@@ -74,7 +74,7 @@ module MerchCalendar
     #
     # @return [Date] the ending date of the specified year
     def end_of_year(year)
-      date_calc.end_of_year(year)
+      retail_calendar.end_of_year(year)
     end
 
 
@@ -85,7 +85,7 @@ module MerchCalendar
     #
     # @return [Date] the starting date of the specified quarter
     def start_of_quarter(year, quarter)
-      date_calc.start_of_quarter(year, quarter)
+      retail_calendar.start_of_quarter(year, quarter)
     end
 
     # The end date of the quarter
@@ -95,7 +95,7 @@ module MerchCalendar
     #
     # @return [Date] the ending date of the specified quarter
     def end_of_quarter(year, quarter)
-      date_calc.end_of_quarter(year, quarter)
+      retail_calendar.end_of_quarter(year, quarter)
     end
 
 
@@ -105,7 +105,7 @@ module MerchCalendar
     #
     # @return [Fixnum] number of weeks
     def weeks_in_year(year)
-      date_calc.weeks_in_year(year)
+      retail_calendar.weeks_in_year(year)
     end
 
 
@@ -116,26 +116,36 @@ module MerchCalendar
     #
     # @return [Array<Date>] array of merch months
     def merch_months_in(start_date, end_date)
-      date_calc.merch_months_in(start_date, end_date)
+      retail_calendar.merch_months_in(start_date, end_date)
     end
 
 
     # Converts a merch month to the correct julian month
     #
-    # @param month [Fixnum] the merch month to convert
+    # @param merch_month [Fixnum] the merch month to convert
     # @return [Fixnum] the julian month
-    def merch_to_julian(month)
-      date_calc.merch_to_julian(month)
+    def merch_to_julian(merch_month)
+      if merch_month == 12
+        1
+      else
+        merch_month + 1
+      end
     end
 
+
     # Converts a julian month to a merch month
     #
-    # @param month [Fixnum] the julian month to convert
+    # @param julian_month [Fixnum] the julian month to convert
     # @return [Fixnum] the merch month
-    def julian_to_merch(month)
-      date_calc.julian_to_merch(month)
+    def julian_to_merch(julian_month)
+      if julian_month == 1
+        12
+      else
+        julian_month - 1
+      end
     end
 
+
     # An array of merch weeks in a given month
     #
     # @param year [Fixnum] the merch year
@@ -147,9 +157,9 @@ module MerchCalendar
     def weeks_for_month(year, month_param)
       merch_month = get_merch_month_param(month_param)
 
-      start_date = date_calc.start_of_month(year, merch_month)
+      start_date = retail_calendar.start_of_month(year, merch_month)
 
-      weeks = (date_calc.end_of_month(year, merch_month) - start_date + 1) / 7
+      weeks = (retail_calendar.end_of_month(year, merch_month) - start_date + 1) / 7
 
       (1..weeks).map do |week_num|
         week_start = start_date + ((week_num - 1) * 7)
@@ -161,24 +171,26 @@ module MerchCalendar
 
     private
 
-    def date_calc
-      @date_calc ||= DateCalculator.new
+    def retail_calendar
+      @retail_calendar ||= RetailCalendar.new
     end
 
     # Reads the provided parameter and converts the value
     # to a MERCH MONTH
     def get_merch_month_param(param)
       if param.is_a? Fixnum
-        return date_calc.julian_to_merch(param)
+        return julian_to_merch(param)
       elsif param.is_a? Hash
         julian_month = param.delete(:julian_month) || param.delete(:month)
         merch_month = param.delete(:merch_month)
+
         if merch_month
           return merch_month
         elsif julian_month
-          return date_calc.julian_to_merch(julian_month)
+          return julian_to_merch(julian_month)
         end
       end
+
       raise ArgumentError
     end
 

data/lib/merch_calendar/version.rb

@@ -1,3 +1,3 @@
 module MerchCalendar
-  VERSION = '0.0.5'
+  VERSION = '0.1.0.rc1'
 end

data/merch_calendar.gemspec

@@ -6,8 +6,8 @@ Gem::Specification.new do |s|
   s.name        = "merch_calendar"
   s.version     = MerchCalendar::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ['Mitch Dempsey']
-  s.email       = ['mitch@stitchfix.com', 'opensource@stitchfix.com']
+  s.authors     = ['Mitch Dempsey', "Jon Worek"]
+  s.email       = ['opensource@stitchfix.com']
   s.licenses    = ['MIT']
   s.homepage    = "https://github.com/stitchfix/merch_calendar"
   s.summary     = "Utility for manipulating dates within a 4-5-4 retail calendar"
@@ -23,4 +23,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency "simplecov"
   s.add_development_dependency "coveralls"
   s.add_development_dependency "pry"
+  s.add_development_dependency "pry-byebug"
 end

data/spec/merch_calendar/fiscal_year_calendar_spec.rb

@@ -0,0 +1,133 @@
+require "spec_helper"
+
+RSpec.describe MerchCalendar::FiscalYearCalendar do
+  describe "#weeks_in_year" do
+    it "returns 53 for a leap year - 2013" do
+      expect(subject.weeks_in_year(2013)).to eq 53
+    end
+
+    it "returns 52 for a normal year" do
+      expect(subject.weeks_in_year(2014)).to eq 52
+    end
+
+    it "returns 52 for a normal year" do
+      expect(subject.weeks_in_year(2015)).to eq 52
+    end
+
+    it "returns 52 for a normal year" do
+      expect(subject.weeks_in_year(2016)).to eq 52
+    end
+
+    it "returns 52 for a normal year" do
+      expect(subject.weeks_in_year(2017)).to eq 52
+    end
+
+    it "returns 53 for a leap year - 2018" do
+      expect(subject.weeks_in_year(2018)).to eq 53
+    end
+
+    it "returns 52 for a normal year" do
+      expect(subject.weeks_in_year(2019)).to eq 52
+    end
+  end
+
+  describe "#start_of_week" do
+    it "returns the correct date for 2017-1-1 (2017-Aug-wk1)" do
+      expect(subject.start_of_week(2017, 1, 1)).to eq Date.new(2016, 7, 31)
+    end
+
+    it "returns the correct Date for 2018-1-1 (2018-Aug-wk1)" do
+      expect(subject.start_of_week(2018, 1, 1)).to eq Date.new(2017, 7, 30)
+    end
+
+    it "returns the correct Date for 2019-1-1 (2019-Aug-wk1)" do
+      expect(subject.start_of_week(2019, 1, 1)).to eq Date.new(2018, 8, 5)
+    end
+  end
+
+  describe "#end_of_week" do
+    it "returns the correct date for 2017-6-1 (2017-Jan-wk1)" do
+      expect(subject.end_of_week(2017, 6, 1)).to eq Date.new(2017, 1, 7)
+    end
+
+    it "returns the correct Date for 2018-6-5 (2018-Jan-wk5)" do
+      expect(subject.end_of_week(2018, 6, 5)).to eq Date.new(2018, 2, 3)
+    end
+
+    it "returns the correct Date for 2019-10-3 (2019-May-wk3)" do
+      expect(subject.end_of_week(2019, 10, 3)).to eq Date.new(2019, 5, 25)
+    end
+  end
+
+  describe "#start_of_month" do
+    it "returns the correct date for 2018-1 AKA 2018-Aug" do
+      expect(subject.start_of_month(2018, 1)).to eq Date.new(2017, 7, 30)
+    end
+
+    it "returns the correct date for 2019-1 AKA 2019-Aug" do
+      expect(subject.start_of_month(2019, 1)).to eq Date.new(2018, 8, 5)
+    end
+  end
+
+  describe "#end_of_month" do
+    it "returns the correct date for 2018-1 AKA 2018-Aug" do
+      expect(subject.end_of_month(2018, 1)).to eq Date.new(2017, 8, 26)
+    end
+
+    it "returns the correct date for 2019-1 AKA 2019-Aug" do
+      expect(subject.end_of_month(2019, 1)).to eq Date.new(2018, 9, 1)
+    end
+  end
+
+  describe "#start_of_quarter" do
+    it "returns the correct date for 2018-Q1" do
+      expect(subject.start_of_quarter(2018, 1)).to eq Date.new(2017, 7, 30)
+    end
+
+    it "returns the correct date for 2018-Q4" do
+      expect(subject.start_of_quarter(2018, 4)).to eq Date.new(2018, 5, 6)
+    end
+
+    it "returns the correct date for 2019-Q1" do
+      expect(subject.start_of_quarter(2019, 1)).to eq Date.new(2018, 8, 5)
+    end
+  end
+
+  describe "#end_of_quarter" do
+    it "returns the correct date for 2018-Q1" do
+      expect(subject.end_of_quarter(2018, 1)).to eq Date.new(2017, 10, 28)
+    end
+
+    it "returns the correct date for 2018-Q4" do
+      expect(subject.end_of_quarter(2018, 4)).to eq Date.new(2018, 8, 4)
+    end
+
+    it "returns the correct date for 2019-Q1" do
+      expect(subject.end_of_quarter(2019, 1)).to eq Date.new(2018, 11, 3)
+    end
+  end
+
+  describe "#start_of_year" do
+    it "returns the correct date for 2018" do
+      expect(subject.start_of_year(2018)).to eq Date.new(2017, 7, 30)
+    end
+
+    it "returns the correct date for 2019" do
+      expect(subject.start_of_year(2019)).to eq Date.new(2018, 8, 5)
+    end
+  end
+
+  describe "#end_of_year" do
+    it "returns the correct date for 2017" do
+      expect(subject.end_of_year(2017)).to eq Date.new(2017, 7, 29)
+    end
+
+    it "returns the correct date for 2018" do
+      expect(subject.end_of_year(2018)).to eq Date.new(2018, 8, 4)
+    end
+
+    it "returns the correct date for 2019" do
+      expect(subject.end_of_year(2019)).to eq Date.new(2019, 8, 3)
+    end
+  end
+end

data/spec/merch_calendar/retail_calendar_spec.rb

@@ -0,0 +1,119 @@
+require 'spec_helper'
+
+RSpec.describe MerchCalendar::RetailCalendar do
+  describe "#weeks_in_year" do
+    it "returns 53 for a leap year" do
+      expect(subject.weeks_in_year(2012)).to eq 53
+      expect(subject.weeks_in_year(2017)).to eq 53
+    end
+
+    it "returns 52 for a normal year" do
+      expect(subject.weeks_in_year(2013)).to eq 52
+      expect(subject.weeks_in_year(2018)).to eq 52
+    end
+  end
+
+  describe "#start_of_week" do
+    it "returns the correct date" do
+      expect(subject.start_of_week(2017, 1, 1)).to eq Date.new(2017, 1, 29)
+      expect(subject.start_of_week(2018, 1, 1)).to eq Date.new(2018, 2, 4)
+    end
+  end
+
+  describe "#end_of_week" do
+    it "returns the correct date" do
+      expect(subject.end_of_week(2017, 1, 1)).to eq Date.new(2017, 2, 4)
+      expect(subject.end_of_week(2018, 1, 1)).to eq Date.new(2018, 2, 10)
+    end
+
+    it "returns the correct date for 2017-12-w5" do
+      expect(subject.end_of_week(2017, 12, 5)).to eq Date.new(2018, 2, 3)
+    end
+  end
+
+  describe "#start_of_month" do
+    it "returns the correct date" do
+      expect(subject.start_of_month(2017, 1)).to eq Date.new(2017, 1, 29)
+      expect(subject.start_of_month(2018, 1)).to eq Date.new(2018, 2, 4)
+    end
+  end
+
+  describe "#start_of_quarter" do
+    it "returns the correct date" do
+      expect(subject.start_of_quarter(2017, 1)).to eq Date.new(2017, 1, 29)
+      expect(subject.start_of_quarter(2018, 1)).to eq Date.new(2018, 2, 4)
+    end
+  end
+
+  describe "#end_of_quarter" do
+    it "returns the correct date" do
+      expect(subject.end_of_quarter(2017, 1)).to eq Date.new(2017, 4, 29)
+      expect(subject.end_of_quarter(2018, 1)).to eq Date.new(2018, 5, 5)
+    end
+  end
+
+  describe "#start_of_year" do
+    it "returns the correct date" do
+      expect(subject.start_of_year(2017)).to eq Date.new(2017, 1, 29)
+      expect(subject.start_of_year(2018)).to eq Date.new(2018, 2, 4)
+    end
+  end
+
+  describe "#end_of_year" do
+    it "returns the correct date for 2016" do
+      expect(subject.end_of_year(2016)).to eq Date.new(2017, 1, 28)
+    end
+
+    it "returns the correct date for 2017 (a leap year)" do
+      expect(subject.end_of_year(2017)).to eq Date.new(2018, 2, 3)
+    end
+
+    it "returns the correct date for 2018" do
+      expect(subject.end_of_year(2018)).to eq Date.new(2019, 2, 2)
+    end
+
+    it "returns the correct date for 2019" do
+      expect(subject.end_of_year(2019)).to eq Date.new(2020, 2, 1)
+    end
+  end
+
+  describe "#merch_months_in" do
+    it "returns merch date for start_date if start_date is the same as end_date" do
+      start_date = Date.new(2014,8,1)
+      end_date = start_date
+      start_merch_date = MerchCalendar.start_of_month(start_date.year, merch_month: start_date.month)
+
+      merch_months = subject.merch_months_in(start_date, end_date)
+      expect(merch_months.count).to be(1)
+      expect(merch_months.first.year).to eq start_merch_date.year
+      expect(merch_months.first.month).to eq start_merch_date.month
+      expect(merch_months.first.day).to eq start_merch_date.day
+    end
+
+    it "returns valid merch dates for 2014" do
+      start_date = Date.new(2014, 1, 1)
+      end_date = Date.new(2014, 12, 1)
+
+      merch_months = subject.merch_months_in(start_date, end_date)
+      expect(merch_months.count).to be 11
+
+      merch_months.each do |merch_month|
+        expect(merch_month.year).to be 2014
+      end
+
+      expect(merch_months[0].strftime('%Y-%m-%d')).to eq  '2014-02-02'
+      expect(merch_months[1].strftime('%Y-%m-%d')).to eq  '2014-03-02'
+      expect(merch_months[2].strftime('%Y-%m-%d')).to eq  '2014-04-06'
+      expect(merch_months[3].strftime('%Y-%m-%d')).to eq  '2014-05-04'
+      expect(merch_months[4].strftime('%Y-%m-%d')).to eq  '2014-06-01'
+      expect(merch_months[5].strftime('%Y-%m-%d')).to eq  '2014-07-06'
+      expect(merch_months[6].strftime('%Y-%m-%d')).to eq  '2014-08-03'
+      expect(merch_months[7].strftime('%Y-%m-%d')).to eq  '2014-08-31'
+      expect(merch_months[8].strftime('%Y-%m-%d')).to eq  '2014-10-05'
+      expect(merch_months[9].strftime('%Y-%m-%d')).to eq  '2014-11-02'
+      expect(merch_months[10].strftime('%Y-%m-%d')).to eq '2014-11-30'
+    end
+  end
+
+end
+

data/spec/merch_calendar/util_spec.rb

@@ -67,14 +67,14 @@ describe MerchCalendar::Util do
   end
 
   describe '#get_merch_month_param' do
-    let(:date_calc) { MerchCalendar::DateCalculator.new }
+    let(:retail_calendar) { MerchCalendar::RetailCalendar.new }
     before(:each) do
-      allow(MerchCalendar).to receive(:date_calc).and_return(date_calc)
+      allow(MerchCalendar).to receive(:retail_calendar).and_return(retail_calendar)
     end
 
     context "valid calls" do
       before(:each) do
-        expect(date_calc).to receive(:start_of_month).with(2014, 1)
+        expect(retail_calendar).to receive(:start_of_month).with(2014, 1)
       end      
       it "assumes an integer is a julian month" do
         MerchCalendar.start_of_month(2014, 2)
@@ -97,9 +97,9 @@ describe MerchCalendar::Util do
 
     context "errors" do
       before(:each) do
-        expect(date_calc).to_not receive(:start_of_month)
+        expect(retail_calendar).to_not receive(:start_of_month)
       end
       it { expect { MerchCalendar.start_of_month(2014, :april) }.to raise_error(ArgumentError) }
     end
   end
-end
+end

data/spec/merch_calendar_spec.rb

@@ -17,6 +17,37 @@ RSpec.describe MerchCalendar do
     end
   end
 
+  describe "#julian_to_merch" do
+    it { expect(subject.julian_to_merch(1)).to eq 12 }
+    it { expect(subject.julian_to_merch(2)).to eq 1 }
+    it { expect(subject.julian_to_merch(3)).to eq 2 }
+    it { expect(subject.julian_to_merch(4)).to eq 3 }
+    it { expect(subject.julian_to_merch(5)).to eq 4 }
+    it { expect(subject.julian_to_merch(6)).to eq 5 }
+    it { expect(subject.julian_to_merch(7)).to eq 6 }
+    it { expect(subject.julian_to_merch(8)).to eq 7 }
+    it { expect(subject.julian_to_merch(9)).to eq 8 }
+    it { expect(subject.julian_to_merch(10)).to eq 9 }
+    it { expect(subject.julian_to_merch(11)).to eq 10 }
+    it { expect(subject.julian_to_merch(12)).to eq 11 }
+  end
+
+  describe "#merch_to_julian" do
+    it { expect(subject.merch_to_julian(12)).to eq 1 }
+    it { expect(subject.merch_to_julian(1)).to eq 2 }
+    it { expect(subject.merch_to_julian(2)).to eq 3 }
+    it { expect(subject.merch_to_julian(3)).to eq 4 }
+    it { expect(subject.merch_to_julian(4)).to eq 5 }
+    it { expect(subject.merch_to_julian(5)).to eq 6 }
+    it { expect(subject.merch_to_julian(6)).to eq 7 }
+    it { expect(subject.merch_to_julian(7)).to eq 8 }
+    it { expect(subject.merch_to_julian(8)).to eq 9 }
+    it { expect(subject.merch_to_julian(9)).to eq 10 }
+    it { expect(subject.merch_to_julian(10)).to eq 11 }
+    it { expect(subject.merch_to_julian(11)).to eq 12 }
+  end
+
+
   describe "#start_of_week" do
     it "returns the correct date for a given merch week" do
       expect(described_class.start_of_week(2017, 4, 1)).to eq Date.new(2017, 4, 2)

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: merch_calendar
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.0.rc1
 platform: ruby
 authors:
 - Mitch Dempsey
+- Jon Worek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-05 00:00:00.000000000 Z
+date: 2017-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -80,9 +81,22 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  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'
 description: Utility for manipulating dates within a 4-5-4 retail calendar
 email:
-- mitch@stitchfix.com
 - opensource@stitchfix.com
 executables: []
 extensions: []
@@ -103,15 +117,17 @@ files:
 - lib/merch_calendar.rb
 - lib/merch_calendar/configurable.rb
 - lib/merch_calendar/configuration.rb
-- lib/merch_calendar/date_calculator.rb
+- lib/merch_calendar/fiscal_year_calendar.rb
 - lib/merch_calendar/merch_week.rb
+- lib/merch_calendar/retail_calendar.rb
 - lib/merch_calendar/util.rb
 - lib/merch_calendar/version.rb
 - merch_calendar.gemspec
 - spec/merch_calendar/configurable_spec.rb
 - spec/merch_calendar/configuration_spec.rb
-- spec/merch_calendar/date_calculator_spec.rb
+- spec/merch_calendar/fiscal_year_calendar_spec.rb
 - spec/merch_calendar/merch_week_spec.rb
+- spec/merch_calendar/retail_calendar_spec.rb
 - spec/merch_calendar/util_spec.rb
 - spec/merch_calendar_spec.rb
 - spec/spec_helper.rb
@@ -130,9 +146,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.12
@@ -142,8 +158,9 @@ summary: Utility for manipulating dates within a 4-5-4 retail calendar
 test_files:
 - spec/merch_calendar/configurable_spec.rb
 - spec/merch_calendar/configuration_spec.rb
-- spec/merch_calendar/date_calculator_spec.rb
+- spec/merch_calendar/fiscal_year_calendar_spec.rb
 - spec/merch_calendar/merch_week_spec.rb
+- spec/merch_calendar/retail_calendar_spec.rb
 - spec/merch_calendar/util_spec.rb
 - spec/merch_calendar_spec.rb
 - spec/spec_helper.rb

data/spec/merch_calendar/date_calculator_spec.rb

@@ -1,90 +0,0 @@
-require 'spec_helper'
-
-describe MerchCalendar::DateCalculator do
-
-  subject { described_class.new }
-
-  describe "#julian_to_merch" do
-    it { expect(subject.julian_to_merch(1)).to eq 12 }
-    it { expect(subject.julian_to_merch(2)).to eq 1 }
-    it { expect(subject.julian_to_merch(3)).to eq 2 }
-    it { expect(subject.julian_to_merch(4)).to eq 3 }
-    it { expect(subject.julian_to_merch(5)).to eq 4 }
-    it { expect(subject.julian_to_merch(6)).to eq 5 }
-    it { expect(subject.julian_to_merch(7)).to eq 6 }
-    it { expect(subject.julian_to_merch(8)).to eq 7 }
-    it { expect(subject.julian_to_merch(9)).to eq 8 }
-    it { expect(subject.julian_to_merch(10)).to eq 9 }
-    it { expect(subject.julian_to_merch(11)).to eq 10 }
-    it { expect(subject.julian_to_merch(12)).to eq 11 }
-  end
-
-  describe "#merch_to_julian" do
-    it { expect(subject.merch_to_julian(12)).to eq 1 }
-    it { expect(subject.merch_to_julian(1)).to eq 2 }
-    it { expect(subject.merch_to_julian(2)).to eq 3 }
-    it { expect(subject.merch_to_julian(3)).to eq 4 }
-    it { expect(subject.merch_to_julian(4)).to eq 5 }
-    it { expect(subject.merch_to_julian(5)).to eq 6 }
-    it { expect(subject.merch_to_julian(6)).to eq 7 }
-    it { expect(subject.merch_to_julian(7)).to eq 8 }
-    it { expect(subject.merch_to_julian(8)).to eq 9 }
-    it { expect(subject.merch_to_julian(9)).to eq 10 }
-    it { expect(subject.merch_to_julian(10)).to eq 11 }
-    it { expect(subject.merch_to_julian(11)).to eq 12 }
-  end
-
-  describe "#weeks_in_year" do
-    it "returns 53 for a leap year" do
-      expect(subject.weeks_in_year(2012)).to eq 53
-    end
-
-    it "returns 52 for a normal year" do
-      expect(subject.weeks_in_year(2013)).to eq 52
-    end
-  end
-
-  it "#start_of_quarter"
-
-  it "#end_of_quarter"
-
-  describe "#merch_months_in" do
-    it "returns merch date for start_date if start_date is the same as end_date" do
-      start_date = Date.new(2014,8,1)
-      end_date = start_date
-      start_merch_date = MerchCalendar.start_of_month(start_date.year, merch_month: start_date.month)
-
-      merch_months = subject.merch_months_in(start_date, end_date)
-      expect(merch_months.count).to be(1)
-      expect(merch_months.first.year).to eq start_merch_date.year
-      expect(merch_months.first.month).to eq start_merch_date.month
-      expect(merch_months.first.day).to eq start_merch_date.day
-    end
-
-    it "returns valid merch dates for 2014" do
-      start_date = Date.new(2014, 1, 1)
-      end_date = Date.new(2014, 12, 1)
-
-      merch_months = subject.merch_months_in(start_date, end_date)
-      expect(merch_months.count).to be 11
-
-      merch_months.each do |merch_month|
-        expect(merch_month.year).to be 2014
-      end
-
-      expect(merch_months[0].strftime('%Y-%m-%d')).to eq  '2014-02-02'
-      expect(merch_months[1].strftime('%Y-%m-%d')).to eq  '2014-03-02'
-      expect(merch_months[2].strftime('%Y-%m-%d')).to eq  '2014-04-06'
-      expect(merch_months[3].strftime('%Y-%m-%d')).to eq  '2014-05-04'
-      expect(merch_months[4].strftime('%Y-%m-%d')).to eq  '2014-06-01'
-      expect(merch_months[5].strftime('%Y-%m-%d')).to eq  '2014-07-06'
-      expect(merch_months[6].strftime('%Y-%m-%d')).to eq  '2014-08-03'
-      expect(merch_months[7].strftime('%Y-%m-%d')).to eq  '2014-08-31'
-      expect(merch_months[8].strftime('%Y-%m-%d')).to eq  '2014-10-05'
-      expect(merch_months[9].strftime('%Y-%m-%d')).to eq  '2014-11-02'
-      expect(merch_months[10].strftime('%Y-%m-%d')).to eq '2014-11-30'
-    end
-  end
-
-end
-