timely 0.6.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6fd5bf30099265da88c4957079fd58a4db290fac8cd4ad239ddb395be546d5d3
-  data.tar.gz: d263dca100292aae36f54b22cc2f3b1eebc1c1df0274fc3ef730ce991fc94c4a
+  metadata.gz: 6aa86a2d85c75b320398194d92abfa5ddb0cf5eb15e26312d619c07fd8d89783
+  data.tar.gz: 6062dae4792ec644a1b7c9de0cfbcc14dba8b560e3b79f117f9e95f6bd311608
 SHA512:
-  metadata.gz: 784aede0c406afe8e0213f275150ee3bba930969c28acf9ac2e992a96ce42c7f30e042a6e0ae9779dc17f86e6a7744c4b0a07bf72e1d326d6e6176b3ac4b28c4
-  data.tar.gz: a780a85c02adcf074c53376c7995739d609329256b76c370966bedaccf953e0e3cb7607cb0d381873a8a4585b48505c8d2d04f68bebdc94f0b49c947bab84d28
+  metadata.gz: 65880f47a10857ebaa6a5f6cb7a1cbf2bd9436d125a454ddff9f28a2144ec2eb9a917e26458efacd4865e5ef984d870ba2da3b0114d2f3e5d18f036218176965
+  data.tar.gz: ccfa4cf94063269922a0bf08c4ba3be6e67ee74d8be3f94857c1a75a506e109f25fef42d794e6e301d7d5dd06a519fd817f5fb169bfa18c2a66b49b73b53339e

data/CHANGELOG.md

@@ -1,5 +1,22 @@
 # Changelog
 
+## 0.10.0
+
+* [PLAT-183] Publish coveralls with github actions add ruby 3.1 to test matrix
+
+## 0.9.0
+
+* [TT-8614] Update to build with github actions / ruby 3.0 / rails 6.1
+
+## 0.8.0
+
+* [TT-6441] Turns out we don't actually need time difference in QT
+* [TT-6661] Fix issue when detecting intersecting date groups
+
+## 0.7.0
+
+* [TT-6441] Due to TimeDifference being unmaintained bring it into the timely library
+
 ## 0.6.0
 
 * [TT-6402] Require date group weekdays bit field to be not null/nil

data/README.md

@@ -1,8 +1,7 @@
 # Timely
 
-[![Build Status](https://travis-ci.org/sealink/timely.png?branch=master)](https://travis-ci.org/sealink/timely)
+[![Build Status](https://github.com/sealink/timely/workflows/Build%20and%20Test/badge.svg?branch=master)](https://github.com/sealink/timely/actions)
 [![Coverage Status](https://coveralls.io/repos/sealink/timely/badge.png)](https://coveralls.io/r/sealink/timely)
-[![Dependency Status](https://gemnasium.com/sealink/timely.png?travis)](https://gemnasium.com/sealink/timely)
 [![Code Climate](https://codeclimate.com/github/sealink/timely.png)](https://codeclimate.com/github/sealink/timely)
 
 # DESCRIPTION
@@ -59,3 +58,15 @@ some_date.at_time(some_time)    # => Sat May 03 13:40:22 -0500 2008
 some_time.on(some_date)         # => Sat May 03 13:40:22 -0500 2008
 some_date.at(some_time)         # => Sat May 03 13:40:22 -0500 2008
 ```
+
+# Release
+
+To publish a new version of this gem the following steps must be taken.
+
+* Update the version in the following files
+  ```
+    CHANGELOG.md
+    lib/timely/version.rb
+  ````
+* Create a tag using the format v0.1.0
+* Follow build progress in GitHub actions

data/lib/timely/rails/date_group.rb

@@ -18,9 +18,7 @@ module Timely
     scope :within_range, lambda { |date_range|
       # IMPORTANT: Required for correctness in case of string param.
       dates = Array(date_range)
-      scope = covering_date(dates.first)
-      scope = scope.or(covering_date(dates.last)) if dates.first != dates.last
-      scope
+      where(arel_table[:start_date].lteq(dates.last)).where(arel_table[:end_date].gteq(dates.first))
     }
 
     scope :for_any_weekdays, lambda { |weekdays_int|

data/lib/timely/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Timely
-  VERSION = '0.6.0'
+  VERSION = '0.10.0'
 end

data/timely.gemspec

@@ -15,24 +15,22 @@ Gem::Specification.new do |spec|
 
   spec.license       = 'MIT'
 
-  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.files = Dir["CHANGELOG.md", "README.md", "timely.gemspec", "lib/**/*"]
+  spec.executables   = []
   spec.require_paths = ['lib']
+  spec.required_ruby_version = '>= 2.7'
 
-  spec.add_development_dependency 'actionpack'
-  spec.add_development_dependency 'activerecord'
-  spec.add_development_dependency 'activesupport'
-  spec.add_development_dependency 'bundler', '~> 2.0.1'
+  spec.add_development_dependency 'activerecord', '>=6', '<8'
+  spec.add_development_dependency 'activesupport', '>=6', '<8'
+  spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'coverage-kit'
-  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 'timecop'
-  spec.add_development_dependency 'travis'
+  spec.add_development_dependency 'pry'
 end

metadata

@@ -1,73 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: timely
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Michael Noack
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-27 00:00:00.000000000 Z
+date: 2022-01-25 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: actionpack
-  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: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '6'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '6'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '6'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.0.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+        version: '6'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: '8'
 - !ruby/object:Gem::Dependency
-  name: coverage-kit
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +65,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: coverage-kit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -137,7 +121,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -151,7 +135,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop-rails
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -165,7 +149,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov-rcov
+  name: rubocop-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -207,7 +191,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: travis
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -227,18 +211,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".rubocop.yml"
-- ".ruby-version"
-- ".travis.yml"
 - CHANGELOG.md
-- Gemfile
-- LICENSE
 - README.md
-- Rakefile
-- gemfiles/rails5.gemfile
-- gemfiles/rails6.gemfile
 - lib/timely.rb
 - lib/timely/date.rb
 - lib/timely/date_chooser.rb
@@ -266,26 +240,6 @@ files:
 - lib/timely/trackable_date_set.rb
 - lib/timely/version.rb
 - lib/timely/week_days.rb
-- rails/init.rb
-- spec/calendar_tag_spec.rb
-- spec/date_chooser_spec.rb
-- spec/date_group_spec.rb
-- spec/date_range_spec.rb
-- spec/date_spec.rb
-- spec/extensions_spec.rb
-- spec/rails/date_spec.rb
-- spec/rails/date_time_spec.rb
-- spec/rails/period_spec.rb
-- spec/rails/time_spec.rb
-- spec/schema.rb
-- spec/season_spec.rb
-- spec/spec_helper.rb
-- spec/support/coverage_loader.rb
-- spec/temporal_patterns_spec.rb
-- spec/time_since_spec.rb
-- spec/time_spec.rb
-- spec/trackable_date_set_spec.rb
-- spec/week_days_spec.rb
 - timely.gemspec
 homepage: http://github.com/sealink/timely
 licenses:
@@ -299,34 +253,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.3.3
 signing_key: 
 specification_version: 4
 summary: Set of time, date, weekday related methods.
-test_files:
-- spec/calendar_tag_spec.rb
-- spec/date_chooser_spec.rb
-- spec/date_group_spec.rb
-- spec/date_range_spec.rb
-- spec/date_spec.rb
-- spec/extensions_spec.rb
-- spec/rails/date_spec.rb
-- spec/rails/date_time_spec.rb
-- spec/rails/period_spec.rb
-- spec/rails/time_spec.rb
-- spec/schema.rb
-- spec/season_spec.rb
-- spec/spec_helper.rb
-- spec/support/coverage_loader.rb
-- spec/temporal_patterns_spec.rb
-- spec/time_since_spec.rb
-- spec/time_spec.rb
-- spec/trackable_date_set_spec.rb
-- spec/week_days_spec.rb
+test_files: []

data/.gitignore

@@ -1,6 +0,0 @@
-pkg
-coverage
-Gemfile.lock
-tmp
-.bundle
-vendor

data/.rspec

@@ -1,2 +0,0 @@
---color
---format progress

data/.rubocop.yml

@@ -1,28 +0,0 @@
-AllCops:
-  TargetRubyVersion: 2.6
-  Exclude:
-    - lib/timely/temporal_patterns/*.rb
-
-Metrics/LineLength:
-  Max: 200
-
-Style/Documentation:
-  Enabled: false
-
-Style/FrozenStringLiteralComment:
-  Enabled: true
-
-Metrics/BlockLength:
-  Enabled: false
-
-Metrics/MethodLength:
-  Enabled: false
-
-Metrics/AbcSize:
-  Enabled: false
-
-Metrics/CyclomaticComplexity:
-  Enabled: false
-
-Metrics/PerceivedComplexity:
-  Enabled: false

data/.ruby-version

@@ -1 +0,0 @@
-2.6.3

data/.travis.yml

@@ -1,16 +0,0 @@
-language: ruby
-rvm:
-  - 2.6
-matrix:
-  fast_finish: true
-before_install:
-  - gem install bundler
-script: bundle exec rake spec
-gemfile:
-  - gemfiles/rails5.gemfile
-  - gemfiles/rails6.gemfile
-notifications:
-  email:
-    - support@travellink.com.au
-sudo: false
-cache: bundler

data/Gemfile

@@ -1,4 +0,0 @@
-# frozen_string_literal: true
-
-source 'https://rubygems.org'
-gemspec

data/LICENSE

@@ -1,21 +0,0 @@
-The MIT License
-
-Copyright (c) Tom Preston-Werner
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.

data/Rakefile

@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-
-require 'bundler/gem_tasks'
-
-desc 'Default: run specs.'
-task default: :spec
-
-require 'rspec/core/rake_task'
-
-desc 'Run specs'
-RSpec::Core::RakeTask.new do |t|
-  t.pattern = './spec/**/*_spec.rb' # don't need this, it's default.
-  # Put spec opts in a file named .rspec in root
-end

data/gemfiles/rails5.gemfile

@@ -1,8 +0,0 @@
-# frozen_string_literal: true
-
-source 'https://rubygems.org'
-gemspec path: '../'
-
-group :development, :test do
-  gem 'activerecord', '~> 5.2'
-end

data/gemfiles/rails6.gemfile

@@ -1,8 +0,0 @@
-# frozen_string_literal: true
-
-source 'https://rubygems.org'
-gemspec path: '../'
-
-group :development, :test do
-  gem 'activerecord', '~> 6.0.0.rc1'
-end

data/rails/init.rb

@@ -1,3 +0,0 @@
-# frozen_string_literal: true
-
-require 'timely/rails'

data/spec/calendar_tag_spec.rb

@@ -1,30 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-class ActionViewTest
-  include Timely::ActionViewHelpers::FormTagHelper
-end
-
-describe Timely::ActionViewHelpers do
-  subject { ActionViewTest.new }
-  let(:string) { double(:string) }
-  let(:date) { Date.new(2000, 12, 25) }
-  before do
-    expect(date).to receive(:to_s).with(:calendar).and_return('25-12-2000')
-    expect(Timely).to receive(:current_date).and_return(date)
-  end
-
-  it 'should generate calendar tags' do
-    expect(string).to receive(:html_safe)
-    expect(subject).to receive(:tag).with(:input,
-                                          id: 'test',
-                                          class: 'datepicker',
-                                          size: 10,
-                                          maxlength: 10,
-                                          name: 'test',
-                                          type: 'text',
-                                          value: '25-12-2000').and_return(string)
-    subject.calendar_tag :test
-  end
-end

data/spec/date_chooser_spec.rb

@@ -1,115 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-describe Timely::DateChooser do
-  before(:all) do
-    @from = '01-01-2011'.to_date
-    @to = '01-03-2011'.to_date
-  end
-
-  # Validation
-  it 'rejects blank FROM dates' do
-    expect { Timely::DateChooser.new(from: '') }.to raise_error(
-      Timely::DateChooserException, 'A Start Date is required'
-    )
-  end
-
-  it 'rejects TO dates later than FROM dates' do
-    expect do
-      Timely::DateChooser.new(
-        multiple_dates: true, from: @from + 10, to: @from
-      )
-    end .to raise_error(Timely::DateChooserException, 'Start Date is after End Date')
-  end
-
-  # Operation
-  it 'returns today if client only wants single date' do
-    expect(Timely::DateChooser.new(
-      multiple_dates: false, from: @from
-    ).choose_dates).to eq [@from]
-  end
-
-  # Test specific date of month
-  it 'returns from and to as same (one) day in the case that only from date is given' do
-    expect(Timely::DateChooser.new(
-      multiple_dates: true, from: @from, to: ''
-    ).choose_dates).to eq [@from]
-  end
-
-  it 'returns all days between from and to days in the basic case' do
-    expect(Timely::DateChooser.new(
-      multiple_dates: true, from: @from, to: @to
-    ).choose_dates).to eq((@from..@to).to_a)
-  end
-
-  it 'returns the recurring dates within the range if this option is picked' do
-    expect(Timely::DateChooser.new(
-      multiple_dates: true, select: 'days', dates: '1,11,3', from: @from, to: @to
-    ).choose_dates).to eq %w[
-      1-01-2011 3-01-2011 11-01-2011 1-02-2011
-      3-02-2011 11-02-2011 1-03-2011
-    ].map(&:to_date)
-  end
-
-  it 'returns the specific dates, within or outside of the range, if this option is picked' do
-    expect(Timely::DateChooser.new(
-      multiple_dates: true, select: 'specific_days', specific_dates: '11-01-2011, 18-02-2011, 22-06-2011', from: @from, to: @to
-    ).choose_dates).to eq %w[
-      11-01-2011 18-02-2011 22-06-2011
-    ].map(&:to_date)
-  end
-
-  # Test days of week, every X weeks
-  it 'returns every sunday correctly' do
-    expect(Timely::DateChooser.new(
-      multiple_dates: true, select: 'weekdays', from: @from, to: @to,
-      interval: { level: '1', unit: 'week' }, weekdays: { sun: true }
-    ).choose_dates).to eq %w[
-      2-01-2011 9-01-2011 16-01-2011 23-01-2011 30-01-2011
-      06-02-2011 13-02-2011 20-02-2011 27-02-2011
-    ].map(&:to_date)
-  end
-
-  it 'returns every thursday and sunday correctly' do
-    expect(Timely::DateChooser.new(
-      multiple_dates: true, select: 'weekdays',
-      interval: { level: '1', unit: 'week' },
-      weekdays: { sun: true, thu: true }, from: @from, to: @to
-    ).choose_dates).to eq %w[
-      2-01-2011 6-01-2011 9-01-2011 13-01-2011 16-01-2011
-      20-01-2011 23-01-2011 27-01-2011 30-01-2011 3-02-2011
-      06-02-2011 10-02-2011 13-02-2011 17-02-2011 20-02-2011
-      24-02-2011 27-02-2011
-    ].map(&:to_date)
-  end
-
-  it 'returns every 2nd thursday and sunday correctly' do
-    expect(Timely::DateChooser.new(
-      multiple_dates: true, select: 'weekdays',
-      interval: { level: '2', unit: 'week' },
-      weekdays: { sun: '1', thu: '1' }, from: @from, to: @to
-    ).choose_dates).to eq %w[
-      2-01-2011 6-01-2011 16-01-2011 20-01-2011 30-01-2011
-      3-02-2011 13-02-2011 17-02-2011 27-02-2011
-    ].map(&:to_date)
-  end
-
-  # Test correct results for every Nth week of month
-  it 'returns every 1st Tuesday' do
-    expect(Timely::DateChooser.new(
-      multiple_dates: true, select: 'weekdays', from: @from, to: @to,
-      interval: { level: '1', unit: 'week_of_month' }, weekdays: { tue: true }
-    ).choose_dates).to eq %w[4-01-2011 1-02-2011 1-03-2011].map(&:to_date)
-  end
-
-  it 'returns every 3st Monday and Friday' do
-    expect(Timely::DateChooser.new(
-      multiple_dates: true, select: 'weekdays',
-      interval: { level: '3', unit: 'week_of_month' },
-      weekdays: { mon: true, fri: true }, from: @from, to: @to
-    ).choose_dates).to eq %w[
-      17-01-2011 21-01-2011 18-02-2011 21-02-2011
-    ].map(&:to_date)
-  end
-end