timely 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23be3863188d0d617f9cb4c6d7aca28605d52e9e3a62cadb2935253395210f1c
-  data.tar.gz: 5b161da1238c424053b255cfb96e28dd3c9bd52e3846f1aa2ee602ccad52371d
+  metadata.gz: f77d2dfe978ebc2b98ce38619976758ffd6bf58cbe5ca72e04f74de5e7518a2b
+  data.tar.gz: 4474ac4c99ed979e16692e919cf0ef53ab9f02955c0eab8471bbc238633c7132
 SHA512:
-  metadata.gz: 97e1202d4c04236c82e445c1cab715a96b68f862370d89eefb542789d621e7cf2249389a47d2a195df412fc328c97ef1e35ec5d77532549d3ec6152d77e47d5a
-  data.tar.gz: 5de7656ed5ecb847307412497c7149696d7e349120c933a3749ebffb9462e9bccc08573ddc62fd039f650d7d6993ef998274ce783ad75215eb12493fa31eeac0
+  metadata.gz: 26ea6163458e19c7971828725d620c320fff0bfca048ce22083f5582465e26ac6211191fc2a3dab02b9bd9f35268b823dfe4e6e3f824b82f7cc1da9d5b987ada
+  data.tar.gz: 7257fb9a2e598833115f7b3edf49c6f1c7f980ec45137c21f7cc1f74fd22639401151990dd48b63cf2e0d9500dfb1438e74b972590d17ce1bf6182c7bca7df58

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 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

data/lib/timely/rails.rb

@@ -12,4 +12,3 @@ require 'timely/rails/date_time'
 require 'timely/rails/date'
 require 'timely/rails/period'
 require 'timely/rails/time'
-require 'timely/rails/time_difference'

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.7.0'
+  VERSION = '0.8.0'
 end

data/spec/date_group_spec.rb

@@ -33,6 +33,44 @@ RSpec.describe Timely::DateGroup do
   end
 end
 
+RSpec.describe Timely::DateGroup, 'Timely::DateGroup.applying_for_duration' do
+  let!(:date_group_a) { Timely::DateGroup.create!(
+    start_date: '2020-01-01', end_date: '2020-04-04', weekdays: %w[1 1 1 1 1 1 1]
+  ) }
+
+  let!(:date_group_b) { Timely::DateGroup.create!(
+    start_date: '2020-04-02', end_date: '2020-04-09', weekdays: %w[1 1 1 1 1 1 1]
+  ) }
+
+  subject {
+    Timely::DateGroup.applying_for_duration(Timely::DateRange.new(start_date, end_date)).to_a
+  }
+
+  context 'intersecting dates (inside first)' do
+    let(:start_date) { '2020-03-29'.to_date }
+    let(:end_date) { '2020-04-13'.to_date }
+    it { is_expected.to eq([date_group_a, date_group_b]) }
+  end
+
+  context 'intersecting dates full range' do
+    let(:start_date) { '2020-01-01'.to_date }
+    let(:end_date) { '2020-04-09'.to_date }
+    it { is_expected.to eq([date_group_a, date_group_b]) }
+  end
+
+  context 'touching end of range' do
+    let(:start_date) { '2020-04-09'.to_date }
+    let(:end_date) { '2020-04-09'.to_date }
+    it { is_expected.to eq([date_group_b]) }
+  end
+
+  context 'touching start of range' do
+    let(:start_date) { '2020-04-01'.to_date }
+    let(:end_date) { '2020-04-01'.to_date }
+    it { is_expected.to eq([date_group_a]) }
+  end
+end
+
 RSpec.describe Timely::DateGroup, 'without weekdays' do
   subject { Timely::DateGroup.new(start_date: Date.current, end_date: Date.current) }
   it { is_expected.to be_valid }

data/spec/spec_helper.rb

@@ -11,6 +11,8 @@ require 'rubygems'
 require 'bundler/setup'
 require 'rspec/its'
 require 'active_record'
+require 'pry'
+require 'database_cleaner'
 
 require 'support/coverage_loader'
 
@@ -30,4 +32,15 @@ load('spec/schema.rb')
 RSpec.configure do |config|
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
+
+  config.before(:suite) do
+    DatabaseCleaner.strategy = :transaction
+    DatabaseCleaner.clean_with(:truncation, except: %w(ar_internal_metadata))
+  end
+
+  config.around(:each) do |example|
+    DatabaseCleaner.cleaning do
+      example.run
+    end
+  end
 end

data/spec/support/coverage_loader.rb

@@ -3,4 +3,4 @@
 require 'simplecov-rcov'
 require 'coveralls'
 require 'coverage/kit'
-Coverage::Kit.setup(minimum_coverage: 72.0)
+Coverage::Kit.setup(minimum_coverage: 69.95)

data/timely.gemspec

@@ -29,10 +29,12 @@ Gem::Specification.new do |spec|
   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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: timely
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Michael Noack
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-27 00:00:00.000000000 Z
+date: 2020-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -136,6 +136,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: database_cleaner
+  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: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -220,6 +234,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  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'
 description: Set of time, date, weekday related methods.
 email:
 - support@travellink.com.au
@@ -254,7 +282,6 @@ files:
 - lib/timely/rails/period.rb
 - lib/timely/rails/season.rb
 - lib/timely/rails/time.rb
-- lib/timely/rails/time_difference.rb
 - lib/timely/railtie.rb
 - lib/timely/range.rb
 - lib/timely/string.rb
@@ -277,7 +304,6 @@ files:
 - spec/rails/date_spec.rb
 - spec/rails/date_time_spec.rb
 - spec/rails/period_spec.rb
-- spec/rails/time_difference_spec.rb
 - spec/rails/time_spec.rb
 - spec/schema.rb
 - spec/season_spec.rb
@@ -322,7 +348,6 @@ test_files:
 - spec/rails/date_spec.rb
 - spec/rails/date_time_spec.rb
 - spec/rails/period_spec.rb
-- spec/rails/time_difference_spec.rb
 - spec/rails/time_spec.rb
 - spec/schema.rb
 - spec/season_spec.rb

data/lib/timely/rails/time_difference.rb

@@ -1,100 +0,0 @@
-# frozen_string_literal: true
-
-require 'rubygems'
-require 'active_support/all'
-
-module Timely
-  class TimeDifference
-    private_class_method :new
-
-    TIME_COMPONENTS = %i[years months weeks days hours minutes seconds].freeze
-
-    def self.between(start_time, end_time)
-      new(start_time, end_time)
-    end
-
-    def in_years
-      in_component(:years)
-    end
-
-    def in_months
-      (@time_diff / (1.day * 30.42)).round(2)
-    end
-
-    def in_weeks
-      in_component(:weeks)
-    end
-
-    def in_days
-      in_component(:days)
-    end
-
-    def in_hours
-      in_component(:hours)
-    end
-
-    def in_minutes
-      in_component(:minutes)
-    end
-
-    def in_seconds
-      @time_diff
-    end
-
-    def in_each_component
-      Hash[TIME_COMPONENTS.map do |time_component|
-        [time_component, public_send("in_#{time_component}")]
-      end]
-    end
-
-    def in_general
-      remaining = @time_diff
-      Hash[TIME_COMPONENTS.map do |time_component|
-        if remaining > 0
-          rounded_time_component = (remaining / 1.send(time_component).seconds).round(2).floor
-          remaining -= rounded_time_component.send(time_component)
-          [time_component, rounded_time_component]
-        else
-          [time_component, 0]
-        end
-      end]
-    end
-
-    def humanize
-      diff_parts = []
-      in_general.each do |part, quantity|
-        next if quantity <= 0
-
-        part = part.to_s.humanize
-
-        part = part.singularize if quantity <= 1
-
-        diff_parts << "#{quantity} #{part}"
-      end
-
-      last_part = diff_parts.pop
-      if diff_parts.empty?
-        last_part
-      else
-        [diff_parts.join(', '), last_part].join(' and ')
-      end
-    end
-
-    private
-
-    def initialize(start_time, end_time)
-      start_time = time_in_seconds(start_time)
-      end_time = time_in_seconds(end_time)
-
-      @time_diff = (end_time - start_time).abs
-    end
-
-    def time_in_seconds(time)
-      time.to_time.to_f
-    end
-
-    def in_component(component)
-      (@time_diff / 1.send(component)).round(2)
-    end
-  end
-end

data/spec/rails/time_difference_spec.rb

@@ -1,185 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-describe Timely::TimeDifference do
-  def self.with_each_class(&block)
-    classes = [Time, Date, DateTime]
-
-    classes.each do |clazz|
-      context "with a #{clazz.name} class" do
-        instance_exec clazz, &block
-      end
-    end
-  end
-
-  describe '.between' do
-    with_each_class do |clazz|
-      it 'returns a new TimeDifference instance in each component' do
-        start_time = clazz.new(2011, 1)
-        end_time = clazz.new(2011, 12)
-
-        expect(Timely::TimeDifference.between(start_time, end_time)).to be_a(Timely::TimeDifference)
-      end
-    end
-  end
-
-  describe '#in_each_component' do
-    with_each_class do |clazz|
-      it 'returns time difference in each component' do
-        start_time = clazz.new(2011, 1)
-        end_time = clazz.new(2011, 12)
-
-        expect(Timely::TimeDifference.between(start_time, end_time).in_each_component).to eql(years: 0.91, months: 10.98, weeks: 47.71, days: 334.0, hours: 8016.0, minutes: 480_960.0, seconds: 28_857_600.0)
-      end
-    end
-  end
-
-  describe '#in_general' do
-    with_each_class do |clazz|
-      it 'returns time difference in general that matches the total seconds' do
-        start_time = clazz.new(2009, 11)
-        end_time = clazz.new(2011, 1)
-
-        expect(Timely::TimeDifference.between(start_time, end_time).in_general).to eql(years: 1, months: 2, weeks: 0, days: 0, hours: 0, minutes: 0, seconds: 0)
-      end
-    end
-  end
-
-  describe '#humanize' do
-    with_each_class do |clazz|
-      it 'returns a string representing the time difference from in_general' do
-        start_time = clazz.new(2009, 11)
-        end_time = clazz.new(2011, 1)
-
-        expect(Timely::TimeDifference.between(start_time, end_time).humanize).to eql('1 Year and 2 Months')
-      end
-    end
-  end
-
-  describe '#in_years' do
-    with_each_class do |clazz|
-      it 'returns time difference in years based on Wolfram Alpha' do
-        start_time = clazz.new(2011, 1)
-        end_time = clazz.new(2011, 12)
-
-        expect(Timely::TimeDifference.between(start_time, end_time).in_years).to eql(0.91)
-      end
-
-      it 'returns an absolute difference' do
-        start_time = clazz.new(2011, 12)
-        end_time = clazz.new(2011, 1)
-
-        expect(Timely::TimeDifference.between(start_time, end_time).in_years).to eql(0.91)
-      end
-    end
-  end
-
-  describe '#in_months' do
-    with_each_class do |clazz|
-      it 'returns time difference in months based on Wolfram Alpha' do
-        start_time = clazz.new(2011, 1)
-        end_time = clazz.new(2011, 12)
-
-        expect(Timely::TimeDifference.between(start_time, end_time).in_months).to eql(10.98)
-      end
-
-      it 'returns an absolute difference' do
-        start_time = clazz.new(2011, 12)
-        end_time = clazz.new(2011, 1)
-
-        expect(Timely::TimeDifference.between(start_time, end_time).in_months).to eql(10.98)
-      end
-    end
-  end
-
-  describe '#in_weeks' do
-    with_each_class do |clazz|
-      it 'returns time difference in weeks based on Wolfram Alpha' do
-        start_time = clazz.new(2011, 1)
-        end_time = clazz.new(2011, 12)
-
-        expect(Timely::TimeDifference.between(start_time, end_time).in_weeks).to eql(47.71)
-      end
-
-      it 'returns an absolute difference' do
-        start_time = clazz.new(2011, 12)
-        end_time = clazz.new(2011, 1)
-
-        expect(Timely::TimeDifference.between(start_time, end_time).in_weeks).to eql(47.71)
-      end
-    end
-  end
-
-  describe '#in_days' do
-    with_each_class do |clazz|
-      it 'returns time difference in weeks based on Wolfram Alpha' do
-        start_time = clazz.new(2011, 1)
-        end_time = clazz.new(2011, 12)
-
-        expect(Timely::TimeDifference.between(start_time, end_time).in_days).to eql(334.0)
-      end
-
-      it 'returns an absolute difference' do
-        start_time = clazz.new(2011, 12)
-        end_time = clazz.new(2011, 1)
-
-        expect(Timely::TimeDifference.between(start_time, end_time).in_days).to eql(334.0)
-      end
-    end
-  end
-
-  describe '#in_hours' do
-    with_each_class do |clazz|
-      it 'returns time difference in hours based on Wolfram Alpha' do
-        start_time = clazz.new(2011, 1)
-        end_time = clazz.new(2011, 12)
-
-        expect(Timely::TimeDifference.between(start_time, end_time).in_hours).to eql(8016.0)
-      end
-
-      it 'returns an absolute difference' do
-        start_time = clazz.new(2011, 12)
-        end_time = clazz.new(2011, 1)
-
-        expect(Timely::TimeDifference.between(start_time, end_time).in_hours).to eql(8016.0)
-      end
-    end
-  end
-
-  describe '#in_minutes' do
-    with_each_class do |clazz|
-      it 'returns time difference in minutes based on Wolfram Alpha' do
-        start_time = clazz.new(2011, 1)
-        end_time = clazz.new(2011, 12)
-
-        expect(Timely::TimeDifference.between(start_time, end_time).in_minutes).to eql(480_960.0)
-      end
-
-      it 'returns an absolute difference' do
-        start_time = clazz.new(2011, 12)
-        end_time = clazz.new(2011, 1)
-
-        expect(Timely::TimeDifference.between(start_time, end_time).in_minutes).to eql(480_960.0)
-      end
-    end
-  end
-
-  describe '#in_seconds' do
-    with_each_class do |clazz|
-      it 'returns time difference in seconds based on Wolfram Alpha' do
-        start_time = clazz.new(2011, 1)
-        end_time = clazz.new(2011, 12)
-
-        expect(Timely::TimeDifference.between(start_time, end_time).in_seconds).to eql(28_857_600.0)
-      end
-
-      it 'returns an absolute difference' do
-        start_time = clazz.new(2011, 12)
-        end_time = clazz.new(2011, 1)
-
-        expect(Timely::TimeDifference.between(start_time, end_time).in_seconds).to eql(28_857_600.0)
-      end
-    end
-  end
-end