Merge branch 'master' into master

Author: pacso

.devcontainer/devcontainer.json

@@ -0,0 +1,26 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the
+// README at: https://github.com/devcontainers/templates/tree/main/src/ruby
+{
+	"name": "IceCube",
+	// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
+	"image": "mcr.microsoft.com/devcontainers/ruby:1-3.3-bookworm",
+
+	// Features to add to the dev container. More info: https://containers.dev/features.
+	// "features": {},
+
+	// Use 'forwardPorts' to make a list of ports inside the container available locally.
+	// "forwardPorts": [],
+
+	// Use 'postCreateCommand' to run commands after the container is created.
+	// "postCreateCommand": "ruby --version",
+
+	// Configure tool-specific properties.
+  "customizations" : {
+    "jetbrains" : {
+      "backend" : "RubyMine"
+    }
+  },
+
+	// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
+	// "remoteUser": "root"
+}

.github/workflows/tests.yaml

@@ -19,21 +19,21 @@ jobs:
   changelog:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - id: read-version
         run: |
           echo "::set-output name=VERSION::`cat lib/ice_cube/version.rb | grep -i version | awk '{ print $3 }' | sed -e 's/\"//g'`"
-      - uses: dangoslen/changelog-enforcer@v2.3.1
+      - uses: dangoslen/changelog-enforcer@v3
         with:
           skipLabels: 'skip-changelog'
           expectedLatestVersion: ${{ steps.read-version.outputs.VERSION }}
   lint:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: '2.6'
+        ruby-version: '3.1'
         bundler-cache: true
     - run: bundle exec standardrb
   test:
@@ -42,16 +42,13 @@ jobs:
       - lint
     strategy:
       matrix:
-        rails: ['5.2', '6.0.4', '6.1']
-        ruby: ['2.6', '2.7', '3.0']
-        exclude:
-          - rails: '5.2'
-            ruby: '3.0'
+        rails: ['6.1', '7.0', '7.1']
+        ruby: ['3.1', '3.2', '3.3']
     runs-on: ubuntu-latest
     env:
       RAILS_VERSION: ${{ matrix.rails }}
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}

CHANGELOG.md

@@ -4,13 +4,23 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
+## [0.17.0] - 2024-07-18
 ### Added
 - Indonesian translations. ([#505](https://github.com/seejohnrun/ice_cube/pull/505)) by [@achmiral](https://github.com/achmiral)
 
+### Changed
+- Removed use of `delegate` method added in [66f1d797](https://github.com/ice-cube-ruby/ice_cube/commit/66f1d797092734563bfabd2132c024c7d087f683) , reverting to previous implementation. ([#522](https://github.com/ice-cube-ruby/ice_cube/pull/522))  by [@pacso](https://github.com/pacso)
+- Updated supported versions of Ruby and Rails and fixed standardrb lint issues. ([#552](https://github.com/ice-cube-ruby/ice_cube/pull/552)) by [@pacso](https://github.com/pacso)
+- Fixed `I18n.load_path` injection ([#546](https://github.com/ice-cube-ruby/ice_cube/pull/546)) by [@glaszig](https://github.com/glaszig)
+- Use `exepect` in specs ([#530](https://github.com/ice-cube-ruby/ice_cube/pull/530) by [@artofhuman](https://github.com/artofhuman))
+
 ### Fixed
 - Fix for weekly interval results when requesting `occurrences_between` on a narrow range ([#487](https://github.com/seejohnrun/ice_cube/pull/487)) by [@jakebrady5](https://github.com/jakebrady5)
 - When using a rule with hour_of_day validations, and asking for occurrences on the day that DST skips forward, valid occurrences would be missed. ([#464](https://github.com/seejohnrun/ice_cube/pull/464)) by [@jakebrady5](https://github.com/jakebrady5)
+- Include `exrules` when exporting a schedule to YAML, JSON or a Hash. ([#519](https://github.com/ice-cube-ruby/ice_cube/pull/519)) by [@pacso](https://github.com/pacso)
+- Documentation links updated to point to the new repository location. ([#553](https://github.com/ice-cube-ruby/ice_cube/pull/553)) by [@pacso](https://github.com/pacso)
+- Input validation added for day_of_week validator. Fixes infinite loops when invalid day_of_week occurrences are provided. ([#554](https://github.com/ice-cube-ruby/ice_cube/pull/554)) by [@pacso](https://github.com/pacso)
+- Documentation links in README.md updated to new repository location. ([#527](https://github.com/ice-cube-ruby/ice_cube/pull/527) by [@dalpo](https://github.com/dalpo))
 
 ## [0.16.4] - 2021-10-21
 ### Added

README.md

@@ -298,7 +298,7 @@ https://github.com/GetJobber/recurring_select
 
 ## Contributors
 
-https://github.com/seejohnrun/ice_cube/graphs/contributors
+https://github.com/ice-cube-ruby/ice_cube/graphs/contributors
 
 ---
 
@@ -316,10 +316,7 @@ Use the GitHub [issue tracker][ice_cube-issues]
 
 
 [ical-3.6.1]: https://tools.ietf.org/html/rfc5545#section-3.6.1
-[github-avit]: https://github.com/avit/
-[travis-ice_cube]: http://travis-ci.org/seejohnrun/ice_cube
-[travis-ice_cube-badge_image]: https://secure.travis-ci.org/seejohnrun/ice_cube.svg
-[ice_cube-lone_star_pdf]: http://seejohnrun.github.com/ice_cube/static/lsrc_ice_cube.pdf
-[ice_cube-ruby_nyc_pdf]: http://seejohnrun.github.com/ice_cube/static/ice_cube_ruby_nyc.pdf
-[ice_cube-docs]: http://seejohnrun.github.io/ice_cube/
-[ice_cube-issues]: https://github.com/seejohnrun/ice_cube/issues
+[ice_cube-lone_star_pdf]: https://ice-cube-ruby.github.io/ice_cube/static/lsrc_ice_cube.pdf
+[ice_cube-ruby_nyc_pdf]: https://ice-cube-ruby.github.io/ice_cube/static/ice_cube_ruby_nyc.pdf
+[ice_cube-docs]: https://ice-cube-ruby.github.io/ice_cube/
+[ice_cube-issues]: https://github.com/ice-cube-ruby/ice_cube/issues

ice_cube.gemspec

@@ -8,16 +8,15 @@ Gem::Specification.new do |s|
   s.description = "ice_cube is a recurring date library for Ruby.  It allows for quick, programatic expansion of recurring date rules."
   s.author = "John Crepezzi"
   s.email = "john@crepezzi.com"
-  s.homepage = "https://seejohnrun.github.io/ice_cube/"
+  s.homepage = "https://ice-cube-ruby.github.io/ice_cube/"
   s.license = "MIT"
 
-  s.metadata["changelog_uri"] = "https://github.com/seejohnrun/ice_cube/blob/master/CHANGELOG.md"
-  s.metadata["wiki_uri"] = "https://github.com/seejohnrun/ice_cube/wiki"
+  s.metadata["changelog_uri"] = "https://github.com/ice-cube-ruby/ice_cube/blob/master/CHANGELOG.md"
+  s.metadata["wiki_uri"] = "https://github.com/ice-cube-ruby/ice_cube/wiki"
 
   s.version = IceCube::VERSION
   s.platform = Gem::Platform::RUBY
   s.files = Dir["lib/**/*.rb", "config/**/*.yml"]
-  s.test_files = Dir.glob("spec/*.rb")
   s.require_paths = ["lib"]
 
   s.add_development_dependency("rake")

lib/ice_cube.rb

@@ -6,7 +6,8 @@ module IceCube
 
   autoload :TimeUtil, "ice_cube/time_util"
   autoload :FlexibleHash, "ice_cube/flexible_hash"
-  autoload :I18n, "ice_cube/i18n"
+
+  require "ice_cube/i18n"
 
   autoload :Rule, "ice_cube/rule"
   autoload :Schedule, "ice_cube/schedule"

lib/ice_cube/builders/string_builder.rb

@@ -61,7 +61,7 @@ def ordinal(number)
         ord = IceCube::I18n.t("ice_cube.integer.ordinals")[number] ||
           IceCube::I18n.t("ice_cube.integer.ordinals")[number % 10] ||
           IceCube::I18n.t("ice_cube.integer.ordinals")[:default]
-        number >= 0 ? ord : IceCube::I18n.t("ice_cube.integer.negative", ordinal: ord)
+        (number >= 0) ? ord : IceCube::I18n.t("ice_cube.integer.negative", ordinal: ord)
       end
     end
 

lib/ice_cube/flexible_hash.rb

@@ -25,9 +25,9 @@ def delete(key)
 
     def _match_key(key)
       return key if __getobj__.has_key? key
-      if Symbol == key.class
+      if key.instance_of?(Symbol)
         __getobj__.keys.detect { |k| return k if k == key.to_s }
-      elsif String == key.class
+      elsif key.instance_of?(String)
         __getobj__.keys.detect { |k| return k if k.to_s == key }
       end
       key

lib/ice_cube/i18n.rb

@@ -1,22 +1,15 @@
 require "ice_cube/null_i18n"
 
 module IceCube
-  module I18n
-    LOCALES_PATH = File.expand_path(File.join("..", "..", "..", "config", "locales"), __FILE__)
-
-    class << self
-      delegate :t, :l, to: :backend
-    end
-
-    def self.backend
-      @backend ||= detect_backend!
-    end
-
-    def self.detect_backend!
-      ::I18n.load_path += Dir[File.join(LOCALES_PATH, "*.yml")]
-      ::I18n
-    rescue NameError
-      NullI18n
-    end
+  LOCALES_PATH = File.expand_path(File.join("..", "..", "config", "locales"), __dir__)
+
+  # rubocop:disable Naming/ConstantName
+  I18n = begin
+    require "i18n"
+    ::I18n.load_path += Dir[File.join(LOCALES_PATH, "*.yml")]
+    ::I18n
+  rescue LoadError
+    NullI18n
   end
+  # rubocop:enable Naming/ConstantName
 end

lib/ice_cube/input_alignment.rb

@@ -8,16 +8,16 @@ def initialize(rule, value, rule_part)
 
     attr_reader :rule, :value, :rule_part
 
-    def verify(freq, options = {}, &block)
+    def verify(freq, options = {}, &)
       @rule.validations[:interval] or return
 
       case @rule
       when DailyRule
-        verify_wday_alignment(freq, &block)
+        verify_wday_alignment(freq, &)
       when MonthlyRule
-        verify_month_alignment(freq, &block)
+        verify_month_alignment(freq, &)
       else
-        verify_freq_alignment(freq, &block)
+        verify_freq_alignment(freq, &)
       end
     end
 
@@ -28,12 +28,12 @@ def interval_validation
     end
 
     def interval_value
-      @interval_value ||= rule_part == :interval ? value : interval_validation.interval
+      @interval_value ||= (rule_part == :interval) ? value : interval_validation.interval
     end
 
     def fixed_validations
       @fixed_validations ||= @rule.validations.values.flatten.select { |v|
-        interval_type = (v.type == :wday ? :day : v.type)
+        interval_type = ((v.type == :wday) ? :day : v.type)
         v.class < Validations::FixedValue &&
           interval_type == rule.base_interval_validation.type
       }