activerecord-time 0.3.14 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf7bd87897ba45fafd55442761573cbbf5c5ad12
-  data.tar.gz: 2e432fb8826089f68847933383c00ec298d4cbca
+  metadata.gz: b1430418d53117b880e0f6f9ee19f76f11c79cfe
+  data.tar.gz: 738201de8e6cd4ca6e3c4b11213867df2cd9c91d
 SHA512:
-  metadata.gz: 89ca7c611a9372e71d8f4ac65130a1d842d1a304b28afc2f942557cf6e73cfd92846cdd4aa416c13efe9c481936c42778a0fe6439dff30508fcb0f3cf59bcb81
-  data.tar.gz: 711db65a5a4f5c75a8be62229a74251030054a65b5647230d0779077f867d10377dcf50a7b1a333f165eb7802c670dd1e70347716c918853c8a734a24eb33a29
+  metadata.gz: 8993938930022bbfbe9bc2fb388fafe090bd91113e7b7d34abe090c6419e1cdbc3db0264833701e291bd4ff32cec953653bfef8009fcdafb2c8d8d702ecf4a02
+  data.tar.gz: 887959d0d52c63ebc6d77500482dd9abc343892ea8ef57969a66cbc76e00b7bb89e92b63c4b4fff8197d066b1787a989e2bdd8c6b990830ab44374528e5770fe

data/.travis.yml

@@ -1,8 +1,15 @@
 language: ruby
+sudo: false
 rvm:
-  - "1.9.3"
-  - "2.0.0"
-  - "2.1.5"
+  - jruby-head
   - ruby-head
+  - "2.2"
   - jruby-19mode
-  - jruby-head
+  - "2.1"
+  - "2.0.0"
+  - "1.9.3"
+env:
+  - AR_VERSION="~>4.2.1"
+  - AR_VERSION="~>4.1.10"
+  - AR_VERSION="~>4.0.13"
+  - AR_VERSION="~>3.2.21"

data/Gemfile

@@ -2,3 +2,13 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in activerecord-time.gemspec
 gemspec
+
+if ENV['AR_VERSION']
+  gem 'activerecord', ENV['AR_VERSION']
+end
+
+# TODO(uwe): Remove when ARJDBC 1.4.0 is out
+if RUBY_ENGINE == 'jruby'
+  gem 'activerecord-jdbc-adapter', '>= 1.4.0.dev', github: 'jruby/activerecord-jdbc-adapter'
+end
+# ODOT

data/Rakefile

@@ -1,4 +1,5 @@
 require 'rubygems'
+require 'bundler/setup'
 require 'bundler/gem_tasks'
 require 'rake/testtask'
 

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'
+  gem.add_runtime_dependency 'activerecord', '>=3.2.21', '<5.0.0'
 
   if defined? JRUBY_VERSION
     gem.add_development_dependency 'activerecord-jdbcpostgresql-adapter'

data/lib/activerecord-time.rb

@@ -1,17 +1,14 @@
 require 'activerecord-time/version'
+require 'active_record/version'
 require 'time_of_day'
-if defined?(JRUBY_VERSION)
-  require 'activerecord-time/extension_arjdbc'
-else
-  require 'activerecord-time/extension_mri'
-end
-
-module Arel
-  module Visitors
-    class Arel::Visitors::Visitor
-      def visit_TimeOfDay o, a
-        "'#{o.to_s(:db)}'"
-      end
-    end
-  end
+# TODO(uwe): Simplify when we stop supporing 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 supporing 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'
+elsif ActiveRecord.gem_version >= Gem::Version.new('4.2.0')
+  require 'activerecord-time/extension_4_2'
 end

data/lib/activerecord-time/extension_4_2.rb

@@ -0,0 +1,29 @@
+require 'active_record/type/time'
+
+module ActiveRecord
+  module ConnectionAdapters
+    module Quoting
+      def _quote_with_time_of_day(value)
+        return "'#{value}'" if TimeOfDay === value
+        _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
+        _type_cast_without_time_of_day(value)
+      end
+      alias_method_chain :_type_cast, :time_of_day
+    end
+  end
+  module Type
+    class Time < Value # :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

@@ -0,0 +1,53 @@
+require 'active_record/connection_adapters/abstract/quoting'
+require 'active_record/connection_adapters/sqlite3_adapter'
+
+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
+          value = TimeOfDay.new(value / 3600, (value % 3600) / 60, value % 60)
+        end
+        return "'#{value.to_s(:db)}'" if TimeOfDay === value
+        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
+        type_cast_without_time_of_day(value, column)
+      end
+      alias_method_chain :type_cast, :time_of_day
+    end
+  end
+end
+
+module Arel
+  module Visitors
+    class Arel::Visitors::Visitor
+      if Gem::Version.new(Arel::VERSION) >= Gem::Version.new('5.0.0')
+        def visit_TimeOfDay o, a
+          "'#{o.to_s(:db)}'"
+        end
+      else
+        def visit_TimeOfDay o
+          "'#{o.to_s(:db)}'"
+        end
+      end
+    end
+  end
+end

data/lib/activerecord-time/version.rb

@@ -1,5 +1,5 @@
 module Activerecord
   module Time
-    VERSION = '0.3.14'
+    VERSION = '0.4.0'
   end
 end

data/matrix_test.sh

@@ -1,12 +1,19 @@
 #!/bin/bash -el
 
-echo
-rvm use ruby
-rake
-
-echo
-rvm use jruby
-rake
+for rb in ruby jruby-head ; do
+  rvm use $rb
+  for AR_VERSION in "~>4.2.1" "~>4.1.10" "~>4.0.13" "~>3.2.21" ; do
+    export AR_VERSION
+    bundle update
+    for DB in postgresql sqlite3 ; do
+      export DB
+      echo
+      echo Testing $rb $DB $AR_VERSION
+      echo
+      bundle exec rake
+    done
+  done
+done
 
 echo -e "\033[0;32m"
 echo -e "                        TESTS PASSED OK!"

data/test/database.yml

@@ -7,13 +7,14 @@ sqlite3:
   :database: ":memory:"
 postgresql:
   :adapter: postgresql
+  :host: localhost
   :username: postgres
-  :password: postgres
-  :database: plugin_test
+  :password:
+  :database: activerecord-time_test
   :min_messages: ERROR
 mysql:
   :adapter: mysql
   :host: localhost
   :username: rails
   :password:
-  :database: plugin_test
+  :database: activerecord-time_test

data/test/test_helper.rb

@@ -15,5 +15,19 @@ require 'fileutils'
 FileUtils.rm_rf File.expand_path(':memory:', File.dirname(__FILE__))
 config = YAML::load(IO.read(File.dirname(__FILE__) + '/database.yml'))
 ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + '/test.log')
-ActiveRecord::Base.establish_connection(config[ENV['DB'] || 'sqlite3'])
+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 $!
+  end
+  begin
+    ActiveRecord::Base.connection.create_database config[db][:database], charset: 'utf8'
+  rescue
+    puts $!
+  end
+end
+ActiveRecord::Base.establish_connection config[db]
 load(File.dirname(__FILE__) + '/schema.rb') if File.exist?(File.dirname(__FILE__) + '/schema.rb')

data/test/time_of_day_test.rb

@@ -3,6 +3,10 @@ require File.expand_path('test_helper', File.dirname(__FILE__))
 class Event < ActiveRecord::Base
 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'
@@ -34,9 +38,14 @@ class TimeOfDayTest < Minitest::Test
     assert_match /---\nstart_at: !!time '?12:34:56'?\n/, string
   end
 
+  def test_column_type
+    assert_equal [:integer, :string, :time], Event.columns.map(&:type)
+  end
+
   def test_activerecord
     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
@@ -45,7 +54,14 @@ class TimeOfDayTest < Minitest::Test
     assert_nil Event.where('start_at < ?', @twelve_o_clock).first
     assert_nil Event.where('start_at > ?', @twelve_o_clock).first
 
-    t.update! start_at: TimeOfDay.new(13)
+    # 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.destroy
   end
 

metadata

@@ -1,94 +1,101 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-time
 version: !ruby/object:Gem::Version
-  version: 0.3.14
+  version: 0.4.0
 platform: ruby
 authors:
 - Uwe Kubosch
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-11 00:00:00.000000000 Z
+date: 2015-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  name: activerecord
-  prerelease: false
+        version: 3.2.21
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 5.0.0
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.2.21
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
+  name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: activerecord-jdbcpostgresql-adapter
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: activerecord-jdbcsqlite3-adapter
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: minitest-reporters
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: rake
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: A handler for storing TimeOfDay objects in ActiveRecord objects as sql time values.
+description: A handler for storing TimeOfDay objects in ActiveRecord objects as sql
+  time values.
 email:
 - uwe@kubosch.no
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - LICENSE.txt
@@ -96,8 +103,8 @@ files:
 - Rakefile
 - activerecord-time.gemspec
 - lib/activerecord-time.rb
-- lib/activerecord-time/extension_arjdbc.rb
-- lib/activerecord-time/extension_mri.rb
+- lib/activerecord-time/extension_4_2.rb
+- lib/activerecord-time/extension_until_4_1.rb
 - lib/activerecord-time/version.rb
 - lib/time_of_day.rb
 - matrix_test.sh
@@ -109,26 +116,27 @@ homepage: https://github.com/donv/activerecord-time
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.1.9
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.4.6
+signing_key: 
 specification_version: 4
-summary: A handler for storing TimeOfDay objects in ActiveRecord objects as sql time values.
+summary: A handler for storing TimeOfDay objects in ActiveRecord objects as sql time
+  values.
 test_files:
 - test/database.yml
 - test/schema.rb

data/lib/activerecord-time/extension_arjdbc.rb

@@ -1,30 +0,0 @@
-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 nil if string.empty?
-        TimeOfDay.parse(string)
-      end
-    end
-    module Quoting
-      def quote_with_time_of_day(value, column = nil)
-        return "'#{quoted_time(value)}'" if TimeOfDay === value
-        quote_without_time_of_day(value, column)
-      end
-
-      alias_method_chain :quote, :time_of_day
-
-      def quoted_time(value)
-        value.to_s
-      end
-    end
-  end
-end

data/lib/activerecord-time/extension_mri.rb

@@ -1,25 +0,0 @@
-require 'active_record/connection_adapters/abstract/quoting'
-
-module ActiveRecord
-  module ConnectionAdapters # :nodoc:
-    module Quoting
-      def type_cast_with_time_of_day(value, column)
-        return value.to_s if TimeOfDay === value
-        type_cast_without_time_of_day(value, column)
-      end
-
-      alias_method_chain :type_cast, :time_of_day
-
-      def quote_with_time_of_day(value, column = nil)
-        if column && column.type == :time && Integer === value
-          value = TimeOfDay.new(value / 3600, (value % 3600) / 60, value % 60)
-        end
-        return "'#{value.to_s(:db)}'" if TimeOfDay === value
-        quote_without_time_of_day(value, column)
-      end
-
-      alias_method_chain :quote, :time_of_day
-
-    end
-  end
-end