activerecord-time 0.10.1 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b109ca8028703d50b73bfd9a66608c2669e9f913
-  data.tar.gz: fceb1381dd5c0012c3412225f0ea666a5040b692
+  metadata.gz: 877aec8ae6f1cf15a3730b23a0f1c2e6ea1f403c
+  data.tar.gz: 1fc6b3270f3a8f2259695e3b3ae13d4f86122421
 SHA512:
-  metadata.gz: 2e037eefad7123564ec01170a4af564a5bcb0b8576109088ecaeb76758dc3d499ae15a23d16bf5ba18ff73c9a3b2b8db4f4894a6fcb16d537539ae225b01c12a
-  data.tar.gz: 10802ff538c716a5bf7aa31668570cddc0c7cbbe91254ea5b9166633bf84d54e9e44f663b34b63dcc8e8b4500c3dea0c2052428cc03794d82d2636827ea7e0c2
+  metadata.gz: b0dcf17261de5d998597d32895bc2eeb11f2f749d9d5d829370f2653b2fe8e14daac265b3242f094efaee29aa8daa111b08f774c82865cc80a95845b02dacca3
+  data.tar.gz: 15cbb911123ef1a9ddd07ebe6799ea24823e196681203d37c22c598192378fa67edbfb8828efa64993bfb60b7b5784db0c69997de385a6d50abec8bbcb7a1984

data/.travis.yml

@@ -4,13 +4,11 @@ jdk:
   - oraclejdk8
 before_install: gem install bundler # TODO(uwe): https://github.com/travis-ci/travis-ci/issues/9383
 rvm:
-#  - ruby-2.5.1
+  - ruby-2.5.1
   - ruby-2.4.4
   - jruby-9.1.17.0
   - ruby-2.3.7
   - ruby-2.2.10
-  - ruby-head
-  - jruby-head
 gemfile:
   - gemfiles/ar52.gemfile
   - gemfiles/ar51.gemfile
@@ -22,8 +20,6 @@ env:
   - JRUBY_OPTS="--dev --debug" ADAPTER="sqlite3"
 matrix:
   allow_failures:
-    - rvm: ruby-head
-      gemfile: gemfiles/ar42.gemfile
     - rvm: jruby-9.1.17.0
       gemfile: gemfiles/ar52.gemfile
     - rvm: jruby-9.1.17.0
@@ -33,6 +29,8 @@ matrix:
     - 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

data/lib/activerecord-time.rb

@@ -3,16 +3,8 @@ 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
+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'

data/lib/activerecord-time/version.rb

@@ -1,5 +1,5 @@
 module Activerecord
   module Time
-    VERSION = '0.10.1'.freeze
+    VERSION = '0.12.0'.freeze
   end
 end

data/lib/time_of_day.rb

@@ -49,6 +49,14 @@ class TimeOfDay
     [hours.to_i, minutes.to_i, seconds.to_i]
   end
 
+  def acts_like_time?
+    true
+  end
+
+  def in_time_zone(*)
+    self
+  end
+
   def on(date)
     Time.local(date.year, date.month, date.day, hour, minute, second) # rubocop: disable Rails/TimeZone
   end

data/lib/time_of_day/core_ext.rb

@@ -6,6 +6,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)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-time
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.12.0
 platform: ruby
 authors:
 - Uwe Kubosch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-04 00:00:00.000000000 Z
+date: 2018-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -144,7 +144,6 @@ files:
 - 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/version.rb
 - lib/time_of_day.rb
 - lib/time_of_day/core_ext.rb

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