rrule 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 1aad8dd06524a47f1d310b7f077db21f41696bc7
-  data.tar.gz: f2e1673c1fd07da16c47fc96e944eeabef43578b
+SHA256:
+  metadata.gz: 110d8805d4e642767c86d7e23f0b77d8d42a0a11ef3c5edf5c08ee2d8f78d4ab
+  data.tar.gz: 8dcd49b64e8300b5facdfb92c72485b6c87b3003ba9dc87116fe13ca9bd44bf5
 SHA512:
-  metadata.gz: fa77f6132a2d47a45d8aab0a58af68a1ccd0417e22a9c2fc6ef4a2b14aef90e65040324177893773cba2b06e74373776105a19e078c5d81360f5e894b2cdec3c
-  data.tar.gz: 4fddc6b136db1d57c8d8e89fe099820e572f13fc447647cdd7c43942a74112255c8720ad2b8c82a0cb1586a8a1bdb0e862ec12014f6f05c5982a86ce58207518
+  metadata.gz: 467ad003c49dea6fb320775f59a33f739405edd0b330b87512ed4e183bcd757f8e16e4deda296c6f916055056ba98ae0be623df3f78fc9b8c39b790ca4198db6
+  data.tar.gz: c51e63c57919c57c4954b66c4b55d77ed6f513117a338ea76c595239433a1bc983c50706e642ba3b7b596aaf1feb3d111743ba8bd945c61d372f099656170dbb

data/.gitignore

@@ -1,4 +1,6 @@
+Gemfile.lock
 .rspec
 *.gem
 *.sublime-project
 *.sublime-workspace
+Gemfile.lock

data/.rubocop.yml

@@ -0,0 +1,25 @@
+AllCops:
+  TargetRubyVersion: 2.3
+
+Layout:
+  Enabled: false
+
+Lint/NonLocalExitFromIterator:
+  Enabled: false
+
+Metrics:
+  Enabled: false
+
+Naming:
+  Enabled: false
+
+Style/Documentation:
+  Enabled: false
+Style/MultilineBlockChain:
+  Enabled: false
+Style/NumericPredicate:
+  Enabled: false
+Style/RescueModifier:
+  Enabled: false
+Style/TrailingCommaInArrayLiteral:
+  EnforcedStyleForMultiline: comma

data/.travis.yml

@@ -1,3 +1,8 @@
 language: ruby
+sudo: false
 rvm:
-  - 2.3.1
+  - 2.3.8
+  - 2.4.5
+  - 2.5.3
+  - 2.6.0
+  - ruby-head

data/Gemfile

@@ -1,5 +1,14 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
+gem 'pry'
 gem 'rake'
+gem 'rspec', '~> 3.8'
+gem 'rubocop', '0.63.1'
+
+platform :mri do
+  gem 'pry-byebug'
+end
 
 gemspec

data/Rakefile

@@ -1,12 +1,18 @@
+# frozen_string_literal: true
+
 require 'rubygems'
 require 'rake'
+require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
-require File.expand_path('../lib/rrule', __FILE__)
+require File.expand_path('lib/rrule', __dir__)
 
 RSpec::Core::RakeTask.new(:spec)
 
+require 'rubocop/rake_task'
+RuboCop::RakeTask.new
+
 namespace :spec do
-  task :all => ['spec']
+  task all: ['spec']
 end
 
-task :default => 'spec:all'
+task default: %w[spec:all rubocop]

data/lib/rrule.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_support/all'
 
 module RRule
@@ -22,6 +24,8 @@ module RRule
   autoload :AllOccurrences, 'rrule/generators/all_occurrences'
   autoload :BySetPosition, 'rrule/generators/by_set_position'
 
+  WEEKDAYS = %w[SU MO TU WE TH FR SA].freeze
+
   def self.parse(rrule, **options)
     Rule.new(rrule, **options)
   end

data/lib/rrule/context.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RRule
   class Context
     attr_reader :options, :dtstart, :tz, :day_of_year_mask, :year
@@ -17,14 +19,14 @@ module RRule
         possible_date_ranges = []
         if options[:freq] == 'YEARLY'
           if options[:bymonth]
-            options[:bymonth].each do |month|
-              possible_date_ranges.push(elapsed_days_in_year_by_month[(month - 1)..(month)])
+            options[:bymonth].each do |mon|
+              possible_date_ranges.push(elapsed_days_in_year_by_month[(mon - 1)..mon])
             end
           else
             possible_date_ranges = [[0, year_length_in_days]]
           end
         elsif options[:freq] == 'MONTHLY'
-          possible_date_ranges = [elapsed_days_in_year_by_month[(month - 1)..(month)]]
+          possible_date_ranges = [elapsed_days_in_year_by_month[(month - 1)..month]]
         end
 
         unless possible_date_ranges.empty?

data/lib/rrule/filters/by_month.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RRule
   class ByMonth
     def initialize(by_months, context)

data/lib/rrule/filters/by_month_day.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RRule
   class ByMonthDay
     def initialize(by_month_days, context)

data/lib/rrule/filters/by_week_day.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RRule
   class ByWeekDay
     def initialize(weekdays, context)

data/lib/rrule/filters/by_week_number.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RRule
   class ByWeekNumber
     def initialize(by_week_numbers, context)

data/lib/rrule/filters/by_year_day.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RRule
   class ByYearDay
     def initialize(by_year_days, context)
@@ -6,7 +8,7 @@ module RRule
     end
 
     def reject?(i)
-      !by_year_days.empty? && 
+      !by_year_days.empty? &&
         ((i < context.year_length_in_days && !by_year_days.include?(i + 1) && !by_year_days.include?(i - context.year_length_in_days)) ||
           (i >= context.year_length_in_days && !by_year_days.include?(i + 1 - context.year_length_in_days) && !by_year_days.include?(i - context.year_length_in_days - context.next_year_length_in_days)))
     end

data/lib/rrule/frequencies/daily.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RRule
   class Daily < Frequency
     def possible_days

data/lib/rrule/frequencies/frequency.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RRule
   class Frequency
     attr_reader :current_date, :filters, :generator, :timeset
@@ -12,9 +14,7 @@ module RRule
 
     def advance
       @current_date = current_date.advance(advance_by).tap do |new_date|
-        unless same_month(current_date, new_date)
-          context.rebuild(new_date.year, new_date.month)
-        end
+        context.rebuild(new_date.year, new_date.month) unless same_month(current_date, new_date)
       end
     end
 
@@ -32,10 +32,6 @@ module RRule
       end
     end
 
-    def possible_days
-      fail NotImplementedError
-    end
-
     def self.for_options(options)
       case options[:freq]
       when 'DAILY'
@@ -51,7 +47,7 @@ module RRule
       when 'YEARLY'
         Yearly
       else
-        raise InvalidRRule, "Valid FREQ value is required"
+        raise InvalidRRule, 'Valid FREQ value is required'
       end
     end
 
@@ -62,9 +58,5 @@ module RRule
     def same_month(first_date, second_date)
       first_date.month == second_date.month && first_date.year == second_date.year
     end
-
-    def advance_by
-      fail NotImplementedError
-    end
   end
 end

data/lib/rrule/frequencies/monthly.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RRule
   class Monthly < Frequency
     def possible_days

data/lib/rrule/frequencies/simple_weekly.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RRule
   class SimpleWeekly < Frequency
     def next_occurrences
@@ -8,15 +10,13 @@ module RRule
     end
 
     def correct_current_date_if_needed
-      if context.options[:byweekday].present?
-        target_wday = context.options[:byweekday].first.index
+      target_wday = if context.options[:byweekday].present?
+        context.options[:byweekday].first.index
       else
-        target_wday = context.dtstart.wday
+        context.dtstart.wday
       end
 
-      while @current_date.wday != target_wday
-        @current_date = @current_date + 1.day
-      end
+      @current_date += 1.day while @current_date.wday != target_wday
     end
   end
 end

data/lib/rrule/frequencies/weekly.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RRule
   class Weekly < Frequency
     def possible_days

data/lib/rrule/frequencies/yearly.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RRule
   class Yearly < Frequency
     def possible_days

data/lib/rrule/generators/all_occurrences.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RRule
   class AllOccurrences < Generator
     def combine_dates_and_times(dayset, timeset)

data/lib/rrule/generators/by_set_position.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RRule
   class BySetPosition < Generator
     attr_reader :by_set_positions

data/lib/rrule/generators/generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RRule
   class Generator
     attr_reader :context
@@ -31,4 +33,4 @@ module RRule
       end.flatten
     end
   end
-end
+end

data/lib/rrule/rule.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RRule
   class Rule
     include Enumerable
@@ -25,11 +27,8 @@ module RRule
     end
 
     def each(floor_date: nil)
-      floor_date ||= dtstart
       # If we have a COUNT or INTERVAL option, we have to start at dtstart, because those are relative to dtstart
-      if count_or_interval_present?
-        floor_date = dtstart
-      end
+      floor_date = dtstart if count_or_interval_present? || floor_date.nil? || dtstart > floor_date
 
       return enum_for(:each, floor_date: floor_date) unless block_given?
       context = Context.new(options, dtstart, tz)
@@ -39,30 +38,20 @@ module RRule
       count = options[:count]
 
       filters = []
-      if options[:bymonth]
-        filters.push(ByMonth.new(options[:bymonth], context))
-      end
+      filters.push(ByMonth.new(options[:bymonth], context)) if options[:bymonth]
 
-      if options[:byweekno]
-        filters.push(ByWeekNumber.new(options[:byweekno], context))
-      end
+      filters.push(ByWeekNumber.new(options[:byweekno], context)) if options[:byweekno]
 
-      if options[:byweekday]
-        filters.push(ByWeekDay.new(options[:byweekday], context))
-      end
+      filters.push(ByWeekDay.new(options[:byweekday], context)) if options[:byweekday]
 
-      if options[:byyearday]
-        filters.push(ByYearDay.new(options[:byyearday], context))
-      end
+      filters.push(ByYearDay.new(options[:byyearday], context)) if options[:byyearday]
 
-      if options[:bymonthday]
-        filters.push(ByMonthDay.new(options[:bymonthday], context))
-      end
+      filters.push(ByMonthDay.new(options[:bymonthday], context)) if options[:bymonthday]
 
-      if options[:bysetpos]
-        generator = BySetPosition.new(options[:bysetpos], context)
+      generator = if options[:bysetpos]
+        BySetPosition.new(options[:bysetpos], context)
       else
-        generator = AllOccurrences.new(context)
+        AllOccurrences.new(context)
       end
 
       frequency = Frequency.for_options(options).new(context, filters, generator, timeset, start_date: floor_date)
@@ -117,15 +106,15 @@ module RRule
           i = begin
             Integer(value)
           rescue ArgumentError
-            raise InvalidRRule, "COUNT must be a non-negative integer"
+            raise InvalidRRule, 'COUNT must be a non-negative integer'
           end
-          raise InvalidRRule, "COUNT must be a non-negative integer" if i < 0
+          raise InvalidRRule, 'COUNT must be a non-negative integer' if i < 0
           options[:count] = i
         when 'UNTIL'
           options[:until] = Time.parse(value)
         when 'INTERVAL'
           i = Integer(value) rescue 0
-          raise InvalidRRule, "INTERVAL must be a positive integer" unless i > 0
+          raise InvalidRRule, 'INTERVAL must be a positive integer' unless i > 0
           options[:interval] = i
         when 'BYHOUR'
           options[:byhour] = value.split(',').compact.map(&:to_i)
@@ -138,7 +127,7 @@ module RRule
         when 'BYSETPOS'
           options[:bysetpos] = value.split(',').map(&:to_i)
         when 'WKST'
-          options[:wkst] = ['SU', 'MO', 'TU', 'WE', 'TH', 'FR', 'SA'].index(value)
+          options[:wkst] = RRule::WEEKDAYS.index(value)
         when 'BYMONTH'
           options[:bymonth] = value.split(',').compact.map(&:to_i)
         when 'BYMONTHDAY'
@@ -150,12 +139,10 @@ module RRule
         end
       end
 
-      if !(options[:byweekno] || options[:byyearday] || options[:bymonthday] || options[:byweekday])
+      unless options[:byweekno] || options[:byyearday] || options[:bymonthday] || options[:byweekday]
         case options[:freq]
         when 'YEARLY'
-          unless options[:bymonth]
-            options[:bymonth] = [dtstart.month]
-          end
+          options[:bymonth] = [dtstart.month] unless options[:bymonth]
           options[:bymonthday] = [dtstart.day]
         when 'MONTHLY'
           options[:bymonthday] = [dtstart.day]
@@ -165,9 +152,7 @@ module RRule
         end
       end
 
-      unless options[:byweekday].nil?
-        options[:byweekday], options[:bynweekday] = options[:byweekday].partition { |wday| wday.ordinal.nil? }
-      end
+      options[:byweekday], options[:bynweekday] = options[:byweekday].partition { |wday| wday.ordinal.nil? } unless options[:byweekday].nil?
 
       options[:timeset] = [{ hour: (options[:byhour].presence || dtstart.hour), minute: (options[:byminute].presence || dtstart.min), second: (options[:bysecond].presence || dtstart.sec) }]
 

data/lib/rrule/version.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+module RRule
+  VERSION = '0.4.2'
+end

data/lib/rrule/weekday.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RRule
   class Weekday
     attr_reader :index, :ordinal
@@ -9,7 +11,7 @@ module RRule
 
     def self.parse(weekday)
       match = /([+-]?\d)?([A-Z]{2})/.match(weekday)
-      index = ['SU', 'MO', 'TU', 'WE', 'TH', 'FR', 'SA'].index(match[2])
+      index = RRule::WEEKDAYS.index(match[2])
       ordinal = match[1] ? match[1].to_i : nil
       new(index, ordinal)
     end

data/rrule.gemspec

@@ -1,20 +1,26 @@
+# frozen_string_literal: true
+
+lib = File.expand_path('lib', __dir__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'rrule/version'
+
 Gem::Specification.new do |s|
   s.name = 'rrule'
-  s.version = '0.4.1'
-  s.date = '2018-04-24'
+  s.version = RRule::VERSION
   s.summary = 'RRule expansion'
   s.description = 'A gem for expanding dates according to the RRule specification'
   s.authors = ['Ryan Mitchell']
   s.email = 'rmitchell@squareup.com'
-  s.files = `git ls-files`.split($/)
-  s.test_files = s.files.grep(%r{^(test|spec|features)/})
+  s.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   s.require_paths = ['lib']
-  s.homepage = 'http://rubygems.org/gems/rrule'
+  s.homepage = 'https://rubygems.org/gems/rrule'
+  s.metadata = {
+    'homepage' => 'https://rubygems.org/gems/rrule',
+    'source_code_uri' => 'https://github.com/square/ruby-rrule',
+    'bug_tracker_uri' => 'https://github.com/square/ruby-rrule/issues',
+    'changelog_uri' => 'https://github.com/square/ruby-rrule/blob/master/CHANGELOG.md'
+  }
 
-  # Since Ruby 1.9.2, Time implementation uses a signed 63 bit integer, Bignum
-  # or Rational. This enables Time to finally work with years after 2038 which
-  # is critical for this library.
-  s.required_ruby_version = '>= 1.9.2'
+  s.required_ruby_version = '>= 2.3.0'
   s.add_runtime_dependency 'activesupport', '>= 4.1'
-  s.add_development_dependency 'rspec', '~> 3.4'
 end