norwegian_holidays 0.0.1 → 0.0.2

data/README.md

@@ -23,3 +23,13 @@ Christmas: December 24th (Norwegians only care about Christmas Eve, apparently).
 
     NorwegianHolidays.next_mothersday( Date.new(2011, 3, 14) )
     => February 12, 2012
+
+
+## Next (if coming up) or last holiday
+
+There is a need to return _the next holiday_ if it is coming up within a certain timeframe, otherwise return _last year's holiday_.
+
+The name for this has not been suitably determined as of yet.
+
+    fathersday_for_season(2.months)
+

data/lib/norwegian_holidays.rb

@@ -33,19 +33,32 @@ module NorwegianHolidays
 
     def method_missing(method, *args, &block)
       if method.to_s =~ /^next_(.*)$/
+        next_holiday($1, args.first)
+      elsif method.to_s =~ /(.*)_for_season/
+        holiday_for_season($1, *args)
+      else
+        super
+      end
+    end
 
-        given_date = args.first
-        holiday = $1
+    private
 
-        the_day = self.send(holiday.to_sym, given_date.year)
+    def next_holiday(holiday, given_date)
+      the_day = self.send(holiday.to_sym, given_date.year)
 
-        if the_day < given_date
-          the_day = self.send(holiday.to_sym, given_date.year + 1)
-        end
+      if the_day < given_date
+        the_day = self.send(holiday.to_sym, given_date.year + 1)
+      end
+
+      the_day
+    end
 
-        the_day
+    def holiday_for_season(holiday, date, timeframe)
+      upcoming = next_holiday(holiday, date)
+      if (date + timeframe) >= upcoming
+        upcoming
       else
-        super
+        send(holiday, upcoming.year - 1)
       end
     end
 

data/lib/norwegian_holidays/version.rb

@@ -1,3 +1,3 @@
 module NorwegianHolidays
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/norwegian_holidays_spec.rb

@@ -16,134 +16,211 @@ describe NorwegianHolidays do
     end
   end
 
-  describe "#christmas(year)" do
+  describe "Christmas" do
+    let(:christmas) { Date.new(2011, 12, 24) }
+
     it "is on Christmas Eve" do
-      NorwegianHolidays.christmas(2011).should eq(Date.new(2011, 12, 24))
+      NorwegianHolidays.christmas(2011).should eq(christmas)
     end
-  end
 
-  describe "#valentines_day(year)" do
-    it "is on Feb 14th" do
-      NorwegianHolidays.valentines_day(2011).should eq(Date.new(2011, 2, 14))
-    end
-  end
+    describe "#next_christmas" do
 
-  describe "#mothersday(year)" do
-    it "is on the second Sunday of February" do
-      NorwegianHolidays.mothersday(2010).should eq(Date.new(2010, 2, 14))
-    end
-  end
+      it "is on Dec 24th" do
+        NorwegianHolidays.next_christmas(christmas - 1.day).should eq(christmas)
+      end
 
-  describe "#fathersday(year)" do
-    it "is on the second Sunday of November" do
-      NorwegianHolidays.fathersday(2010).should eq(Date.new(2010, 11, 14))
+      it "is this year if today is Christmas Eve" do
+        NorwegianHolidays.next_christmas(christmas).should eq(christmas)
+      end
+
+      it "is next year if it's already passed" do
+        NorwegianHolidays.next_christmas(christmas + 1.day).should eq(christmas + 1.year)
+      end
     end
-  end
 
-  describe "#next_christmas" do
-    let(:christmas) { Date.new(2011, 12, 24) }
+    describe "#christmas_for_season(date, timespan)" do
+      let(:timeframe) { 2.months }
+      let(:cutoff) { christmas - 2.months }
 
-    it "is on Dec 24th" do
-      NorwegianHolidays.next_christmas(christmas - 1.day).should eq(christmas)
-    end
+      it "is this year if it's coming up within the timeframe" do
+        NorwegianHolidays.christmas_for_season(cutoff + 1.day, timeframe).should eq(christmas)
+      end
 
-    it "is this year if today is Christmas Eve" do
-      NorwegianHolidays.next_christmas(christmas).should eq(christmas)
-    end
+      it "is this year if it's coming up in exactly the timeframe" do
+        NorwegianHolidays.christmas_for_season(cutoff, timeframe).should eq(christmas)
+      end
 
-    it "is next year if it's already passed" do
-      NorwegianHolidays.next_christmas(christmas + 1.day).should eq(christmas + 1.year)
+      it "is last year if it's too long til the next one" do
+        NorwegianHolidays.christmas_for_season(cutoff - 1.day, timeframe).should eq(christmas - 1.year)
+      end
     end
   end
 
-  describe "#next_valentines_day" do
+  describe "Valentines Day" do
     let(:valentines_day) { Date.new(2011, 2, 14) }
 
     it "is on Feb 14th" do
-      NorwegianHolidays.next_valentines_day(valentines_day - 1.day).should eq(valentines_day)
+      NorwegianHolidays.valentines_day(2011).should eq(valentines_day)
     end
 
-    it "is this year if today is valentines day" do
-      NorwegianHolidays.next_valentines_day(valentines_day).should eq(valentines_day)
+    describe "#next_valentines_day" do
+
+      it "is on Feb 14th" do
+        NorwegianHolidays.next_valentines_day(valentines_day - 1.day).should eq(valentines_day)
+      end
+
+      it "is this year if today is valentines day" do
+        NorwegianHolidays.next_valentines_day(valentines_day).should eq(valentines_day)
+      end
+
+      it "is next year if it's already passed" do
+        NorwegianHolidays.next_valentines_day(valentines_day + 1.day).should eq(valentines_day + 1.year)
+      end
     end
 
-    it "is next year if it's already passed" do
-      NorwegianHolidays.next_valentines_day(valentines_day + 1.day).should eq(valentines_day + 1.year)
+    describe "#valentines_day_for_season(date, timespan)" do
+      let(:timeframe) { 2.months }
+      let(:cutoff) { valentines_day - 2.months }
+
+      it "is this year if it's coming up within the timeframe" do
+        NorwegianHolidays.valentines_day_for_season(cutoff + 1.day, timeframe).should eq(valentines_day)
+      end
+
+      it "is this year if it's coming up in exactly the timeframe" do
+        NorwegianHolidays.valentines_day_for_season(cutoff, timeframe).should eq(valentines_day)
+      end
+
+      it "is last year if it's too long til the next one" do
+        NorwegianHolidays.valentines_day_for_season(cutoff - 1.day, timeframe).should eq(valentines_day - 1.year)
+      end
     end
+
   end
 
-  describe "#next_mothersday" do
+  describe "Mothersday" do
     let(:mothersday_2010) { Date.new(2010, 2, 14) }
     let(:mothersday_2011) { Date.new(2011, 2, 13) }
     let(:mothersday_2012) { Date.new(2012, 2, 12) }
 
-    context "(sanity check) correct in" do
-      specify "2010" do
-        NorwegianHolidays.next_mothersday( Date.new(2010, 1, 1) ).should eq(mothersday_2010)
+    it "is on the second Sunday of February" do
+      NorwegianHolidays.mothersday(2010).should eq(mothersday_2010)
+    end
+
+    describe "#next_mothersday" do
+
+      context "(sanity check) correct in" do
+        specify "2010" do
+          NorwegianHolidays.next_mothersday( Date.new(2010, 1, 1) ).should eq(mothersday_2010)
+        end
+
+        specify "2011" do
+          NorwegianHolidays.next_mothersday( Date.new(2011, 1, 1) ).should eq(mothersday_2011)
+        end
+
+        specify "2012" do
+          NorwegianHolidays.next_mothersday( Date.new(2012, 1, 1) ).should eq(mothersday_2012)
+        end
       end
 
-      specify "2011" do
-        NorwegianHolidays.next_mothersday( Date.new(2011, 1, 1) ).should eq(mothersday_2011)
+      context "on mothersday" do
+        it "is this year" do
+          NorwegianHolidays.next_mothersday(mothersday_2010).should eq(mothersday_2010)
+        end
       end
 
-      specify "2012" do
-        NorwegianHolidays.next_mothersday( Date.new(2012, 1, 1) ).should eq(mothersday_2012)
+      context "before mothersday" do
+        it "is this year" do
+          NorwegianHolidays.next_mothersday(mothersday_2010 - 1.day).should eq(mothersday_2010)
+        end
       end
-    end
 
-    context "on mothersday" do
-      it "is this year" do
-        NorwegianHolidays.next_mothersday(mothersday_2010).should eq(mothersday_2010)
+      context "after mothersday" do
+        it "is next year" do
+          NorwegianHolidays.next_mothersday(mothersday_2010 + 1.day).should eq(mothersday_2011)
+        end
       end
     end
 
-    context "before mothersday" do
-      it "is this year" do
-        NorwegianHolidays.next_mothersday(mothersday_2010 - 1.day).should eq(mothersday_2010)
+    describe "#mothersday_for_season(date, timespan)" do
+      let(:mothersday) { mothersday_2011 }
+      let(:last_mothersday) { mothersday_2010 }
+
+      let(:cutoff) { mothersday - 2.months }
+      let(:timeframe) { 2.months }
+
+      it "is this year if it's coming up within the timeframe" do
+        NorwegianHolidays.mothersday_for_season(cutoff + 1.day, timeframe).should eq(mothersday)
+      end
+
+      it "is this year if it's coming up in exactly the timeframe" do
+        NorwegianHolidays.mothersday_for_season(cutoff, timeframe).should eq(mothersday)
       end
-    end
 
-    context "after mothersday" do
-      it "is next year" do
-        NorwegianHolidays.next_mothersday(mothersday_2010 + 1.day).should eq(mothersday_2011)
+      it "is last year if it's too long til the next one" do
+        NorwegianHolidays.mothersday_for_season(cutoff - 1.day, timeframe).should eq(last_mothersday)
       end
     end
   end
 
-  describe "#next_fathersday" do
+  describe "Fathersday" do
     let(:fathersday_2010) { Date.new(2010, 11, 14) }
     let(:fathersday_2011) { Date.new(2011, 11, 13) }
     let(:fathersday_2012) { Date.new(2012, 11, 11) }
 
-    context "(sanity check) correct in" do
-      specify "2010" do
-        NorwegianHolidays.next_fathersday( Date.new(2010, 1, 1) ).should eq(fathersday_2010)
+    it "is on the second Sunday of November" do
+      NorwegianHolidays.fathersday(2011).should eq(fathersday_2011)
+    end
+
+    describe "#next_fathersday" do
+      context "(sanity check) correct in" do
+        specify "2010" do
+          NorwegianHolidays.next_fathersday( Date.new(2010, 1, 1) ).should eq(fathersday_2010)
+        end
+
+        specify "2011" do
+          NorwegianHolidays.next_fathersday( Date.new(2011, 1, 1) ).should eq(fathersday_2011)
+        end
+
+        specify "2012" do
+          NorwegianHolidays.next_fathersday( Date.new(2012, 1, 1) ).should eq(fathersday_2012)
+        end
       end
 
-      specify "2011" do
-        NorwegianHolidays.next_fathersday( Date.new(2011, 1, 1) ).should eq(fathersday_2011)
+      context "on fathersday" do
+        it "is this year" do
+          NorwegianHolidays.next_fathersday(fathersday_2010).should eq(fathersday_2010)
+        end
       end
 
-      specify "2012" do
-        NorwegianHolidays.next_fathersday( Date.new(2012, 1, 1) ).should eq(fathersday_2012)
+      context "before fathersday" do
+        it "is this year" do
+          NorwegianHolidays.next_fathersday(fathersday_2010 - 1.day).should eq(fathersday_2010)
+        end
       end
-    end
 
-    context "on fathersday" do
-      it "is this year" do
-        NorwegianHolidays.next_fathersday(fathersday_2010).should eq(fathersday_2010)
+      context "after fathersday" do
+        it "is next year" do
+          NorwegianHolidays.next_fathersday(fathersday_2010 + 1.day).should eq(fathersday_2011)
+        end
       end
     end
 
-    context "before fathersday" do
-      it "is this year" do
-        NorwegianHolidays.next_fathersday(fathersday_2010 - 1.day).should eq(fathersday_2010)
+    describe "#fathersday_for_season(date, timespan)" do
+      let(:fathersday) { fathersday_2011 }
+      let(:last_fathersday) { fathersday_2010 }
+      let(:timeframe) { 2.months }
+      let(:cutoff) { fathersday - 2.months }
+
+      it "is this year if it's coming up within the timeframe" do
+        NorwegianHolidays.fathersday_for_season(cutoff + 1.day, timeframe).should eq(fathersday)
+      end
+
+      it "is this year if it's coming up in exactly the timeframe" do
+        NorwegianHolidays.fathersday_for_season(cutoff, timeframe).should eq(fathersday)
       end
-    end
 
-    context "after fathersday" do
-      it "is next year" do
-        NorwegianHolidays.next_fathersday(fathersday_2010 + 1.day).should eq(fathersday_2011)
+      it "is last year if it's too long til the next one" do
+        NorwegianHolidays.fathersday_for_season(cutoff - 1.day, timeframe).should eq(last_fathersday)
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: norwegian_holidays
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-04 00:00:00.000000000Z
+date: 2012-01-19 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70138570566060 !ruby/object:Gem::Requirement
+  requirement: &70170598094940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70138570566060
+  version_requirements: *70170598094940
 - !ruby/object:Gem::Dependency
   name: active_support
-  requirement: &70138570565640 !ruby/object:Gem::Requirement
+  requirement: &70170598094500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70138570565640
+  version_requirements: *70170598094500
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70138570565220 !ruby/object:Gem::Requirement
+  requirement: &70170598094080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70138570565220
+  version_requirements: *70170598094080
 description: ! 'A Norwegian holiday calendar. Answers the age-old question: "When
   is mothersday this year?"'
 email: