activerecord-time 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ae9554b5154d27b89d69c1b24773eb9335be354
-  data.tar.gz: 42ec02e4d00f79d45b23770149b7fd7df583e980
+  metadata.gz: f3377582c4b69bbaffdfb4b2147c4c9fedd6bd87
+  data.tar.gz: e871b6b116bd17436c0b1f27e1ead868ccafb692
 SHA512:
-  metadata.gz: 57819c0256a549da0c0f790efef7a83b69c628f24f1157733fe38026d50476bde7b30490b6fc9d818fb785883c9ddd1e70aad381cb981e1c25d3ec123ab30562
-  data.tar.gz: 2ecae0563de41830cc400adb4935a95309c6b233904286bf11dd1d51b3b0e80bf00ecb5d1a71e0af45f76b02bd0c689c3fed68db2f0fbb4706d8a7ed29fcf5d8
+  metadata.gz: 672aa67786ca42da38a78fd79f036c0954c43aedc186c767321e42ad9d56dddc931d557d709f8879a39d5311c66594937117da99a4bdfad27460f12bee0ce367
+  data.tar.gz: ec625e4fd2eb0ef826a0304a71de12177a39fac32ec71fc6f948e20fa110cd3820dc93a32812c0f0f37e4215ac050a8c05d54cf861e65cdc5e505899c3137509

data/.rubocop.yml

@@ -0,0 +1,36 @@
+inherit_from: .rubocop_todo.yml
+
+AllCops:
+  TargetRubyVersion: 2.1
+  DisplayCopNames: true
+  DisplayStyleGuide: true
+  Include:
+    - '**/Gemfile'
+    - '**/Rakefile'
+  Exclude:
+    - 'gemfiles/vendor/**/*'
+
+Rails:
+  Enabled: true
+
+Style/Documentation:
+  Enabled: false
+
+Style/Encoding:
+  Enabled: true
+
+Style/FileName:
+  Exclude:
+    - 'lib/activerecord-time.rb'
+
+Style/FormatString:
+  EnforcedStyle: percent
+
+Style/NumericPredicate:
+  Enabled: false
+
+Style/ParallelAssignment:
+  Enabled: false
+
+Style/SafeNavigation:
+  ConvertCodeThatCanStartToReturnNil: true

data/.rubocop_todo.yml

@@ -0,0 +1,36 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2016-12-23 10:29:47 +0100 using RuboCop version 0.46.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
+Metrics/AbcSize:
+  Max: 34
+
+# Offense count: 2
+# Configuration parameters: CountComments.
+Metrics/BlockLength:
+  Max: 39
+
+# Offense count: 1
+# Configuration parameters: CountComments.
+Metrics/ClassLength:
+  Max: 169
+
+# Offense count: 1
+Metrics/CyclomaticComplexity:
+  Max: 7
+
+# Offense count: 11
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# URISchemes: http, https
+Metrics/LineLength:
+  Max: 114
+
+# Offense count: 1
+# Configuration parameters: CountComments.
+Metrics/MethodLength:
+  Max: 16

data/.travis.yml

@@ -1,27 +1,32 @@
 language: ruby
 sudo: false
+jdk:
+  - oraclejdk8
+before_install: gem query -i -n ^bundler$ >/dev/null || gem install bundler
 rvm:
-  - "2.3"
-  - jruby-9.1.0.0
-  - "2.2"
-  - jruby-9.0.5.0
-  - "2.1"
-  - "2.0.0"
-  - jruby-1.7.25
+  - ruby-2.3.3
+  - jruby-9.1.6.0
+  - ruby-2.2.6
+  - ruby-2.1.9
   - ruby-head
   - jruby-head
 gemfile:
+  - gemfiles/ar50.gemfile
   - gemfiles/ar42.gemfile
   - gemfiles/ar41.gemfile
   - gemfiles/ar40.gemfile
   - gemfiles/ar32.gemfile
 env:
-  - ADAPTER="postgresql"
-  - ADAPTER="derby"
-  - ADAPTER="sqlite3"
+  - JRUBY_OPTS="--dev --debug" ADAPTER="postgresql"
+  - JRUBY_OPTS="--dev --debug" ADAPTER="derby"
+  - JRUBY_OPTS="--dev --debug" ADAPTER="sqlite3"
 matrix:
-  allow_failures:
+  exclude:
     - rvm: ruby-head
-      gemfile: gemfiles/ar40.gemfile
+      gemfile: gemfiles/ar42.gemfile
+    - rvm: ruby-head
+      gemfile: gemfiles/ar41.gemfile
     - rvm: ruby-head
       gemfile: gemfiles/ar32.gemfile
+    - rvm: ruby-2.1.9
+      gemfile: gemfiles/ar50.gemfile

data/Gemfile

@@ -3,6 +3,4 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in activerecord-time.gemspec
 gemspec
 
-if ENV['AR_VERSION']
-  gem 'activerecord', ENV['AR_VERSION']
-end
+gem 'activerecord', ENV['AR_VERSION'] if ENV['AR_VERSION']

data/activerecord-time.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |gem|
   gem.test_files = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = %w(lib)
 
-  gem.add_runtime_dependency 'activerecord', '>=3.2.21', '<5.0.0'
+  gem.add_runtime_dependency 'activerecord', '>=3.2.21', '<5.1'
 
   if defined? JRUBY_VERSION
     gem.add_development_dependency 'activerecord-jdbcpostgresql-adapter'
@@ -30,5 +30,6 @@ Gem::Specification.new do |gem|
   end
   gem.add_development_dependency 'minitest-reporters'
   gem.add_development_dependency 'rake'
+  gem.add_development_dependency 'rubocop'
   gem.add_development_dependency 'simplecov'
 end

data/gemfiles/ar32.gemfile.lock

@@ -1,23 +1,23 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (3.2.22)
-      activesupport (= 3.2.22)
+    activemodel (3.2.22.5)
+      activesupport (= 3.2.22.5)
       builder (~> 3.0.0)
-    activerecord (3.2.22)
-      activemodel (= 3.2.22)
-      activesupport (= 3.2.22)
+    activerecord (3.2.22.5)
+      activemodel (= 3.2.22.5)
+      activesupport (= 3.2.22.5)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activerecord-jdbc-adapter (1.3.18)
+    activerecord-jdbc-adapter (1.3.21)
       activerecord (>= 2.2)
-    activerecord-jdbcpostgresql-adapter (1.3.18)
-      activerecord-jdbc-adapter (~> 1.3.18)
+    activerecord-jdbcpostgresql-adapter (1.3.21)
+      activerecord-jdbc-adapter (~> 1.3.21)
       jdbc-postgres (>= 9.1)
-    activerecord-jdbcsqlite3-adapter (1.3.18)
-      activerecord-jdbc-adapter (~> 1.3.18)
+    activerecord-jdbcsqlite3-adapter (1.3.21)
+      activerecord-jdbc-adapter (~> 1.3.21)
       jdbc-sqlite3 (>= 3.7.2, < 3.9)
-    activesupport (3.2.22)
+    activesupport (3.2.22.5)
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
     ansi (1.5.0)
@@ -25,26 +25,27 @@ GEM
     builder (3.0.4)
     docile (1.1.5)
     i18n (0.7.0)
-    jdbc-postgres (9.4.1200)
-    jdbc-sqlite3 (3.8.10.1)
-    json (1.8.3-java)
-    minitest (5.8.0)
-    minitest-reporters (1.0.19)
+    jdbc-postgres (9.4.1206)
+    jdbc-sqlite3 (3.8.11.2)
+    json (2.0.2)
+    json (2.0.2-java)
+    minitest (5.10.1)
+    minitest-reporters (1.1.13)
       ansi
       builder
       minitest (>= 5.0)
       ruby-progressbar
-    multi_json (1.11.2)
-    pg (0.18.2)
-    rake (10.4.2)
-    ruby-progressbar (1.7.5)
-    simplecov (0.10.0)
+    multi_json (1.12.1)
+    pg (0.19.0)
+    rake (12.0.0)
+    ruby-progressbar (1.8.1)
+    simplecov (0.12.0)
       docile (~> 1.1.0)
-      json (~> 1.8)
+      json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
-    sqlite3 (1.3.10)
-    tzinfo (0.3.44)
+    sqlite3 (1.3.12)
+    tzinfo (0.3.52)
 
 PLATFORMS
   java
@@ -62,4 +63,4 @@ DEPENDENCIES
   sqlite3
 
 BUNDLED WITH
-   1.10.6
+   1.13.6

data/gemfiles/ar40.gemfile.lock

@@ -10,13 +10,13 @@ GEM
       activesupport (= 4.0.13)
       arel (~> 4.0.0)
     activerecord-deprecated_finders (1.0.4)
-    activerecord-jdbc-adapter (1.3.18)
+    activerecord-jdbc-adapter (1.3.21)
       activerecord (>= 2.2)
-    activerecord-jdbcpostgresql-adapter (1.3.18)
-      activerecord-jdbc-adapter (~> 1.3.18)
+    activerecord-jdbcpostgresql-adapter (1.3.21)
+      activerecord-jdbc-adapter (~> 1.3.21)
       jdbc-postgres (>= 9.1)
-    activerecord-jdbcsqlite3-adapter (1.3.18)
-      activerecord-jdbc-adapter (~> 1.3.18)
+    activerecord-jdbcsqlite3-adapter (1.3.21)
+      activerecord-jdbc-adapter (~> 1.3.21)
       jdbc-sqlite3 (>= 3.7.2, < 3.9)
     activesupport (4.0.13)
       i18n (~> 0.6, >= 0.6.9)
@@ -28,32 +28,32 @@ GEM
     arel (4.0.2)
     builder (3.1.4)
     docile (1.1.5)
-    hashie (3.4.2)
+    hashie (3.4.6)
     i18n (0.7.0)
-    jdbc-postgres (9.4.1200)
-    jdbc-sqlite3 (3.8.10.1)
-    json (1.8.3-java)
+    jdbc-postgres (9.4.1206)
+    jdbc-sqlite3 (3.8.11.2)
+    json (2.0.2)
+    json (2.0.2-java)
     minitest (4.7.5)
     minitest-reporters (0.14.24)
       ansi
       builder
       minitest (>= 2.12, < 5.0)
       powerbar
-    multi_json (1.11.2)
-    pg (0.18.2)
-    powerbar (1.0.12)
-      ansi (~> 1.5.0)
+    multi_json (1.12.1)
+    pg (0.19.0)
+    powerbar (1.0.17)
       hashie (>= 1.1.0)
-    rake (10.4.2)
-    simplecov (0.10.0)
+    rake (12.0.0)
+    simplecov (0.12.0)
       docile (~> 1.1.0)
-      json (~> 1.8)
+      json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
-    sqlite3 (1.3.10)
+    sqlite3 (1.3.12)
     thread_safe (0.3.5)
     thread_safe (0.3.5-java)
-    tzinfo (0.3.44)
+    tzinfo (0.3.52)
 
 PLATFORMS
   java
@@ -71,4 +71,4 @@ DEPENDENCIES
   sqlite3
 
 BUNDLED WITH
-   1.10.6
+   1.13.6

data/gemfiles/ar41.gemfile.lock

@@ -1,22 +1,22 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (4.1.12)
-      activesupport (= 4.1.12)
+    activemodel (4.1.16)
+      activesupport (= 4.1.16)
       builder (~> 3.1)
-    activerecord (4.1.12)
-      activemodel (= 4.1.12)
-      activesupport (= 4.1.12)
+    activerecord (4.1.16)
+      activemodel (= 4.1.16)
+      activesupport (= 4.1.16)
       arel (~> 5.0.0)
-    activerecord-jdbc-adapter (1.3.18)
+    activerecord-jdbc-adapter (1.3.21)
       activerecord (>= 2.2)
-    activerecord-jdbcpostgresql-adapter (1.3.18)
-      activerecord-jdbc-adapter (~> 1.3.18)
+    activerecord-jdbcpostgresql-adapter (1.3.21)
+      activerecord-jdbc-adapter (~> 1.3.21)
       jdbc-postgres (>= 9.1)
-    activerecord-jdbcsqlite3-adapter (1.3.18)
-      activerecord-jdbc-adapter (~> 1.3.18)
+    activerecord-jdbcsqlite3-adapter (1.3.21)
+      activerecord-jdbc-adapter (~> 1.3.21)
       jdbc-sqlite3 (>= 3.7.2, < 3.9)
-    activesupport (4.1.12)
+    activesupport (4.1.16)
       i18n (~> 0.6, >= 0.6.9)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -27,25 +27,25 @@ GEM
     builder (3.2.2)
     docile (1.1.5)
     i18n (0.7.0)
-    jdbc-postgres (9.4.1200)
-    jdbc-sqlite3 (3.8.10.1)
+    jdbc-postgres (9.4.1206)
+    jdbc-sqlite3 (3.8.11.2)
     json (1.8.3)
     json (1.8.3-java)
-    minitest (5.8.0)
-    minitest-reporters (1.0.19)
+    minitest (5.10.1)
+    minitest-reporters (1.1.13)
       ansi
       builder
       minitest (>= 5.0)
       ruby-progressbar
-    pg (0.18.2)
-    rake (10.4.2)
-    ruby-progressbar (1.7.5)
-    simplecov (0.10.0)
+    pg (0.19.0)
+    rake (12.0.0)
+    ruby-progressbar (1.8.1)
+    simplecov (0.12.0)
       docile (~> 1.1.0)
-      json (~> 1.8)
+      json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
-    sqlite3 (1.3.10)
+    sqlite3 (1.3.12)
     thread_safe (0.3.5)
     thread_safe (0.3.5-java)
     tzinfo (1.2.2)
@@ -67,4 +67,4 @@ DEPENDENCIES
   sqlite3
 
 BUNDLED WITH
-   1.10.6
+   1.13.6

data/gemfiles/ar42.gemfile.lock

@@ -1,22 +1,22 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (4.2.3)
-      activesupport (= 4.2.3)
+    activemodel (4.2.7.1)
+      activesupport (= 4.2.7.1)
       builder (~> 3.1)
-    activerecord (4.2.3)
-      activemodel (= 4.2.3)
-      activesupport (= 4.2.3)
+    activerecord (4.2.7.1)
+      activemodel (= 4.2.7.1)
+      activesupport (= 4.2.7.1)
       arel (~> 6.0)
-    activerecord-jdbc-adapter (1.3.18)
+    activerecord-jdbc-adapter (1.3.21)
       activerecord (>= 2.2)
-    activerecord-jdbcpostgresql-adapter (1.3.18)
-      activerecord-jdbc-adapter (~> 1.3.18)
+    activerecord-jdbcpostgresql-adapter (1.3.21)
+      activerecord-jdbc-adapter (~> 1.3.21)
       jdbc-postgres (>= 9.1)
-    activerecord-jdbcsqlite3-adapter (1.3.18)
-      activerecord-jdbc-adapter (~> 1.3.18)
+    activerecord-jdbcsqlite3-adapter (1.3.21)
+      activerecord-jdbc-adapter (~> 1.3.21)
       jdbc-sqlite3 (>= 3.7.2, < 3.9)
-    activesupport (4.2.3)
+    activesupport (4.2.7.1)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -27,25 +27,25 @@ GEM
     builder (3.2.2)
     docile (1.1.5)
     i18n (0.7.0)
-    jdbc-postgres (9.4.1200)
-    jdbc-sqlite3 (3.8.10.1)
+    jdbc-postgres (9.4.1206)
+    jdbc-sqlite3 (3.8.11.2)
     json (1.8.3)
     json (1.8.3-java)
-    minitest (5.8.0)
-    minitest-reporters (1.0.19)
+    minitest (5.10.1)
+    minitest-reporters (1.1.13)
       ansi
       builder
       minitest (>= 5.0)
       ruby-progressbar
-    pg (0.18.2)
-    rake (10.4.2)
-    ruby-progressbar (1.7.5)
-    simplecov (0.10.0)
+    pg (0.19.0)
+    rake (12.0.0)
+    ruby-progressbar (1.8.1)
+    simplecov (0.12.0)
       docile (~> 1.1.0)
-      json (~> 1.8)
+      json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
-    sqlite3 (1.3.10)
+    sqlite3 (1.3.12)
     thread_safe (0.3.5)
     thread_safe (0.3.5-java)
     tzinfo (1.2.2)
@@ -67,4 +67,4 @@ DEPENDENCIES
   sqlite3
 
 BUNDLED WITH
-   1.10.6
+   1.13.6

data/gemfiles/ar50.gemfile

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

data/gemfiles/ar50.gemfile.lock

@@ -0,0 +1,78 @@
+GIT
+  remote: git://github.com/jruby/activerecord-jdbc-adapter.git
+  revision: ee68c1881a9b0ce59f5095cd1999c109bddf6167
+  branch: rails-5
+  specs:
+    activerecord-jdbc-adapter (5.0)
+      activerecord (>= 2.2)
+    activerecord-jdbcpostgresql-adapter (5.0)
+      activerecord-jdbc-adapter (~> 5.0)
+      jdbc-postgres (>= 9.1)
+    activerecord-jdbcsqlite3-adapter (5.0)
+      activerecord-jdbc-adapter (~> 5.0)
+      jdbc-sqlite3 (>= 3.7.2, < 3.9)
+    jdbc-postgres (9.3.1102)
+    jdbc-sqlite3 (3.7.2.1)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (5.0.1)
+      activesupport (= 5.0.1)
+    activerecord (5.0.1)
+      activemodel (= 5.0.1)
+      activesupport (= 5.0.1)
+      arel (~> 7.0)
+    activesupport (5.0.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    ansi (1.5.0)
+    arel (7.1.4)
+    builder (3.2.2)
+    concurrent-ruby (1.0.3)
+    concurrent-ruby (1.0.3-java)
+    docile (1.1.5)
+    i18n (0.7.0)
+    json (2.0.2)
+    json (2.0.2-java)
+    minitest (5.10.1)
+    minitest-reporters (1.1.13)
+      ansi
+      builder
+      minitest (>= 5.0)
+      ruby-progressbar
+    pg (0.19.0)
+    rake (12.0.0)
+    ruby-progressbar (1.8.1)
+    simplecov (0.12.0)
+      docile (~> 1.1.0)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.0)
+    sqlite3 (1.3.12)
+    thread_safe (0.3.5)
+    thread_safe (0.3.5-java)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  java
+  ruby
+
+DEPENDENCIES
+  activerecord (~> 5.0.1)
+  activerecord-jdbc-adapter!
+  activerecord-jdbcpostgresql-adapter!
+  activerecord-jdbcsqlite3-adapter!
+  jdbc-postgres!
+  jdbc-sqlite3!
+  minitest-reporters
+  pg
+  rake
+  simplecov
+  sqlite3
+
+BUNDLED WITH
+   1.13.6

data/gemfiles/common.gemfile

@@ -1,9 +1,17 @@
 source 'https://rubygems.org'
 
 platform :jruby do
-  gem 'activerecord-jdbc-adapter'
-  gem 'activerecord-jdbcpostgresql-adapter'
-  gem 'activerecord-jdbcsqlite3-adapter'
+  if defined?(RAILS_5)
+    gem 'activerecord-jdbc-adapter', github: 'jruby/activerecord-jdbc-adapter', branch: 'rails-5'
+    gem 'activerecord-jdbcpostgresql-adapter', github: 'jruby/activerecord-jdbc-adapter', branch: 'rails-5'
+    gem 'activerecord-jdbcsqlite3-adapter', github: 'jruby/activerecord-jdbc-adapter', branch: 'rails-5'
+    gem 'jdbc-postgres', github: 'jruby/activerecord-jdbc-adapter', branch: 'rails-5'
+    gem 'jdbc-sqlite3', github: 'jruby/activerecord-jdbc-adapter', branch: 'rails-5'
+  else
+    gem 'activerecord-jdbc-adapter'
+    gem 'activerecord-jdbcpostgresql-adapter'
+    gem 'activerecord-jdbcsqlite3-adapter'
+  end
 end
 
 platform :ruby do

data/lib/activerecord-time.rb

@@ -3,12 +3,15 @@ require 'active_record/version'
 require 'time_of_day'
 # TODO(uwe): Simplify when we stop supporting ActiveRecord 3.2
 if ActiveRecord::VERSION::MAJOR < 3 ||
-    (ActiveRecord::VERSION::MAJOR == 3 && ActiveRecord::VERSION::MINOR < 2)
+   (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)
+      (ActiveRecord::VERSION::MAJOR == 4 && ActiveRecord::VERSION::MINOR <= 1)
   require 'activerecord-time/extension_until_4_1'
-elsif ActiveRecord.gem_version >= Gem::Version.new('4.2.0')
+# 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

data/lib/activerecord-time/extension_4_2.rb

@@ -2,20 +2,23 @@ module ActiveRecord
   module ConnectionAdapters
     module Quoting
       def _quote_with_time_of_day(value)
-        return "'#{value}'" if TimeOfDay === 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 TimeOfDay === 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
-  module Type
-    class Time < Value # :nodoc:
+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)
@@ -25,3 +28,4 @@ module ActiveRecord
     end
   end
 end
+ActiveRecord::Type::Time.prepend Activerecord::Time::TypeCast

data/lib/activerecord-time/extension_5_0.rb

@@ -0,0 +1,33 @@
+require 'active_record/connection_adapters/abstract/quoting'
+
+module Activerecord
+  module Time
+    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
+  end
+end
+
+# ActiveRecord::ConnectionAdapters::Quoting.prepend Activerecord::Time::Quoting
+ActiveRecord::ConnectionAdapters::AbstractAdapter.prepend Activerecord::Time::Quoting
+
+module ActiveRecord
+  module Type
+    class Time < ActiveModel::Type::Time # :nodoc:
+      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

data/lib/activerecord-time/extension_until_4_1.rb

@@ -2,48 +2,64 @@ require 'active_record/connection_adapters/abstract/quoting'
 
 module ActiveRecord
   module ConnectionAdapters
-    class Column
-      def klass_with_time_of_day
-        return TimeOfDay if :time === type
-        klass_without_time_of_day
-      end
-
-      alias_method_chain :klass, :time_of_day
-
-      def self.string_to_dummy_time(string)
-        return string if string.is_a? TimeOfDay
-        return string.time_of_day if string.is_a? ::Time
-        return nil if string.empty?
-        TimeOfDay.parse(string)
-      end
-    end
     module Quoting
       def quote_with_time_of_day(value, column = nil)
-        if column && column.type == :time && Integer === value
+        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 TimeOfDay === value
+        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 TimeOfDay === value
+        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 :time == type
+        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 Arel::Visitors::Visitor
+    class Visitor
       if Gem::Version.new(Arel::VERSION) >= Gem::Version.new('5.0.0')
-        def visit_TimeOfDay o, a
+        def visit_TimeOfDay(o, _a) # rubocop: disable Style/MethodName
           "'#{o.to_s(:db)}'"
         end
       else
-        def visit_TimeOfDay o
+        def visit_TimeOfDay(o) # rubocop: disable Style/MethodName
           "'#{o.to_s(:db)}'"
         end
       end

data/lib/activerecord-time/version.rb

@@ -1,5 +1,5 @@
 module Activerecord
   module Time
-    VERSION = '0.6.1'
+    VERSION = '0.7.0'.freeze
   end
 end

data/lib/time_of_day.rb

@@ -1,5 +1,6 @@
 require 'yaml'
 
+# rubocop: disable Rails/TimeZone, Rails/Date
 class TimeOfDay
   attr_accessor :hour # 0 - 23
   attr_accessor :minute # 0 - 59
@@ -17,35 +18,40 @@ class TimeOfDay
     initialize(*parts)
   end
 
+  def encode_with(coder)
+    coder.tag = 'tag:yaml.org,2002:time'
+    coder.scalar = to_s
+  end
+
   def self.now
     Time.now.time_of_day
   end
 
   def self.parse(string)
     return nil if string.blank?
-    self.new(*parse_parts(string))
+    new(*parse_parts(string))
   end
 
   def self.parse_parts(string)
     string = string.strip
     raise "Illegal time format: '#{string}'" unless string =~ /^(\d{1,2}):?(\d{2})?(?::(\d{1,2}))?$/
-    [$1.to_i, $2.to_i, $3.to_i]
+    [Regexp.last_match(1).to_i, Regexp.last_match(2).to_i, Regexp.last_match(3).to_i]
   end
 
   def on(date)
     Time.local(date.year, date.month, date.day, hour, minute, second)
   end
 
-  def +(seconds)
-    raise "Illegal argument: #{seconds.inspect}" unless seconds.is_a? Numeric
+  def +(other)
+    raise "Illegal argument: #{other.inspect}" unless other.is_a? Numeric
     t = Time.local(0, 1, 1, hour, minute, second)
-    t += seconds
+    t += other
     self.class.new(t.hour, t.min, t.sec)
   end
 
-  def -(seconds)
-    raise "Illegal argument: #{seconds.inspect}" unless seconds.is_a? Numeric
-    self.+(-seconds)
+  def -(other)
+    raise "Illegal argument: #{other.inspect}" unless other.is_a? Numeric
+    self.+(-other)
   end
 
   def <=>(other)
@@ -89,23 +95,15 @@ class TimeOfDay
     end
   end
 
-  def to_yaml(opts = {})
-    YAML::quick_emit(nil, opts) do |out|
-      out.scalar('tag:yaml.org,2002:time', self.to_s, :plain)
-    end
-  end
-
   def to_json(*)
-    %{"#{to_s}"}
+    %("#{self}")
   end
-
 end
 
 class Time
   def time_of_day
     TimeOfDay.new(hour, min, sec)
   end
-
 end
 
 class Date
@@ -113,11 +111,10 @@ class Date
     time_of_day = TimeOfDay.parse(time_of_day) if time_of_day.is_a?(String)
     Time.local(year, month, day, time_of_day.hour, time_of_day.minute, time_of_day.second)
   end
-
 end
 
 module Kernel
-  def TimeOfDay(string_or_int, *ints)
+  def TimeOfDay(string_or_int, *ints) # rubocop: disable Style/MethodName
     if string_or_int.is_a? String
       raise(ArgumentError, 'TimeOfDay() takes a string or multiple integers as arguments') unless ints.empty?
       TimeOfDay.parse(string_or_int)

data/matrix_test.rb

@@ -1,33 +1,43 @@
 #!/usr/bin/env ruby -w
 
+system('rubocop --auto-correct') || exit(1)
+
+update_gemfiles = ARGV.delete('--update')
+
 require 'yaml'
 travis = YAML.load(File.read('.travis.yml'))
 
 travis['rvm'].each do |ruby|
+  next if ruby =~ /head/
   puts '#' * 80
   puts "Testing #{ruby}"
   puts
-  system "rvm install #{ruby}"
-  exit $? unless $? == 0
-  system "rvm #{ruby} do gem query -i -n bundler >/dev/null || gem install bundler"
-  exit $? unless $? == 0
+  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)
   travis['gemfile'].each do |gemfile|
+    if travis['matrix']['exclude'].any? { |f| f['rvm'] == ruby && f['gemfile'] == gemfile }
+      puts 'Skipping known failure.'
+      next
+    end
     puts '$' * 80
     puts "Testing #{gemfile}"
     puts
     ENV['BUNDLE_GEMFILE'] = gemfile
-    system "rvm #{ruby} do bundle install"
-    exit $?.exitstatus unless $? == 0
+    if update_gemfiles
+      system "chruby-exec #{ruby} -- bundle update"
+    else
+      system "chruby-exec #{ruby} -- bundle check || chruby-exec #{ruby} -- bundle install"
+    end || exit(1)
     travis['env'].each do |env|
-      env.scan(/\b(?<key>[A-Z_]+)="?(?<value>.+?)"?\b/) do |key, value|
+      env.scan(/\b(?<key>[A-Z_]+)="(?<value>.+?)"/) do |key, value|
         ENV[key] = value
-        puts '*' * 80
-        puts "Testing #{ruby} #{gemfile} #{env}"
-        puts
-        system "rvm #{ruby} do bundle exec rake"
-        exit $? unless $? == 0
-        puts '*' * 80
       end
+      puts '*' * 80
+      puts "Testing #{ruby} #{gemfile} #{env}"
+      puts
+      system "chruby-exec #{ruby} -- bundle exec rake" || exit(1)
+      puts '*' * 80
     end
     puts "Testing #{gemfile} OK"
     puts '$' * 80

data/test/test_helper.rb

@@ -1,4 +1,4 @@
-$:.unshift(File.dirname(__FILE__) + '/../lib')
+$LOAD_PATH.unshift(File.dirname(__FILE__) + '/../lib')
 RAILS_ROOT = File.dirname(__FILE__)
 
 require 'rubygems'
@@ -17,20 +17,20 @@ require 'simplecov'
 SimpleCov.start
 
 FileUtils.rm_rf File.expand_path(':memory:', File.dirname(__FILE__))
-config = YAML::load(IO.read(File.dirname(__FILE__) + '/database.yml'))
+config = YAML.load(IO.read(File.dirname(__FILE__) + '/database.yml'))
 ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + '/test.log')
 db = ENV['DB'] || 'sqlite3'
 if db != 'sqlite3'
   ActiveRecord::Base.establish_connection config[db].merge(database: nil)
   begin
     ActiveRecord::Base.connection.drop_database config[db][:database]
-  rescue
-    puts $!
+  rescue => e
+    puts e
   end
   begin
     ActiveRecord::Base.connection.create_database config[db][:database], charset: 'utf8'
-  rescue
-    puts $!
+  rescue => e
+    puts e
   end
 end
 ActiveRecord::Base.establish_connection config[db]

data/test/time_of_day_test.rb

@@ -4,7 +4,7 @@ class Event < ActiveRecord::Base
 end
 
 # TODO(uwe): Remove when we stop testing ActiveRecord 4.0
-MiniTest::Test = Minitest::Unit unless defined? Minitest::Test
+Minitest::Test = Minitest::Unit unless defined? Minitest::Test
 # ODOT
 
 class TimeOfDayTest < Minitest::Test
@@ -80,11 +80,11 @@ class TimeOfDayTest < Minitest::Test
 
   def test_yaml_load
     hash = YAML.load('start_at: !!time 12:34:56')
-    assert_equal({'start_at' => TimeOfDay.parse('12:34:56')}, hash)
+    assert_equal({ 'start_at' => TimeOfDay.parse('12:34:56') }, hash)
   end
 
   def test_yaml_dump
-    string = YAML.dump({'start_at' => TimeOfDay.parse('12:34:56')})
+    string = YAML.dump('start_at' => TimeOfDay.parse('12:34:56'))
     assert_match(/---\nstart_at: !!time '?12:34:56'?\n/, string)
   end
 
@@ -93,10 +93,10 @@ class TimeOfDayTest < Minitest::Test
   end
 
   def test_activerecord
-    Event.create! :name => 'Bored meeting', :start_at => @twelve_o_clock
-    t = Event.where(:start_at => '12:00:00').first
+    Event.create! name: 'Bored meeting', start_at: @twelve_o_clock
+    t = Event.where(start_at: '12:00:00').first
     assert_equal TimeOfDay, t.start_at.class
-    assert_equal t, Event.where(:start_at => @twelve_o_clock).first
+    assert_equal t, Event.where(start_at: @twelve_o_clock).first
     assert_equal t, Event.where('start_at = ?', @twelve_o_clock).first
     assert_equal t, Event.where('start_at >= ?', @twelve_o_clock).first
     assert_equal t, Event.where('start_at <= ?', @twelve_o_clock).first
@@ -106,9 +106,9 @@ class TimeOfDayTest < Minitest::Test
 
     # TODO(uwe): Simplify when we stop supporting ActiveRecord 3
     if ActiveRecord::VERSION::MAJOR >= 4
-      t.update! :start_at => TimeOfDay.new(13)
+      t.update! start_at: TimeOfDay.new(13)
     else
-      t.update_attributes! :start_at => TimeOfDay.new(13)
+      t.update_attributes! start_at: TimeOfDay.new(13)
     end
     # ODOT
 
@@ -117,15 +117,15 @@ class TimeOfDayTest < Minitest::Test
 
   def test_activerecord_binary_column
     text = 'Some binary content'
-    Event.create! :content => text
-    e = Event.where(:content => text).first
+    Event.create! content: text
+    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'
+      e.update! content: 'Other binary content'
     else
-      e.update_attributes! :content => 'Other binary content'
+      e.update_attributes! content: 'Other binary content'
     end
     # ODOT
   end
@@ -166,7 +166,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
+    assert_equal 0, tod1 <=> tod1 # rubocop: disable Lint/UselessComparison
   end
 
   def test_strftime
@@ -211,6 +211,6 @@ class TimeOfDayTest < Minitest::Test
 
   def test_to_json
     tod = TimeOfDay.new(12, 13)
-    assert_equal "\"12:13:00\"", tod.to_json('foo')
+    assert_equal '"12:13:00"', tod.to_json('foo')
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-time
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Uwe Kubosch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-10 00:00:00.000000000 Z
+date: 2016-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -19,7 +19,7 @@ dependencies:
         version: 3.2.21
     - - "<"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: 3.2.21
     - - "<"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -86,6 +86,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  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
@@ -109,6 +123,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
 - ".travis.yml"
 - Gemfile
 - LICENSE
@@ -124,9 +140,12 @@ files:
 - gemfiles/ar41.gemfile.lock
 - gemfiles/ar42.gemfile
 - gemfiles/ar42.gemfile.lock
+- gemfiles/ar50.gemfile
+- gemfiles/ar50.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_until_4_1.rb
 - lib/activerecord-time/version.rb
 - lib/time_of_day.rb