holidate 0.0.2 → 0.0.3

data/lib/holidate.rb

@@ -1,62 +1,91 @@
 require 'date'
 
 class Holidate
-  def self.find_day nth, wday, month, year=Date.today.year
+  def self.find nth_, wday_, month_, year_=Date.today.year
+    nth = nth_int(nth_)
+    wday = wday_int(wday_)
+    month = month_int(month_)
+    year = year_int(year_)
     if nth > 0
       Date.new year, month, (      1       + ( nth - 1) * 7 + (wday       -       Date.new(year, month, 1).wday) % 7)
-    elsif nth < 0
+    else
       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
+  singleton_class.send(:alias_method, :find_day, :find)
 
-  def self.new_years_day year
+  def self.new_years_day year=Date.today.year
     Date.new year, 1, 1
   end
-  self.singleton_class.send(:alias_method, :new_year, :new_years_day)
+  singleton_class.send(:alias_method, :new_year, :new_years_day)
 
-  def self.martin_luther_king_jr_day year
-    self.find_day 3, 1, 1, year
+  def self.martin_luther_king_jr_day year=Date.today.year
+    find 'third', 'monday', 'january', year
   end
-  self.singleton_class.send(:alias_method, :mlk, :martin_luther_king_jr_day)
+  singleton_class.send(:alias_method, :mlk, :martin_luther_king_jr_day)
 
-  def self.washingtons_birthday year
-    self.find_day 3, 1, 2, year
+  def self.washingtons_birthday year=Date.today.year
+    find 'third', 'monday', 'february', year
   end
-  self.singleton_class.send(:alias_method, :washington, :washingtons_birthday)
+  singleton_class.send(:alias_method, :washington, :washingtons_birthday)
 
-  def self.memorial_day year
-    self.find_day -1, 1, 5, year
+  def self.memorial_day year=Date.today.year
+    find 'last', 'monday', 'may', year
   end
-  self.singleton_class.send(:alias_method, :memorial, :memorial_day)
+  singleton_class.send(:alias_method, :memorial, :memorial_day)
 
-  def self.independence_day year
+  def self.independence_day year=Date.today.year
     Date.new year, 7, 4
   end
-  self.singleton_class.send(:alias_method, :july_4, :independence_day)
+  singleton_class.send(:alias_method, :july_4, :independence_day)
 
-  def self.labor_day year
-    self.find_day 1, 1, 9, year
+  def self.labor_day year=Date.today.year
+    find 'first', 'monday', 'september', year
   end
-  self.singleton_class.send(:alias_method, :labor, :labor_day)
+  singleton_class.send(:alias_method, :labor, :labor_day)
 
-  def self.columbus_day year
-    self.find_day 2, 1, 10, year
+  def self.columbus_day year=Date.today.year
+    find 'second', 'monday', 'october', year
   end
-  self.singleton_class.send(:alias_method, :columbus, :columbus_day)
+  singleton_class.send(:alias_method, :columbus, :columbus_day)
 
-  def self.veterans_day year
+  def self.veterans_day year=Date.today.year
     Date.new year, 11, 11
   end
-  self.singleton_class.send(:alias_method, :veteran, :veterans_day)
+  singleton_class.send(:alias_method, :veteran, :veterans_day)
 
-  def self.thanksgiving_day year
-    self.find_day 4, 4, 11, year
+  def self.thanksgiving_day year=Date.today.year
+    find 'fourth', 'thursday', 'november', year
   end
-  self.singleton_class.send(:alias_method, :thanksgiving, :thanksgiving_day)
+  singleton_class.send(:alias_method, :thanksgiving, :thanksgiving_day)
 
-  def self.christmas_day year
+  def self.christmas_day year=Date.today.year
     Date.new year, 12, 25
   end
-  self.singleton_class.send(:alias_method, :xmas, :christmas_day)
+  singleton_class.send(:alias_method, :xmas, :christmas_day)
+
+  private
+
+  def self.nth_int nth_
+    h = { 'first' => 1, 'second' => 2, 'third' => 3, 'fourth' => 4, 'fifth' => 5, 'last' => 1 }
+    nth = nth_.to_s.downcase
+    nth_int = nth.to_i == 0 ? h[nth.split(/[-_ ]/).first] : nth.to_i
+    nth_int = -nth_int if nth.to_s.downcase.end_with?('last')
+    nth_int
+  end
+
+  def self.wday_int wday
+    h = { 'sun' => 0, 'mon' => 1, 'tue' => 2, 'wed' => 3, 'thu' => 4, 'fri' => 5, 'sat' => 6 }
+    (0..6).include?(wday) ? wday : h[wday.to_s.downcase[0..2]]
+  end
+
+  def self.month_int month
+    h = { 'jan' => 1, 'feb' => 2, 'mar' => 3, 'apr' => 4, 'may' => 5, 'jun' => 6, 'jul' => 7, 'aug' => 8, 'sep' => 9, 'oct' => 10, 'nov' => 11, 'dec' => 12 }
+    (1..12).include?(month) ? month : h[month.to_s.downcase[0..2]]
+  end
+
+  def self.year_int year
+    year.to_s.to_i
+  end
 end

metadata

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