feriados 4.1.0 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b6304c6e0804e940a38a3d1bc976e2c4612f7222
-  data.tar.gz: f05551d5ea220131d4daef3b8e3fa4f61e8d5b51
+SHA256:
+  metadata.gz: 8cf1cd7d69a441cb282e4fd9636dd540b82eeaea55bd5d54e85eb4d705e7d075
+  data.tar.gz: 8146731541c46b93292b41e3c5e878a16186ca8c25aa3d9fe9d4ec4af574f43b
 SHA512:
-  metadata.gz: 5044a6d3ceb31faf0c3ce61059f3fc795d8d9a59627f6b564dcd1808270ff4741289f93b45236e09a3f9d27160d03748958dfd5ab955277c2bde6be653a71e56
-  data.tar.gz: d4087872f7c29a7731adf7e0ef91a673e972140a4684698575a06d1afdf44a9fe8cf49e25d2ae49b29f2cd97f949c1bfd56854602370a114534bddea5f8ceedb
+  metadata.gz: f869ff0db752a3120fbe5c00aebccc03bbe344e4d507c3fa21303354722da9d6db495e38ed96515087cbfebd32f18cef2e58f77aaf59a90e555297955184ef94
+  data.tar.gz: e873ac319a47ec080c7d2665aae74d22c92bcc2ec97f9e8349e72d673dd4c37de0f8afae96a3063c21749e414789026f4ed18d3d8067769b3142a7fa13331ee6

data/lib/feriados.rb

@@ -1,4 +1,5 @@
-require_relative './feriados/calendar'
+require 'yaml'
+
 require_relative './feriados/rules'
-require_relative './feriados/argentina'
-require_relative './feriados/brazil'
+require_relative './feriados/calendar'
+require_relative './feriados/loader'

data/lib/feriados/calendar.rb

@@ -8,20 +8,28 @@ module Feriados
     end
 
     def holiday?(date)
-      @rules.any? { |rule| rule.holiday?(date) }
+      rules.any? { |rule| rule.holiday?(date) }
     end
 
     def add(rule)
-      @rules << rule
+      rules << rule
     end
 
     def remove(rule)
-      @rules.delete(rule)
+      rules.delete(rule)
     end
 
     def push(rules)
-      @rules = rules
+      self.rules = rules
     end
+
+    def load_rules(file)
+      Loader.new(file, self).load
+    end
+
+    private
+
+    attr_accessor :rules
   end
 
   refine Date do

data/lib/feriados/loader.rb

@@ -0,0 +1,59 @@
+module Feriados
+  class Loader
+    def initialize(file, calendar)
+      @file = file
+      @calendar = calendar
+    end
+
+    def load
+      load_day_of_month
+      load_functions
+      load_fix_weekdays
+      load_fix_days
+    end
+
+    private
+
+    attr_reader :file, :calendar
+
+    def config_rules
+      @config_rules ||= YAML.load_file(file)
+    end
+
+    def load_day_of_month
+      config_rules['months'].each do |month, rules|
+        rules.each do |rule|
+          calendar.add(Rules::DayOfMonth.new(rule['day'], month))
+        end
+      end
+    end
+
+    def load_functions
+      config_rules['functions'].each do |rule|
+        function_name = rule.split('_').collect(&:capitalize).join
+        class_name = "Feriados::Rules::#{function_name}".split('::')
+
+        klass = class_name.inject(Object) { |obj, const| obj.const_get(const) }
+        calendar.add(klass)
+      end
+    end
+
+    def load_fix_weekdays
+      config_rules['fix_weekdays']['months'].each do |month, rules|
+        rules.each do |rule|
+          calendar.add(Rules::FixWeekDay.new(rule['week'], rule['day'], month))
+        end
+      end
+    end
+
+    def load_fix_days
+      config_rules['fix_days'].each do |year, months|
+        months.each do |month, rules|
+          rules.each do |rule|
+            calendar.add(Rules::FixDate.new(year, month, rule['day']))
+          end
+        end
+      end
+    end
+  end
+end

data/lib/feriados/rules.rb

@@ -1,142 +1,10 @@
-module Feriados
-  module Rules
-    class RuleBase
-      def hash
-        state.hash
-      end
-
-      def eql?(other)
-        hash == other.hash
-      end
-
-      def ==(other)
-        eql?(other)
-      end
-    end
-
-    class DayOfWeek < RuleBase
-      def initialize(wday)
-        @wday = wday
-      end
-
-      def holiday?(date)
-        @wday == date.wday
-      end
-
-      protected
-
-      def state
-        [@wday]
-      end
-    end
-
-    class DayOfMonth < RuleBase
-      def initialize(day, month)
-        @day = day
-        @month = month
-      end
-
-      def holiday?(date)
-        @day == date.day && @month == date.month
-      end
-
-      protected
-
-      def state
-        [@day, @month]
-      end
-    end
-
-    class FixDate < RuleBase
-      def initialize(year, month, day)
-        @year = year
-        @month = month
-        @day = day
-      end
-
-      def holiday?(date)
-        @year == date.year && @month == date.month && @day = date.day
-      end
-
-      protected
-
-      def state
-        [@year, @month, @day]
-      end
-    end
-
-    class Easter
-      def initialize(year)
-        @year = year
-      end
-
-      def date
-        a = @year % 19
-        b = @year / 100
-        c = @year % 100
-        d = b / 4
-        e = b % 4
-        f = (b + 8) / 25
-        g = (b - f + 1) / 3
-        h = (19 * a + b - d - g + 15) % 30
-        i = c / 4
-        k = c % 4
-        l = (32 + 2 * e + 2 * i - h - k) % 7
-        m = (a + 11 * h + 22 * l) / 451
-        month = (h + l - 7 * m + 114) / 31
-        day = ((h + l - 7 * m + 114) % 31) + 1
-
-        Date.new(@year, month, day)
-      end
-
-      def self.holiday?(date)
-        easter = Easter.new(date.year)
-
-        easter.date == date
-      end
-    end
-
-    class HolyFriday
-      def self.holiday?(date)
-        Easter.new(date.year).date - 2 == date
-      end
-    end
-
-    class HolyThursday
-      def self.holiday?(date)
-        Easter.new(date.year).date - 3 == date
-      end
-    end
-
-    class CarnivalMonday
-      def self.holiday?(date)
-        Easter.new(date.year).date - 48 == date
-      end
-    end
-
-    class CarnivalTuesday
-      def self.holiday?(date)
-        Easter.new(date.year).date - 47 == date
-      end
-    end
-
-    class FixWeekDay < RuleBase
-      def initialize(week, wday, month)
-        @week = week
-        @wday = wday
-        @month = month
-      end
-
-      def holiday?(date)
-        week = (date.day - 1) / 7 + 1
-        @wday == date.wday && @month == date.month && @week == week
-      end
-
-      protected
-
-      def state
-        [@week, @wday, @month]
-      end
-    end
-  end
-end
+require_relative './rules/rule_base'
+require_relative './rules/carnival_monday'
+require_relative './rules/carnival_tuesday'
+require_relative './rules/day_of_month'
+require_relative './rules/day_of_week'
+require_relative './rules/easter'
+require_relative './rules/fix_date'
+require_relative './rules/fix_week_day'
+require_relative './rules/holy_friday'
+require_relative './rules/holy_thursday'

data/lib/feriados/rules/carnival_monday.rb

@@ -0,0 +1,9 @@
+module Feriados
+  module Rules
+    class CarnivalMonday
+      def self.holiday?(date)
+        Easter.new(date.year).date - 48 == date
+      end
+    end
+  end
+end

data/lib/feriados/rules/carnival_tuesday.rb

@@ -0,0 +1,9 @@
+module Feriados
+  module Rules
+    class CarnivalTuesday
+      def self.holiday?(date)
+        Easter.new(date.year).date - 47 == date
+      end
+    end
+  end
+end

data/lib/feriados/rules/day_of_month.rb

@@ -0,0 +1,22 @@
+module Feriados
+  module Rules
+    class DayOfMonth < RuleBase
+      def initialize(day, month)
+        @day = day
+        @month = month
+      end
+
+      def holiday?(date)
+        day == date.day && month == date.month
+      end
+
+      protected
+
+      attr_reader :day, :month
+
+      def state
+        [day, month]
+      end
+    end
+  end
+end

data/lib/feriados/rules/day_of_week.rb

@@ -0,0 +1,20 @@
+module Feriados
+  module Rules
+    class DayOfWeek < RuleBase
+      def initialize(wday)
+        @wday = wday
+      end
+
+      def holiday?(date)
+        wday == date.wday
+      end
+
+      protected
+      attr_reader :wday
+
+      def state
+        [wday]
+      end
+    end
+  end
+end

data/lib/feriados/rules/easter.rb

@@ -0,0 +1,39 @@
+module Feriados
+  module Rules
+    class Easter
+      def initialize(year)
+        @year = year
+      end
+
+      def date
+        a = year % 19
+        b = year / 100
+        c = year % 100
+        d = b / 4
+        e = b % 4
+        f = (b + 8) / 25
+        g = (b - f + 1) / 3
+        h = (19 * a + b - d - g + 15) % 30
+        i = c / 4
+        k = c % 4
+        l = (32 + 2 * e + 2 * i - h - k) % 7
+        m = (a + 11 * h + 22 * l) / 451
+        result = h + l - 7 * m + 114
+        month = result / 31
+        day = (result % 31) + 1
+
+        Date.new(year, month, day)
+      end
+
+      def self.holiday?(date)
+        easter = Easter.new(date.year)
+
+        easter.date == date
+      end
+
+      private
+
+      attr_reader :year
+    end
+  end
+end

data/lib/feriados/rules/fix_date.rb

@@ -0,0 +1,23 @@
+module Feriados
+  module Rules
+    class FixDate < RuleBase
+      def initialize(year, month, day)
+        @year = year
+        @month = month
+        @day = day
+      end
+
+      def holiday?(date)
+        year == date.year && month == date.month && day == date.day
+      end
+
+      protected
+
+      attr_reader :day, :month, :year
+
+      def state
+        [year, month, day]
+      end
+    end
+  end
+end

data/lib/feriados/rules/fix_week_day.rb

@@ -0,0 +1,24 @@
+module Feriados
+  module Rules
+    class FixWeekDay < RuleBase
+      def initialize(week, wday, month)
+        @week = week
+        @wday = wday
+        @month = month
+      end
+
+      def holiday?(date)
+        date_from_week = (date.day - 1) / 7 + 1
+        wday == date.wday && month == date.month && week == date_from_week
+      end
+
+      protected
+
+      attr_reader :week, :wday, :month
+
+      def state
+        [week, wday, month]
+      end
+    end
+  end
+end

data/lib/feriados/rules/holy_friday.rb

@@ -0,0 +1,9 @@
+module Feriados
+  module Rules
+    class HolyFriday
+      def self.holiday?(date)
+        Easter.new(date.year).date - 2 == date
+      end
+    end
+  end
+end

data/lib/feriados/rules/holy_thursday.rb

@@ -0,0 +1,9 @@
+module Feriados
+  module Rules
+    class HolyThursday
+      def self.holiday?(date)
+        Easter.new(date.year).date - 3 == date
+      end
+    end
+  end
+end

data/lib/feriados/rules/rule_base.rb

@@ -0,0 +1,17 @@
+module Feriados
+  module Rules
+    class RuleBase
+      def hash
+        state.hash
+      end
+
+      def eql?(other)
+        hash == other.hash
+      end
+
+      def ==(other)
+        eql?(other)
+      end
+    end
+  end
+end

data/test/feriados_test.rb

@@ -254,34 +254,45 @@ class CalendarTest < Minitest::Test
   def test_load_argentinian_holidays
     calendar = Calendar.new
 
-    Feriados::Argentina.rules.each { |rule| calendar.add rule }
-
-    assert calendar.holiday?(Date.new(2016, 1, 1))
-
-    assert calendar.holiday?(Date.new(2016, 2, 8))
-    assert calendar.holiday?(Date.new(2016, 2, 9))
-
-    assert calendar.holiday?(Date.new(2016, 3, 24))
-    assert calendar.holiday?(Date.new(2016, 3, 25))
-    assert calendar.holiday?(Date.new(2016, 3, 27))
-
-    assert calendar.holiday?(Date.new(2016, 4, 2))
-
-    assert calendar.holiday?(Date.new(2016, 5, 1))
-    assert calendar.holiday?(Date.new(2016, 5, 25))
-
-    assert calendar.holiday?(Date.new(2016, 6, 20))
-
-    assert calendar.holiday?(Date.new(2016, 7, 8))
-    assert calendar.holiday?(Date.new(2016, 7, 9))
-
-    assert calendar.holiday?(Date.new(2016, 8, 15))
-
-    assert calendar.holiday?(Date.new(2016, 10, 10))
-
-    assert calendar.holiday?(Date.new(2016, 11, 28))
-
-    assert calendar.holiday?(Date.new(2016, 12, 8))
-    assert calendar.holiday?(Date.new(2016, 12, 25))
+    calendar.load_rules(File.join(__dir__, './argentina.yml'))
+
+    holidays_2020 = [
+      [1, 1],
+      [2, 24],
+      [2, 25],
+      [3, 23],
+      [3, 24],
+      [4, 2],
+      [4, 9],
+      [4, 10],
+      [4, 12],
+      [5, 1],
+      [5, 25],
+      [6, 15],
+      [6, 20],
+      [7, 9],
+      [7, 10],
+      [8, 17],
+      [10, 12],
+      [11, 23],
+      [12, 7],
+      [12, 8],
+      [12, 25]
+    ]
+
+    holidays_2020.each do |month, day|
+      assert calendar.holiday?(Date.new(2020, month, day))
+    end
+
+    date = Date.new(2020, 1, 1)
+    assertions = []
+    0.upto(365) do |day|
+      today = date + day
+      holiday = calendar.holiday?(today)
+
+      assertions << holiday
+    end
+
+    assert_equal(holidays_2020.count, assertions.count { |e| e })
   end
 end

data/test/test_helper.rb

@@ -1,8 +1,3 @@
 require 'minitest/autorun'
-require 'minitest/reporters'
-
-Minitest::Reporters.use! [
-  Minitest::Reporters::DefaultReporter.new(detailed_skip: false)
-]
 
 require 'feriados'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: feriados
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.2.0
 platform: ruby
 authors:
 - Sebastian Rabuini
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-14 00:00:00.000000000 Z
+date: 2020-02-11 00:00:00.000000000 Z
 dependencies: []
 description: Make holidays calendars from rules
 email:
@@ -18,10 +18,19 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/feriados.rb
-- lib/feriados/argentina.rb
-- lib/feriados/brazil.rb
 - lib/feriados/calendar.rb
+- lib/feriados/loader.rb
 - lib/feriados/rules.rb
+- lib/feriados/rules/carnival_monday.rb
+- lib/feriados/rules/carnival_tuesday.rb
+- lib/feriados/rules/day_of_month.rb
+- lib/feriados/rules/day_of_week.rb
+- lib/feriados/rules/easter.rb
+- lib/feriados/rules/fix_date.rb
+- lib/feriados/rules/fix_week_day.rb
+- lib/feriados/rules/holy_friday.rb
+- lib/feriados/rules/holy_thursday.rb
+- lib/feriados/rules/rule_base.rb
 - test/date_test.rb
 - test/feriados_test.rb
 - test/runner.rb
@@ -45,13 +54,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Holidays calendars
 test_files:
 - test/date_test.rb
 - test/feriados_test.rb
-- test/runner.rb
 - test/test_helper.rb
+- test/runner.rb

data/lib/feriados/argentina.rb

@@ -1,49 +0,0 @@
-module Feriados
-  module Argentina
-    include Feriados::Rules
-
-    def self.rules
-      [
-        DayOfMonth.new(1, 1),
-        DayOfMonth.new(24, 3),
-        DayOfMonth.new(2, 4),
-        DayOfMonth.new(1, 5),
-        DayOfMonth.new(25, 5),
-        DayOfMonth.new(20, 6),
-        DayOfMonth.new(9, 7),
-        DayOfMonth.new(8, 12),
-        DayOfMonth.new(25, 12),
-
-        Easter,
-        HolyThursday,
-        HolyFriday,
-        CarnivalMonday,
-        CarnivalTuesday,
-
-        FixWeekDay.new(3, 1, 8),
-        FixWeekDay.new(2, 1, 10),
-        FixWeekDay.new(4, 1, 11),
-
-        FixDate.new(2012, 2, 27),
-        FixDate.new(2012, 9, 24),
-        FixDate.new(2012, 4, 30),
-        FixDate.new(2012, 12, 24),
-
-        FixDate.new(2013, 1, 31),
-        FixDate.new(2013, 2, 20),
-        FixDate.new(2013, 1, 31),
-        FixDate.new(2013, 4, 1),
-        FixDate.new(2013, 6, 21),
-
-        FixDate.new(2014, 5, 2),
-        FixDate.new(2014, 12, 26),
-
-        FixDate.new(2015, 3, 23),
-        FixDate.new(2015, 12, 7),
-
-        FixDate.new(2016, 7, 8),
-        FixDate.new(2016, 12, 9)
-      ]
-    end
-  end
-end

data/lib/feriados/brazil.rb

@@ -1,23 +0,0 @@
-module Feriados
-  module Brazil
-    include Feriados::Rules
-
-    def self.rules
-      [
-        DayOfMonth.new(1, 1),
-        DayOfMonth.new(21, 4),
-        DayOfMonth.new(1, 5),
-        DayOfMonth.new(4, 6),
-        DayOfMonth.new(7, 9),
-        DayOfMonth.new(12, 10),
-        DayOfMonth.new(2, 11),
-        DayOfMonth.new(15, 11),
-        DayOfMonth.new(25, 12),
-
-        HolyFriday,
-        CarnivalMonday,
-        CarnivalTuesday
-      ]
-    end
-  end
-end