activerecord-time 0.12.0 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 877aec8ae6f1cf15a3730b23a0f1c2e6ea1f403c
-  data.tar.gz: 1fc6b3270f3a8f2259695e3b3ae13d4f86122421
+SHA256:
+  metadata.gz: 3dd9c896468de348081c956b30ff978ecc973a5e59c15e023d0ea1d6744fc790
+  data.tar.gz: 159d2a9796c4598d06d56f1516e61f66ca0867f46d2211ef48b825aa6cb8798c
 SHA512:
-  metadata.gz: b0dcf17261de5d998597d32895bc2eeb11f2f749d9d5d829370f2653b2fe8e14daac265b3242f094efaee29aa8daa111b08f774c82865cc80a95845b02dacca3
-  data.tar.gz: 15cbb911123ef1a9ddd07ebe6799ea24823e196681203d37c22c598192378fa67edbfb8828efa64993bfb60b7b5784db0c69997de385a6d50abec8bbcb7a1984
+  metadata.gz: 6b978dd14a0c88e93876abde8e54e61831e46039f7c976110fa0ed228094ec9ca515d06f34fb112cb770dcc641f08ec47e45504090a3e2bd0ef390f98b1a114b
+  data.tar.gz: f70e7fb91f7c85692a3d9b9529bbf8f10cd531a46dce434757783d56ad9a7f86b740430ac1ee0d97577052da45c441744d50da7ccb4efcd305b0ad05e8fd40c1

data/.rubocop.yml

@@ -1,25 +1,29 @@
 inherit_from: .rubocop_todo.yml
+require:
+  - rubocop-performance
+  - rubocop-rails
 
 AllCops:
-  TargetRubyVersion: 2.2
+  TargetRubyVersion: 2.4
   DisplayCopNames: true
   DisplayStyleGuide: true
   Include:
     - '**/Gemfile'
     - '**/Rakefile'
+    - '**/*.rb'
 
 Layout/AlignParameters:
   EnforcedStyle: with_fixed_indentation
   IndentationWidth: 4
 
-Layout/FirstParameterIndentation:
+Layout/IndentFirstArgument:
   EnforcedStyle: consistent
   IndentationWidth: 4
 
-Layout/IndentArray:
+Layout/IndentFirstArrayElement:
   EnforcedStyle: consistent
 
-Layout/IndentHash:
+Layout/IndentFirstHashElement:
   EnforcedStyle: consistent
 
 Layout/IndentAssignment:

data/.rubocop_todo.yml

@@ -1,18 +1,20 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2018-05-03 15:54:21 +0200 using RuboCop version 0.55.0.
+# on 2019-11-07 12:06:57 +0100 using RuboCop version 0.76.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: 4
+# Offense count: 3
 Metrics/AbcSize:
-  Max: 34
+  Max: 33
 
-# Offense count: 4
+# Offense count: 1
+# Configuration parameters: CountComments, ExcludedMethods.
+# ExcludedMethods: refine
 Metrics/BlockLength:
-  Max: 26
+  Max: 28
 
 # Offense count: 1
 # Configuration parameters: CountComments.
@@ -24,20 +26,54 @@ Metrics/CyclomaticComplexity:
   Max: 7
 
 # Offense count: 2
-# Configuration parameters: CountComments.
+# Configuration parameters: CountComments, ExcludedMethods.
 Metrics/MethodLength:
   Max: 16
 
+# Offense count: 1
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: strict, flexible
+Rails/Date:
+  Exclude:
+    - 'lib/time_of_day.rb'
+
 # Offense count: 2
 # Cop supports --auto-correct.
-Rails/ActiveRecordAliases:
+Security/YAMLLoad:
   Exclude:
+    - 'test/test_helper.rb'
     - 'test/time_of_day_test.rb'
 
-# Offense count: 3
+# Offense count: 1
+# Configuration parameters: .
+# SupportedStyles: inline, group
+Style/AccessModifierDeclarations:
+  EnforcedStyle: inline
+
+# Offense count: 1
 # Cop supports --auto-correct.
-Security/YAMLLoad:
+# Configuration parameters: AutoCorrect, 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:
+  Exclude:
+    - 'Gemfile'
+    - 'Rakefile'
+
+# Offense count: 4
+Style/IdenticalConditionalBranches:
   Exclude:
-    - 'matrix_test.rb'
-    - 'test/test_helper.rb'
     - 'test/time_of_day_test.rb'

data/.travis.yml

@@ -1,39 +1,27 @@
 language: ruby
 sudo: false
+cache: bundler
+services:
+  - postgresql
 jdk:
-  - oraclejdk8
-before_install: gem install bundler # TODO(uwe): https://github.com/travis-ci/travis-ci/issues/9383
+  - openjdk8
 rvm:
-  - ruby-2.5.1
-  - ruby-2.4.4
-  - jruby-9.1.17.0
-  - ruby-2.3.7
-  - ruby-2.2.10
+  - ruby-2.6
+  - ruby-2.5
+  - ruby-2.4
+  - jruby
 gemfile:
   - gemfiles/ar52.gemfile
   - gemfiles/ar51.gemfile
-  - gemfiles/ar50.gemfile
-  - gemfiles/ar42.gemfile
 env:
-  - JRUBY_OPTS="--dev --debug" ADAPTER="postgresql"
-  - JRUBY_OPTS="--dev --debug" ADAPTER="derby"
-  - JRUBY_OPTS="--dev --debug" ADAPTER="sqlite3"
+  global:
+    - JRUBY_OPTS="--dev --debug"
+  matrix:
+    - ADAPTER="postgresql"
+    - ADAPTER="sqlite3"
 matrix:
   allow_failures:
-    - rvm: jruby-9.1.17.0
-      gemfile: gemfiles/ar52.gemfile
-    - rvm: jruby-9.1.17.0
-      gemfile: gemfiles/ar51.gemfile
-    - rvm: jruby-9.1.17.0
-      gemfile: gemfiles/ar50.gemfile
-    - rvm: jruby-9.1.17.0
-      gemfile: gemfiles/ar42.gemfile
-  exclude:
-    - rvm: ruby-2.5.1
-      env: JRUBY_OPTS="--dev --debug" ADAPTER="derby"
-    - rvm: ruby-2.4.4
-      env: JRUBY_OPTS="--dev --debug" ADAPTER="derby"
-    - rvm: ruby-2.3.7
-      env: JRUBY_OPTS="--dev --debug" ADAPTER="derby"
-    - rvm: ruby-2.2.10
-      env: JRUBY_OPTS="--dev --debug" ADAPTER="derby"
+    - rvm: jruby
+      env: ADAPTER="sqlite3"
+    - rvm: jruby
+      env: ADAPTER="sqlite3"

data/activerecord-time.gemspec

@@ -1,3 +1,8 @@
+begin
+  require 'english'
+rescue LoadError
+end
+
 lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'activerecord-time/version'
@@ -11,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.2'
+  gem.required_ruby_version = '>= 2.4'
 
   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', '>=4.2', '<6'
+  gem.add_runtime_dependency 'activerecord', '>=5.1', '<6'
 
   if defined? JRUBY_VERSION
     gem.add_development_dependency 'activerecord-jdbcpostgresql-adapter'
@@ -30,5 +35,7 @@ Gem::Specification.new do |gem|
   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 'simplecov'
 end

data/gemfiles/ar51.gemfile

@@ -1,4 +1,3 @@
-RAILS_5 = true
 eval File.read("#{File.dirname __FILE__}/common.gemfile")
 
 gem 'activerecord', '~>5.1.1'

data/gemfiles/ar51.gemfile.lock

@@ -1,31 +1,24 @@
-GIT
-  remote: https://github.com/jruby/activerecord-jdbc-adapter.git
-  revision: cfea62ad56141c9e3c5348797028d45b64a193ca
-  specs:
-    activerecord-jdbc-adapter (51.0-java)
-      activerecord (~> 5.1.0)
-    activerecord-jdbcderby-adapter (51.0)
-      activerecord-jdbc-adapter (~> 51.0)
-      jdbc-derby (~> 10.6)
-    activerecord-jdbcpostgresql-adapter (51.0)
-      activerecord-jdbc-adapter (~> 51.0)
-      jdbc-postgres (>= 9.4, < 43)
-    activerecord-jdbcsqlite3-adapter (51.0)
-      activerecord-jdbc-adapter (~> 51.0)
-      jdbc-sqlite3 (~> 3.8, < 3.30)
-    jdbc-postgres (42.1.4)
-    jdbc-sqlite3 (3.20.1)
-
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (5.1.6)
-      activesupport (= 5.1.6)
-    activerecord (5.1.6)
-      activemodel (= 5.1.6)
-      activesupport (= 5.1.6)
+    activemodel (5.1.7)
+      activesupport (= 5.1.7)
+    activerecord (5.1.7)
+      activemodel (= 5.1.7)
+      activesupport (= 5.1.7)
       arel (~> 8.0)
-    activesupport (5.1.6)
+    activerecord-jdbc-adapter (51.4-java)
+      activerecord (~> 5.1.0)
+    activerecord-jdbcderby-adapter (0.8.2)
+      activerecord-jdbc-adapter (>= 0.8.2)
+      jdbc-derby (>= 10.3.2.1)
+    activerecord-jdbcpostgresql-adapter (51.4-java)
+      activerecord-jdbc-adapter (= 51.4)
+      jdbc-postgres (>= 9.4, < 43)
+    activerecord-jdbcsqlite3-adapter (51.4-java)
+      activerecord-jdbc-adapter (= 51.4)
+      jdbc-sqlite3 (~> 3.8, < 3.30)
+    activesupport (5.1.7)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -33,29 +26,30 @@ GEM
     ansi (1.5.0)
     arel (8.0.0)
     builder (3.2.3)
-    concurrent-ruby (1.0.5)
-    concurrent-ruby (1.0.5-java)
-    docile (1.3.0)
-    i18n (1.0.1)
+    concurrent-ruby (1.1.5)
+    docile (1.3.2)
+    i18n (1.7.0)
       concurrent-ruby (~> 1.0)
     jdbc-derby (10.12.1.1)
-    json (2.1.0)
-    json (2.1.0-java)
-    minitest (5.10.3)
-    minitest-reporters (1.2.0)
+    jdbc-postgres (42.2.6)
+    jdbc-sqlite3 (3.28.0)
+    json (2.2.0)
+    json (2.2.0-java)
+    minitest (5.12.2)
+    minitest-reporters (1.4.1)
       ansi
       builder
       minitest (>= 5.0)
       ruby-progressbar
     pg (0.21.0)
-    rake (12.3.1)
-    ruby-progressbar (1.9.0)
-    simplecov (0.16.1)
+    rake (13.0.0)
+    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.3.13)
+    sqlite3 (1.4.1)
     thread_safe (0.3.6)
     thread_safe (0.3.6-java)
     tzinfo (1.2.5)
@@ -67,12 +61,10 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord (~> 5.1.1)
-  activerecord-jdbc-adapter!
-  activerecord-jdbcderby-adapter!
-  activerecord-jdbcpostgresql-adapter!
-  activerecord-jdbcsqlite3-adapter!
-  jdbc-postgres!
-  jdbc-sqlite3!
+  activerecord-jdbc-adapter
+  activerecord-jdbcderby-adapter
+  activerecord-jdbcpostgresql-adapter
+  activerecord-jdbcsqlite3-adapter
   minitest-reporters
   pg (< 1)
   rake
@@ -80,4 +72,4 @@ DEPENDENCIES
   sqlite3
 
 BUNDLED WITH
-   1.16.1
+   1.17.2

data/gemfiles/ar52.gemfile

@@ -1,5 +1,3 @@
-SKIP_JRUBY = true
-
 eval File.read("#{File.dirname __FILE__}/common.gemfile")
 
 gem 'activerecord', '~>5.2.0'

data/gemfiles/ar52.gemfile.lock

@@ -1,13 +1,24 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (5.2.0)
-      activesupport (= 5.2.0)
-    activerecord (5.2.0)
-      activemodel (= 5.2.0)
-      activesupport (= 5.2.0)
+    activemodel (5.2.3)
+      activesupport (= 5.2.3)
+    activerecord (5.2.3)
+      activemodel (= 5.2.3)
+      activesupport (= 5.2.3)
       arel (>= 9.0)
-    activesupport (5.2.0)
+    activerecord-jdbc-adapter (52.3-java)
+      activerecord (~> 5.2.0)
+    activerecord-jdbcderby-adapter (0.8.2)
+      activerecord-jdbc-adapter (>= 0.8.2)
+      jdbc-derby (>= 10.3.2.1)
+    activerecord-jdbcpostgresql-adapter (52.3-java)
+      activerecord-jdbc-adapter (= 52.3)
+      jdbc-postgres (>= 9.4, < 43)
+    activerecord-jdbcsqlite3-adapter (52.3-java)
+      activerecord-jdbc-adapter (= 52.3)
+      jdbc-sqlite3 (~> 3.8, < 3.30)
+    activesupport (5.2.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -15,28 +26,30 @@ GEM
     ansi (1.5.0)
     arel (9.0.0)
     builder (3.2.3)
-    concurrent-ruby (1.0.5)
-    concurrent-ruby (1.0.5-java)
-    docile (1.3.0)
-    i18n (1.0.1)
+    concurrent-ruby (1.1.5)
+    docile (1.3.2)
+    i18n (1.7.0)
       concurrent-ruby (~> 1.0)
-    json (2.1.0)
-    json (2.1.0-java)
-    minitest (5.10.3)
-    minitest-reporters (1.2.0)
+    jdbc-derby (10.12.1.1)
+    jdbc-postgres (42.2.6)
+    jdbc-sqlite3 (3.28.0)
+    json (2.2.0)
+    json (2.2.0-java)
+    minitest (5.12.2)
+    minitest-reporters (1.4.1)
       ansi
       builder
       minitest (>= 5.0)
       ruby-progressbar
     pg (0.21.0)
-    rake (12.3.1)
-    ruby-progressbar (1.9.0)
-    simplecov (0.16.1)
+    rake (13.0.0)
+    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.3.13)
+    sqlite3 (1.4.1)
     thread_safe (0.3.6)
     thread_safe (0.3.6-java)
     tzinfo (1.2.5)
@@ -48,6 +61,10 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord (~> 5.2.0)
+  activerecord-jdbc-adapter
+  activerecord-jdbcderby-adapter
+  activerecord-jdbcpostgresql-adapter
+  activerecord-jdbcsqlite3-adapter
   minitest-reporters
   pg (< 1)
   rake
@@ -55,4 +72,4 @@ DEPENDENCIES
   sqlite3
 
 BUNDLED WITH
-   1.16.1
+   1.17.2

data/lib/activerecord-time.rb

@@ -1,11 +1,6 @@
+# frozen_string_literal: true
+
 require 'activerecord-time/version'
-require 'active_record/version'
 require 'time_of_day'
 require 'time_of_day/core_ext'
-
-# TODO(uwe): Simplify when we stop supporting ActiveRecord 4.2
-if ActiveRecord::VERSION::MAJOR == 4 && ActiveRecord::VERSION::MINOR >= 2
-  require 'activerecord-time/extension_4_2'
-elsif ActiveRecord.gem_version >= Gem::Version.new('5.0.0')
-  require 'activerecord-time/extension_5_0'
-end
+require 'activerecord-time/extension'

data/lib/activerecord-time/{extension_5_0.rb → extension.rb}

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_record/connection_adapters/abstract/quoting'
 
 module Activerecord
@@ -5,11 +7,13 @@ module Activerecord
     module Quoting
       def _quote(value)
         return "'#{value}'" if value.is_a?(TimeOfDay)
+
         super(value)
       end
 
       def _type_cast(value)
         return value.to_s if value.is_a?(TimeOfDay)
+
         super(value)
       end
     end
@@ -26,6 +30,7 @@ module ActiveRecord
         return value.time_of_day if value.is_a?(::DateTime) || value.is_a?(::Time)
         return value unless value.is_a?(::String)
         return if value.empty?
+
         TimeOfDay._parse(value)
       end
     end

data/lib/activerecord-time/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module Activerecord
   module Time
-    VERSION = '0.12.0'.freeze
+    VERSION = '0.14.0'
   end
 end

data/lib/time_of_day.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'yaml'
 
 class TimeOfDay
@@ -8,9 +10,14 @@ class TimeOfDay
   attr_accessor :second # 0 - 59
 
   def initialize(hour, minute = 0, second = 0)
-    raise "Invalid hour: #{hour}" unless hour >= 0 && hour <= 23
+    if hour == 24
+      raise "Invalid TimeOfDay. #{hour}:#{minute}:#{second} given, but highest allowed value is 24:00:00" unless minute == 0 && second == 0
+    else
+      raise "Invalid hour: #{hour}" unless hour >= 0 && hour <= 23
+    end
     raise "Invalid minute: #{minute}" unless minute >= 0 && minute <= 59
     raise "Invalid second: #{second}" unless second >= 0 && second <= 59
+
     @hour = hour
     @minute = minute
     @second = second
@@ -32,20 +39,24 @@ class TimeOfDay
 
   def self.parse(string)
     return nil if string.blank?
+
     tod = _parse(string)
     raise ArgumentError, "Illegal time format: '#{string}'" unless tod
+
     tod
   end
 
   def self._parse(string)
     parts = parse_parts(string)
     return unless parts
+
     new(*parts)
   end
 
   def self.parse_parts(string)
     return nil if string.blank?
     return unless /^(?<hours>\d{1,2}):?(?<minutes>\d{2})?(?::(?<seconds>\d{1,2}))?$/ =~ string.strip
+
     [hours.to_i, minutes.to_i, seconds.to_i]
   end
 
@@ -57,12 +68,17 @@ class TimeOfDay
     self
   end
 
+  def to_time
+    on Date.today
+  end
+
   def on(date)
     Time.local(date.year, date.month, date.day, hour, minute, second) # rubocop: disable Rails/TimeZone
   end
 
   def +(other)
     raise "Illegal argument: #{other.inspect}" unless other.is_a? Numeric
+
     t = Time.local(0, 1, 1, hour, minute, second) # rubocop: disable Rails/TimeZone
     t += other
     self.class.new(t.hour, t.min, t.sec)
@@ -70,11 +86,13 @@ class TimeOfDay
 
   def -(other)
     raise "Illegal argument: #{other.inspect}" unless other.is_a? Numeric
+
     self.+(-other)
   end
 
   def <=>(other)
     return -1 unless other
+
     other_tod = if other.is_a?(TimeOfDay)
                   other
                 elsif other.respond_to?(:time_of_day)
@@ -87,7 +105,7 @@ class TimeOfDay
   end
 
   def strftime(format)
-    on(Date.today).strftime(format) # rubocop: disable Rails/Date
+    on(Date.today).strftime(format)
   end
 
   def to_s(with_seconds = true)

data/lib/time_of_day/core_ext.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'time_of_day'
 
 class Time
@@ -27,6 +29,7 @@ module Kernel
       unless ints.empty?
         raise(ArgumentError, 'TimeOfDay() takes a string or multiple integers as arguments')
       end
+
       TimeOfDay.parse(string_or_int)
     else
       TimeOfDay.new(string_or_int, *ints)

data/matrix_test.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby -w
+# frozen_string_literal: true
 
 system('rubocop --auto-correct') || exit(1)
 
@@ -16,6 +17,7 @@ def run_script(ruby, env, gemfile)
   puts
   system("chruby-exec #{ruby} -- bundle exec rake") || exit(1)
   puts '*' * 80
+  puts
 end
 
 def use_gemfile(ruby, gemfile, update_gemfiles)
@@ -23,6 +25,7 @@ def use_gemfile(ruby, gemfile, update_gemfiles)
   puts "Testing #{gemfile}"
   puts
   ENV['BUNDLE_GEMFILE'] = gemfile
+  system "chruby-exec #{ruby} -- bundle -v"
   if update_gemfiles
     system "chruby-exec #{ruby} -- bundle update"
   else
@@ -33,16 +36,21 @@ def use_gemfile(ruby, gemfile, update_gemfiles)
   puts '$' * 80
 end
 
-bad_variants = (travis['matrix']['exclude'].to_a + travis['matrix']['allow_failures'].to_a)
+bad_variants = (travis.dig('matrix', 'exclude').to_a + travis.dig('matrix', 'allow_failures').to_a)
 
 travis['rvm'].each do |ruby|
-  next if ruby =~ /head/ # ruby-install does not support HEAD installation
+  next if /head/.match?(ruby) # ruby-install does not support HEAD installation
+
   puts '#' * 80
   puts "Testing #{ruby}"
   puts
   system "ruby-install --no-reinstall #{ruby}" || exit(1)
-  bundler_gem_check_cmd = "chruby-exec #{ruby} -- gem query -i -n bundler >/dev/null"
-  system "#{bundler_gem_check_cmd} || chruby-exec #{ruby} -- gem install bundler" || exit(1)
+  bundler_version = '1.17.2'
+  gem_cmd = "chruby-exec #{ruby} -- gem"
+  system "#{gem_cmd} uninstall --force --all --version '!=#{bundler_version}' bundler"
+  bundler_gem_check_cmd = "#{gem_cmd} query -i -n '^bundler$' -v '#{bundler_version}' >/dev/null"
+  bundler_install_cmd = "#{gem_cmd} install bundler -v '#{bundler_version}'"
+  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|

data/test/database.yml

@@ -1,6 +1,3 @@
-sqlite:
-  :adapter: sqlite
-  :dbfile: plugin.sqlite.db
 sqlite3:
   :adapter: sqlite3
   :dbfile: ":memory:"
@@ -12,17 +9,3 @@ postgresql:
   :password:
   :database: activerecord-time_test
   :min_messages: ERROR
-mysql:
-  :adapter: mysql
-  :host: localhost
-  :username: rails
-  :password:
-  :database: activerecord-time_test
-derby:
-  :adapter: derby
-  :driver: org.apache.derby.jdbc.EmbeddedDriver
-  :url: jdbc:derby:activerecord-time_test-derby;user=derby;create=true",
-  :username: derby
-  :pool: 50
-  :transaction_isolation: false
-  :database: activerecord-time_test-derby

data/test/schema.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 ActiveRecord::Schema.define(version: 1) do
   create_table :events do |t|
     t.string :name

data/test/test_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 $LOAD_PATH.unshift(File.dirname(__FILE__) + '/../lib')
 RAILS_ROOT = File.dirname(__FILE__)
 
@@ -13,8 +15,10 @@ require 'logger'
 require 'fileutils'
 require 'yaml'
 
-require 'simplecov'
-SimpleCov.start
+if defined?(Rake) && (RUBY_ENGINE != 'jruby' || org.jruby.RubyInstanceConfig.FULL_TRACE_ENABLED)
+  require 'simplecov'
+  SimpleCov.start
+end
 
 FileUtils.rm_rf File.expand_path(':memory:', File.dirname(__FILE__))
 config = YAML.load(IO.read(File.dirname(__FILE__) + '/database.yml'))

data/test/time_of_day_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require File.expand_path('test_helper', File.dirname(__FILE__))
 
 class ApplicationRecord < ActiveRecord::Base
@@ -6,10 +8,6 @@ end
 class Event < ApplicationRecord
 end
 
-# TODO(uwe): Remove when we stop testing ActiveRecord 4.0
-Minitest::Test = Minitest::Unit unless defined? Minitest::Test
-# ODOT
-
 class TimeOfDayTest < Minitest::Test
   def setup
     @twelve_o_clock = TimeOfDay.parse '12:00:00'
@@ -58,12 +56,12 @@ class TimeOfDayTest < Minitest::Test
   end
 
   def test_parse_immutable_string
-    tod = TimeOfDay.parse('10:01'.freeze)
+    tod = TimeOfDay.parse('10:01')
     assert_equal 10, tod.hour
     assert_equal 1, tod.minute
     assert_equal 0, tod.second
 
-    tod = TimeOfDay.parse('23:59:59'.freeze)
+    tod = TimeOfDay.parse('23:59:59')
     assert_equal 23, tod.hour
     assert_equal 59, tod.minute
     assert_equal 59, tod.second
@@ -107,14 +105,7 @@ class TimeOfDayTest < Minitest::Test
     assert_nil Event.where('start_at < ?', @twelve_o_clock).first
     assert_nil Event.where('start_at > ?', @twelve_o_clock).first
 
-    # TODO(uwe): Simplify when we stop supporting ActiveRecord 3
-    if ActiveRecord::VERSION::MAJOR >= 4
-      t.update! start_at: TimeOfDay.new(13)
-    else
-      t.update_attributes! start_at: TimeOfDay.new(13)
-    end
-    # ODOT
-
+    t.update! start_at: TimeOfDay.new(13)
     t.destroy
   end
 
@@ -124,13 +115,7 @@ class TimeOfDayTest < Minitest::Test
     e = Event.where(content: text).first
     assert_equal text, e.content
 
-    # TODO(uwe): Simplify when we stop supporting ActiveRecord 3
-    if ActiveRecord::VERSION::MAJOR >= 4
-      e.update! content: 'Other binary content'
-    else
-      e.update_attributes! content: 'Other binary content'
-    end
-    # ODOT
+    e.update! content: 'Other binary content'
   end
 
   def test_on

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-time
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.14.0
 platform: ruby
 authors:
 - Uwe Kubosch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-08 00:00:00.000000000 Z
+date: 2019-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.1'
     - - "<"
       - !ruby/object:Gem::Version
         version: '6'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.1'
     - - "<"
       - !ruby/object:Gem::Version
         version: '6'
@@ -100,6 +100,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  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-rails
+  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: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -132,18 +160,13 @@ files:
 - README.md
 - Rakefile
 - activerecord-time.gemspec
-- gemfiles/ar42.gemfile
-- gemfiles/ar42.gemfile.lock
-- gemfiles/ar50.gemfile
-- gemfiles/ar50.gemfile.lock
 - gemfiles/ar51.gemfile
 - gemfiles/ar51.gemfile.lock
 - gemfiles/ar52.gemfile
 - gemfiles/ar52.gemfile.lock
 - gemfiles/common.gemfile
 - lib/activerecord-time.rb
-- lib/activerecord-time/extension_4_2.rb
-- lib/activerecord-time/extension_5_0.rb
+- lib/activerecord-time/extension.rb
 - lib/activerecord-time/version.rb
 - lib/time_of_day.rb
 - lib/time_of_day/core_ext.rb
@@ -164,15 +187,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.2'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A handler for storing TimeOfDay objects in ActiveRecord objects as sql time

data/gemfiles/ar42.gemfile

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

data/gemfiles/ar42.gemfile.lock

@@ -1,77 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activemodel (4.2.10)
-      activesupport (= 4.2.10)
-      builder (~> 3.1)
-    activerecord (4.2.10)
-      activemodel (= 4.2.10)
-      activesupport (= 4.2.10)
-      arel (~> 6.0)
-    activerecord-jdbc-adapter (50.0)
-      activerecord (>= 2.2)
-    activerecord-jdbcderby-adapter (0.8.2)
-      activerecord-jdbc-adapter (>= 0.8.2)
-      jdbc-derby (>= 10.3.2.1)
-    activerecord-jdbcpostgresql-adapter (50.0)
-      activerecord-jdbc-adapter (~> 50.0)
-      jdbc-postgres (>= 9.4, < 43)
-    activerecord-jdbcsqlite3-adapter (50.0)
-      activerecord-jdbc-adapter (~> 50.0)
-      jdbc-sqlite3 (~> 3.8, < 3.30)
-    activesupport (4.2.10)
-      i18n (~> 0.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
-      tzinfo (~> 1.1)
-    ansi (1.5.0)
-    arel (6.0.4)
-    builder (3.2.3)
-    concurrent-ruby (1.0.5)
-    concurrent-ruby (1.0.5-java)
-    docile (1.3.0)
-    i18n (0.9.5)
-      concurrent-ruby (~> 1.0)
-    jdbc-derby (10.12.1.1)
-    jdbc-postgres (42.1.4)
-    jdbc-sqlite3 (3.20.1)
-    json (2.1.0)
-    json (2.1.0-java)
-    minitest (5.10.3)
-    minitest-reporters (1.2.0)
-      ansi
-      builder
-      minitest (>= 5.0)
-      ruby-progressbar
-    pg (0.21.0)
-    rake (12.3.1)
-    ruby-progressbar (1.9.0)
-    simplecov (0.16.1)
-      docile (~> 1.1)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
-    sqlite3 (1.3.13)
-    thread_safe (0.3.6)
-    thread_safe (0.3.6-java)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
-
-PLATFORMS
-  java
-  ruby
-
-DEPENDENCIES
-  activerecord (~> 4.2.3)
-  activerecord-jdbc-adapter
-  activerecord-jdbcderby-adapter
-  activerecord-jdbcpostgresql-adapter
-  activerecord-jdbcsqlite3-adapter
-  minitest-reporters
-  pg (< 1)
-  rake
-  simplecov
-  sqlite3
-
-BUNDLED WITH
-   1.16.1

data/gemfiles/ar50.gemfile

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

data/gemfiles/ar50.gemfile.lock

@@ -1,76 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activemodel (5.0.7)
-      activesupport (= 5.0.7)
-    activerecord (5.0.7)
-      activemodel (= 5.0.7)
-      activesupport (= 5.0.7)
-      arel (~> 7.0)
-    activerecord-jdbc-adapter (50.0)
-      activerecord (>= 2.2)
-    activerecord-jdbcderby-adapter (0.8.2)
-      activerecord-jdbc-adapter (>= 0.8.2)
-      jdbc-derby (>= 10.3.2.1)
-    activerecord-jdbcpostgresql-adapter (50.0)
-      activerecord-jdbc-adapter (~> 50.0)
-      jdbc-postgres (>= 9.4, < 43)
-    activerecord-jdbcsqlite3-adapter (50.0)
-      activerecord-jdbc-adapter (~> 50.0)
-      jdbc-sqlite3 (~> 3.8, < 3.30)
-    activesupport (5.0.7)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    ansi (1.5.0)
-    arel (7.1.4)
-    builder (3.2.3)
-    concurrent-ruby (1.0.5)
-    concurrent-ruby (1.0.5-java)
-    docile (1.3.0)
-    i18n (1.0.1)
-      concurrent-ruby (~> 1.0)
-    jdbc-derby (10.12.1.1)
-    jdbc-postgres (42.1.4)
-    jdbc-sqlite3 (3.20.1)
-    json (2.1.0)
-    json (2.1.0-java)
-    minitest (5.10.3)
-    minitest-reporters (1.2.0)
-      ansi
-      builder
-      minitest (>= 5.0)
-      ruby-progressbar
-    pg (0.21.0)
-    rake (12.3.1)
-    ruby-progressbar (1.9.0)
-    simplecov (0.16.1)
-      docile (~> 1.1)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
-    sqlite3 (1.3.13)
-    thread_safe (0.3.6)
-    thread_safe (0.3.6-java)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
-
-PLATFORMS
-  java
-  ruby
-
-DEPENDENCIES
-  activerecord (~> 5.0.1)
-  activerecord-jdbc-adapter
-  activerecord-jdbcderby-adapter
-  activerecord-jdbcpostgresql-adapter
-  activerecord-jdbcsqlite3-adapter
-  minitest-reporters
-  pg (< 1)
-  rake
-  simplecov
-  sqlite3
-
-BUNDLED WITH
-   1.16.1

data/lib/activerecord-time/extension_4_2.rb

@@ -1,31 +0,0 @@
-module ActiveRecord
-  module ConnectionAdapters
-    module Quoting
-      def _quote_with_time_of_day(value)
-        return "'#{value}'" if value.is_a?(TimeOfDay)
-        _quote_without_time_of_day(value)
-      end
-      alias_method_chain :_quote, :time_of_day
-      def _type_cast_with_time_of_day(value)
-        return value.to_s if value.is_a?(TimeOfDay)
-        _type_cast_without_time_of_day(value)
-      end
-      alias_method_chain :_type_cast, :time_of_day
-    end
-  end
-end
-module Activerecord
-  module Time
-    module TypeCast
-      private
-
-      def cast_value(value)
-        return value.time_of_day if value.is_a?(::DateTime) || value.is_a?(::Time)
-        return value unless value.is_a?(::String)
-        return if value.empty?
-        TimeOfDay.parse value
-      end
-    end
-  end
-end
-ActiveRecord::Type::Time.prepend Activerecord::Time::TypeCast