Merge branch 'master' into master

Author: pacso

.github/workflows/tests.yaml

@@ -0,0 +1,39 @@
+name: Tests
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: '2.6'
+        bundler-cache: true
+    - run: bundle exec standardrb
+  test:
+    needs: 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'
+    runs-on: ubuntu-latest
+    env:
+      RAILS_VERSION: ${{ matrix.rails }}
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true
+    - run: bundle exec rake

.standard_todo.yml

@@ -0,0 +1,12 @@
+# Auto generated files with errors to ignore.
+# Remove from this list as you refactor files.
+---
+ignore:
+- lib/ice_cube/parsers/yaml_parser.rb:
+  - Security/YAMLLoad
+- lib/ice_cube/rule.rb:
+  - Security/YAMLLoad
+- spec/examples/serialization_spec.rb:
+  - Security/YAMLLoad
+- spec/examples/to_yaml_spec.rb:
+  - Security/YAMLLoad

.travis.yml

@@ -1,6 +1,6 @@
 # Changelog
 
-## Next version
+## 0.16.4 / 2021-10-21
 
 * [FEATURE]     Italian translations
 

CHANGELOG.md

@@ -1,11 +1,11 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 gemspec
 
 compatible_rails_versions = [
-  '>= 3.0.0',
-  ('<5' if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.2.2'))
+  ">= 3.0.0",
+  ("<5" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2.2"))
 ].compact
 
-gem 'activesupport', (ENV['RAILS_VERSION'] || compatible_rails_versions), require: false
-gem 'i18n', require: false
-gem 'tzinfo', require: false # only needed explicitly for RAILS_VERSION=3
+gem "activesupport", (ENV["RAILS_VERSION"] || compatible_rails_versions), require: false
+gem "i18n", require: false
+gem "tzinfo", require: false # only needed explicitly for RAILS_VERSION=3

Gemfile

@@ -1,7 +1,8 @@
 # ice_cube - Easy schedule expansion
 
-[![Build Status][travis-ice_cube-badge_image]][travis-ice_cube]
+[![Tests](https://github.com/seejohnrun/ice_cube/actions/workflows/tests.yaml/badge.svg)](https://github.com/seejohnrun/ice_cube/actions/workflows/tests.yaml)
 [![Gem Version](https://badge.fury.io/rb/ice_cube.svg)](http://badge.fury.io/rb/ice_cube)
+[![Ruby Style Guide](https://img.shields.io/badge/code_style-standard-brightgreen.svg)](https://github.com/testdouble/standard)
 
 ```bash
 gem install ice_cube
@@ -323,5 +324,5 @@ Use the GitHub [issue tracker][ice_cube-issues]
 [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.com/ice_cube/
+[ice_cube-docs]: http://seejohnrun.github.io/ice_cube/
 [ice_cube-issues]: https://github.com/seejohnrun/ice_cube/issues

README.md

@@ -1,6 +1,7 @@
 require "rspec/core/rake_task"
 require "bundler/gem_tasks"
+require "standard/rake"
 
 RSpec::Core::RakeTask.new(:spec)
-task :build => :spec
-task :default => :spec
+task build: :spec
+task default: :spec

Rakefile

@@ -1,23 +1,23 @@
-# encoding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'ice_cube/version'
+require "ice_cube/version"
 
 Gem::Specification.new do |s|
-  s.name          = 'ice_cube'
-  s.summary       = 'Ruby Date Recurrence Library'
-  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      = 'http://seejohnrun.github.com/ice_cube/'
-  s.license       = 'MIT'
+  s.name = "ice_cube"
+  s.summary = "Ruby Date Recurrence Library"
+  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 = "http://seejohnrun.github.com/ice_cube/"
+  s.license = "MIT"
 
-  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.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')
-  s.add_development_dependency('rspec', '> 3')
+  s.add_development_dependency("rake")
+  s.add_development_dependency("rspec", "> 3")
+  s.add_development_dependency("standard")
 end

ice_cube.gemspec

@@ -1,71 +1,70 @@
-require 'date'
-require 'ice_cube/deprecated'
+require "date"
+require "ice_cube/deprecated"
 
 module IceCube
+  autoload :VERSION, "ice_cube/version"
 
-  autoload :VERSION, 'ice_cube/version'
+  autoload :TimeUtil, "ice_cube/time_util"
+  autoload :FlexibleHash, "ice_cube/flexible_hash"
+  autoload :I18n, "ice_cube/i18n"
 
-  autoload :TimeUtil, 'ice_cube/time_util'
-  autoload :FlexibleHash, 'ice_cube/flexible_hash'
-  autoload :I18n, 'ice_cube/i18n'
+  autoload :Rule, "ice_cube/rule"
+  autoload :Schedule, "ice_cube/schedule"
+  autoload :Occurrence, "ice_cube/occurrence"
 
-  autoload :Rule, 'ice_cube/rule'
-  autoload :Schedule, 'ice_cube/schedule'
-  autoload :Occurrence, 'ice_cube/occurrence'
+  autoload :IcalBuilder, "ice_cube/builders/ical_builder"
+  autoload :HashBuilder, "ice_cube/builders/hash_builder"
+  autoload :StringBuilder, "ice_cube/builders/string_builder"
 
-  autoload :IcalBuilder, 'ice_cube/builders/ical_builder'
-  autoload :HashBuilder, 'ice_cube/builders/hash_builder'
-  autoload :StringBuilder, 'ice_cube/builders/string_builder'
+  autoload :HashParser, "ice_cube/parsers/hash_parser"
+  autoload :YamlParser, "ice_cube/parsers/yaml_parser"
+  autoload :IcalParser, "ice_cube/parsers/ical_parser"
 
-  autoload :HashParser, 'ice_cube/parsers/hash_parser'
-  autoload :YamlParser, 'ice_cube/parsers/yaml_parser'
-  autoload :IcalParser, 'ice_cube/parsers/ical_parser'
+  autoload :CountExceeded, "ice_cube/errors/count_exceeded"
+  autoload :UntilExceeded, "ice_cube/errors/until_exceeded"
 
-  autoload :CountExceeded, 'ice_cube/errors/count_exceeded'
-  autoload :UntilExceeded, 'ice_cube/errors/until_exceeded'
+  autoload :ValidatedRule, "ice_cube/validated_rule"
+  autoload :SingleOccurrenceRule, "ice_cube/single_occurrence_rule"
 
-  autoload :ValidatedRule, 'ice_cube/validated_rule'
-  autoload :SingleOccurrenceRule, 'ice_cube/single_occurrence_rule'
-
-  autoload :SecondlyRule, 'ice_cube/rules/secondly_rule'
-  autoload :MinutelyRule, 'ice_cube/rules/minutely_rule'
-  autoload :HourlyRule, 'ice_cube/rules/hourly_rule'
-  autoload :DailyRule, 'ice_cube/rules/daily_rule'
-  autoload :WeeklyRule, 'ice_cube/rules/weekly_rule'
-  autoload :MonthlyRule, 'ice_cube/rules/monthly_rule'
-  autoload :YearlyRule, 'ice_cube/rules/yearly_rule'
+  autoload :SecondlyRule, "ice_cube/rules/secondly_rule"
+  autoload :MinutelyRule, "ice_cube/rules/minutely_rule"
+  autoload :HourlyRule, "ice_cube/rules/hourly_rule"
+  autoload :DailyRule, "ice_cube/rules/daily_rule"
+  autoload :WeeklyRule, "ice_cube/rules/weekly_rule"
+  autoload :MonthlyRule, "ice_cube/rules/monthly_rule"
+  autoload :YearlyRule, "ice_cube/rules/yearly_rule"
 
   module Validations
-    autoload :FixedValue, 'ice_cube/validations/fixed_value'
-    autoload :ScheduleLock, 'ice_cube/validations/schedule_lock'
-
-    autoload :Count, 'ice_cube/validations/count'
-    autoload :Until, 'ice_cube/validations/until'
-
-    autoload :SecondlyInterval, 'ice_cube/validations/secondly_interval'
-    autoload :MinutelyInterval, 'ice_cube/validations/minutely_interval'
-    autoload :DailyInterval, 'ice_cube/validations/daily_interval'
-    autoload :WeeklyInterval, 'ice_cube/validations/weekly_interval'
-    autoload :MonthlyInterval, 'ice_cube/validations/monthly_interval'
-    autoload :YearlyInterval, 'ice_cube/validations/yearly_interval'
-    autoload :HourlyInterval, 'ice_cube/validations/hourly_interval'
-
-    autoload :HourOfDay, 'ice_cube/validations/hour_of_day'
-    autoload :MonthOfYear, 'ice_cube/validations/month_of_year'
-    autoload :MinuteOfHour, 'ice_cube/validations/minute_of_hour'
-    autoload :SecondOfMinute, 'ice_cube/validations/second_of_minute'
-    autoload :DayOfMonth, 'ice_cube/validations/day_of_month'
-    autoload :DayOfWeek, 'ice_cube/validations/day_of_week'
-    autoload :Day, 'ice_cube/validations/day'
-    autoload :DayOfYear, 'ice_cube/validations/day_of_year'
+    autoload :FixedValue, "ice_cube/validations/fixed_value"
+    autoload :ScheduleLock, "ice_cube/validations/schedule_lock"
+
+    autoload :Count, "ice_cube/validations/count"
+    autoload :Until, "ice_cube/validations/until"
+
+    autoload :SecondlyInterval, "ice_cube/validations/secondly_interval"
+    autoload :MinutelyInterval, "ice_cube/validations/minutely_interval"
+    autoload :DailyInterval, "ice_cube/validations/daily_interval"
+    autoload :WeeklyInterval, "ice_cube/validations/weekly_interval"
+    autoload :MonthlyInterval, "ice_cube/validations/monthly_interval"
+    autoload :YearlyInterval, "ice_cube/validations/yearly_interval"
+    autoload :HourlyInterval, "ice_cube/validations/hourly_interval"
+
+    autoload :HourOfDay, "ice_cube/validations/hour_of_day"
+    autoload :MonthOfYear, "ice_cube/validations/month_of_year"
+    autoload :MinuteOfHour, "ice_cube/validations/minute_of_hour"
+    autoload :SecondOfMinute, "ice_cube/validations/second_of_minute"
+    autoload :DayOfMonth, "ice_cube/validations/day_of_month"
+    autoload :DayOfWeek, "ice_cube/validations/day_of_week"
+    autoload :Day, "ice_cube/validations/day"
+    autoload :DayOfYear, "ice_cube/validations/day_of_year"
   end
 
   # Define some useful constants
   ONE_SECOND = 1
   ONE_MINUTE = ONE_SECOND * 60
-  ONE_HOUR =   ONE_MINUTE * 60
-  ONE_DAY =    ONE_HOUR   * 24
-  ONE_WEEK =   ONE_DAY    * 7
+  ONE_HOUR = ONE_MINUTE * 60
+  ONE_DAY = ONE_HOUR * 24
+  ONE_WEEK = ONE_DAY * 7
 
   # Defines the format used by IceCube when printing out Schedule#to_s.
   # Defaults to '%B %e, %Y'

lib/ice_cube.rb

@@ -1,9 +1,7 @@
 module IceCube
-
   class HashBuilder
-
     def initialize(rule = nil)
-      @hash = { :validations => {}, :rule_type => rule.class.name }
+      @hash = {validations: {}, rule_type: rule.class.name}
     end
 
     def validations
@@ -21,7 +19,5 @@ def validations_array(type)
     def to_hash
       @hash
     end
-
   end
-
 end