activerecord-time 0.17.0 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a78f054f0473a1a0adb90af5ae3395b847bdd06cfb9d564a67f595a8e90d0c6f
-  data.tar.gz: feca115e76f76ab8d2b5734ac2c5e89a8d3fca0eb12930b1c12a9a512f24df1c
+  metadata.gz: 80b52c52ad34414185dbadd7b54be0d7dbfc2b9be326581d7102fe1ce713eff2
+  data.tar.gz: '04965d38dce4fa1a2510725f4626f7796d2e23e0a7a9597535f6b212b8058b46'
 SHA512:
-  metadata.gz: 3936ced2f21a9d38cb4578789a952917a90f20365caccbb58e1bfd9a280a6b551a4dd8cc672208a04466311971158a480d20cdf88a60939eb2538f85360f0d97
-  data.tar.gz: 1fc524b519c6a4ca3bec14f8c73976df8ff111856d1834d1da31ad81f9b2ffe967fa0829a81b01c1dbd05b42144ebf33694c76570e4b88529ebf088f1370b02b
+  metadata.gz: cf3f7975838214c58b8c7970c3951b1be99f14b1dea449f30c1ab63370ab196cc352fff4dde07c99d848f04e49e3f9d9ca1c148545e457a9293100fab97cd7bb
+  data.tar.gz: a64a1dd1ffccccf70699318117503f67841f59b4c54e8c36f8d7fadd01169130a921a027e8800f6173b3387487b54d08c6ca0a91749b0c679d39274b0f6fd921

data/.rubocop.yml

@@ -5,7 +5,6 @@ require:
   - rubocop-rake
 
 AllCops:
-  TargetRubyVersion: 2.4
   DisplayCopNames: true
   DisplayStyleGuide: true
   NewCops: enable

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2021-02-02 13:29:03 UTC using RuboCop version 1.9.1.
+# on 2021-11-25 10:12:00 UTC using RuboCop version 1.23.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -26,12 +26,12 @@ Metrics/AbcSize:
 # Configuration parameters: CountComments, CountAsOne, ExcludedMethods, IgnoredMethods.
 # IgnoredMethods: refine
 Metrics/BlockLength:
-  Max: 26
+  Max: 28
 
 # Offense count: 2
 # Configuration parameters: CountComments, CountAsOne.
 Metrics/ClassLength:
-  Max: 176
+  Max: 174
 
 # Offense count: 1
 # Configuration parameters: IgnoredMethods.
@@ -41,7 +41,7 @@ Metrics/CyclomaticComplexity:
 # Offense count: 3
 # Configuration parameters: CountComments, CountAsOne, ExcludedMethods, IgnoredMethods.
 Metrics/MethodLength:
-  Max: 15
+  Max: 13
 
 # Offense count: 1
 # Configuration parameters: IgnoredMethods.
@@ -49,7 +49,7 @@ Metrics/PerceivedComplexity:
   Max: 11
 
 # Offense count: 2
-# Configuration parameters: EnforcedStyle.
+# Configuration parameters: EnforcedStyle, AllowToTime.
 # SupportedStyles: strict, flexible
 Rails/Date:
   Exclude:
@@ -105,6 +105,7 @@ Style/OptionalBooleanParameter:
 
 # Offense count: 5
 # Cop supports --auto-correct.
+# Configuration parameters: Mode.
 Style/StringConcatenation:
   Exclude:
     - 'test/test_helper.rb'

data/.travis.yml

@@ -4,13 +4,15 @@ cache: bundler
 services:
   - postgresql
 jdk:
-  - openjdk
+  - openjdk11
 rvm:
+  - ruby-3.0
   - ruby-2.7
   - ruby-2.6
   - ruby-2.5
   - jruby
 gemfile:
+  - gemfiles/ar61.gemfile
   - gemfiles/ar60.gemfile
   - gemfiles/ar52.gemfile
   - gemfiles/ar51.gemfile

data/activerecord-time.gemspec

@@ -32,7 +32,6 @@ Gem::Specification.new do |gem|
     gem.add_development_dependency 'pg'
     gem.add_development_dependency 'sqlite3'
   end
-  gem.add_development_dependency 'minitest-reporters'
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rubocop'
   gem.add_development_dependency 'rubocop-performance'

data/lib/activerecord-time/version.rb

@@ -2,6 +2,6 @@
 
 module Activerecord
   module Time
-    VERSION = '0.17.0'
+    VERSION = '0.18.0'
   end
 end

data/lib/time_of_day.rb

@@ -87,9 +87,15 @@ class TimeOfDay
   end
 
   def -(other)
-    raise "Illegal argument: #{other.inspect}" unless other.is_a? Numeric
-
-    self.+(-other)
+    if other.is_a?(TimeOfDay)
+      t1 = Time.local(0, 1, 1, hour, minute, second) # rubocop: disable Rails/TimeZone
+      t2 = Time.local(0, 1, 1, other.hour, other.minute, other.second) # rubocop: disable Rails/TimeZone
+      (t1 - t2).seconds
+    elsif other.is_a?(Numeric)
+      self.+(-other)
+    else
+      raise "Illegal argument: #{other.inspect}"
+    end
   end
 
   def <=>(other)

data/test/test_helper.rb

@@ -6,8 +6,6 @@ RAILS_ROOT = File.dirname(__FILE__)
 require 'rubygems'
 require 'bundler/setup'
 require 'minitest/autorun'
-require 'minitest/reporters'
-MiniTest::Reporters.use!
 
 require 'active_record'
 require 'activerecord-time'

data/test/time_of_day_test.rb

@@ -142,6 +142,16 @@ class TimeOfDayTest < Minitest::Test
     assert_equal 59, tod.second
   end
 
+  def test_minus_tod
+    tod1 = TimeOfDay.new(12, 0, 29)
+    tod2 = TimeOfDay.new(13, 30, 59)
+    duration = tod2 - tod1
+
+    assert_equal 1, duration.in_hours.to_i
+    assert_equal 30, duration.in_minutes.to_i % 60
+    assert_equal 30, duration.in_seconds % 60
+  end
+
   def test_equality
     tod1 = TimeOfDay.new(12, 0, 5)
     tod2 = TimeOfDay.new(12, 0, 5)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-time
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.18.0
 platform: ruby
 authors:
 - Uwe Kubosch
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-02 00:00:00.000000000 Z
+date: 2021-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -58,20 +58,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: minitest-reporters
-  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: rake
   requirement: !ruby/object:Gem::Requirement
@@ -211,7 +197,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: A handler for storing TimeOfDay objects in ActiveRecord objects as sql time