activerecord-time 0.14.0 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3dd9c896468de348081c956b30ff978ecc973a5e59c15e023d0ea1d6744fc790
-  data.tar.gz: 159d2a9796c4598d06d56f1516e61f66ca0867f46d2211ef48b825aa6cb8798c
+  metadata.gz: 80b52c52ad34414185dbadd7b54be0d7dbfc2b9be326581d7102fe1ce713eff2
+  data.tar.gz: '04965d38dce4fa1a2510725f4626f7796d2e23e0a7a9597535f6b212b8058b46'
 SHA512:
-  metadata.gz: 6b978dd14a0c88e93876abde8e54e61831e46039f7c976110fa0ed228094ec9ca515d06f34fb112cb770dcc641f08ec47e45504090a3e2bd0ef390f98b1a114b
-  data.tar.gz: f70e7fb91f7c85692a3d9b9529bbf8f10cd531a46dce434757783d56ad9a7f86b740430ac1ee0d97577052da45c441744d50da7ccb4efcd305b0ad05e8fd40c1
+  metadata.gz: cf3f7975838214c58b8c7970c3951b1be99f14b1dea449f30c1ab63370ab196cc352fff4dde07c99d848f04e49e3f9d9ca1c148545e457a9293100fab97cd7bb
+  data.tar.gz: a64a1dd1ffccccf70699318117503f67841f59b4c54e8c36f8d7fadd01169130a921a027e8800f6173b3387487b54d08c6ca0a91749b0c679d39274b0f6fd921

data/.rubocop.yml

@@ -2,32 +2,35 @@ inherit_from: .rubocop_todo.yml
 require:
   - rubocop-performance
   - rubocop-rails
+  - rubocop-rake
 
 AllCops:
-  TargetRubyVersion: 2.4
   DisplayCopNames: true
   DisplayStyleGuide: true
+  NewCops: enable
   Include:
     - '**/Gemfile'
     - '**/Rakefile'
     - '**/*.rb'
 
-Layout/AlignParameters:
-  EnforcedStyle: with_fixed_indentation
+Layout/AssignmentIndentation:
   IndentationWidth: 4
 
-Layout/IndentFirstArgument:
+Layout/FirstArgumentIndentation:
   EnforcedStyle: consistent
   IndentationWidth: 4
 
-Layout/IndentFirstArrayElement:
+Layout/FirstArrayElementIndentation:
   EnforcedStyle: consistent
 
-Layout/IndentFirstHashElement:
+Layout/FirstHashElementIndentation:
   EnforcedStyle: consistent
 
-Layout/IndentAssignment:
-  IndentationWidth: 4
+Layout/LineLength:
+  Max: 107
+  AllowHeredoc: true
+  AllowURI: true
+  IgnoreCopDirectives: true
 
 Layout/MultilineMethodCallIndentation:
   EnforcedStyle: indented
@@ -37,16 +40,14 @@ Layout/MultilineOperationIndentation:
   EnforcedStyle: indented
   IndentationWidth: 4
 
+Layout/ParameterAlignment:
+  EnforcedStyle: with_fixed_indentation
+  IndentationWidth: 4
+
 Metrics/BlockLength:
   Exclude:
     - '*.gemspec'
 
-Metrics/LineLength:
-  Max: 107
-  AllowHeredoc: true
-  AllowURI: true
-  IgnoreCopDirectives: true
-
 Naming/FileName:
   Exclude:
     - 'activerecord-time.gemspec'
@@ -68,6 +69,9 @@ Style/Encoding:
 Style/FormatString:
   EnforcedStyle: percent
 
+Style/FormatStringToken:
+  EnforcedStyle: unannotated
+
 Style/NumericPredicate:
   Enabled: false
 

data/.rubocop_todo.yml

@@ -1,42 +1,72 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2019-11-07 12:06:57 +0100 using RuboCop version 0.76.0.
+# 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
 # versions of RuboCop, may require this file to be generated again.
 
+# Offense count: 1
+Lint/BinaryOperatorWithIdenticalOperands:
+  Exclude:
+    - 'test/time_of_day_test.rb'
+
+# Offense count: 1
+# Configuration parameters: IgnoreLiteralBranches, IgnoreConstantBranches.
+Lint/DuplicateBranch:
+  Exclude:
+    - 'lib/time_of_day.rb'
+
 # Offense count: 3
+# Configuration parameters: IgnoredMethods, CountRepeatedAttributes.
 Metrics/AbcSize:
-  Max: 33
+  Max: 31
 
 # Offense count: 1
-# Configuration parameters: CountComments, ExcludedMethods.
-# ExcludedMethods: refine
+# Configuration parameters: CountComments, CountAsOne, ExcludedMethods, IgnoredMethods.
+# IgnoredMethods: refine
 Metrics/BlockLength:
   Max: 28
 
-# Offense count: 1
-# Configuration parameters: CountComments.
+# Offense count: 2
+# Configuration parameters: CountComments, CountAsOne.
 Metrics/ClassLength:
-  Max: 169
+  Max: 174
 
 # Offense count: 1
+# Configuration parameters: IgnoredMethods.
 Metrics/CyclomaticComplexity:
-  Max: 7
+  Max: 10
 
-# Offense count: 2
-# Configuration parameters: CountComments, ExcludedMethods.
+# Offense count: 3
+# Configuration parameters: CountComments, CountAsOne, ExcludedMethods, IgnoredMethods.
 Metrics/MethodLength:
-  Max: 16
+  Max: 13
 
 # Offense count: 1
-# Configuration parameters: EnforcedStyle.
+# Configuration parameters: IgnoredMethods.
+Metrics/PerceivedComplexity:
+  Max: 11
+
+# Offense count: 2
+# Configuration parameters: EnforcedStyle, AllowToTime.
 # SupportedStyles: strict, flexible
 Rails/Date:
   Exclude:
     - 'lib/time_of_day.rb'
 
+# Offense count: 1
+# Cop supports --auto-correct.
+Rails/WhereEquals:
+  Exclude:
+    - 'test/time_of_day_test.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Rails/WhereNot:
+  Exclude:
+    - 'test/time_of_day_test.rb'
+
 # Offense count: 2
 # Cop supports --auto-correct.
 Security/YAMLLoad:
@@ -45,35 +75,37 @@ Security/YAMLLoad:
     - 'test/time_of_day_test.rb'
 
 # Offense count: 1
-# Configuration parameters: .
+# Configuration parameters: AllowModifiersOnSymbols.
 # SupportedStyles: inline, group
 Style/AccessModifierDeclarations:
   EnforcedStyle: inline
 
+# Offense count: 3
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: separated, grouped
+Style/AccessorGrouping:
+  Exclude:
+    - 'lib/time_of_day.rb'
+
 # Offense count: 1
 # Cop supports --auto-correct.
-# Configuration parameters: AutoCorrect, EnforcedStyle.
+# Configuration parameters: EnforcedStyle.
 # SupportedStyles: nested, compact
 Style/ClassAndModuleChildren:
   Exclude:
     - 'lib/time_of_day/core_ext.rb'
 
-# Offense count: 5
-# Configuration parameters: .
-# SupportedStyles: annotated, template, unannotated
-Style/FormatStringToken:
-  EnforcedStyle: unannotated
-
-# Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: always, never
-Style/FrozenStringLiteralComment:
+# Offense count: 1
+# Configuration parameters: AllowedMethods.
+# AllowedMethods: respond_to_missing?
+Style/OptionalBooleanParameter:
   Exclude:
-    - 'Gemfile'
-    - 'Rakefile'
+    - 'lib/time_of_day.rb'
 
-# Offense count: 4
-Style/IdenticalConditionalBranches:
+# Offense count: 5
+# Cop supports --auto-correct.
+# Configuration parameters: Mode.
+Style/StringConcatenation:
   Exclude:
-    - 'test/time_of_day_test.rb'
+    - 'test/test_helper.rb'

data/.travis.yml

@@ -4,13 +4,16 @@ cache: bundler
 services:
   - postgresql
 jdk:
-  - openjdk8
+  - openjdk11
 rvm:
+  - ruby-3.0
+  - ruby-2.7
   - ruby-2.6
   - ruby-2.5
-  - ruby-2.4
   - jruby
 gemfile:
+  - gemfiles/ar61.gemfile
+  - gemfiles/ar60.gemfile
   - gemfiles/ar52.gemfile
   - gemfiles/ar51.gemfile
 env:
@@ -23,5 +26,4 @@ matrix:
   allow_failures:
     - rvm: jruby
       env: ADAPTER="sqlite3"
-    - rvm: jruby
-      env: ADAPTER="sqlite3"
+    - rvm: ruby-2.7

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in activerecord-time.gemspec

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rubygems'
 require 'bundler/setup'
 require 'bundler/gem_tasks'

data/activerecord-time.gemspec

@@ -16,14 +16,14 @@ Gem::Specification.new do |gem|
   gem.summary = 'A handler for storing TimeOfDay objects in ActiveRecord objects as sql time values.'
   gem.homepage = 'https://github.com/donv/activerecord-time'
   gem.license = 'MIT'
-  gem.required_ruby_version = '>= 2.4'
+  gem.required_ruby_version = '>= 2.5'
 
   gem.files = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   gem.executables = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }
   gem.test_files = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = %w[lib]
 
-  gem.add_runtime_dependency 'activerecord', '>=5.1', '<6'
+  gem.add_runtime_dependency 'activerecord', '>=5.1', '<7'
 
   if defined? JRUBY_VERSION
     gem.add_development_dependency 'activerecord-jdbcpostgresql-adapter'
@@ -32,10 +32,10 @@ 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'
   gem.add_development_dependency 'rubocop-rails'
+  gem.add_development_dependency 'rubocop-rake'
   gem.add_development_dependency 'simplecov'
 end

data/gemfiles/ar60.gemfile

@@ -0,0 +1,3 @@
+eval File.read("#{File.dirname __FILE__}/common.gemfile")
+
+gem 'activerecord', '~>6.0.0'

data/gemfiles/ar60.gemfile.lock

@@ -0,0 +1,75 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (6.0.2.1)
+      activesupport (= 6.0.2.1)
+    activerecord (6.0.2.1)
+      activemodel (= 6.0.2.1)
+      activesupport (= 6.0.2.1)
+    activerecord-jdbc-adapter (60.1-java)
+      activerecord (~> 6.0.0)
+    activerecord-jdbcderby-adapter (0.8.2)
+      activerecord-jdbc-adapter (>= 0.8.2)
+      jdbc-derby (>= 10.3.2.1)
+    activerecord-jdbcpostgresql-adapter (60.1-java)
+      activerecord-jdbc-adapter (= 60.1)
+      jdbc-postgres (>= 9.4, < 43)
+    activerecord-jdbcsqlite3-adapter (60.1-java)
+      activerecord-jdbc-adapter (= 60.1)
+      jdbc-sqlite3 (~> 3.8, < 3.30)
+    activesupport (6.0.2.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+      zeitwerk (~> 2.2)
+    ansi (1.5.0)
+    builder (3.2.4)
+    concurrent-ruby (1.1.5)
+    docile (1.3.2)
+    i18n (1.7.0)
+      concurrent-ruby (~> 1.0)
+    jdbc-derby (10.12.1.1)
+    jdbc-postgres (42.2.6)
+    jdbc-sqlite3 (3.28.0)
+    json (2.3.0)
+    json (2.3.0-java)
+    minitest (5.13.0)
+    minitest-reporters (1.4.2)
+      ansi
+      builder
+      minitest (>= 5.0)
+      ruby-progressbar
+    pg (0.21.0)
+    rake (13.0.1)
+    ruby-progressbar (1.10.1)
+    simplecov (0.17.1)
+      docile (~> 1.1)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.2)
+    sqlite3 (1.4.2)
+    thread_safe (0.3.6)
+    thread_safe (0.3.6-java)
+    tzinfo (1.2.6)
+      thread_safe (~> 0.1)
+    zeitwerk (2.2.2)
+
+PLATFORMS
+  java
+  ruby
+
+DEPENDENCIES
+  activerecord (~> 6.0.0)
+  activerecord-jdbc-adapter
+  activerecord-jdbcderby-adapter
+  activerecord-jdbcpostgresql-adapter
+  activerecord-jdbcsqlite3-adapter
+  minitest-reporters
+  pg (< 1)
+  rake
+  simplecov
+  sqlite3
+
+BUNDLED WITH
+   1.17.2

data/gemfiles/ar61.gemfile

@@ -0,0 +1,3 @@
+eval File.read("#{File.dirname __FILE__}/common.gemfile")
+
+gem 'activerecord', '~>6.1.0'

data/gemfiles/common.gemfile

@@ -25,7 +25,7 @@ unless defined?(SKIP_JRUBY)
 end
 
 platform :ruby do
-  gem 'pg', '<1'
+  gem 'pg'
   gem 'sqlite3'
 end
 

data/lib/activerecord-time/version.rb

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

data/lib/time_of_day.rb

@@ -11,7 +11,9 @@ class TimeOfDay
 
   def initialize(hour, minute = 0, second = 0)
     if hour == 24
-      raise "Invalid TimeOfDay. #{hour}:#{minute}:#{second} given, but highest allowed value is 24:00:00" unless minute == 0 && second == 0
+      unless minute == 0 && second == 0
+        raise "Invalid TimeOfDay. #{hour}:#{minute}:#{second} given, but highest allowed value is 24:00:00"
+      end
     else
       raise "Invalid hour: #{hour}" unless hour >= 0 && hour <= 23
     end
@@ -85,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)
@@ -104,6 +112,17 @@ class TimeOfDay
     to_a <=> [other_tod.hour, other_tod.minute, other_tod.second]
   end
 
+  # Referring to the same H/M/S makes objects equal.
+  # and we only want one hash key.
+  def hash
+    @hour.hash ^ @minute.hash ^ @second.hash
+  end
+
+  # Referring to the same H/M/S makes objects equal.
+  def eql?(other)
+    hash == other.hash
+  end
+
   def strftime(format)
     on(Date.today).strftime(format)
   end
@@ -118,6 +137,10 @@ class TimeOfDay
     "#{@hour.inspect}:#{@minute.inspect}:#{@second.inspect}"
   end
 
+  def inspect
+    "#<#{self.class} hour=#{@hour}, minute=#{@minute}, second=#{@second}>"
+  end
+
   def to_a
     [@hour, @minute, @second]
   end

data/matrix_test.rb

@@ -38,6 +38,12 @@ end
 
 bad_variants = (travis.dig('matrix', 'exclude').to_a + travis.dig('matrix', 'allow_failures').to_a)
 
+travis['env']['global'].each do |env|
+  env.scan(/\b(?<key>[A-Z_]+)="(?<value>.+?)"/) do |key, value|
+    ENV[key] = value
+  end
+end
+
 travis['rvm'].each do |ruby|
   next if /head/.match?(ruby) # ruby-install does not support HEAD installation
 
@@ -53,7 +59,7 @@ travis['rvm'].each do |ruby|
   system "#{bundler_gem_check_cmd} || #{bundler_install_cmd}" || exit(1)
   travis['gemfile'].each do |gemfile|
     use_gemfile(ruby, gemfile, update_gemfiles) do
-      travis['env'].each do |env|
+      travis['env']['matrix'].each do |env|
         bad_variant = bad_variants.any? do |f|
           (f['rvm'].nil? || f['rvm'] == ruby) &&
               (f['gemfile'].nil? || f['gemfile'] == gemfile) && (f['env'].nil? || f['env'] == env)

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

@@ -5,6 +5,7 @@ require File.expand_path('test_helper', File.dirname(__FILE__))
 class ApplicationRecord < ActiveRecord::Base
   self.abstract_class = true
 end
+
 class Event < ApplicationRecord
 end
 
@@ -141,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)
@@ -154,7 +165,7 @@ class TimeOfDayTest < Minitest::Test
     tod2 = TimeOfDay.new(13, 0)
     assert_equal(-1, tod1 <=> tod2)
     assert_equal 1, tod2 <=> tod1
-    assert_equal 0, tod1 <=> tod1 # rubocop: disable Lint/UselessComparison
+    assert_equal 0, tod1 <=> tod1
   end
 
   def test_strftime
@@ -201,4 +212,19 @@ class TimeOfDayTest < Minitest::Test
     tod = TimeOfDay.new(12, 13)
     assert_equal '"12:13:00"', tod.to_json('foo')
   end
+
+  def test_eql?
+    a = TimeOfDay.new(10, 11, 12)
+    b = TimeOfDay.new(10, 11, 12)
+    assert a.eql?(b)
+    assert_equal a.hash, b.hash
+    hashmap = {}
+    hashmap[a] = 'foo'
+    hashmap[b] = 'bar'
+    assert_equal hashmap, TimeOfDay.new(10, 11, 12) => 'bar'
+  end
+
+  def test_inspect
+    assert_equal '#<TimeOfDay hour=10, minute=11, second=12>', TimeOfDay.new(10, 11, 12).inspect
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-time
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.18.0
 platform: ruby
 authors:
 - Uwe Kubosch
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-11-21 00:00:00.000000000 Z
+date: 2021-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -19,7 +19,7 @@ dependencies:
         version: '5.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '5.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -59,7 +59,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest-reporters
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -73,7 +73,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -87,7 +87,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -101,7 +101,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop-performance
+  name: rubocop-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -115,7 +115,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop-rails
+  name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -164,6 +164,9 @@ files:
 - gemfiles/ar51.gemfile.lock
 - gemfiles/ar52.gemfile
 - gemfiles/ar52.gemfile.lock
+- gemfiles/ar60.gemfile
+- gemfiles/ar60.gemfile.lock
+- gemfiles/ar61.gemfile
 - gemfiles/common.gemfile
 - lib/activerecord-time.rb
 - lib/activerecord-time/extension.rb
@@ -179,7 +182,7 @@ homepage: https://github.com/donv/activerecord-time
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -187,15 +190,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.22
+signing_key:
 specification_version: 4
 summary: A handler for storing TimeOfDay objects in ActiveRecord objects as sql time
   values.