holidate 0.0.1 → 0.0.2

data/lib/holidate.rb

@@ -1,62 +1,61 @@
 require 'date'
 
 class Holidate
+  def self.find_day nth, wday, month, year=Date.today.year
+    if nth > 0
+      Date.new year, month, (      1       + ( nth - 1) * 7 + (wday       -       Date.new(year, month, 1).wday) % 7)
+    elsif nth < 0
+      days_in_month = ((Date.new(year, month) >> 1) -1).day
+      Date.new year, month, (days_in_month - (-nth - 1) * 7 - (Date.new(year, month, days_in_month).wday - wday) % 7)
+    end
+  end
+
   def self.new_years_day year
-    raise ArgumentError, "Invalid value for method #{__method__}: #{year.inspect}" unless year.is_a? Integer
-    Date.new year, 1
+    Date.new year, 1, 1
   end
   self.singleton_class.send(:alias_method, :new_year, :new_years_day)
 
   def self.martin_luther_king_jr_day year
-    raise ArgumentError, "Invalid value for method #{__method__}: #{year.inspect}" unless year.is_a? Integer
-    Date.new year, 1, (15 + (1 - Date.new(year, 1).wday)%7)
+    self.find_day 3, 1, 1, year
   end
   self.singleton_class.send(:alias_method, :mlk, :martin_luther_king_jr_day)
 
   def self.washingtons_birthday year
-    raise ArgumentError, "Invalid value for method #{__method__}: #{year.inspect}" unless year.is_a? Integer
-    Date.new year, 2, (15 + (1 - Date.new(year, 2).wday)%7)
+    self.find_day 3, 1, 2, year
   end
   self.singleton_class.send(:alias_method, :washington, :washingtons_birthday)
 
   def self.memorial_day year
-    raise ArgumentError, "Invalid value for method #{__method__}: #{year.inspect}" unless year.is_a? Integer
-    Date.new year, 5, (31 - (Date.new(year, 5, 31).wday - 1)%7)
+    self.find_day -1, 1, 5, year
   end
   self.singleton_class.send(:alias_method, :memorial, :memorial_day)
 
   def self.independence_day year
-    raise ArgumentError, "Invalid value for method #{__method__}: #{year.inspect}" unless year.is_a? Integer
     Date.new year, 7, 4
   end
   self.singleton_class.send(:alias_method, :july_4, :independence_day)
 
   def self.labor_day year
-    raise ArgumentError, "Invalid value for method #{__method__}: #{year.inspect}" unless year.is_a? Integer
-    Date.new year, 9, (1 + (1 - Date.new(year, 9).wday)%7)
+    self.find_day 1, 1, 9, year
   end
   self.singleton_class.send(:alias_method, :labor, :labor_day)
 
   def self.columbus_day year
-    raise ArgumentError, "Invalid value for method #{__method__}: #{year.inspect}" unless year.is_a? Integer
-    Date.new year, 10, (8 + (1 - Date.new(year, 10).wday)%7)
+    self.find_day 2, 1, 10, year
   end
   self.singleton_class.send(:alias_method, :columbus, :columbus_day)
 
   def self.veterans_day year
-    raise ArgumentError, "Invalid value for method #{__method__}: #{year.inspect}" unless year.is_a? Integer
     Date.new year, 11, 11
   end
   self.singleton_class.send(:alias_method, :veteran, :veterans_day)
 
   def self.thanksgiving_day year
-    raise ArgumentError, "Invalid value for method #{__method__}: #{year.inspect}" unless year.is_a? Integer
-    Date.new year, 11, (22 + (4 - Date.new(year, 11).wday)%7)
+    self.find_day 4, 4, 11, year
   end
   self.singleton_class.send(:alias_method, :thanksgiving, :thanksgiving_day)
 
   def self.christmas_day year
-    raise ArgumentError, "Invalid value for method #{__method__}: #{year.inspect}" unless year.is_a? Integer
     Date.new year, 12, 25
   end
   self.singleton_class.send(:alias_method, :xmas, :christmas_day)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: holidate
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-19 00:00:00.000000000 Z
+date: 2015-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler