feriados 4.4.0 → 4.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7da9b7e3f668080aae4808490a75277a23b6b7ec3855a40101c3b9543aa56ea8
-  data.tar.gz: 149e631c50d584aba12bb97e36a0d3164ef933a31a704514644ea2f25578a98c
+  metadata.gz: ee24a27a0eda88f68deda3ffafbd5fc62830ed4cd7334273584b43045d367210
+  data.tar.gz: 0dc144579116f6e0eb1a4e33e94fc3812adc63e08060a4468173b5dc0ee29702
 SHA512:
-  metadata.gz: 53f7a18b300b37dec9bc811157931ab13738cbf0b33144edfde675b881c4f496799c34ec160011d71dc274f4adba7645b0c98779e24b6bc5839eda15f853052a
-  data.tar.gz: 1a457ff1da1371d206ab34e2c49164d8035967c220e3d68d7b0b507be71988ba5ac20c2bf7fcce60faff71dcb055c35d28e60036c98414aea88b10a517b5949e
+  metadata.gz: 361ca07c20034224bcbed30f8a42647975e7bf1e63ae1d1e83c4ca609c3347596d2237aa0532a2730002327dfabb65ce135966070a349b1360a04284d9c59961
+  data.tar.gz: 916b8f3b1c335c4f2906c3447b32b0b191a58d0df70dcedeff487781dd465f97d11ca70f74eec9c83087490c8261208b831249118cff1534f15365c7578a3e73

data/lib/feriados/calendar.rb

@@ -27,6 +27,47 @@ module Feriados
       Loader.new(rules, self).load
     end
 
+    def holidays_in_year(year)
+      start_date = Date.new(year, 1, 1)
+      end_date = Date.new(year, 12, 31)
+      holidays_between(start_date, end_date)
+    end
+
+    def holidays_between(start_date, end_date)
+      holidays = []
+      current_date = start_date
+
+      while current_date <= end_date
+        if holiday?(current_date)
+          holidays << {
+            date: current_date,
+            name: holiday_name(current_date)
+          }
+        end
+        current_date += 1
+      end
+
+      holidays
+    end
+
+    def next_holiday(from_date = Date.today)
+      # Search in the next 2 years to ensure finding at least one holiday
+      end_search_date = Date.new(from_date.year + 2, 12, 31)
+      current_date = from_date
+
+      while current_date <= end_search_date
+        if holiday?(current_date)
+          return {
+            date: current_date,
+            name: holiday_name(current_date)
+          }
+        end
+        current_date += 1
+      end
+
+      nil # No holidays found in the range
+    end
+
     def eql?(other)
       rules == other.rules
     end
@@ -41,20 +82,26 @@ module Feriados
   end
 
   refine Date do
-    @calendar = nil
-
     def holiday?
-      @@calendar.holiday?(self)
+      calendar = Date.class_variable_get(:@@calendar) if Date.class_variable_defined?(:@@calendar)
+      return false unless calendar
+      calendar.holiday?(self)
     end
 
     def holiday_name
-      @@calendar.holiday_name(self)
+      calendar = Date.class_variable_get(:@@calendar) if Date.class_variable_defined?(:@@calendar)
+      return nil unless calendar
+      calendar.holiday_name(self)
     end
   end
 
   refine Date.singleton_class do
     def calendar=(calendar)
-      @@calendar = calendar
+      class_variable_set(:@@calendar, calendar)
+    end
+
+    def calendar
+      class_variable_get(:@@calendar) if class_variable_defined?(:@@calendar)
     end
   end
 end

data/lib/feriados/rules.rb

@@ -18,44 +18,44 @@ module Feriados
     class Rule
       extend Forwardable
 
-      def_delegators :@rule, :day, :month, :year, :week
+      def_delegators :@data, :day, :month, :year, :week
 
-      attr_reader :rule
+      attr_reader :data
 
-      def initialize(rule)
-        @rule = OpenStruct.new(rule)
+      def initialize(data)
+        @data = OpenStruct.new(data)
       end
 
       def week_day?
-        rule.day && rule.month && rule.week
+        data.day && data.month && data.week
       end
 
       def fix_date?
-        rule.day && rule.month && rule.year
+        data.day && data.month && data.year
       end
 
       def day_of_month?
-        rule.day && rule.month && !fix_date? && !week_day?
+        data.day && data.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?
+        functions.map { |e| data.respond_to?(e) }.any?
       end
 
       def name
-        rule[:name] || rule.to_h.values.first
+        data[:name] || data.to_h.values.first
       end
 
       def function_name
-        rule.to_h.keys.first.to_s.split('_').collect(&:capitalize).join
+        data.to_h.keys.first.to_s.split('_').collect(&:capitalize).join
       end
     end
 
-    def self.create_with(rule)
-      rule = Rule.new(rule)
+    def self.create_with(data)
+      rule = Rule.new(data)
       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?

data/lib/feriados.rb

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

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: feriados
 version: !ruby/object:Gem::Version
-  version: 4.4.0
+  version: 4.5.0
 platform: ruby
 authors:
 - Sebastian Rabuini
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-05 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -38,7 +37,22 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.17'
-description: Make holidays calendars from rules
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
+description: Make holidays calendars from rules. Supports querying holidays by year,
+  date ranges, and finding next holidays.
 email:
 - srabuini@gmail.com
 executables: []
@@ -60,22 +74,13 @@ files:
 - lib/feriados/rules/holy_friday.rb
 - lib/feriados/rules/holy_thursday.rb
 - lib/feriados/rules/rule_base.rb
-- test/date_test.rb
-- test/day_of_month_test.rb
-- test/day_off_week_test.rb
-- test/easter_test.rb
-- test/feriados_test.rb
-- test/fix_date_test.rb
-- test/fix_week_day_test.rb
-- test/holy_friday_test.rb
-- test/holy_thursday_test.rb
-- test/runner.rb
-- test/test_helper.rb
 homepage: https://github.com/srabuini/feriados
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  bug_tracker_uri: https://github.com/srabuini/feriados/issues
+  changelog_uri: https://github.com/srabuini/feriados/blob/master/CHANGELOG.md
+  source_code_uri: https://github.com/srabuini/feriados
 rdoc_options: []
 require_paths:
 - lib
@@ -90,19 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.6.9
 specification_version: 4
-summary: Holidays calendars
-test_files:
-- test/holy_thursday_test.rb
-- test/easter_test.rb
-- test/date_test.rb
-- test/fix_week_day_test.rb
-- test/fix_date_test.rb
-- test/feriados_test.rb
-- test/day_off_week_test.rb
-- test/day_of_month_test.rb
-- test/test_helper.rb
-- test/holy_friday_test.rb
-- test/runner.rb
+summary: Holidays calendars with advanced querying capabilities
+test_files: []

data/test/date_test.rb

@@ -1,21 +0,0 @@
-require 'test_helper'
-
-class DateTest < Minitest::Test
-  include Feriados::Rules
-  include Feriados
-  using Feriados
-
-  def test_using_refinements
-    calendar = Calendar.new
-    Date.calendar = calendar
-
-    date = Date.new(2016, 5, 2)
-
-    calendar.add(FixDate.new(date.year, date.month, date.day, 'Bridge'))
-
-    assert calendar.holiday?(date)
-
-    assert date.holiday?
-    assert_equal date.holiday_name, 'Bridge'
-  end
-end

data/test/day_of_month_test.rb

@@ -1,63 +0,0 @@
-require 'test_helper'
-
-class DayOfMonthTest < Minitest::Test
-  include Feriados::Rules
-  include Feriados
-
-  def test_a_date_of_month_can_be_a_holiday
-    calendar = Calendar.new
-
-    a_january_first = Date.new(2016, 1, 1)
-
-    calendar.add(DayOfMonth.new(1, 1))
-
-    assert calendar.holiday?(a_january_first)
-  end
-
-  def test_a_date_of_month_can_have_a_name
-    calendar = Calendar.new
-
-    a_january_first = Date.new(2016, 1, 1)
-
-    calendar.add(DayOfMonth.new(1, 1, 'new year'))
-
-    assert_equal 'new year', calendar.holiday_name(a_january_first)
-  end
-
-  def test_a_day_of_month_can_be_not_a_holiday
-    calendar = Calendar.new
-
-    a_day = Date.new(2016, 1, 2)
-
-    calendar.add(DayOfMonth.new(1, 1))
-
-    refute calendar.holiday?(a_day)
-  end
-
-  def test_a_bunch_of_days_of_month_can_be_a_holiday
-    calendar = Calendar.new
-
-    a_christmas = Date.new(2016, 12, 25)
-    a_january_first = Date.new(2016, 1, 1)
-
-    calendar.add(DayOfMonth.new(1, 1))
-    calendar.add(DayOfMonth.new(25, 12))
-
-    assert calendar.holiday?(a_christmas)
-    assert calendar.holiday?(a_january_first)
-  end
-
-  def test_a_day_of_month_rule_can_be_deleted
-    calendar = Calendar.new
-
-    date = Date.new(2016, 5, 1)
-
-    calendar.add(DayOfMonth.new(date.day, date.month))
-
-    assert calendar.holiday?(date)
-
-    calendar.remove(DayOfMonth.new(date.day, date.month))
-
-    refute calendar.holiday?(date)
-  end
-end

data/test/day_off_week_test.rb

@@ -1,71 +0,0 @@
-require 'test_helper'
-
-class DayOfWeekTest < Minitest::Test
-  include Feriados::Rules
-  include Feriados
-
-  def test_a_day_of_week_can_be_a_holiday
-    calendar = Calendar.new
-
-    a_saturday = Date.new(2016, 4, 30)
-
-    calendar.add(DayOfWeek.new(a_saturday.wday))
-
-    assert calendar.holiday?(a_saturday)
-  end
-
-  def test_a_day_of_week_can__a_name
-    calendar = Calendar.new
-
-    a_saturday = Date.new(2016, 4, 30)
-
-    calendar.add(DayOfWeek.new(a_saturday.wday, 'saturday night live'))
-
-    assert_equal 'saturday night live', calendar.holiday_name(a_saturday)
-  end
-
-  def test_a_day_of_week_with_no_a_name
-    calendar = Calendar.new
-
-    a_saturday = Date.new(2016, 4, 30)
-
-    calendar.add(DayOfWeek.new(a_saturday.wday))
-
-    assert_nil calendar.holiday_name(a_saturday)
-  end
-
-  def test_a_day_of_week_can_be_not_a_holiday
-    calendar = Calendar.new
-
-    a_monday = Date.new(2016, 5, 2)
-
-    refute calendar.holiday?(a_monday)
-  end
-
-  def test_a_bunch_of_days_can_be_a_holiday
-    calendar = Calendar.new
-
-    a_saturday = Date.new(2016, 4, 30)
-    a_sunday = Date.new(2016, 5, 1)
-
-    calendar.add(DayOfWeek.new(a_saturday.wday))
-    calendar.add(DayOfWeek.new(a_sunday.wday))
-
-    assert calendar.holiday?(a_sunday)
-    assert calendar.holiday?(a_saturday)
-  end
-
-  def test_a_day_of_week_rule_can_be_deleted
-    calendar = Calendar.new
-
-    date = Date.new(2016, 5, 1)
-
-    calendar.add(DayOfWeek.new(date.wday))
-
-    assert calendar.holiday?(date)
-
-    calendar.remove(DayOfWeek.new(date.wday))
-
-    refute calendar.holiday?(date)
-  end
-end

data/test/easter_test.rb

@@ -1,52 +0,0 @@
-require 'test_helper'
-
-class EasterTest < Minitest::Test
-  include Feriados::Rules
-  include Feriados
-
-  def test_easter
-    calendar = Calendar.new
-
-    date = Date.new(2016, 3, 27)
-
-    calendar.add(Easter)
-
-    assert calendar.holiday?(date)
-  end
-
-  def test_easter_can_have_name
-    calendar = Calendar.new
-
-    date = Date.new(2016, 3, 27)
-
-    Easter.name = 'pascua'
-
-    calendar.add(Easter)
-
-    assert_equal 'pascua', calendar.holiday_name(date)
-  end
-
-  def test_not_easter
-    calendar = Calendar.new
-
-    date = Date.new(2016, 3, 26)
-
-    calendar.add(Easter)
-
-    refute calendar.holiday?(date)
-  end
-
-  def test_remove_easter
-    calendar = Calendar.new
-
-    date = Date.new(2016, 3, 27)
-
-    calendar.add(Easter)
-
-    assert calendar.holiday?(date)
-
-    calendar.remove(Easter)
-
-    refute calendar.holiday?(date)
-  end
-end

data/test/feriados_test.rb

@@ -1,66 +0,0 @@
-require 'test_helper'
-
-class CalendarTest < Minitest::Test
-  include Feriados::Rules
-  include Feriados
-
-  def test_load_argentinian_holidays
-    calendar = Calendar.new
-
-    file = File.join(__dir__, './argentina.yml')
-    rules = YAML.load_file(file)
-
-    calendar.load(rules)
-
-    holidays2020_data = [
-      [1, 1, 'Año nuevo'],
-      [2, 24, 'Lunes de carnaval'],
-      [2, 25, 'Martes de carnaval'],
-      [3, 23, 'Feriado con fines turísticos'],
-      [3, 24, 'Día Nacional de la Memoria por la Verdad y la Justicia'],
-      [4, 2, 'Día del Veterano y de los Caídos en la Guerra de Malvinas'],
-      [4, 9, 'Jueves Santo'],
-      [4, 10, 'Viernes Santo'],
-      [4, 12, 'Pascua'],
-      [5, 1, 'Día del Trabajador'],
-      [5, 25, 'Día de la Revolución de Mayo'],
-      [6, 15, 'Día Paso a la Inmortalidad del General Martín Miguel de Güemes'],
-      [6, 20, 'Día de la Bandera'],
-      [7, 9, 'Día de la Independencia'],
-      [7, 10, 'Feriado con fines turísticos'],
-      [8, 17, 'Paso a la Inmortalidad del Gral. José de San Martín'],
-      [10, 12, 'Día del Respeto a la Diversidad Cultural'],
-      [11, 23, 'Día de la Soberanía Nacional'],
-      [12, 7, 'Feriado con fines turísticos'],
-      [12, 8, 'Inmaculada Concepción de María'],
-      [12, 25, 'Navidad']
-    ]
-
-    holidays2020_data.each do |month, day, description|
-      date = Date.new(2020, month, day)
-
-      assert calendar.holiday?(date), date
-
-      assert_equal description, calendar.holiday_name(date), date
-    end
-
-    date = Date.new(2020, 1, 1)
-    detected_holidays = []
-
-    0.upto(365) do |day|
-      detected_holidays << calendar.holiday?(date + day)
-    end
-
-    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

data/test/fix_date_test.rb

@@ -1,59 +0,0 @@
-require 'test_helper'
-
-class FixDateTest < Minitest::Test
-  include Feriados::Rules
-  include Feriados
-
-  def test_a_fix_date_can_be_a_holiday
-    calendar = Calendar.new
-
-    date = Date.new(2016, 1, 1)
-
-    calendar.add(FixDate.new(2016, 1, 1))
-
-    assert calendar.holiday?(date)
-  end
-
-  def test_a_fix_date_can_have_a_name
-    calendar = Calendar.new
-
-    date = Date.new(2016, 1, 1)
-
-    calendar.add(FixDate.new(2016, 1, 1, 'new year'))
-
-    assert calendar.holiday_name(date)
-  end
-
-  def test_a_fix_date_can_be_not_a_holiday
-    calendar = Calendar.new
-
-    refute calendar.holiday?(Date.new(2016, 1, 1))
-  end
-
-  def test_a_bunch_of_dates_can_be_a_holiday
-    calendar = Calendar.new
-
-    date = Date.new(2016, 4, 29)
-    another_date = Date.new(2016, 4, 30)
-
-    calendar.add(FixDate.new(2016, 4, 29))
-    calendar.add(FixDate.new(2016, 4, 30))
-
-    assert calendar.holiday?(date)
-    assert calendar.holiday?(another_date)
-  end
-
-  def test_a_fix_date_rule_can_be_deleted
-    calendar = Calendar.new
-
-    date = Date.new(2016, 5, 1)
-
-    calendar.add(FixDate.new(date.year, date.month, date.day))
-
-    assert calendar.holiday?(date)
-
-    calendar.remove(FixDate.new(date.year, date.month, date.day))
-
-    refute calendar.holiday?(date)
-  end
-end

data/test/fix_week_day_test.rb

@@ -1,48 +0,0 @@
-require 'test_helper'
-
-class FixWeekDayTest < Minitest::Test
-  include Feriados::Rules
-  include Feriados
-
-  def test_fix_week_day_rule
-    calendar = Calendar.new
-
-    calendar.add(FixWeekDay.new(4, 1, 11))
-    calendar.add(FixWeekDay.new(3, 1, 8))
-
-    assert calendar.holiday?(Date.new(2016, 11, 28))
-    assert calendar.holiday?(Date.new(2016, 8, 15))
-  end
-
-  def test_fix_week_can_have_a_name
-    calendar = Calendar.new
-
-    calendar.add(FixWeekDay.new(3, 1, 8, 'nice holiday'))
-
-    assert_equal 'nice holiday', calendar.holiday_name(Date.new(2016, 8, 15))
-  end
-
-  def test_not_fix_week_day_rule
-    calendar = Calendar.new
-
-    date = Date.new(2016, 5, 2)
-
-    calendar.add(FixWeekDay.new(2, 1, 5))
-
-    refute calendar.holiday?(date)
-  end
-
-  def test_remove_fix_week_day_rule
-    calendar = Calendar.new
-
-    date = Date.new(2016, 11, 28)
-
-    calendar.add(FixWeekDay.new(4, 1, 11))
-
-    assert calendar.holiday?(date)
-
-    calendar.remove(FixWeekDay.new(4, 1, 11))
-
-    refute calendar.holiday?(date)
-  end
-end

data/test/holy_friday_test.rb

@@ -1,52 +0,0 @@
-require 'test_helper'
-
-class HolyFridayTest < Minitest::Test
-  include Feriados::Rules
-  include Feriados
-
-  def test_holy_friday
-    calendar = Calendar.new
-
-    date = Date.new(2016, 3, 25)
-
-    calendar.add(HolyFriday)
-
-    assert calendar.holiday?(date)
-  end
-
-  def test_holy_friday_has_name
-    calendar = Calendar.new
-
-    date = Date.new(2016, 3, 25)
-
-    calendar.add(HolyFriday)
-
-    HolyFriday.name = 'viernes santo'
-
-    assert_equal 'viernes santo', calendar.holiday_name(date)
-  end
-
-  def test_not_holy_friday
-    calendar = Calendar.new
-
-    date = Date.new(2016, 3, 20)
-
-    calendar.add(HolyFriday)
-
-    refute calendar.holiday?(date)
-  end
-
-  def test_remove_holy_friday
-    calendar = Calendar.new
-
-    date = Date.new(2016, 3, 25)
-
-    calendar.add(HolyFriday)
-
-    assert calendar.holiday?(date)
-
-    calendar.remove(HolyFriday)
-
-    refute calendar.holiday?(date)
-  end
-end

data/test/holy_thursday_test.rb

@@ -1,28 +0,0 @@
-require 'test_helper'
-
-class HolyThursdayTest < Minitest::Test
-  include Feriados::Rules
-  include Feriados
-
-  def test_holy_thursday
-    calendar = Calendar.new
-
-    date = Date.new(2016, 3, 24)
-
-    calendar.add(HolyThursday)
-
-    assert calendar.holiday?(date)
-  end
-
-  def test_holy_thursday_has_name
-    calendar = Calendar.new
-
-    date = Date.new(2016, 3, 24)
-
-    calendar.add(HolyThursday)
-
-    HolyThursday.name = 'jueves santo'
-
-    assert_equal 'jueves santo', calendar.holiday_name(date)
-  end
-end

data/test/runner.rb

@@ -1,10 +0,0 @@
-ARGV.select do |argument|
-  case argument
-  when /\*/
-    Dir.glob(argument).each do |file|
-      require File.expand_path(file)
-    end
-  else
-    require File.expand_path(argument)
-  end
-end

data/test/test_helper.rb

@@ -1,6 +0,0 @@
-require 'simplecov'
-SimpleCov.start
-
-require 'minitest/autorun'
-
-require 'feriados'