activerecord-time 0.10.1 → 0.17.0

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,15 +1,14 @@
+# frozen_string_literal: true
+
 require File.expand_path('test_helper', File.dirname(__FILE__))
 
 class ApplicationRecord < ActiveRecord::Base
   self.abstract_class = true
 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 +57,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 +106,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 +116,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
@@ -169,7 +155,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
@@ -216,4 +202,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.10.1
+  version: 0.17.0
 platform: ruby
 authors:
 - Uwe Kubosch
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-05-04 00:00:00.000000000 Z
+date: 2021-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -100,6 +100,48 @@ 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: rubocop-rake
+  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,19 +174,16 @@ 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/ar60.gemfile
+- gemfiles/ar60.gemfile.lock
+- gemfiles/ar61.gemfile
 - 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_until_4_1.rb
+- lib/activerecord-time/extension.rb
 - lib/activerecord-time/version.rb
 - lib/time_of_day.rb
 - lib/time_of_day/core_ext.rb
@@ -157,7 +196,7 @@ homepage: https://github.com/donv/activerecord-time
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -165,16 +204,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.2'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14.1
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: A handler for storing TimeOfDay objects in ActiveRecord objects as sql time
   values.

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/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

data/lib/activerecord-time/extension_until_4_1.rb

@@ -1,71 +0,0 @@
-require 'active_record/connection_adapters/abstract/quoting'
-
-module ActiveRecord
-  module ConnectionAdapters
-    module Quoting
-      def quote_with_time_of_day(value, column = nil)
-        if column && column.type == :time && value.is_a?(Integer)
-          value = TimeOfDay.new(value / 3600, (value % 3600) / 60, value % 60)
-        end
-        return "'#{value.to_s(:db)}'" if value.is_a?(TimeOfDay)
-        quote_without_time_of_day(value, column)
-      end
-
-      alias_method_chain :quote, :time_of_day
-
-      def type_cast_with_time_of_day(value, column)
-        return value.to_s if value.is_a?(TimeOfDay)
-        type_cast_without_time_of_day(value, column)
-      end
-
-      alias_method_chain :type_cast, :time_of_day
-    end
-  end
-end
-
-module Activerecord
-  module Time
-    module DummyTime
-      def klass
-        return TimeOfDay if type == :time
-        super
-      end
-
-      module ClassMethods
-        def string_to_dummy_time(value)
-          return value if value.is_a? TimeOfDay
-          return value.time_of_day if value.is_a? ::Time
-          return nil if value.empty?
-          TimeOfDay.parse(value)
-        end
-      end
-
-      def self.prepended(base)
-        class << base
-          prepend ClassMethods
-        end
-      end
-    end
-  end
-end
-
-ActiveRecord::ConnectionAdapters::Column.prepend Activerecord::Time::DummyTime
-
-module Arel
-  module Visitors
-    class Visitor
-      # rubocop: disable Naming/MethodName
-      # TODO(uwe): Simplify when we stop support for AR < 5
-      if Gem::Version.new(Arel::VERSION) >= Gem::Version.new('5.0.0')
-        def visit_TimeOfDay(object, _collector)
-          "'#{object.to_s(:db)}'"
-        end
-      else
-        def visit_TimeOfDay(object)
-          "'#{object.to_s(:db)}'"
-        end
-      end
-      # rubocop: enable Naming/MethodName
-    end
-  end
-end