holidate 0.0.4 → 1.0.0

data/holidate.gemspec

@@ -2,7 +2,7 @@ require 'date'
 
 Gem::Specification.new do |s|
   s.name        = 'holidate'
-  s.version     = '0.0.4'
+  s.version     = '1.0.0'
   s.date        = Date.today.to_s
   s.summary     = 'Holiday Dates'
   s.description = 'A simple gem that returns Date objects for holidays'

data/lib/holidate.rb

@@ -1,71 +1,73 @@
 require 'date'
 
 class Holidate
-  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))
-    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))
+  class << self
+
+    undef_method(:new)
+
+    def 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))
+      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
-  end
-  singleton_class.send(:alias_method, :find_day, :find)
 
-  def self.new_years_day(year=Date.today.year)
-    Date.new(year, 1, 1)
-  end
-  singleton_class.send(:alias_method, :new_year, :new_years_day)
+    def new_years_day(year=Date.today.year)
+      Date.new(year, 1, 1)
+    end
+    alias_method(:new_year, :new_years_day)
 
-  def self.martin_luther_king_jr_day(year=Date.today.year)
-    find('third', 'monday', 'january', year)
-  end
-  singleton_class.send(:alias_method, :mlk, :martin_luther_king_jr_day)
+    def martin_luther_king_jr_day(year=Date.today.year)
+      find('third', 'monday', 'january', year)
+    end
+    alias_method(:mlk, :martin_luther_king_jr_day)
 
-  def self.washingtons_birthday(year=Date.today.year)
-    find('third', 'monday', 'february', year)
-  end
-  singleton_class.send(:alias_method, :washington, :washingtons_birthday)
+    def washingtons_birthday(year=Date.today.year)
+      find('third', 'monday', 'february', year)
+    end
+    alias_method(:washington, :washingtons_birthday)
 
-  def self.memorial_day(year=Date.today.year)
-    find('last', 'monday', 'may', year)
-  end
-  singleton_class.send(:alias_method, :memorial, :memorial_day)
+    def memorial_day(year=Date.today.year)
+      find('last', 'monday', 'may', year)
+    end
+    alias_method(:memorial, :memorial_day)
 
-  def self.independence_day(year=Date.today.year)
-    Date.new(year, 7, 4)
-  end
-  singleton_class.send(:alias_method, :july_4, :independence_day)
+    def independence_day(year=Date.today.year)
+      Date.new(year, 7, 4)
+    end
+    alias_method(:july_4, :independence_day)
 
-  def self.labor_day(year=Date.today.year)
-    find('first', 'monday', 'september', year)
-  end
-  singleton_class.send(:alias_method, :labor, :labor_day)
+    def labor_day(year=Date.today.year)
+      find('first', 'monday', 'september', year)
+    end
+    alias_method(:labor, :labor_day)
 
-  def self.columbus_day(year=Date.today.year)
-    find('second', 'monday', 'october', year)
-  end
-  singleton_class.send(:alias_method, :columbus, :columbus_day)
+    def columbus_day(year=Date.today.year)
+      find('second', 'monday', 'october', year)
+    end
+    alias_method(:columbus, :columbus_day)
 
-  def self.veterans_day(year=Date.today.year)
-    Date.new(year, 11, 11)
-  end
-  singleton_class.send(:alias_method, :veteran, :veterans_day)
+    def veterans_day(year=Date.today.year)
+      Date.new(year, 11, 11)
+    end
+    alias_method(:veteran, :veterans_day)
 
-  def self.thanksgiving_day(year=Date.today.year)
-    find('fourth', 'thursday', 'november', year)
-  end
-  singleton_class.send(:alias_method, :thanksgiving, :thanksgiving_day)
+    def thanksgiving_day(year=Date.today.year)
+      find('fourth', 'thursday', 'november', year)
+    end
+    alias_method(:thanksgiving, :thanksgiving_day)
 
-  def self.christmas_day(year=Date.today.year)
-    Date.new(year, 12, 25)
-  end
-  singleton_class.send(:alias_method, :xmas, :christmas_day)
+    def christmas_day(year=Date.today.year)
+      Date.new(year, 12, 25)
+    end
+    alias_method(:xmas, :christmas_day)
 
-  class << self
     protected
 
     def nth_int(nth_)

data/spec/holidate_spec.rb

@@ -5,6 +5,10 @@ require 'holidate'
 
 describe Holidate do
 
+  it "doesn't respond to ::new" do
+    Holidate.respond_to?(:new).must_equal false
+  end
+
   describe '::new_years_day' do
     it "finds New Year's Day" do
       Holidate.new_year(2014).must_equal Date.new(2014, 1, 1)

metadata

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