activerecord-time 0.10.1 → 0.17.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/gemfiles/{ar42.gemfile → ar60.gemfile}

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

data/gemfiles/{ar50.gemfile.lock → ar60.gemfile.lock}

@@ -1,67 +1,66 @@
 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)
+    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 (50.0)
-      activerecord-jdbc-adapter (~> 50.0)
+    activerecord-jdbcpostgresql-adapter (60.1-java)
+      activerecord-jdbc-adapter (= 60.1)
       jdbc-postgres (>= 9.4, < 43)
-    activerecord-jdbcsqlite3-adapter (50.0)
-      activerecord-jdbc-adapter (~> 50.0)
+    activerecord-jdbcsqlite3-adapter (60.1-java)
+      activerecord-jdbc-adapter (= 60.1)
       jdbc-sqlite3 (~> 3.8, < 3.30)
-    activesupport (5.0.7)
+    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)
-    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)
+    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.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)
+    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 (12.3.1)
-    ruby-progressbar (1.9.0)
-    simplecov (0.16.1)
+    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.3.13)
+    sqlite3 (1.4.2)
     thread_safe (0.3.6)
     thread_safe (0.3.6-java)
-    tzinfo (1.2.5)
+    tzinfo (1.2.6)
       thread_safe (~> 0.1)
+    zeitwerk (2.2.2)
 
 PLATFORMS
   java
   ruby
 
 DEPENDENCIES
-  activerecord (~> 5.0.1)
+  activerecord (~> 6.0.0)
   activerecord-jdbc-adapter
   activerecord-jdbcderby-adapter
   activerecord-jdbcpostgresql-adapter
@@ -73,4 +72,4 @@ DEPENDENCIES
   sqlite3
 
 BUNDLED WITH
-   1.16.1
+   1.17.2

data/gemfiles/{ar50.gemfile → ar61.gemfile}

@@ -1,3 +1,3 @@
 eval File.read("#{File.dirname __FILE__}/common.gemfile")
 
-gem 'activerecord', '~>5.0.1'
+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.rb

@@ -1,19 +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 3.2
-if ActiveRecord::VERSION::MAJOR < 3 ||
-      (ActiveRecord::VERSION::MAJOR == 3 && ActiveRecord::VERSION::MINOR < 2)
-  raise 'activerecord-time only supports ActiveRecord 3.2.21 or later'
-# TODO(uwe): Simplify when we stop supporting ActiveRecord 4.0 and 4.1
-elsif ActiveRecord::VERSION::MAJOR == 3 ||
-      (ActiveRecord::VERSION::MAJOR == 4 && ActiveRecord::VERSION::MINOR <= 1)
-  require 'activerecord-time/extension_until_4_1'
-# TODO(uwe): Simplify when we stop supporting ActiveRecord 4.2
-elsif 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.10.1'.freeze
+    VERSION = '0.17.0'
   end
 end

data/lib/time_of_day.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'yaml'
 
 class TimeOfDay
@@ -8,9 +10,16 @@ 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
+      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
     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,29 +41,46 @@ 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
 
+  def acts_like_time?
+    true
+  end
+
+  def in_time_zone(*)
+    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)
@@ -62,11 +88,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)
@@ -78,8 +106,19 @@ 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) # rubocop: disable Rails/Date
+    on(Date.today).strftime(format)
   end
 
   def to_s(with_seconds = true)
@@ -92,6 +131,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/lib/time_of_day/core_ext.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'time_of_day'
 
 class Time
@@ -6,6 +8,12 @@ class Time
   end
 end
 
+class ActiveSupport::TimeWithZone
+  def time_of_day
+    TimeOfDay.new(hour, min, sec)
+  end
+end
+
 class Date
   def at(time_of_day)
     time_of_day = TimeOfDay.parse(time_of_day) if time_of_day.is_a?(String)
@@ -21,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,19 +36,30 @@ 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['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 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|
+      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)