feriados 4.2.2 → 4.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f987e77a82fb0a2f30fb0712c5238df644e19b17d774b82d2431e837f36f0073
-  data.tar.gz: c2d5fb6517a05649ca540e41644f3bf4052c64cca2dee4a90cbe2551b2720e4d
+  metadata.gz: 2a0f8a45bd3052939f53aa3ed238852d161f0be93d8758e9e8bf8354b58a3969
+  data.tar.gz: 592ae7797b8f0999346996e0409163deaccd935c3967cb7c5e5067c13d3b31db
 SHA512:
-  metadata.gz: 55c8afdf959e9144c5d9bd23469d56a4a8c0b73b5b29263e420d585b40a764b986d41aa5e36d6842b964e45c29e8fa84854667ec2d360f66fd2784d8055aa99b
-  data.tar.gz: 98eb156d025c308deed1ddc498b08f8b1427be7d819b14bfe3523a10ed5c493053a7a75a1ad3d01cc5dd622af604826c7bc7ac10c2d4532e7eabdd42cebbb2ac
+  metadata.gz: 1154029a3b4446ee620fde02254b31edf874374d9bbbdcce948ff86c9c796d83d321dcbb262c83a8e344962ab10e7be8a616096d7c44311627aa4880368f708b
+  data.tar.gz: dc180372559ca005f02d418a66d2869deeb0f56e5a9caacd0d4ed8ce47545da69278e519ebb54070907a4c96640c171f63ac932b340d99ac35963cd7fe78120f

data/lib/feriados/calendar.rb

@@ -23,11 +23,19 @@ module Feriados
       rules.delete(rule)
     end
 
-    def load(file)
-      Loader.new(file, self).load
+    def load(rules)
+      Loader.new(rules, self).load
     end
 
-    private
+    def eql?(other)
+      rules == other.rules
+    end
+
+    def ==(other)
+      eql?(other)
+    end
+
+    protected
 
     attr_accessor :rules
   end

data/lib/feriados/loader.rb

@@ -1,79 +1,20 @@
-require 'ostruct'
-
 module Feriados
   class Loader
     include Rules
 
-    def initialize(data, calendar)
-      @data = data
+    def initialize(rules, calendar)
+      @rules = rules
       @calendar = calendar
     end
 
     def load
-      load_day_of_month
-      load_functions
-      load_fix_week_days
-      load_fix_dates
-    end
-
-    private
-
-    attr_reader :data, :calendar
-
-    def load_day_of_month
-      day_of_month.each do |month, rules|
-        rules.each do |rule_data|
-          rule = OpenStruct.new(rule_data)
-          calendar.add(DayOfMonth.new(rule.day, month, rule.name))
-        end
+      rules.each do |rule|
+        calendar.add(Rules.create_with(rule))
       end
     end
 
-    def load_functions
-      function.each do |function, name|
-        function_name = function.split('_').collect(&:capitalize).join
-        class_name = "Feriados::Rules::#{function_name}".split('::')
-
-        klass = class_name.inject(Object) { |obj, const| obj.const_get(const) }
-        klass.name = name
-        calendar.add(klass)
-      end
-    end
-
-    def load_fix_week_days
-      fix_week_day.each do |month, rules|
-        rules.each do |rule_data|
-          rule = OpenStruct.new(rule_data)
-          calendar.add(FixWeekDay.new(rule.week, rule.day, month, rule.name))
-        end
-      end
-    end
-
-    def load_fix_dates
-      fix_date.each do |year, months|
-        months.each do |month, rules|
-          rules.each do |rule_data|
-            rule = OpenStruct.new(rule_data)
-            calendar.add(FixDate.new(year, month, rule.day, rule.name))
-          end
-        end
-      end
-    end
-
-    def day_of_month
-      data['day_of_month']['month']
-    end
-
-    def function
-      data['function']
-    end
-
-    def fix_week_day
-      data['fix_week_day']['month']
-    end
+    private
 
-    def fix_date
-      data['fix_date']
-    end
+    attr_reader :rules, :calendar
   end
 end

data/lib/feriados/rules.rb

@@ -1,3 +1,6 @@
+require 'ostruct'
+require 'forwardable'
+
 require_relative './rules/rule_base'
 require_relative './rules/function'
 require_relative './rules/carnival_monday'
@@ -9,3 +12,62 @@ require_relative './rules/fix_date'
 require_relative './rules/fix_week_day'
 require_relative './rules/holy_friday'
 require_relative './rules/holy_thursday'
+
+module Feriados
+  module Rules
+    class Rule
+      extend Forwardable
+
+      def_delegators :@rule, :day, :month, :year, :week
+
+      attr_reader :rule
+
+      def initialize(rule)
+        @rule = OpenStruct.new(rule)
+      end
+
+      def week_day?
+        rule.day && rule.month && rule.week
+      end
+
+      def fix_date?
+        rule.day && rule.month && rule.year
+      end
+
+      def day_of_month?
+        rule.day && rule.month && !fix_date? && !week_day?
+      end
+
+      def function?
+        functions = %i[easter holy_thursday holy_friday carnival_monday
+                       carnival_tuesday]
+
+        functions.map { |e| rule.respond_to?(e) }.any?
+      end
+
+      def name
+        rule[:name] || rule.to_h.values.first
+      end
+
+      def function_name
+        rule.to_h.keys.first.to_s.split('_').collect(&:capitalize).join
+      end
+    end
+
+    def self.create_with(rule)
+      rule = Rule.new(rule)
+      return DayOfMonth.new(rule.day, rule.month, rule.name) if rule.day_of_month?
+      return FixWeekDay.new(rule.week, rule.day, rule.month, rule.name) if rule.week_day?
+      return FixDate.new(rule.year, rule.month, rule.day, rule.name) if rule.fix_date?
+
+      raise ArgumentError, "Argument #{rule} is not a valid rule" unless rule.function?
+
+      function_name = rule.function_name
+      class_name = "Feriados::Rules::#{function_name}".split('::')
+      klass = class_name.inject(Object) { |obj, const| obj.const_get(const) }
+      klass.name = rule.name
+
+      klass
+    end
+  end
+end

data/test/feriados_test.rb

@@ -39,7 +39,7 @@ class CalendarTest < Minitest::Test
     holidays2020_data.each do |month, day, description|
       date = Date.new(2020, month, day)
 
-      assert calendar.holiday?(date)
+      assert calendar.holiday?(date), date
 
       assert_equal description, calendar.holiday_name(date), date
     end
@@ -53,4 +53,14 @@ class CalendarTest < Minitest::Test
 
     assert_equal(holidays2020_data.count, detected_holidays.count { |e| e })
   end
+
+  def test_load_incomplete_rules
+    rules = {}
+
+    calendar = Calendar.new
+
+    calendar.load(rules)
+
+    assert_equal calendar, Calendar.new
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: feriados
 version: !ruby/object:Gem::Version
-  version: 4.2.2
+  version: 4.3.0
 platform: ruby
 authors:
 - Sebastian Rabuini
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-12 00:00:00.000000000 Z
+date: 2020-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -83,14 +83,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Holidays calendars