adding support for more versions of ActiveSupport

Author: nehresma

lib/ice_cube/occurrence.rb

@@ -85,11 +85,8 @@ def to_time
     # time formats and is only used when ActiveSupport is available.
     #
     def to_s(format = nil)
-      if format && to_time.public_method(:to_s).arity != 0
-        t0, t1 = start_time.to_s(format), end_time.to_s(format)
-      else
-        t0, t1 = start_time.to_s, end_time.to_s
-      end
+      t0 = format_time(start_time, format)
+      t1 = format_time(end_time, format)
       (duration > 0) ? "#{t0} - #{t1}" : t0
     end
 
@@ -98,5 +95,18 @@ def overnight?
       midnight = Time.new(offset.year, offset.month, offset.day)
       midnight < end_time
     end
+
+    private
+
+    # Normalize formatted output across ActiveSupport versions:
+    # Rails 7.1+ prefers to_fs, older versions use to_formatted_s or to_s(:format).
+    def format_time(time, format)
+      return time.to_s unless format
+      return time.to_fs(format) if time.respond_to?(:to_fs)
+      return time.to_formatted_s(format) if time.respond_to?(:to_formatted_s)
+      return time.to_s(format) if time.public_method(:to_s).arity != 0
+
+      time.to_s
+    end
   end
 end

spec/examples/active_support_spec.rb

@@ -1,4 +1,5 @@
 require File.dirname(__FILE__) + "/../spec_helper"
+require "logger"
 require "active_support"
 require "active_support/time"
 require "active_support/version"

spec/examples/occurrence_spec.rb

@@ -28,12 +28,19 @@
       time_now = Time.current
       occurrence = Occurrence.new(time_now)
 
-      # From Rails 7.1 onwards, support for format options was removed
-      if time_now.public_method(:to_s).arity != 0
-        expect(occurrence.to_s(:short)).to eq time_now.to_s(:short)
-      else
-        expect(occurrence.to_s(:short)).to eq time_now.to_s
-      end
+      # Match ActiveSupport formatting behavior across versions.
+      expected =
+        if time_now.respond_to?(:to_fs)
+          time_now.to_fs(:short)
+        elsif time_now.respond_to?(:to_formatted_s)
+          time_now.to_formatted_s(:short)
+        elsif time_now.public_method(:to_s).arity != 0
+          time_now.to_s(:short)
+        else
+          time_now.to_s
+        end
+
+      expect(occurrence.to_s(:short)).to eq expected
     end
   end
 

spec/examples/to_ical_spec.rb

@@ -1,4 +1,5 @@
 require File.dirname(__FILE__) + "/../spec_helper"
+require "logger"
 require "active_support"
 require "active_support/time"