timely 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6fd5bf30099265da88c4957079fd58a4db290fac8cd4ad239ddb395be546d5d3
-  data.tar.gz: d263dca100292aae36f54b22cc2f3b1eebc1c1df0274fc3ef730ce991fc94c4a
+  metadata.gz: 23be3863188d0d617f9cb4c6d7aca28605d52e9e3a62cadb2935253395210f1c
+  data.tar.gz: 5b161da1238c424053b255cfb96e28dd3c9bd52e3846f1aa2ee602ccad52371d
 SHA512:
-  metadata.gz: 784aede0c406afe8e0213f275150ee3bba930969c28acf9ac2e992a96ce42c7f30e042a6e0ae9779dc17f86e6a7744c4b0a07bf72e1d326d6e6176b3ac4b28c4
-  data.tar.gz: a780a85c02adcf074c53376c7995739d609329256b76c370966bedaccf953e0e3cb7607cb0d381873a8a4585b48505c8d2d04f68bebdc94f0b49c947bab84d28
+  metadata.gz: 97e1202d4c04236c82e445c1cab715a96b68f862370d89eefb542789d621e7cf2249389a47d2a195df412fc328c97ef1e35ec5d77532549d3ec6152d77e47d5a
+  data.tar.gz: 5de7656ed5ecb847307412497c7149696d7e349120c933a3749ebffb9462e9bccc08573ddc62fd039f650d7d6993ef998274ce783ad75215eb12493fa31eeac0

data/.travis.yml

@@ -1,6 +1,7 @@
 language: ruby
 rvm:
   - 2.6
+  - 2.7
 matrix:
   fast_finish: true
 before_install:

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 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/gemfiles/rails6.gemfile

@@ -4,5 +4,5 @@ source 'https://rubygems.org'
 gemspec path: '../'
 
 group :development, :test do
-  gem 'activerecord', '~> 6.0.0.rc1'
+  gem 'activerecord', '~> 6.0'
 end

data/lib/timely/rails.rb

@@ -12,3 +12,4 @@ 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/time_difference.rb

@@ -0,0 +1,100 @@
+# 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/lib/timely/version.rb

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

data/spec/rails/time_difference_spec.rb

@@ -0,0 +1,185 @@
+# 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

data/spec/support/coverage_loader.rb

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

data/timely.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   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 'bundler', '~> 2.1.0'
   spec.add_development_dependency 'coverage-kit'
   spec.add_development_dependency 'coveralls'
   spec.add_development_dependency 'rake'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: timely
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Michael Noack
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-27 00:00:00.000000000 Z
+date: 2019-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: coverage-kit
   requirement: !ruby/object:Gem::Requirement
@@ -254,6 +254,7 @@ 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
@@ -276,6 +277,7 @@ 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
@@ -320,6 +322,7 @@ 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