holidays 3.1.1 → 3.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77d44ea4e57f9a700180b0829f9937735a0524a9
-  data.tar.gz: df50a09e25562ed02a3c1eb22e177e08bbb9898d
+  metadata.gz: d9375295866b446c7a50f08a7e20b4dbecb97d2f
+  data.tar.gz: 3b82fcc48186210c139631fff93aba145c5d1b39
 SHA512:
-  metadata.gz: c05e5b47fcdf1cbd444a1d13efbfb2dd8a5ba18ef293f10b4434a26aeddbf5e3b65fe379843c069869b491bc9321b10cba9f1d64f14bc8c9af4481b983923d02
-  data.tar.gz: 01a41eae9774e74a9104d06fbf4629c1fa8820d23873cf048ae1921264c90e669e319e4cbe86d16f3941ebc51aa415ee5c982a2e926b0cf3dfdec1fb6b9108a8
+  metadata.gz: b1a141005e644cf21ae5b62fcf1998528ef8694e5e32d0242802761a9519e21e2bd862ac606234dc03fb43ba149844e33be066f30939641286b5813ddced2590
+  data.tar.gz: b3d481b65dfdd56aa7d24f89f979adc8629885e35f5fd4180a5cddf45663766eea2ff8f6e950c09d31573e8cab55a5b567898a31e6d252ef3e18c10a52f2de04

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Ruby Holidays Gem CHANGELOG
 
+## 3.1.2
+
+* Do not require Date monkeypatching in definitions to use mday calculations (thanks to https://github.com/CloCkWeRX)
+
 ## 3.1.1
 
 * Require 'digest/md5' in main 'holidays' module. This was missed during the refactor (thanks to https://github.com/espen)

data/definitions/au.yaml

@@ -193,7 +193,7 @@ methods:
       if year < 2006
         nil
       else
-        Date.civil(year, 3, Date.calculate_mday(year, 3, :second, :monday))
+        Date.civil(year, 3, Holidays::DateCalculatorFactory.day_of_month_calculator.call(year, 3, :second, :monday))
       end
     end
   may_pub_hol_sa: |
@@ -203,7 +203,7 @@ methods:
       if year >= 2006
         nil
       else
-        Date.civil(year, 5, Date.calculate_mday(year, 5, :third, :monday))
+        Date.civil(year, 5, Holidays::DateCalculatorFactory.day_of_month_calculator.call(year, 5, :third, :monday))
       end
     end
 tests: |

data/definitions/us.yaml

@@ -79,7 +79,7 @@ methods:
     end
   day_after_thanksgiving: |
     def self.day_after_thanksgiving(year)
-      Date.calculate_mday(year, 11, 4, 4) + 1
+      Holidays::DateCalculatorFactory.day_of_month_calculator.call(year, 11, 4, 4) + 1
     end
 tests: |
     {Date.civil(2008,1,1) => 'New Year\'s Day',

data/lib/generated_definitions/au.rb

@@ -106,7 +106,7 @@ def self.march_pub_hol_sa(year)
   if year < 2006
     nil
   else
-    Date.civil(year, 3, Date.calculate_mday(year, 3, :second, :monday))
+    Date.civil(year, 3, Holidays::DateCalculatorFactory.day_of_month_calculator.call(year, 3, :second, :monday))
   end
 end
 
@@ -117,7 +117,7 @@ def self.may_pub_hol_sa(year)
   if year >= 2006
     nil
   else
-    Date.civil(year, 5, Date.calculate_mday(year, 5, :third, :monday))
+    Date.civil(year, 5, Holidays::DateCalculatorFactory.day_of_month_calculator.call(year, 5, :third, :monday))
   end
 end
 

data/lib/generated_definitions/fed_ex.rb

@@ -31,7 +31,7 @@ module Holidays
   end
 
 def self.day_after_thanksgiving(year)
-  Date.calculate_mday(year, 11, 4, 4) + 1
+  Holidays::DateCalculatorFactory.day_of_month_calculator.call(year, 11, 4, 4) + 1
 end
 
 

data/lib/generated_definitions/north_america.rb

@@ -117,7 +117,7 @@ end
 
 
 def self.day_after_thanksgiving(year)
-  Date.calculate_mday(year, 11, 4, 4) + 1
+  Holidays::DateCalculatorFactory.day_of_month_calculator.call(year, 11, 4, 4) + 1
 end
 
 

data/lib/generated_definitions/ups.rb

@@ -31,7 +31,7 @@ module Holidays
   end
 
 def self.day_after_thanksgiving(year)
-  Date.calculate_mday(year, 11, 4, 4) + 1
+  Holidays::DateCalculatorFactory.day_of_month_calculator.call(year, 11, 4, 4) + 1
 end
 
 

data/lib/generated_definitions/us.rb

@@ -53,7 +53,7 @@ end
 
 
 def self.day_after_thanksgiving(year)
-  Date.calculate_mday(year, 11, 4, 4) + 1
+  Holidays::DateCalculatorFactory.day_of_month_calculator.call(year, 11, 4, 4) + 1
 end
 
 

data/lib/holidays/date_calculator/day_of_month.rb

@@ -15,15 +15,15 @@ module Holidays
     #
     # ===== Examples
     # First Monday of January, 2008:
-    #   Date.calculate_mday(2008, 1, :first, :monday)
+    #   Holidays::DateCalculatorFactory.day_of_month_calculator.call(2008, 1, :first, :monday)
     #   => 7
     #
     # Third Thursday of December, 2008:
-    #   Date.calculate_mday(2008, 12, :third, :thursday)
+    #   Holidays::DateCalculatorFactory.day_of_month_calculator.call(2008, 12, :third, :thursday)
     #   => 18
     #
     # Last Monday of January, 2008:
-    #   Date.calculate_mday(2008, 1, :last, 1)
+    #   Holidays::DateCalculatorFactory.day_of_month_calculator.call(2008, 1, :last, 1)
     #   => 28
     #--
     # see http://www.irt.org/articles/js050/index.htm

data/lib/holidays/version.rb

@@ -1,3 +1,3 @@
 module Holidays
-  VERSION = '3.1.1'
+  VERSION = '3.1.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: holidays
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.1.2
 platform: ruby
 authors:
 - Alex Dunae
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-22 00:00:00.000000000 Z
+date: 2016-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler