Remove active support dependency (#41)

Author: fnando

.gitignore

@@ -2,3 +2,4 @@
 .bundle
 html
 *.lock
+coverage

.rubocop.yml

@@ -3,7 +3,7 @@ inherit_gem:
   rubocop-fnando: .rubocop.yml
 
 AllCops:
-  TargetRubyVersion: 2.5
+  TargetRubyVersion: 3.3
   NewCops: enable
   Exclude:
     - bin/**/*

lib/recurrence.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "recurrence/namespace"
+require_relative "recurrence/namespace"
 
 # The default namespace. If you already have Recurrence constant set on your
 # codebase, you can inherit from `Recurrence_` and have your own namespace.

lib/recurrence/event.rb

@@ -41,11 +41,14 @@ def next!
         @date = next_in_recurrence
 
         @finished = true if @options[:through] && @date >= @options[:through]
+
         if @date > @options[:until]
           @finished = true
           @date = nil
         end
+
         shift_to @date if @date && @options[:shift]
+
         @date
       end
 
@@ -79,25 +82,26 @@ def finished?
 
       # Common validation for inherited classes.
       #
-      private def valid_month_day?(day)
-        raise ArgumentError, "invalid day #{day}" unless (1..31).cover?(day)
+      private def validate_month_day(day)
+        return if (1..31).cover?(day)
+
+        raise ArgumentError, "invalid day: #{day.inspect}"
       end
 
       # Check if the given key has a valid weekday (0 upto 6) or a valid weekday
       # name (defined in the DAYS constant). If a weekday name (String) is
       # given, convert it to a weekday (Integer).
       #
-      private def valid_weekday_or_weekday_name?(value)
+      private def expand_weekday!(value)
         if value.is_a?(Numeric)
           unless (0..6).cover?(value)
-            raise ArgumentError,
-                  "invalid day #{value}"
+            raise ArgumentError, "invalid weekday: #{value}"
           end
 
           value
         else
           weekday = WEEKDAYS[value.to_s]
-          raise ArgumentError, "invalid weekday #{value}" unless weekday
+          raise ArgumentError, "invalid weekday: #{value}" unless weekday
 
           weekday
         end

lib/recurrence/event/base.rb

@@ -12,26 +12,24 @@ class Monthly < Base # :nodoc: all
 
       private def validate
         if @options.key?(:weekday)
-
           # Allow :on => :last, :weekday => :thursday contruction.
           if @options[:on].to_s == "last"
             @options[:on] = 5
           elsif @options[:on].is_a?(Numeric)
-            valid_week?(@options[:on])
+            validate_week(@options[:on])
           else
-            valid_ordinal?(@options[:on])
+            validate_ordinal(@options[:on])
             @options[:on] = ORDINALS.index(@options[:on].to_s) + 1
           end
 
-          @options[:weekday] =
-            valid_weekday_or_weekday_name?(@options[:weekday])
+          @options[:weekday] = expand_weekday!(@options[:weekday])
         else
-          valid_month_day?(@options[:on])
+          validate_month_day(@options[:on])
         end
 
         return unless @options[:interval].is_a?(Symbol)
 
-        valid_interval?(@options[:interval])
+        validate_interval(@options[:interval])
         @options[:interval] = INTERVALS[@options[:interval]]
       end
 
@@ -40,7 +38,7 @@ class Monthly < Base # :nodoc: all
 
         type = @options.key?(:weekday) ? :weekday : :monthday
 
-        class_eval <<-METHOD, __FILE__, __LINE__ + 1
+        singleton_class.class_eval <<-METHOD, __FILE__, __LINE__ + 1
           # private def next_month
           #   if initialized?
           #     advance_to_month_by_weekday(@date)
@@ -105,23 +103,25 @@ class Monthly < Base # :nodoc: all
       end
 
       private def shift_to(date)
-        @options[:on] = date.day
+        @options[:on] = date.day unless @options[:weekday]
       end
 
-      private def valid_ordinal?(ordinal)
+      private def validate_ordinal(ordinal)
         return if ORDINALS.include?(ordinal.to_s)
 
-        raise ArgumentError, "invalid ordinal #{ordinal}"
+        raise ArgumentError, "invalid ordinal: #{ordinal}"
       end
 
-      private def valid_interval?(interval)
+      private def validate_interval(interval)
         return if INTERVALS.key?(interval)
 
-        raise ArgumentError, "invalid ordinal #{interval}"
+        raise ArgumentError, "invalid ordinal: #{interval.inspect}"
       end
 
-      private def valid_week?(week)
-        raise ArgumentError, "invalid week #{week}" unless (1..5).cover?(week)
+      private def validate_week(week)
+        return if (1..5).cover?(week)
+
+        raise ArgumentError, "invalid week: #{week.inspect}"
       end
     end
   end

lib/recurrence/event/monthly.rb

@@ -4,8 +4,8 @@ class Recurrence_
   module Event
     class Weekly < Base # :nodoc: all
       private def validate
-        @options[:on] = Array.wrap(@options[:on]).inject([]) do |days, value|
-          days << valid_weekday_or_weekday_name?(value)
+        @options[:on] = Array(@options[:on]).inject([]) do |days, value|
+          days << expand_weekday!(value)
         end
 
         @options[:on].sort!

lib/recurrence/event/weekly.rb

@@ -19,12 +19,12 @@ class Yearly < Base # :nodoc: all
       }.freeze
 
       private def validate
-        valid_month_day?(@options[:on].last)
+        validate_month_day(@options[:on]&.last)
 
         if @options[:on].first.is_a?(Numeric)
-          valid_month?(@options[:on].first)
+          validate_month(@options[:on].first)
         else
-          valid_month_name?(@options[:on].first)
+          validate_month_name(@options[:on].first)
           @options[:on] = [MONTHS[@options[:on].first.to_s], @options[:on].last]
         end
       end
@@ -50,16 +50,16 @@ class Yearly < Base # :nodoc: all
         @options[:on] = [date.month, date.day]
       end
 
-      private def valid_month?(month)
+      private def validate_month(month)
         return if (1..12).cover?(month)
 
-        raise ArgumentError, "invalid month #{month}"
+        raise ArgumentError, "invalid month: #{month.inspect}"
       end
 
-      private def valid_month_name?(month)
+      private def validate_month_name(month)
         return if MONTHS.key?(month.to_s)
 
-        raise ArgumentError, "invalid month #{month}"
+        raise ArgumentError, "invalid month: #{month.inspect}"
       end
     end
   end

lib/recurrence/event/yearly.rb

@@ -15,6 +15,8 @@ module Handler # :nodoc: all
     #   # => February 28, 2011
     #
     module FallBack
+      using Refinements
+
       def self.call(day, month, year)
         Date.new(year, month, [day, Time.days_in_month(month, year)].min)
       end