Backwards compatibility changes

Author: pacso

lib/ice_cube/parsers/yaml_parser.rb

@@ -7,7 +7,12 @@ class YamlParser < HashParser
     attr_reader :hash
 
     def initialize(yaml)
-      @hash = YAML.safe_load(yaml, permitted_classes: [Date, Symbol, Time], aliases: true)
+      # Ruby 2.6-3.0 use positional args, Ruby 3.1+ uses keyword args for YAML.safe_load
+      @hash = if RUBY_VERSION < "3.1"
+        YAML.safe_load(yaml, [Date, Symbol, Time], [], true)
+      else
+        YAML.safe_load(yaml, permitted_classes: [Date, Symbol, Time], aliases: true)
+      end
       yaml.match SERIALIZED_START do |match|
         start_time = hash[:start_time] || hash[:start_date]
         TimeUtil.restore_deserialized_offset start_time, match[:tz]

lib/ice_cube/rule.rb

@@ -42,7 +42,12 @@ def to_yaml(*)
 
     # From yaml
     def self.from_yaml(yaml)
-      from_hash YAML.safe_load(yaml, permitted_classes: [Date, Symbol, Time])
+      # Ruby 2.6-3.0 use positional args, Ruby 3.1+ uses keyword args for YAML.safe_load
+      if RUBY_VERSION < "3.1"
+        from_hash YAML.safe_load(yaml, [Date, Symbol, Time])
+      else
+        from_hash YAML.safe_load(yaml, permitted_classes: [Date, Symbol, Time])
+      end
     end
 
     def to_hash

spec/examples/serialization_spec.rb

@@ -15,7 +15,12 @@
       let(:start_time) { Time.now.in_time_zone("America/Vancouver") }
 
       it "serializes time as a Hash" do
-        hash = YAML.safe_load(yaml, permitted_classes: [Symbol, Time])
+        # Ruby 2.6-3.0 use positional args, Ruby 3.1+ uses keyword args for YAML.safe_load
+        hash = if RUBY_VERSION < "3.1"
+          YAML.safe_load(yaml, [Symbol, Time])
+        else
+          YAML.safe_load(yaml, permitted_classes: [Symbol, Time])
+        end
         expect(hash[:start_time][:time]).to eq start_time.utc
         expect(hash[:start_time][:zone]).to eq "America/Vancouver"
       end

spec/examples/to_yaml_spec.rb

@@ -375,8 +375,14 @@ module IceCube
 
       symbol_yaml = Schedule.from_hash(symbol_data).to_yaml
       string_yaml = Schedule.from_hash(string_data).to_yaml
-      expect(YAML.safe_load(symbol_yaml, permitted_classes: [Symbol, Time]))
-        .to eq(YAML.safe_load(string_yaml, permitted_classes: [Symbol, Time]))
+      # Ruby 2.6-3.0 use positional args, Ruby 3.1+ uses keyword args for YAML.safe_load
+      if RUBY_VERSION < "3.1"
+        expect(YAML.safe_load(symbol_yaml, [Symbol, Time]))
+          .to eq(YAML.safe_load(string_yaml, [Symbol, Time]))
+      else
+        expect(YAML.safe_load(symbol_yaml, permitted_classes: [Symbol, Time]))
+          .to eq(YAML.safe_load(string_yaml, permitted_classes: [Symbol, Time]))
+      end
     end
 
     it "should raise an ArgumentError when trying to deserialize an invalid rule type" do