Skip to content

Add backwards compatibility to Ruby 2.6 #562

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pacso merged 6 commits into from
Jan 20, 2026
Merged

Add backwards compatibility to Ruby 2.6 #562

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6054715
Add backwards compatibility to Ruby 2.6
scpike Nov 6, 2024
3a55740
Merge branch 'master' into backwards-compatibility-ruby-2
pacso Jan 19, 2026
372deb7
Update test matrix
pacso Jan 20, 2026
fe2c336
Update CHANGELOG.md
pacso Jan 20, 2026
9e29a21
Backwards compatibility changes
pacso Jan 20, 2026
629e067
Backwards compatibility changes - named splat parameter
pacso Jan 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 51 additions & 2 deletions .github/workflows/tests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,57 @@ jobs:
- lint
strategy:
matrix:
rails: ['7.2', '8.0', '8.1']
ruby: ['3.2', '3.3', '3.4', '4.0']
rails: ['6.1', '7.0', '7.1', '7.2', '8.0', '8.1']
ruby: ['2.6', '2.7', '3.0', '3.1', '3.2', '3.3', '3.4', '4.0']
exclude:
# Rails 6.1: Only supports Ruby 2.6-3.0
- rails: '6.1'
ruby: '3.1'
- rails: '6.1'
ruby: '3.2'
- rails: '6.1'
ruby: '3.3'
- rails: '6.1'
ruby: '3.4'
- rails: '6.1'
ruby: '4.0'
# Rails 7.0 & 7.1: Require Ruby 2.7+, tested up to 3.3
- rails: '7.0'
ruby: '2.6'
- rails: '7.0'
ruby: '3.4'
- rails: '7.0'
ruby: '4.0'
- rails: '7.1'
ruby: '2.6'
- rails: '7.1'
ruby: '3.4'
- rails: '7.1'
ruby: '4.0'
# Rails 7.2: Requires Ruby 3.1+
- rails: '7.2'
ruby: '2.6'
- rails: '7.2'
ruby: '2.7'
- rails: '7.2'
ruby: '3.0'
# Rails 8.0 & 8.1: Require Ruby 3.2+
- rails: '8.0'
ruby: '2.6'
- rails: '8.0'
ruby: '2.7'
- rails: '8.0'
ruby: '3.0'
- rails: '8.0'
ruby: '3.1'
- rails: '8.1'
ruby: '2.6'
- rails: '8.1'
ruby: '2.7'
- rails: '8.1'
ruby: '3.0'
- rails: '8.1'
ruby: '3.1'
runs-on: ubuntu-latest
env:
RAILS_VERSION: ${{ matrix.rails }}
Expand Down
3 changes: 2 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Support for BYSETPOS with all rule frequencies (yearly, monthly, weekly, daily, hourly, minutely, secondly). ([#449](https://github.com/ice-cube-ruby/ice_cube/pull/449)) by [@nehresma](https://github.com/nehresma) and [@NicolasMarlier](https://github.com/NicolasMarlier)

### Changed
- Updated CI test matrix to support Rails 7.2, 8.0, 8.1 and Ruby 3.2, 3.3, 3.4, 4.0 by [@nehresma](https://github.com/nehresma) and [@pacso](https://github.com/pacso)
- Updated CI test matrix to support Rails 7.2, 8.0, 8.1 and Ruby 3.2, 3.3, 3.4, 4.0. ([#565](https://github.com/ice-cube-ruby/ice_cube/pull/565)) by [@nehresma](https://github.com/nehresma) and [@pacso](https://github.com/pacso)
- Added backwards compatibility for Ruby 2.6+ by replacing anonymous block arguments with explicit block parameters and adding Rails/Ruby version compatibility exclusions in CI test matrix. ([#562](https://github.com/ice-cube-ruby/ice_cube/pull/562)) by [@scpike](https://github.com/scpike)

## [0.17.0] - 2024-07-18
### Added
Expand Down
8 changes: 4 additions & 4 deletions lib/ice_cube/input_alignment.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@ def initialize(rule, value, rule_part)

attr_reader :rule, :value, :rule_part

def verify(freq, options = {}, &)
def verify(freq, options = {}, &block)
@rule.validations[:interval] or return

case @rule
when DailyRule
verify_wday_alignment(freq, &)
verify_wday_alignment(freq, &block)
when MonthlyRule
verify_month_alignment(freq, &)
verify_month_alignment(freq, &block)
else
verify_freq_alignment(freq, &)
verify_freq_alignment(freq, &block)
end
end

Expand Down
7 changes: 6 additions & 1 deletion lib/ice_cube/parsers/yaml_parser.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
11 changes: 8 additions & 3 deletions lib/ice_cube/rule.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,18 @@ def self.from_ical(ical)
end

# Yaml implementation
def to_yaml(*)
YAML.dump(to_hash, *)
def to_yaml(*args)
YAML.dump(to_hash, *args)
end

# 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
Expand Down
4 changes: 2 additions & 2 deletions lib/ice_cube/schedule.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,8 +160,8 @@ def all_occurrences_enumerator
end

# Iterate forever
def each_occurrence(&)
enumerate_occurrences(start_time, &).to_a
def each_occurrence(&block)
enumerate_occurrences(start_time, &block).to_a
self
end

Expand Down
7 changes: 6 additions & 1 deletion spec/examples/serialization_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 8 additions & 2 deletions spec/examples/to_yaml_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading