merch_calendar 0.1.0 → 0.3.0

data/spec/merch_calendar/merch_week_spec.rb

@@ -1,12 +1,14 @@
 require 'spec_helper'
 
 describe MerchCalendar::MerchWeek do
+  let!(:fiscal_calendar_options) { { calendar: MerchCalendar::StitchFixFiscalYearCalendar.new } }
 
   describe ".find" do
     it "returns an array of weeks" do
       weeks = described_class.find(2014,1)
       expect(weeks).to be_an Array
       expect(weeks.size).to eq 4
+      expect(weeks[0].calendar.class).to eq MerchCalendar::RetailCalendar
     end
 
     it "with year, month, week" do
@@ -16,6 +18,25 @@ describe MerchCalendar::MerchWeek do
       expect(mw.merch_month).to eq 12
       expect(mw.week).to eq 1
     end
+    context "using the Fiscal Calendar instead of the Retail Calendar" do
+      it "returns an array of weeks" do
+        weeks = described_class.find(2019, 7, nil, fiscal_calendar_options)
+        expect(weeks).to be_an Array
+        expect(weeks.size).to eq 5
+        expect(weeks[0].calendar.class).to eq MerchCalendar::StitchFixFiscalYearCalendar
+      end
+      
+      it "with year, month, week" do
+        mw = described_class.find(2019, 7, 5, fiscal_calendar_options)
+        expect(mw.year).to eq 2019
+        expect(mw.month).to eq 7
+        expect(mw.merch_month).to eq 12
+        expect(mw.week).to eq 5
+        expect(mw.end_of_week).to eq Date.new(2019,8,3)
+        expect(mw.start_of_week).to eq Date.new(2019,7,28)
+        expect(mw.calendar.class).to eq MerchCalendar::StitchFixFiscalYearCalendar
+      end
+    end
   end
 
   describe ".from_date" do
@@ -23,9 +44,10 @@ describe MerchCalendar::MerchWeek do
     context "parameters" do
       context "allows valid date types" do
         it "allows a date string" do
-          mw = described_class.from_date("1990-10-01")
-          expect(mw.date.to_s).to eq "1990-10-01"
+          mw = described_class.from_date("2018-10-01")
+          expect(mw.date.to_s).to eq "2018-10-01"
           expect(mw.date.month).to eq 10
+          expect(mw.merch_month).to eq 8
         end
       end
 
@@ -40,6 +62,17 @@ describe MerchCalendar::MerchWeek do
         it { expect{described_class.from_date("2015")}.to raise_error(ArgumentError) }
         it { expect{described_class.from_date("2015-04")}.to raise_error(ArgumentError) }
       end
+      
+      context "wants to know a date in a Fiscal Calendar" do
+        it "allows calendar to be passed and translate date to what it looks like in a FY year" do
+          mw = described_class.from_date("2019-08-04", fiscal_calendar_options)
+          expect(mw.date.to_s).to eq "2019-08-04"
+          expect(mw.date.month).to eq 8
+          expect(mw.merch_month).to eq 1
+          expect(mw.year).to eq 2020
+          expect(mw.calendar.class).to eq MerchCalendar::StitchFixFiscalYearCalendar
+        end
+      end
     end
   end
 
@@ -47,65 +80,111 @@ describe MerchCalendar::MerchWeek do
     it "returns a merch week based on today's date" do
       mw = described_class.today
       expect(mw.date.to_s).to eq Date.today.to_s
+      expect(mw.calendar.class).to eq MerchCalendar::RetailCalendar
+    end
+    
+    context "passing in the Fiscal Calendar into options" do
+      it "returns a merch week based on today's date" do
+        mw = described_class.today(fiscal_calendar_options)
+        expect(mw.date.to_s).to eq Date.today.to_s
+        expect(mw.calendar.class).to eq MerchCalendar::StitchFixFiscalYearCalendar
+      end
     end
   end
 
   describe "#to_s" do
     let(:merch_week) { described_class.from_date("2014-01-01") }
+    let(:fiscal_week) { described_class.from_date("2019-08-01", fiscal_calendar_options) }
 
     it ":short / default format" do
       expect(merch_week.to_s(:short)).to eq "Dec W5"
       expect(merch_week.to_s).to eq "Dec W5"
       expect("#{merch_week}").to eq "Dec W5"
+      
+      expect(fiscal_week.to_s(:short)).to eq "Jul W5"
+      expect(fiscal_week.to_s).to eq "Jul W5"
     end
 
     it ":long format" do
       expect(merch_week.to_s(:long)).to eq "2013:48 Dec W5"
+      expect(fiscal_week.to_s(:long)).to eq "2019:53 Jul W5"
     end
 
     it ":elasticsearch format" do
       expect(merch_week.to_s(:elasticsearch)).to eq "2013-12w05"
+      expect(fiscal_week.to_s(:elasticsearch)).to eq "2019-07w05"
     end
   end
 
-  it "#end_of_week" do
-    mw = described_class.find(2014,1,1)
+  describe "#end_of_week" do
+    it "returns the end of the week based on the Retail Calendar" do
+      mw = described_class.find(2014,1,1)
+      expect(mw.end_of_week).to eq (mw.start_of_week + 6)
+    end
 
-    expect(mw.end_of_week).to eq (mw.start_of_week + 6)
+    it "returns the end of the week based on the Retail Calendar" do
+      mw = described_class.find(2019,1,1, fiscal_calendar_options)
+      expect(mw.end_of_week).to eq (mw.start_of_week + 6)
+    end
   end
 
-
   describe "#end_of_month" do
-    it "for a 4 week month" do
-      mw = described_class.find(2014, 2, 1)
-      expect(mw.end_of_month - mw.start_of_month + 1).to eq (4*7)
-    end
+    context "using the Retail Calendar" do
+      it "for a 4 week month" do
+        mw = described_class.find(2017, 2, 1)
+        expect(mw.end_of_month - mw.start_of_month + 1).to eq (4*7)
+      end
+
+      it "for a 5 week month" do
+        mw = described_class.find(2017, 3, 1)
+        expect(mw.end_of_month - mw.start_of_month + 1).to eq (5*7)
+      end
 
-    it "for a 5 week month" do
-      mw = described_class.find(2014, 3, 1)
-      expect(mw.end_of_month - mw.start_of_month + 1).to eq (5*7)
+      it "for a 4-5-5 quarter" do
+        mw = described_class.find(2017, 11, 1)
+        expect(mw.end_of_month - mw.start_of_month + 1).to eq (4*7)
+
+        mw = described_class.find(2017, 12, 1)
+        expect(mw.end_of_month - mw.start_of_month + 1).to eq (5*7)
+
+        mw = described_class.find(2017, 1, 1)
+        expect(mw.end_of_month - mw.start_of_month + 1).to eq (5*7)
+      end
     end
+    
+    context "using the Stitch Fix Fiscal Calendar" do
+      it "for a 4 week month" do
+        mw = described_class.find(2017, 2, 1, fiscal_calendar_options)
+        expect(mw.end_of_month - mw.start_of_month + 1).to eq (4*7)
+      end
+
+      it "for a 5 week month" do
+        mw = described_class.find(2017, 3, 1, fiscal_calendar_options)
+        expect(mw.end_of_month - mw.start_of_month + 1).to eq (5*7)
+      end
 
-    it "for a 4 to 5 week month in a leap year" do
-      mw = described_class.find(2011, 1, 1)
-      expect(mw.end_of_month - mw.start_of_month + 1).to eq (4*7)
+      it "for a 4-5-5 quarter" do
+        mw = described_class.find(2019, 5, 1, fiscal_calendar_options)
+        expect(mw.end_of_month - mw.start_of_month + 1).to eq (4*7)
 
-      mw = described_class.find(2012, 1, 1)
-      expect(mw.end_of_month - mw.start_of_month + 1).to eq (5*7)
+        mw = described_class.find(2019, 6, 1, fiscal_calendar_options)
+        expect(mw.end_of_month - mw.start_of_month + 1).to eq (5*7)
+
+        mw = described_class.find(2019, 7, 1, fiscal_calendar_options)
+        expect(mw.end_of_month - mw.start_of_month + 1).to eq (5*7)
+      end
     end
   end
 
   describe "#season" do
-    context "Fall/Winter" do
+    context "when it comes from the Retail calendar" do
       it { expect(described_class.from_date("2011-08-06").season).to eq "Fall/Winter" }
       it { expect(described_class.from_date("2011-09-06").season).to eq "Fall/Winter" }
       it { expect(described_class.from_date("2011-10-06").season).to eq "Fall/Winter" }
       it { expect(described_class.from_date("2011-11-06").season).to eq "Fall/Winter" }
       it { expect(described_class.from_date("2011-12-06").season).to eq "Fall/Winter" }
       it { expect(described_class.from_date("2012-01-06").season).to eq "Fall/Winter" }
-    end
-
-    context "Spring/Summer" do
+      
       it { expect(described_class.from_date("2011-02-06").season).to eq "Spring/Summer" }
       it { expect(described_class.from_date("2011-03-06").season).to eq "Spring/Summer" }
       it { expect(described_class.from_date("2011-04-06").season).to eq "Spring/Summer" }
@@ -113,63 +192,136 @@ describe MerchCalendar::MerchWeek do
       it { expect(described_class.from_date("2011-06-06").season).to eq "Spring/Summer" }
       it { expect(described_class.from_date("2011-07-06").season).to eq "Spring/Summer" }
     end
+
+    context "when it comes from the Stitch Fix Fiscal Calendar" do
+      it { expect(described_class.from_date("2012-08-06", fiscal_calendar_options).season).to eq "Fall/Winter" }
+      it { expect(described_class.from_date("2012-09-06", fiscal_calendar_options).season).to eq "Fall/Winter" }
+      it { expect(described_class.from_date("2012-10-06", fiscal_calendar_options).season).to eq "Fall/Winter" }
+      it { expect(described_class.from_date("2012-11-06", fiscal_calendar_options).season).to eq "Fall/Winter" }
+      it { expect(described_class.from_date("2012-12-06", fiscal_calendar_options).season).to eq "Fall/Winter" }
+      it { expect(described_class.from_date("2012-01-06", fiscal_calendar_options).season).to eq "Fall/Winter" }
+      
+      it { expect(described_class.from_date("2011-02-06", fiscal_calendar_options).season).to eq "Spring/Summer" }
+      it { expect(described_class.from_date("2011-03-06", fiscal_calendar_options).season).to eq "Spring/Summer" }
+      it { expect(described_class.from_date("2011-04-06", fiscal_calendar_options).season).to eq "Spring/Summer" }
+      it { expect(described_class.from_date("2011-05-06", fiscal_calendar_options).season).to eq "Spring/Summer" }
+      it { expect(described_class.from_date("2011-06-06", fiscal_calendar_options).season).to eq "Spring/Summer" }
+      it { expect(described_class.from_date("2011-07-06", fiscal_calendar_options).season).to eq "Spring/Summer" }
+    end
   end
 
 
-  context "logic" do
+  describe "logic for Retail Calendar" do
     [
-      OpenStruct.new(date: "2011-05-01", year: 2011, month: 5,  week: 1, quarter: 4, year_week: 14, start_date: "2011-01-30"),
+      OpenStruct.new(date: "2011-05-01", year: 2011, month: 5,  week: 1, quarter: 2, year_week: 14, start_date: "2011-01-30"),
 
-      OpenStruct.new(date: "2014-08-31", year: 2014, month: 9,  week: 1, quarter: 1, year_week: 31, start_date: "2014-02-02"),
-      OpenStruct.new(date: "2017-12-30", year: 2017, month: 12, week: 5, quarter: 2, year_week: 48, start_date: "2017-01-29"),
-      OpenStruct.new(date: "2014-01-01", year: 2013, month: 12, week: 5, quarter: 2, year_week: 48, start_date: "2013-02-03"),
-      OpenStruct.new(date: "2014-01-04", year: 2013, month: 12, week: 5, quarter: 2, year_week: 48, start_date: "2013-02-03"),
-      OpenStruct.new(date: "2014-01-05", year: 2013, month: 1,  week: 1, quarter: 2, year_week: 49, start_date: "2013-02-03"),
-      OpenStruct.new(date: "2014-01-12", year: 2013, month: 1,  week: 2, quarter: 2, year_week: 50, start_date: "2013-02-03"),
-      OpenStruct.new(date: "2014-01-19", year: 2013, month: 1,  week: 3, quarter: 2, year_week: 51, start_date: "2013-02-03"),
-      OpenStruct.new(date: "2014-01-26", year: 2013, month: 1,  week: 4, quarter: 2, year_week: 52, start_date: "2013-02-03"),
+      OpenStruct.new(date: "2014-08-31", year: 2014, month: 9,  week: 1, quarter: 3, year_week: 31, start_date: "2014-02-02"),
+      OpenStruct.new(date: "2014-01-01", year: 2013, month: 12, week: 5, quarter: 4, year_week: 48, start_date: "2013-02-03"),
+      OpenStruct.new(date: "2014-01-04", year: 2013, month: 12, week: 5, quarter: 4, year_week: 48, start_date: "2013-02-03"),
+      OpenStruct.new(date: "2014-01-05", year: 2013, month: 1,  week: 1, quarter: 4, year_week: 49, start_date: "2013-02-03"),
+      OpenStruct.new(date: "2014-01-12", year: 2013, month: 1,  week: 2, quarter: 4, year_week: 50, start_date: "2013-02-03"),
+      OpenStruct.new(date: "2014-01-19", year: 2013, month: 1,  week: 3, quarter: 4, year_week: 51, start_date: "2013-02-03"),
+      OpenStruct.new(date: "2014-01-26", year: 2013, month: 1,  week: 4, quarter: 4, year_week: 52, start_date: "2013-02-03"),
 
       # 2013
-      OpenStruct.new(date: "2013-02-03", year: 2013, month: 2,  week: 1, quarter: 3, year_week: 1,  start_date: "2013-02-03"),
+      OpenStruct.new(date: "2013-02-03", year: 2013, month: 2,  week: 1, quarter: 1, year_week: 1,  start_date: "2013-02-03"),
+
+      #2014
+      OpenStruct.new(date: "2014-02-02", year: 2014, month: 2,  week: 1, quarter: 1, year_week: 1,  start_date: "2014-02-02"),
+      OpenStruct.new(date: "2014-02-01", year: 2013, month: 1,  week: 4, quarter: 4, year_week: 52, start_date: "2013-02-03"),
+      OpenStruct.new(date: "2015-01-31", year: 2014, month: 1,  week: 4, quarter: 4, year_week: 52, start_date: "2014-02-02"),
+  
+      #2015
+      OpenStruct.new(date: "2015-02-01", year: 2015, month: 2,  week: 1, quarter: 1, year_week: 1, start_date: "2015-02-01"),
+      
+      #2017
+      OpenStruct.new(date: "2017-12-30", year: 2017, month: 12, week: 5, quarter: 4, year_week: 48, start_date: "2017-01-29")
+    ].each do |date_check|
+
+      context "using date '#{date_check.date}'" do
+        let(:merch_week) { described_class.from_date(date_check.date) }
 
-      # 2014
-      OpenStruct.new(date: "2014-02-02", year: 2014, month: 2,  week: 1, quarter: 3, year_week: 1,  start_date: "2014-02-02"),
-      OpenStruct.new(date: "2015-01-31", year: 2014, month: 1,  week: 4, quarter: 2, year_week: 52, start_date: "2014-02-02"),
+        describe "#year_week" do
+          it { expect(merch_week.year_week).to eq date_check.year_week }
+        end
 
-      OpenStruct.new(date: "2014-02-01", year: 2013, month: 1,  week: 4, quarter: 2, year_week: 52, start_date: "2013-02-03"),
+        describe "#month" do
+          it { expect(merch_week.month).to eq date_check.month }
+        end
 
-      OpenStruct.new(date: "2015-02-01", year: 2015, month: 2,  week: 1, quarter: 3, year_week: 1, start_date: "2015-02-01"),
+        describe "#quarter" do
+          it { expect(merch_week.quarter).to eq date_check.quarter }
+        end
 
+        describe "#week" do
+          it { expect(merch_week.week).to eq date_check.week }
+        end
+
+        describe "#start_of_year" do
+          it { expect(merch_week.start_of_year.to_s).to eq date_check.start_date }
+        end
+
+        describe "#year" do
+          it { expect(merch_week.year).to eq date_check.year }
+        end
+      end
+    end
+  end
+
+  describe "logic for Stitch Fix Fiscal Calendar" do
+    [
+      #2018
+      OpenStruct.new(date: "2018-07-26", year: 2018, month: 7,  week: 4, quarter: 4, year_week: 52, start_date: "2017-07-30"),
+
+      #2019
+      OpenStruct.new(date: "2018-07-31", year: 2019, month: 8,  week: 1, quarter: 1, year_week: 1, start_date: "2018-07-29"),
+      OpenStruct.new(date: "2019-02-01", year: 2019, month: 2, week: 1, quarter: 3, year_week: 27, start_date: "2018-07-29"),
+      OpenStruct.new(date: "2019-08-02", year: 2019, month: 7, week: 5, quarter: 4, year_week: 53, start_date: "2018-07-29"),
+      
+      # 2020
+      OpenStruct.new(date: "2019-08-08", year: 2020, month: 8,  week: 1, quarter: 1, year_week: 1,  start_date: "2019-08-04"),
+      OpenStruct.new(date: "2020-05-05", year: 2020, month: 5,  week: 1, quarter: 4, year_week: 40, start_date: "2019-08-04"),
+      OpenStruct.new(date: "2020-08-01", year: 2020, month: 7,  week: 4, quarter: 4, year_week: 52, start_date: "2019-08-04"),
+
+      #2023
+      OpenStruct.new(date: "2022-07-31", year: 2023, month: 8,  week: 1, quarter: 1, year_week: 1,  start_date: "2022-07-31"),
+      OpenStruct.new(date: "2023-04-22", year: 2023, month: 4,  week: 3, quarter: 3, year_week: 38, start_date: "2022-07-31"),
+      OpenStruct.new(date: "2023-07-25", year: 2023, month: 7,  week: 4, quarter: 4, year_week: 52, start_date: "2022-07-31"),
+
+      #2024
+      OpenStruct.new(date: "2023-08-01", year: 2024, month: 8,  week: 1, quarter: 1, year_week: 1, start_date: "2023-07-30"),
+      OpenStruct.new(date: "2023-11-08", year: 2024, month: 11, week: 2, quarter: 2, year_week: 15, start_date: "2023-07-30"),
+      OpenStruct.new(date: "2024-07-29", year: 2024, month: 7,  week: 5, quarter: 4, year_week: 53, start_date: "2023-07-30"),
+      
     ].each do |date_check|
 
       context "using date '#{date_check.date}'" do
-        let(:merch_week) { described_class.from_date(date_check.date) }
+        let(:merch_week) { described_class.from_date(date_check.date, fiscal_calendar_options) }
 
-        it "#year_week" do
-          expect(merch_week.year_week).to eq date_check.year_week
+        describe "#year_week" do
+          it { expect(merch_week.year_week).to eq date_check.year_week }
         end
 
-        it "#month" do
-          expect(merch_week.month).to eq date_check.month
+        describe "#month" do
+          it { expect(merch_week.month).to eq date_check.month }
         end
 
-        it "#quarter" do
-          expect(merch_week.quarter).to eq date_check.quarter
+        describe "#quarter" do
+          it { expect(merch_week.quarter).to eq date_check.quarter }
         end
 
-        it "#week" do
-          expect(merch_week.week).to eq date_check.week
+        describe "#week" do
+          it { expect(merch_week.week).to eq date_check.week }
         end
 
-        it "#start_of_year" do
-          expect(merch_week.start_of_year.to_s).to eq date_check.start_date
+        describe "#start_of_year" do
+          it { expect(merch_week.start_of_year.to_s).to eq date_check.start_date }
         end
 
-        it "#year" do
-          expect(merch_week.year).to eq date_check.year
+        describe "#year" do
+          it { expect(merch_week.year).to eq date_check.year }
         end
       end
     end
   end
-
 end

data/spec/merch_calendar/retail_calendar_spec.rb

@@ -5,11 +5,14 @@ RSpec.describe MerchCalendar::RetailCalendar 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
+      expect(subject.weeks_in_year(2023)).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
+      expect(subject.weeks_in_year(2019)).to eq 52
+      expect(subject.weeks_in_year(2020)).to eq 52      
     end
   end
 
@@ -42,6 +45,13 @@ RSpec.describe MerchCalendar::RetailCalendar 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)
+      expect(subject.start_of_quarter(2019, 2)).to eq Date.new(2019, 5, 5)
+      expect(subject.start_of_quarter(2019, 3)).to eq Date.new(2019, 8, 4)
+      expect(subject.start_of_quarter(2019, 4)).to eq Date.new(2019, 11, 3)
+    end
+
+    it "raises an error when there is an invalid quarter" do
+      expect { subject.start_of_quarter(2019, 5) }.to raise_error "invalid quarter"
     end
   end
 
@@ -49,6 +59,50 @@ RSpec.describe MerchCalendar::RetailCalendar 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)
+      expect(subject.end_of_quarter(2019, 2)).to eq Date.new(2019, 8, 3)
+      expect(subject.end_of_quarter(2019, 3)).to eq Date.new(2019, 11, 2)
+      expect(subject.end_of_quarter(2019, 4)).to eq Date.new(2020, 2, 1)
+    end
+
+    it "raises an error when there is an invalid quarter" do
+      expect { subject.end_of_quarter(2019, 5) }.to raise_error "invalid quarter"
+    end
+  end
+  
+  describe "#quarter" do
+    it "returns the correct quarter number" do
+      expect(subject.quarter(5)).to eq 2
+      expect(subject.quarter(7)).to eq 3
+      expect(subject.quarter(2)).to eq 1
+      expect(subject.quarter(11)).to eq 4
+    end
+
+    it "raises an error when there is an invalid merch month" do
+      expect { subject.quarter(13) }.to raise_error "invalid merch month"
+    end
+  end
+  
+  describe "#season" do
+    context "for merch_months in the Spring and Summer Season" do
+      it { expect(subject.season(1)).to eq "Spring/Summer" }
+      it { expect(subject.season(2)).to eq "Spring/Summer" }
+      it { expect(subject.season(3)).to eq "Spring/Summer" }
+      it { expect(subject.season(4)).to eq "Spring/Summer" }
+      it { expect(subject.season(5)).to eq "Spring/Summer" }
+      it { expect(subject.season(6)).to eq "Spring/Summer" }
+    end
+
+    context "for merch_months in the Fall and Winter Season" do
+      it { expect(subject.season(7)).to eq "Fall/Winter" }
+      it { expect(subject.season(8)).to eq "Fall/Winter" }
+      it { expect(subject.season(9)).to eq "Fall/Winter" }
+      it { expect(subject.season(10)).to eq "Fall/Winter" }
+      it { expect(subject.season(11)).to eq "Fall/Winter" }
+      it { expect(subject.season(12)).to eq "Fall/Winter" }
+    end
+    
+    it "raises an error when there is an invalid merch month" do
+      expect { subject.season(13) }.to raise_error "invalid merch month"
     end
   end
 
@@ -84,6 +138,7 @@ RSpec.describe MerchCalendar::RetailCalendar do
       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
@@ -96,7 +151,6 @@ RSpec.describe MerchCalendar::RetailCalendar do
 
       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
@@ -114,6 +168,91 @@ RSpec.describe MerchCalendar::RetailCalendar do
       expect(merch_months[10].strftime('%Y-%m-%d')).to eq '2014-11-30'
     end
   end
+  
+  describe "#merch_year_from_date" do
+    it "returns the correct merch calendar year" do
+      expect(subject.merch_year_from_date(Date.new(2012, 1, 28))).to eq 2011
+      expect(subject.merch_year_from_date(Date.new(2012, 1, 29))).to eq 2012
+      expect(subject.merch_year_from_date(Date.new(2018, 1, 24))).to eq 2017
+      expect(subject.merch_year_from_date(Date.new(2018, 2, 3))).to eq 2017
+      expect(subject.merch_year_from_date(Date.new(2018, 2, 4))).to eq 2018
+      expect(subject.merch_year_from_date(Date.new(2019, 2, 2))).to eq 2018
+      expect(subject.merch_year_from_date(Date.new(2019, 2, 3))).to eq 2019
+    end
+  end
+  
+  describe "#merch_to_julian" do
+    it "converts merch months to julian months" do
+      expect(subject.merch_to_julian(1)).to eq 2
+      expect(subject.merch_to_julian(2)).to eq 3
+      expect(subject.merch_to_julian(3)).to eq 4
+      expect(subject.merch_to_julian(4)).to eq 5
+      expect(subject.merch_to_julian(5)).to eq 6
+      expect(subject.merch_to_julian(6)).to eq 7
+      expect(subject.merch_to_julian(7)).to eq 8
+      expect(subject.merch_to_julian(8)).to eq 9
+      expect(subject.merch_to_julian(9)).to eq 10
+      expect(subject.merch_to_julian(10)).to eq 11
+      expect(subject.merch_to_julian(11)).to eq 12
+      expect(subject.merch_to_julian(12)).to eq 1
+    end
 
-end
+    it "raises an error for invalid merch months" do
+      expect { subject.merch_to_julian(13) }.to raise_error ArgumentError
+      expect { subject.merch_to_julian(0) }.to raise_error ArgumentError
+    end
+  end
+  
+  describe "#julian_to_merch" do
+    it "converts julian months to merch months" do
+      expect(subject.julian_to_merch(2)).to eq 1
+      expect(subject.julian_to_merch(3)).to eq 2
+      expect(subject.julian_to_merch(4)).to eq 3
+      expect(subject.julian_to_merch(5)).to eq 4
+      expect(subject.julian_to_merch(6)).to eq 5
+      expect(subject.julian_to_merch(7)).to eq 6
+      expect(subject.julian_to_merch(8)).to eq 7
+      expect(subject.julian_to_merch(9)).to eq 8
+      expect(subject.julian_to_merch(10)).to eq 9
+      expect(subject.julian_to_merch(11)).to eq 10
+      expect(subject.julian_to_merch(12)).to eq 11
+      expect(subject.julian_to_merch(1)).to eq 12
+    end
+
+    it "raises an error for invalid merch months" do
+      expect { subject.julian_to_merch(13) }.to raise_error ArgumentError
+      expect { subject.julian_to_merch(0) }.to raise_error ArgumentError
+    end
+  end
+  
+  describe "#weeks_for_month" do
+    it "returns 4 weeks for a 4-week month Retail Year 2019 for Aug" do
+      weeks = subject.weeks_for_month(2018, 2)
+      expect(weeks.size).to eq 4
+    end
 
+    it "returns 5 weeks for a 5-week month Retail Year 2019 for Sept" do
+      weeks = subject.weeks_for_month(2018, 3)
+      expect(weeks.size).to eq 5
+    end
+
+    it "returns 5 weeks during a 4-5-5 quarter" do
+      weeks = subject.weeks_for_month(2017, julian_month: 11)
+      expect(weeks.size).to eq 4
+
+      weeks = subject.weeks_for_month(2017, merch_month: 11)
+      expect(weeks.size).to eq 5
+      
+      weeks = subject.weeks_for_month(2017, 1)
+      expect(weeks.size).to eq 5
+      
+      weeks = subject.weeks_for_month(2018, 2)
+      expect(weeks.size).to eq 4
+    end
+
+    it "raises an ArgumentError if the param is not a hash with a key we care about or Fixnum" do
+      expect { subject.weeks_for_month(2018, "3") }.to raise_error ArgumentError
+      expect { subject.weeks_for_month(2018, some_month: 4) }.to raise_error ArgumentError
+    end
+  end
+end