timely 0.4.2 → 0.9.0

data/spec/support/coverage_loader.rb

@@ -1,4 +1,6 @@
+# frozen_string_literal: true
+
 require 'simplecov-rcov'
 require 'coveralls'
 require 'coverage/kit'
-Coverage::Kit.setup(minimum_coverage: 68.3)
+Coverage::Kit.setup(minimum_coverage: 69.95)

data/spec/temporal_patterns_spec.rb

@@ -1,15 +1,16 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Timely::TemporalPatterns do
-
   before(:all) do
     @from = Date.new(2012, 1, 1)
     @to   = Date.new(2013, 4, 1)
   end
 
-  it "should be able to create a basic 1st-of-the-month recurrence pattern" do
+  it 'should be able to create a basic 1st-of-the-month recurrence pattern' do
     pattern = Timely::TemporalPatterns::Pattern.new([@from..@to], 1.month)
-    expect(pattern.to_s).to eq "every 1st of the month from 2012-01-01T00:00:00+00:00 to 2013-04-01T00:00:00+00:00"
+    expect(pattern.to_s).to eq 'every 1st of the month from 2012-01-01T00:00:00+00:00 to 2013-04-01T00:00:00+00:00'
 
     expect(pattern.match?('01-05-2012'.to_date)).to be true
     expect(pattern.match?('01-08-2012'.to_date)).to be true
@@ -19,10 +20,9 @@ describe Timely::TemporalPatterns do
     expect(pattern.match?('01-06-2013'.to_date)).to be false
   end
 
-  it "should only allow a positive duration to be set as the frequency of the pattern" do
+  it 'should only allow a positive duration to be set as the frequency of the pattern' do
     expect { Timely::TemporalPatterns::Frequency.new(2) }.to raise_error(ArgumentError)
     expect { Timely::TemporalPatterns::Frequency.new(-5.months) }.to raise_error(ArgumentError)
     expect(Timely::TemporalPatterns::Frequency.new(3.months).to_s).to eq 'every 3 months'
   end
-
 end

data/spec/time_since_spec.rb

@@ -1,11 +1,13 @@
+# frozen_string_literal: true
+
 require 'timely/time_since'
 
 require 'timecop'
 
 describe Timely::TimeSince do
-  before {
+  before do
     Timecop.freeze(DateTime.new(2000, 1, 10, 12, 0, 42))
-  }
+  end
   after { Timecop.return }
 
   context '42 seconds ago' do
@@ -17,8 +19,8 @@ describe Timely::TimeSince do
 
   context 'a day ago' do
     subject(:time) { DateTime.new(2000, 1, 9, 12, 0, 42) }
-    its(:seconds_since) { should eq 24*60*60 }
-    its(:minutes_since) { should eq 24*60 }
+    its(:seconds_since) { should eq 24 * 60 * 60 }
+    its(:minutes_since) { should eq 24 * 60 }
     its(:hours_since) { should eq 24 }
   end
 end

data/spec/time_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 TestTime = Class.new(Time) do
@@ -7,7 +9,7 @@ end
 describe Time do
   it 'should be able to set date on a time' do
     xmas = Date.new(2012, 12, 25)
-    lunch_time = TestTime.parse("12:00")
+    lunch_time = TestTime.parse('12:00')
     xmas_lunch = lunch_time.on_date(xmas)
     expect(xmas_lunch.year).to eq 2012
     expect(xmas_lunch.month).to eq 12
@@ -17,9 +19,9 @@ describe Time do
     expect(xmas_lunch.sec).to eq 0
   end
 
-  it "should allow setting the date part given a date" do
-    time = TestTime.parse("2010-01-01 09:30:00")
-    expect(time.on_date(Date.parse("2012-12-31"))).to eq Time.parse("2012-12-31 09:30:00")
+  it 'should allow setting the date part given a date' do
+    time = TestTime.parse('2010-01-01 09:30:00')
+    expect(time.on_date(Date.parse('2012-12-31'))).to eq Time.parse('2012-12-31 09:30:00')
   end
 end
 

data/spec/trackable_date_set_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Timely::TrackableDateSet, ' tracking 7 days' do
@@ -6,45 +8,45 @@ describe Timely::TrackableDateSet, ' tracking 7 days' do
     @trackable_date_set = Timely::TrackableDateSet.new(@range)
   end
 
-  it "should start on the first date" do
+  it 'should start on the first date' do
     expect(@trackable_date_set.start_date).to eq Date.today
   end
 
-  it "should end on the last date" do
+  it 'should end on the last date' do
     expect(@trackable_date_set.end_date).to eq Date.today + 6
   end
 
-  it "should have the 7 days set" do
-    expect(get_dates).to eq @range.to_a
+  it 'should have the 7 days set' do
+    expect(dates).to eq @range.to_a
     expect(@trackable_date_set.duration).to eq 7
     expect(@trackable_date_set.number_of_nights).to eq 7
   end
 
-  it "should have all the 7 days to do" do
-    expect(get_dates_to_do).to eq @range.to_a
+  it 'should have all the 7 days to do' do
+    expect(dates_to_do).to eq @range.to_a
     should_not_have_done(@range.to_a)
   end
 
-  it "should have only the last 6 days to do when we set_done! the first one" do
+  it 'should have only the last 6 days to do when we set_done! the first one' do
     @trackable_date_set.set_date_done!(Date.today)
-    expect(get_dates_to_do).to eq ((Date.today + 1)..(Date.today + 6)).to_a
+    expect(dates_to_do).to eq(((Date.today + 1)..(Date.today + 6)).to_a)
 
     should_not_have_done(@range.to_a - [Date.today])
     should_have_done([Date.today])
   end
 
-  it "should have the first, and last three left to do if we set 2nd, 3rd & 4th to be done" do
+  it 'should have the first, and last three left to do if we set 2nd, 3rd & 4th to be done' do
     dates_to_be_done = [Date.today + 1, Date.today + 2, Date.today + 3]
     @trackable_date_set.set_dates_done!(dates_to_be_done)
 
-    expect(get_dates_to_do).to eq [Date.today, Date.today + 4, Date.today + 5, Date.today + 6]
+    expect(dates_to_do).to eq [Date.today, Date.today + 4, Date.today + 5, Date.today + 6]
     should_not_have_done(@range.to_a - dates_to_be_done)
     should_have_done(dates_to_be_done)
   end
 
-  it "should have none left to do when set_all_done!" do
+  it 'should have none left to do when set_all_done!' do
     @trackable_date_set.set_all_done!
-    expect(get_dates_to_do).to eq []
+    expect(dates_to_do).to eq []
     should_have_done(@range.to_a)
   end
 
@@ -59,22 +61,22 @@ describe Timely::TrackableDateSet, ' tracking 7 days' do
   end
 
   def should_have_done(dates)
-    dates.each{|date| expect(@trackable_date_set.has_done?(date)).to be true }
+    dates.each { |date| expect(@trackable_date_set.done_dates?(date)).to be true }
   end
 
   def should_not_have_done(dates)
-    dates.each{|date| expect(@trackable_date_set.has_done?(date)).to be false }
+    dates.each { |date| expect(@trackable_date_set.done_dates?(date)).to be false }
   end
 
-  def get_dates
+  def dates
     contained_dates = []
-    @trackable_date_set.each_date{|date| contained_dates << date}
+    @trackable_date_set.each_date { |date| contained_dates << date }
     contained_dates
   end
 
-  def get_dates_to_do
+  def dates_to_do
     contained_dates = []
-    @trackable_date_set.each_date_to_do{|date| contained_dates << date}
+    @trackable_date_set.each_date_to_do { |date| contained_dates << date }
     contained_dates
   end
 end

data/spec/week_days_spec.rb

@@ -1,30 +1,32 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
-describe Timely::WeekDays do
+RSpec.describe Timely::WeekDays do
   before do
-    @weekdays = Timely::WeekDays.new(:tue => true, :thu => true)
+    @weekdays = Timely::WeekDays.new(tue: true, thu: true)
   end
 
   it 'should create via hash, integer and array' do
     # 0   0   1   0   1   0   0
     # Sat Fri Thu Wed Tue Mon Sun
-    expect(Timely::WeekDays.new(0b0010100).weekdays).to eq [:tue, :thu]
-    expect(Timely::WeekDays.new(%w(0 0 1 0 1 0 0)).weekdays).to eq [:tue, :thu]
-    expect(Timely::WeekDays.new(:tue => true, :thu => true).weekdays).to eq [:tue, :thu]
+    expect(Timely::WeekDays.new(0b0010100).weekdays).to eq %i[tue thu]
+    expect(Timely::WeekDays.new(%w[0 0 1 0 1 0 0]).weekdays).to eq %i[tue thu]
+    expect(Timely::WeekDays.new(tue: true, thu: true).weekdays).to eq %i[tue thu]
   end
 
   it 'should be able to set/unset days' do
     @weekdays[:mon] = true
-    expect(@weekdays.weekdays).to eq [:mon, :tue, :thu]
+    expect(@weekdays.weekdays).to eq %i[mon tue thu]
     @weekdays[:tue] = false
-    expect(@weekdays.weekdays).to eq [:mon, :thu]
+    expect(@weekdays.weekdays).to eq %i[mon thu]
   end
 
-  it 'should output days nicely' do 
-    expect(Timely::WeekDays.new(%w(1 0 0 0 0 0 0)).to_s).to eq "Sun"
-    expect(Timely::WeekDays.new(%w(1 0 1 0 0 0 0)).to_s).to eq "Sun, and Tue"
-    expect(Timely::WeekDays.new(%w(1 0 1 1 0 0 0)).to_s).to eq "Sun, Tue, and Wed"
-    expect(Timely::WeekDays.new(%w(1 0 1 1 0 1 0)).to_s).to eq "Sun, Tue, Wed, and Fri"    
+  it 'should output days nicely' do
+    expect(Timely::WeekDays.new(%w[1 0 0 0 0 0 0]).to_s).to eq 'Sun'
+    expect(Timely::WeekDays.new(%w[1 0 1 0 0 0 0]).to_s).to eq 'Sun, and Tue'
+    expect(Timely::WeekDays.new(%w[1 0 1 1 0 0 0]).to_s).to eq 'Sun, Tue, and Wed'
+    expect(Timely::WeekDays.new(%w[1 0 1 1 0 1 0]).to_s).to eq 'Sun, Tue, Wed, and Fri'
   end
 
   it 'should be able to determine if days of the week are selected' do
@@ -36,8 +38,8 @@ describe Timely::WeekDays do
   end
 
   it 'should be able to determine if it would be applicable on a date' do
-    expect(@weekdays.applies_for_date?(Date.new(2012, 04, 22))).to be false # Sunday
-    expect(@weekdays.applies_for_date?(Date.new(2012, 04, 24))).to be true  # Tuesday
+    expect(@weekdays.applies_for_date?(Date.new(2012, 0o4, 22))).to be false # Sunday
+    expect(@weekdays.applies_for_date?(Date.new(2012, 0o4, 24))).to be true  # Tuesday
   end
 
   it 'should be able to convert to integer for use in databases, etc.' do
@@ -45,7 +47,30 @@ describe Timely::WeekDays do
   end
 
   it 'should be able to determine if all days are selected' do
-    expect(Timely::WeekDays.new(%w(1 1 1 1 1 1 1)).all_days?).to be true
-    expect(Timely::WeekDays.new(%w(1 1 1 1 1 0 1)).all_days?).to be false
+    expect(Timely::WeekDays.new(%w[1 1 1 1 1 1 1]).all_days?).to be true
+    expect(Timely::WeekDays.new(%w[1 1 1 1 1 0 1]).all_days?).to be false
+  end
+end
+
+RSpec.describe 'Timely::WeekDays.from_range' do
+  {
+    'single date as string': { date_range: '2019-10-17',         expected_weekdays: [:thu] },
+    'single date as object': { date_range: '2019-10-17'.to_date, expected_weekdays: [:thu] },
+    'range with strings': {
+      date_range: '2019-10-17'..'2019-10-18',
+      expected_weekdays: %i[thu fri]
+    },
+    'range with objects': {
+      date_range: ('2019-10-17'.to_date)..('2019-10-18'.to_date),
+      expected_weekdays: %i[thu fri]
+    }
+  }.each do |type, data|
+    it "#{type} has correct weekdays and applies for dates" do
+      weekdays = Timely::WeekDays.from_range(data[:date_range])
+      expect(weekdays.weekdays).to eq(data[:expected_weekdays])
+      Array(data[:date_range]).each do |date|
+        expect(weekdays.applies_for_date?(date.to_date)).to eq(true)
+      end
+    end
   end
 end

data/timely.gemspec

@@ -1,36 +1,40 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'timely/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "timely"
+  spec.name          = 'timely'
   spec.version       = Timely::VERSION
-  spec.authors       = ["Michael Noack"]
-  spec.email         = ["support@travellink.com.au"]
-  spec.description   = %q{Set of time, date, weekday related methods.}
-  spec.summary       = %q{Set of time, date, weekday related methods.}
+  spec.authors       = ['Michael Noack']
+  spec.email         = ['support@travellink.com.au']
+  spec.description   = 'Set of time, date, weekday related methods.'
+  spec.summary       = 'Set of time, date, weekday related methods.'
   spec.homepage      = 'http://github.com/sealink/timely'
 
-  spec.license       = "MIT"
+  spec.license       = 'MIT'
 
-  spec.files         = `git ls-files`.split($/)
+  spec.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
+  spec.required_ruby_version = '>= 2.6'
 
-  spec.add_development_dependency "bundler", "~> 2.0.1"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency 'rspec'
-  spec.add_development_dependency 'rspec-its'
+  spec.add_development_dependency 'actionpack'
+  spec.add_development_dependency 'activerecord'
+  spec.add_development_dependency 'activesupport'
+  spec.add_development_dependency 'bundler', '~> 2.2.0'
   spec.add_development_dependency 'coverage-kit'
-  spec.add_development_dependency 'simplecov-rcov'
   spec.add_development_dependency 'coveralls'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'rspec-its'
+  spec.add_development_dependency 'database_cleaner'
   spec.add_development_dependency 'rubocop'
+  spec.add_development_dependency 'rubocop-rails'
+  spec.add_development_dependency 'simplecov-rcov'
   spec.add_development_dependency 'sqlite3'
-  spec.add_development_dependency 'activesupport'
-  spec.add_development_dependency 'activerecord'
-  spec.add_development_dependency 'actionpack'
   spec.add_development_dependency 'timecop'
-  spec.add_development_dependency 'travis'
+  spec.add_development_dependency 'pry'
 end

metadata

@@ -1,31 +1,31 @@
 --- !ruby/object:Gem::Specification
 name: timely
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.9.0
 platform: ruby
 authors:
 - Michael Noack
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-01 00:00:00.000000000 Z
+date: 2021-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +53,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec-its
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.2.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.2.0
+- !ruby/object:Gem::Dependency
+  name: coverage-kit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: coverage-kit
+  name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov-rcov
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,7 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -137,7 +151,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -151,7 +165,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: rubocop-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -165,7 +179,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: actionpack
+  name: simplecov-rcov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -193,7 +221,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: travis
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -213,18 +241,20 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
+- ".github/workflows/release.yml"
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
 - ".ruby-version"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
-- gemfiles/rails5.gemfile
-- gemfiles/rails6.gemfile
+- gemfiles/rails60.gemfile
+- gemfiles/rails61.gemfile
 - lib/timely.rb
 - lib/timely/date.rb
 - lib/timely/date_chooser.rb
@@ -266,7 +296,6 @@ files:
 - spec/schema.rb
 - spec/season_spec.rb
 - spec/spec_helper.rb
-- spec/string_spec.rb
 - spec/support/coverage_loader.rb
 - spec/temporal_patterns_spec.rb
 - spec/time_since_spec.rb
@@ -286,14 +315,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: Set of time, date, weekday related methods.
@@ -311,7 +340,6 @@ test_files:
 - spec/schema.rb
 - spec/season_spec.rb
 - spec/spec_helper.rb
-- spec/string_spec.rb
 - spec/support/coverage_loader.rb
 - spec/temporal_patterns_spec.rb
 - spec/time_since_spec.rb