activerecord-time 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9726749c08e7f21a192df63e9969d9ac2e6b6ed9
-  data.tar.gz: a6ea5592bc0fdfc1988468ed78f97e9546dffa73
+  metadata.gz: c8de8d80f318e113ff121248a76f69f6f0a5773f
+  data.tar.gz: 66a667a4adb6325e81d65786fd8faf97c62d7775
 SHA512:
-  metadata.gz: cd921d9c1954b63dc1d885ed2eb526ac2317879ba530425423f574fe341d5d3232b5cf50723c9860d125a0651487b10632f3d3526ef172830767c2a21c10296a
-  data.tar.gz: efb1a223cb7bbc0cb1b4cdfb07f363f7de4faa7af412e7fdaf6990f3091b6c38c732c9fcd7ce9b5117b50f037af1e862cc82cfe1116716826ac81c9114729f8b
+  metadata.gz: a2d38d767ee3e5a1550e78750e5c7417704bbb8aa74ab026bb1b0e5b8a8a25092472d28c3057b761870c73e62ce43a985d30f492d4f34f97ce91d2fcd3ecdd88
+  data.tar.gz: 6e1a694bc9c45bdff91664e3e9e3ea93f83f249b0b798a867c3a81942f2fb90717ad599e7f79c0d27fcf260dfc5c711f2ba8579111f9dd24f4fdf516d58b03ca

data/.gitignore

@@ -15,6 +15,7 @@ lib/bundler/man
 pkg
 rdoc
 spec/reports
+test/test.log
 test/tmp
 test/version_tmp
 tmp

data/.travis

@@ -0,0 +1,5 @@
+language: ruby
+rvm:
+  - "1.9.3"
+  - jruby-19mode # JRuby in 1.9 mode
+  - rbx

data/LICENSE

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2013 Uwe Kubosch
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/Rakefile

@@ -2,6 +2,8 @@ require 'rubygems'
 require 'bundler/gem_tasks'
 require 'rake/testtask'
 
+task default: :test
+
 Rake::TestTask.new do |t|
   t.libs << 'test'
   t.test_files = FileList['test/*_test.rb']

data/activerecord-time.gemspec

@@ -4,18 +4,29 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'activerecord-time/version'
 
 Gem::Specification.new do |gem|
-  gem.name          = 'activerecord-time'
-  gem.version       = Activerecord::Time::VERSION
-  gem.authors       = ['Uwe Kubosch']
-  gem.email         = %w(uwe@kubosch.no)
-  gem.description   = %q{A handler for storing TimeOfDay objects in ActiveRecord objects as sql time values.}
-  gem.summary       = %q{A handler for storing TimeOfDay objects in ActiveRecord objects as sql time values.}
-  gem.homepage      = 'https://github.com/donv/activerecord-time'
+  gem.name = 'activerecord-time'
+  gem.version = Activerecord::Time::VERSION
+  gem.authors = ['Uwe Kubosch']
+  gem.email = %w(uwe@kubosch.no)
+  gem.description = %q{A handler for storing TimeOfDay objects in ActiveRecord objects as sql time values.}
+  gem.summary = %q{A handler for storing TimeOfDay objects in ActiveRecord objects as sql time values.}
+  gem.homepage = 'https://github.com/donv/activerecord-time'
+  gem.license = 'MIT'
 
-  gem.files         = `git ls-files`.split($/)
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
-  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
+  gem.files = `git ls-files`.split($/)
+  gem.executables = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }
+  gem.test_files = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = %w(lib)
 
-  gem.add_development_dependency 'activerecord-jdbcsqlite3-adapter'
+  gem.add_runtime_dependency 'activerecord'
+
+  if defined? JRUBY_VERSION
+    gem.add_development_dependency 'activerecord-jdbcpostgresql-adapter'
+    gem.add_development_dependency 'activerecord-jdbcsqlite3-adapter'
+  else
+    gem.add_development_dependency 'pg'
+    gem.add_development_dependency 'sqlite3'
+  end
+  gem.add_development_dependency 'minitest-reporters'
+  gem.add_development_dependency 'rake'
 end

data/lib/activerecord-time.rb

@@ -1,3 +1,17 @@
 require 'activerecord-time/version'
 require 'time_of_day'
-require 'activerecord-time/extension'
+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
+end

data/lib/activerecord-time/{extension.rb → extension_arjdbc.rb}

@@ -5,8 +5,9 @@ module ActiveRecord
         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?
@@ -18,8 +19,9 @@ module ActiveRecord
         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

data/lib/activerecord-time/extension_mri.rb

@@ -0,0 +1,48 @@
+require 'active_record/connection_adapters/abstract/quoting'
+
+module ActiveRecord
+  module ConnectionAdapters
+    class Column
+      # FIXME(uwe):  Not necessary?
+      def klass_with_time_of_day
+        return TimeOfDay if :time === type
+        klass_without_time_of_day
+      end
+
+      alias_method_chain :klass, :time_of_day
+      # EMXIF
+
+      # FIXME(uwe):  Not necessary?
+      def self.string_to_dummy_time(string)
+        return string if string.is_a? TimeOfDay
+        return nil if string.empty?
+        TimeOfDay.parse(string)
+      end
+      # EMXIF
+
+    end
+  end
+end
+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

data/lib/activerecord-time/version.rb

@@ -1,5 +1,5 @@
 module Activerecord
   module Time
-    VERSION = '0.2.0'
+    VERSION = '0.3.0'
   end
 end

data/lib/time_of_day.rb

@@ -1,7 +1,11 @@
+require 'yaml'
+
 class TimeOfDay
-  yaml_as "tag:yaml.org,2002:timestamp#hms"
-  yaml_as "tag:yaml.org,2002:time"
-  yaml_as "tag:ruby.yaml.org,2002:time"
+  # FIXME(uwe):  Not necessary?
+  def to_yaml_type
+    '!tag:yaml.org,2002:time'
+  end
+  # EMXIF
 
   attr_accessor :hour # 0 - 23
   attr_accessor :minute # 0 - 59
@@ -14,10 +18,12 @@ class TimeOfDay
     @hour, @minute, @second = hour, minute, second
   end
 
+  # FIXME(uwe):  Not necessary?
   def init_with(coder)
     parts = self.class.parse_parts(coder.scalar)
     initialize(*parts)
   end
+  # EMXIF
 
   def self.now
     Time.now.time_of_day
@@ -28,11 +34,13 @@ class TimeOfDay
     self.new(*parse_parts(string))
   end
 
+  # FIXME(uwe):  Not necessary?
   def self.parse_parts(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]
   end
+  # EMXIF
 
   def on(date)
     Time.local(date.year, date.month, date.day, hour, minute, second)
@@ -85,25 +93,29 @@ class TimeOfDay
 
   def to_s(with_seconds = true)
     if with_seconds
-      "%02d:%02d:%02d" % [@hour, @minute, @second]
+      '%02d:%02d:%02d' % [@hour, @minute, @second]
     else
-      "%02d:%02d" % [@hour, @minute]
+      '%02d:%02d' % [@hour, @minute]
     end
   end
 
+    # FIXME(uwe):  Not necessary?
   def self.yaml_new(klass, tag, val)
     if String === val
       self.parse val
     else
-      raise YAML::TypeError, "Invalid Time: " + val.inspect
+      raise YAML::TypeError, 'Invalid Time: ' + val.inspect
     end
   end
+  # EMXIF
 
+  # FIXME(uwe):  Not necessary?
   def to_yaml(opts = {})
     YAML::quick_emit(nil, opts) do |out|
       out.scalar('tag:yaml.org,2002:time', self.to_s, :plain)
     end
   end
+  # EMXIF
 
 end
 
@@ -120,3 +132,5 @@ class Date
   end
 
 end
+
+YAML.add_tag 'tag:yaml.org,2002:time', TimeOfDay

data/test/database.yml

@@ -4,6 +4,7 @@ sqlite:
 sqlite3:
   :adapter: sqlite3
   :dbfile: ":memory:"
+  :database: ":memory:"
 postgresql:
   :adapter: postgresql
   :username: postgres

data/test/schema.rb

@@ -1,10 +1,6 @@
-ActiveRecord::Schema.define(:version => 1) do
-  
-  # Create tables for testing your plugin
-
-   create_table :things do |t|
-     t.column :name,   :string
-     t.column :price_in_cents, :integer
-   end
-    
+ActiveRecord::Schema.define(version: 1) do
+  create_table :events do |t|
+    t.string :name
+    t.time :start_at
+  end
 end

data/test/test_helper.rb

@@ -2,7 +2,10 @@ $:.unshift(File.dirname(__FILE__) + '/../lib')
 RAILS_ROOT = File.dirname(__FILE__)
 
 require 'rubygems'
-require 'test/unit'
+require 'minitest/autorun'
+require 'minitest/reporters'
+MiniTest::Reporters.use!
+
 require 'active_record'
 require 'activerecord-time'
 require 'logger'
@@ -10,6 +13,6 @@ 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__) + '/debug.log')
+ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + '/test.log')
 ActiveRecord::Base.establish_connection(config[ENV['DB'] || 'sqlite3'])
 load(File.dirname(__FILE__) + '/schema.rb') if File.exist?(File.dirname(__FILE__) + '/schema.rb')

data/test/time_of_day_test.rb

@@ -1,11 +1,15 @@
 require File.expand_path('test_helper', File.dirname(__FILE__))
 
-class TimeOfDayTest < Test::Unit::TestCase
+class Event < ActiveRecord::Base
+end
+
+class TimeOfDayTest < Minitest::Test
   def setup
     @twelve_o_clock = TimeOfDay.parse '12:00:00'
   end
 
   def teardown
+    @twelve_o_clock = nil
   end
 
   def test_parse_full
@@ -20,4 +24,29 @@ class TimeOfDayTest < Test::Unit::TestCase
     assert_equal @twelve_o_clock, TimeOfDay.parse('12')
   end
 
+  def test_yaml_load
+    hash = YAML.load("start_at: !!time 12:34:56")
+    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')})
+    assert_equal("---\nstart_at: !!time 12:34:56\n", string)
+  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 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_nil Event.where('start_at <> ?', @twelve_o_clock).first
+    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)
+    t.destroy
+  end
+
 end

metadata

@@ -1,27 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-time
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Uwe Kubosch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-29 00:00:00.000000000 Z
+date: 2014-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activerecord-jdbcsqlite3-adapter
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pg
+  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: sqlite3
+  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: minitest-reporters
+  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: 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'
 description: A handler for storing TimeOfDay objects in ActiveRecord objects as sql
@@ -32,14 +88,17 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
+- ".travis"
 - Gemfile
+- LICENSE
 - LICENSE.txt
 - README.md
 - Rakefile
 - activerecord-time.gemspec
 - lib/activerecord-time.rb
-- lib/activerecord-time/extension.rb
+- lib/activerecord-time/extension_arjdbc.rb
+- lib/activerecord-time/extension_mri.rb
 - lib/activerecord-time/version.rb
 - lib/time_of_day.rb
 - test/database.yml
@@ -47,7 +106,8 @@ files:
 - test/test_helper.rb
 - test/time_of_day_test.rb
 homepage: https://github.com/donv/activerecord-time
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -55,17 +115,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: A handler for storing TimeOfDay objects in ActiveRecord objects as sql time
@@ -75,4 +135,3 @@ test_files:
 - test/schema.rb
 - test/test_helper.rb
 - test/time_of_day_test.rb
-has_rdoc: