timetress 0.0.3 → 0.0.4

data/README.md

@@ -34,6 +34,12 @@ Timetress.next_christmas
 => #<Date: 2012-12-25>
 ```
 
+```
+# On Christmas Day, 2012
+Timetress.previous_christmas
+=> #<Date: 2011-12-25>
+```
+
 ### Public Holidays (Norway only)
 
 > A public holiday, national holiday or legal holiday is a holiday generally established by law and is usually a non-working day during the year.

data/lib/timetress/holiday.rb

@@ -102,11 +102,26 @@ module Timetress
       the_day
     end
 
+    def previous_holiday(holiday, given_date)
+      given_date ||= Date.today
+
+      unless given_date.respond_to?(:asctime)
+        raise ArgumentError.new("#{given_date.inspect} must be a date or time object")
+      end
+
+      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
+      the_day
+    end
+
     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)
+      elsif method.to_s =~ /^previous_(.*)$/
+        previous_holiday($1, args.first)
       else
         super
       end

data/lib/timetress/version.rb

@@ -1,3 +1,3 @@
 module Timetress
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

data/spec/holiday_spec.rb

@@ -130,6 +130,35 @@ describe Timetress::Holiday do
     it "rejects integer input" do
       lambda { Timetress::Norway.next_pi_day(1) }.should raise_error(ArgumentError)
     end
+  end
+
+  describe "previous pi day" do
+    let(:last_pi_day) { Date.new(2010, 3, 14) }
+    let(:pi_day) { Date.new(2011, 3, 14) }
+
+    it "is this year if it has passed" do
+      Timetress.previous_pi_day(pi_day + 1).should eq(pi_day)
+    end
+
+    it "is last year if today is pi day" do
+      Timetress.previous_pi_day(pi_day).should eq(last_pi_day)
+    end
+
+    it "is last year if it is coming up" do
+      Timetress.previous_pi_day(pi_day - 1).should eq(last_pi_day)
+    end
 
+    it "default is relative to today" do
+      Timetress::Norway.previous_pi_day.should eq(Timetress::Norway.previous_pi_day(Date.today))
+    end
+
+    it "rejects string input" do
+      lambda { Timetress::Norway.previous_pi_day("a string") }.should raise_error(ArgumentError)
+    end
+
+    it "rejects integer input" do
+      lambda { Timetress::Norway.previous_pi_day(1) }.should raise_error(ArgumentError)
+    end
   end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: timetress
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-29 00:00:00.000000000 Z
+date: 2013-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70165893417640 !ruby/object:Gem::Requirement
+  requirement: &70185762816380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70165893417640
+  version_requirements: *70185762816380
 description: Answers the age-old question 'When is mothersday this year?'
 email:
 - katrina.owen@gmail.com