norwegian_holidays 0.0.2 → 0.0.3

data/lib/norwegian_holidays.rb

@@ -14,14 +14,14 @@ module NorwegianHolidays
       Date.new(year, 2, 14)
     end
 
-    def mothersday(year)
-      second_sunday_in(2, year)
-    end
-
     def fathersday(year)
       second_sunday_in(11, year)
     end
 
+    def mothersday(year)
+      second_sunday_in(2, year)
+    end
+
     def second_sunday_in(month, year)
       second_week = Date.new(year, month, 8)
       second_week + days_til_sunday(second_week)
@@ -31,18 +31,6 @@ module NorwegianHolidays
       (7 - date.wday) % 7
     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)
-      else
-        super
-      end
-    end
-
-    private
-
     def next_holiday(holiday, given_date)
       the_day = self.send(holiday.to_sym, given_date.year)
 
@@ -53,7 +41,7 @@ module NorwegianHolidays
       the_day
     end
 
-    def holiday_for_season(holiday, date, timeframe)
+    def holiday_for_season(holiday, date, timeframe = 0)
       upcoming = next_holiday(holiday, date)
       if (date + timeframe) >= upcoming
         upcoming
@@ -62,5 +50,16 @@ module NorwegianHolidays
       end
     end
 
+    private
+
+    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
   end
 end

data/lib/norwegian_holidays/version.rb

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

metadata

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