feriados 2.1.1 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cfff3d04ae5c302b400f063a83ff4f8d6ac5e0c6
-  data.tar.gz: 633dc8d651430874151ed33b513a0948db6f3349
+  metadata.gz: 132b8e4a800c3cb3a2e24eccb914eef054ad152d
+  data.tar.gz: 2bf6ba574acd5cba5fefa4c1dc63f5633731a578
 SHA512:
-  metadata.gz: 85f0f0d8774c08751eb3057955ac6bedb0873793c54bfe7b34daeb4ee231a8dd74e27264140d734c77434dbb7de5d0b49637e4071266bb68f2f5fb139bf50cfe
-  data.tar.gz: f37bff8af351696ad8abb0297e146e84c50f85596268e3d49267366b8cb2faeae269495fd31260cc6519ccf7ce36be56eb46dd948bbbb859c6a8311bfaa59616
+  metadata.gz: 8cf269e31c1861050e8aadc51d4fddb7aba389415fa222aa82d7efb7cbbcf1dc5a8c63d21c3f1b54e73a3db169aa4427952faa69e2af34d3ef22ed761989aec0
+  data.tar.gz: d2d1c2da3df0cccd210fa9c355284d0950d19cdac84b2353e6f3c3495ce28718a44eb0239e78593d063177daa0451a7705a3faa7bc8d029fceb0b1dc1b014726

data/lib/feriados/argentina.rb

@@ -1,61 +1,67 @@
-#encoding: utf-8
+# encoding: UTF-8
 
 module Feriados
   module Argentina
     # Feriados Fijos
     Feriados.add 'Año nuevo', day: 1, month: 1
     Feriados.add 'Día Nacional de la Memoria por la Verdad y la Justicia',
-     day: 24, month: 3
+                 day: 24, month: 3
     Feriados.add 'Día del Veterano y de los Caídos en la Guerra de Malvinas',
-     day: 2, month: 4
+                 day: 2, month: 4
     Feriados.add 'Día del trabajador', day: 1, month: 5
     Feriados.add 'Día de la Revolución de Mayo', day: 25, month: 5
-    Feriados.add 'Paso a la Inmortalidad del General Manuel Belgrano', day: 20,
-     month: 6
+    Feriados.add 'Paso a la Inmortalidad del General Manuel Belgrano',
+                 day: 20, month: 6
     Feriados.add 'Día de la Independencia', day: 9, month: 7
     Feriados.add 'Inmaculada Concepción de María', day: 8, month: 12
     Feriados.add 'Navidad', day: 25, month: 12
 
     # Feriados calculados
-    Feriados.add 'easter', function: ->(year) { Feriados.easter(year) }
-    Feriados.add 'Viernes Santo', function: ->(year) { Feriados.easter(year) - 2 }
-    Feriados.add 'Jueves Santo', function: ->(year) { Feriados.easter(year) - 3 }
-    Feriados.add 'Lunes de Carnaval', function: ->(year) { Feriados.easter(year) - 48 }
-    Feriados.add 'Martes de Carnaval', function: ->(year) { Feriados.easter(year) - 47 }
+    Feriados.add 'easter', function: -> (year) { Feriados.easter(year) }
+    Feriados.add 'Viernes Santo',
+                 function: -> (year) { Feriados.easter(year) - 2 }
+    Feriados.add 'Jueves Santo',
+                 function: -> (year) { Feriados.easter(year) - 3 }
+    Feriados.add 'Lunes de Carnaval',
+                 function: -> (year) { Feriados.easter(year) - 48 }
+    Feriados.add 'Martes de Carnaval',
+                 function: -> (year) { Feriados.easter(year) - 47 }
 
     # Feriados relativos
     Feriados.add 'Paso a la Inmortalidad del General José de San Martín',
-     day: 17, month: 8, fix_change: [:third, :monday]
-    Feriados.add 'Día del Respeto a la Diversidad Cultural', day: 12, month: 10,
-     fix_change: [:second, :monday]
-    Feriados.add 'Día de la Soberanía Nacional', day: 20, month: 11,
-     fix_change: [:fourth, :monday]
+                 day: 17, month: 8, fix_change: [:third, :monday]
+    Feriados.add 'Día del Respeto a la Diversidad Cultural',
+                 day: 12, month: 10, fix_change: [:second, :monday]
+    Feriados.add 'Día de la Soberanía Nacional',
+                 day: 20, month: 11, fix_change: [:fourth, :monday]
 
     # Feriados especiales 2012
-    Feriados.add "Día del Bicentenario de la Creación y Primera Jura de la \
-      Bandera Argentina", day: 27, month: 2, year: 2012
-    Feriados.add "Día del Bicentenario de la Batalla de Tucumán", day: 24,
-     month: 9, year: 2012
-    Feriados.add "Feriado puente", day: 30, month: 4, year: 2012
-    Feriados.add "Feriado puente", day: 24, month: 12, year: 2012
+    Feriados.add 'Día del Bicentenario de la Creación y Primera Jura de la'\
+      'Bandera Argentina', day: 27, month: 2, year: 2012
+    Feriados.add 'Día del Bicentenario de la Batalla de Tucumán',
+                 day: 24, month: 9, year: 2012
+    Feriados.add 'Feriado puente', day: 30, month: 4, year: 2012
+    Feriados.add 'Feriado puente', day: 24, month: 12, year: 2012
 
     # Feriados especiales 2013
-    Feriados.add "Bicentenario de la Asamblea General Constituyente de 1813",
-     day: 31, month: 1, year: 2013
-    Feriados.add "Día de la Batalla de Salta", day: 20, month: 2, year: 2013
-    Feriados.add "Feriado puente", day: 1, month: 4, year: 2013
-    Feriados.add "Feriado puente", day: 21, month: 6, year: 2013
+    Feriados.add 'Bicentenario de la Asamblea General Constituyente de 1813',
+                 day: 31, month: 1, year: 2013
+    Feriados.add 'Día de la Batalla de Salta', day: 20, month: 2, year: 2013
+    Feriados.add 'Feriado puente', day: 1, month: 4, year: 2013
+    Feriados.add 'Feriado puente', day: 21, month: 6, year: 2013
 
     # Feriados especiales 2014
-    Feriados.add "Feriado puente", day: 2, month: 5, year: 2014
-    Feriados.add "Feriado puente", day: 26, month: 12, year: 2014
+    Feriados.add 'Feriado puente', day: 2, month: 5, year: 2014
+    Feriados.add 'Feriado puente', day: 26, month: 12, year: 2014
 
     # Feriados especiales 2015
-    Feriados.add "Feriado puente", day: 23, month: 3, year: 2015
-    Feriados.add "Feriado puente", day: 7, month: 12, year: 2015
+    Feriados.add 'Feriado puente', day: 23, month: 3, year: 2015
+    Feriados.add 'Bicentenario del Congreso de los Pueblos Libres',
+                 day: 29, month: 6, year: 2015
+    Feriados.add 'Feriado puente', day: 7, month: 12, year: 2015
 
     # Feriados especiales 2016
-    Feriados.add "Feriado puente", day: 8, month: 7, year: 2016
-    Feriados.add "Feriado puente", day: 9, month: 12, year: 2016
+    Feriados.add 'Feriado puente', day: 8, month: 7, year: 2016
+    Feriados.add 'Feriado puente', day: 9, month: 12, year: 2016
   end
 end

data/lib/feriados.rb

@@ -1,18 +1,18 @@
 require 'date'
 
 module Feriados
-  DAYS = {sunday: 7, monday: 1, tuesday: 2, wednesday: 3, thursday: 4,
-    friday: 5, saturday: 6}
+  DAYS = { sunday: 7, monday: 1, tuesday: 2, wednesday: 3, thursday: 4,
+           friday: 5, saturday: 6 }
 
   def self.add(description, options = {})
-    @holidays_by_month ||= {}
     month = options[:month] || 0
+    @holidays_by_month ||= {}
     @holidays_by_month[month] ||= []
-    @holidays_by_month[month] << {description: description}.merge!(options)
+    @holidays_by_month[month] << { description: description }.merge!(options)
   end
 
   def self.calculated(th, day, month, year)
-    n = {first: 1, second: 2, third: 3, fourth: 4}
+    n = { first: 1, second: 2, third: 3, fourth: 4 }
 
     week = n[th]
     date = Date.civil(year, month, 1)
@@ -23,10 +23,9 @@ module Feriados
   end
 
   def self.easter(year)
-    y = year
-    a = y % 19
-    b = y / 100
-    c = y % 100
+    a = year % 19
+    b = year / 100
+    c = year % 100
     d = b / 4
     e = b % 4
     f = (b + 8) / 25
@@ -38,6 +37,7 @@ module Feriados
     m = (a + 11 * h + 22 * l) / 451
     month = (h + l - 7 * m + 114) / 31
     day = ((h + l - 7 * m + 114) % 31) + 1
+
     Date.civil(year, month, day)
   end
 
@@ -53,25 +53,23 @@ module Feriados
 
     dates.each do |year, months|
       months.each do |month|
-        if holidays = @holidays_by_month[month]
-          holidays.each do |holiday|
-            description = holiday[:description]
-
-            date = if holiday[:function]
-              holiday[:function].call(year)
-            elsif holiday[:fix_change]
-              calculated(holiday[:fix_change][0], holiday[:fix_change][1],
-                month, year)
-            elsif holiday[:variable_change]
-              holiday[:variable_change].call(Date.civil(year, month,
-                holiday[:day]))
-            else
-              Date.civil(holiday[:year] || year, month, holiday[:day])
-            end
+        next unless (holidays = @holidays_by_month[month])
+        holidays.each do |holiday|
+          description = holiday[:description]
+          date = if holiday[:function]
+                   holiday[:function].call(year)
+                 elsif holiday[:fix_change]
+                   calculated(holiday[:fix_change][0], holiday[:fix_change][1],
+                              month, year)
+                 elsif holiday[:variable_change]
+                   holiday[:variable_change].call(Date.civil(year, month,
+                                                             holiday[:day]))
+                 else
+                   Date.civil(holiday[:year] || year, month, holiday[:day])
+                 end
 
-            if date.between?(start_date, end_date) && date.year == year
-              list << { date: date, description: description }
-            end
+          if date.between?(start_date, end_date) && date.year == year
+            list << { date: date, description: description }
           end
         end
       end
@@ -82,12 +80,12 @@ module Feriados
 end
 
 class Date
-  def is_holiday?
+  def holiday?
     holidays = Feriados.between(self, self)
     holidays && !holidays.empty?
   end
 
-  def is_week_end?
-    self.wday == 6 or self.wday == 0
+  def week_end?
+    wday == 6 || wday == 0
   end
 end

data/test/{test_date.rb → date_test.rb}

@@ -1,30 +1,24 @@
-#encoding:utf-8
+# encoding: UTF-8
 
-require 'helper.rb'
+require 'test_helper.rb'
 
 class DateTests < MiniTest::Test
-  def setup
-    @date = Date.civil(2012,1,1)
-  end
-
   def test_extending_date_class
-    assert @date.respond_to?('is_holiday?')
-    assert @date.respond_to?('is_week_end?')
+    @date = Date.civil(2012, 1, 1)
+
+    assert @date.respond_to?('holiday?')
+    assert @date.respond_to?('week_end?')
   end
 
   def test_week_end
-    regulars = [ :monday, :tuesday, :wednesday, :thursday, :friday ]
-    week_end = [ :saturday, :sunday ]
-    nths = [ :first, :second, :third, :fourth ]
-
     (2012..2015).each do |year|
       (1..12).each do |month|
         nths.each do |n|
           regulars.each do |day|
-            assert !Feriados.calculated(n, day, month, year).is_week_end?
+            refute Feriados.calculated(n, day, month, year).week_end?
           end
           week_end.each do |day|
-            assert Feriados.calculated(n, day, month, year).is_week_end?
+            assert Feriados.calculated(n, day, month, year).week_end?
           end
         end
       end
@@ -32,7 +26,7 @@ class DateTests < MiniTest::Test
   end
 
   def test_calculated
-    # Día de la bandera.
+    # Dia de la bandera.
     assert_equal 18, Feriados.calculated(:third, :monday, 6, 2012).day
     assert_equal 17, Feriados.calculated(:third, :monday, 6, 2013).day
     assert_equal 16, Feriados.calculated(:third, :monday, 6, 2014).day
@@ -62,13 +56,25 @@ class DateTests < MiniTest::Test
 
   def test_fix_holidays
     2012.upto(2015) do |year|
-      assert Date.civil(year, 1,  1).is_holiday?
-      assert Date.civil(year, 3,  24).is_holiday?
-      assert Date.civil(year, 4,  2).is_holiday?
-      assert Date.civil(year, 5,  1).is_holiday?
-      assert Date.civil(year, 7,  9).is_holiday?
-      assert Date.civil(year, 12, 8).is_holiday?
-      assert Date.civil(year, 12, 25).is_holiday?
+      assert Date.civil(year, 1,  1).holiday?
+      assert Date.civil(year, 3,  24).holiday?
+      assert Date.civil(year, 4,  2).holiday?
+      assert Date.civil(year, 5,  1).holiday?
+      assert Date.civil(year, 7,  9).holiday?
+      assert Date.civil(year, 12, 8).holiday?
+      assert Date.civil(year, 12, 25).holiday?
     end
   end
+
+  def regulars
+    [:monday, :tuesday, :wednesday, :thursday, :friday]
+  end
+
+  def week_end
+    [:saturday, :sunday]
+  end
+
+  def nths
+    [:first, :second, :third, :fourth]
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: feriados
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 3.0.1
 platform: ruby
 authors:
 - Sebastian Rabuini
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-07 00:00:00.000000000 Z
+date: 2015-06-04 00:00:00.000000000 Z
 dependencies: []
 description: Feriados argentinos. Adaptable to other countries
 email:
@@ -19,8 +19,8 @@ extra_rdoc_files: []
 files:
 - lib/feriados.rb
 - lib/feriados/argentina.rb
-- test/helper.rb
-- test/test_date.rb
+- test/date_test.rb
+- test/test_helper.rb
 homepage: https://github.com/srabuini/feriados
 licenses:
 - MIT
@@ -41,11 +41,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Feriados argentinos
 test_files:
-- test/helper.rb
-- test/test_date.rb
+- test/date_test.rb
+- test/test_helper.rb
 has_rdoc: