activerecord-time 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1430418d53117b880e0f6f9ee19f76f11c79cfe
-  data.tar.gz: 738201de8e6cd4ca6e3c4b11213867df2cd9c91d
+  metadata.gz: 58d80c32a813a511615958ac7e50c39646a6f6bf
+  data.tar.gz: 57f8670274cdf265cd4ffa812046a8142e04bda2
 SHA512:
-  metadata.gz: 8993938930022bbfbe9bc2fb388fafe090bd91113e7b7d34abe090c6419e1cdbc3db0264833701e291bd4ff32cec953653bfef8009fcdafb2c8d8d702ecf4a02
-  data.tar.gz: 887959d0d52c63ebc6d77500482dd9abc343892ea8ef57969a66cbc76e00b7bb89e92b63c4b4fff8197d066b1787a989e2bdd8c6b990830ab44374528e5770fe
+  metadata.gz: 403db3b2198fe2bb9042ca4087109882dc8445e29fdadbc3ae150f72ded6715dbad0e5ee52307e88d7e9c1560ff97d601d8c3c6e4abf71087ceb7da0369fe086
+  data.tar.gz: 4612616c3dba28dd200b6994fb3d1763d0470f01cd71f64fac68b20c36c06ed1f2fa4763baef7f7eba0b56105ce21d2f774db52c0bf330656179095267f2cce4

data/.travis.yml

@@ -3,13 +3,17 @@ sudo: false
 rvm:
   - jruby-head
   - ruby-head
+  - jruby-9.0.0.0
   - "2.2"
-  - jruby-19mode
   - "2.1"
   - "2.0.0"
-  - "1.9.3"
+  - jruby-19mode
+gemfile:
+  - gemfiles/ar42.gemfile
+  - gemfiles/ar41.gemfile
+  - gemfiles/ar40.gemfile
+  - gemfiles/ar32.gemfile
 env:
-  - AR_VERSION="~>4.2.1"
-  - AR_VERSION="~>4.1.10"
-  - AR_VERSION="~>4.0.13"
-  - AR_VERSION="~>3.2.21"
+  - ADAPTER="postgresql"
+  - ADAPTER="derby"
+  - ADAPTER="sqlite3"

data/Gemfile

@@ -9,6 +9,6 @@ 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'
+  gem 'activerecord-jdbc-adapter', '>= 1.3.17', github: 'jruby/activerecord-jdbc-adapter', branch: '1-3-stable'
 end
 # ODOT

data/README.md

@@ -41,7 +41,7 @@ or
 ```Ruby
 create_table :schedules do |table|
   ...
-  t.time :start_at
+  t.column :start_at, :time
   ...
 end
 ```

data/gemfiles/ar32.gemfile

@@ -0,0 +1,3 @@
+eval File.read("#{File.dirname __FILE__}/common.gemfile")
+
+gem 'activerecord', '~>3.2.22'

data/gemfiles/ar32.gemfile.lock

@@ -0,0 +1,63 @@
+GIT
+  remote: git://github.com/jruby/activerecord-jdbc-adapter.git
+  revision: 16446e752f07e03eaa6386184039addb42fc3e60
+  branch: 1-3-stable
+  specs:
+    activerecord-jdbc-adapter (1.3.17)
+      activerecord (>= 2.2)
+    activerecord-jdbcpostgresql-adapter (1.3.17)
+      activerecord-jdbc-adapter (~> 1.3.17)
+      jdbc-postgres (>= 9.1)
+    activerecord-jdbcsqlite3-adapter (1.3.17)
+      activerecord-jdbc-adapter (~> 1.3.17)
+      jdbc-sqlite3 (>= 3.7.2, < 3.9)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (3.2.22)
+      activesupport (= 3.2.22)
+      builder (~> 3.0.0)
+    activerecord (3.2.22)
+      activemodel (= 3.2.22)
+      activesupport (= 3.2.22)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activesupport (3.2.22)
+      i18n (~> 0.6, >= 0.6.4)
+      multi_json (~> 1.0)
+    ansi (1.5.0)
+    arel (3.0.3)
+    builder (3.0.4)
+    i18n (0.7.0)
+    jdbc-postgres (9.4.1200)
+    jdbc-sqlite3 (3.8.10.1)
+    minitest (5.8.0)
+    minitest-reporters (1.0.19)
+      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)
+    sqlite3 (1.3.10)
+    tzinfo (0.3.44)
+
+PLATFORMS
+  java
+  ruby
+
+DEPENDENCIES
+  activerecord (~> 3.2.22)
+  activerecord-jdbc-adapter (>= 1.3.17)!
+  activerecord-jdbcpostgresql-adapter
+  activerecord-jdbcsqlite3-adapter
+  minitest-reporters
+  pg
+  rake
+  sqlite3
+
+BUNDLED WITH
+   1.10.6

data/gemfiles/ar40.gemfile

@@ -0,0 +1,3 @@
+eval File.read("#{File.dirname __FILE__}/common.gemfile")
+
+gem 'activerecord', '~>4.0.13'

data/gemfiles/ar40.gemfile.lock

@@ -0,0 +1,72 @@
+GIT
+  remote: git://github.com/jruby/activerecord-jdbc-adapter.git
+  revision: 16446e752f07e03eaa6386184039addb42fc3e60
+  branch: 1-3-stable
+  specs:
+    activerecord-jdbc-adapter (1.3.17)
+      activerecord (>= 2.2)
+    activerecord-jdbcpostgresql-adapter (1.3.17)
+      activerecord-jdbc-adapter (~> 1.3.17)
+      jdbc-postgres (>= 9.1)
+    activerecord-jdbcsqlite3-adapter (1.3.17)
+      activerecord-jdbc-adapter (~> 1.3.17)
+      jdbc-sqlite3 (>= 3.7.2, < 3.9)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (4.0.13)
+      activesupport (= 4.0.13)
+      builder (~> 3.1.0)
+    activerecord (4.0.13)
+      activemodel (= 4.0.13)
+      activerecord-deprecated_finders (~> 1.0.2)
+      activesupport (= 4.0.13)
+      arel (~> 4.0.0)
+    activerecord-deprecated_finders (1.0.4)
+    activesupport (4.0.13)
+      i18n (~> 0.6, >= 0.6.9)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
+    ansi (1.5.0)
+    arel (4.0.2)
+    builder (3.1.4)
+    hashie (3.4.2)
+    i18n (0.7.0)
+    jdbc-postgres (9.4.1200)
+    jdbc-sqlite3 (3.8.10.1)
+    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)
+      hashie (>= 1.1.0)
+    rake (10.4.2)
+    sqlite3 (1.3.10)
+    thread_safe (0.3.5)
+    thread_safe (0.3.5-java)
+    tzinfo (0.3.44)
+
+PLATFORMS
+  java
+  ruby
+
+DEPENDENCIES
+  activerecord (~> 4.0.13)
+  activerecord-jdbc-adapter (>= 1.3.17)!
+  activerecord-jdbcpostgresql-adapter
+  activerecord-jdbcsqlite3-adapter
+  minitest-reporters
+  pg
+  rake
+  sqlite3
+
+BUNDLED WITH
+   1.10.6

data/gemfiles/ar41.gemfile

@@ -0,0 +1,3 @@
+eval File.read("#{File.dirname __FILE__}/common.gemfile")
+
+gem 'activerecord', '~>4.1.12'

data/gemfiles/ar41.gemfile.lock

@@ -0,0 +1,69 @@
+GIT
+  remote: git://github.com/jruby/activerecord-jdbc-adapter.git
+  revision: 16446e752f07e03eaa6386184039addb42fc3e60
+  branch: 1-3-stable
+  specs:
+    activerecord-jdbc-adapter (1.3.17)
+      activerecord (>= 2.2)
+    activerecord-jdbcpostgresql-adapter (1.3.17)
+      activerecord-jdbc-adapter (~> 1.3.17)
+      jdbc-postgres (>= 9.1)
+    activerecord-jdbcsqlite3-adapter (1.3.17)
+      activerecord-jdbc-adapter (~> 1.3.17)
+      jdbc-sqlite3 (>= 3.7.2, < 3.9)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (4.1.12)
+      activesupport (= 4.1.12)
+      builder (~> 3.1)
+    activerecord (4.1.12)
+      activemodel (= 4.1.12)
+      activesupport (= 4.1.12)
+      arel (~> 5.0.0)
+    activesupport (4.1.12)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.1)
+      tzinfo (~> 1.1)
+    ansi (1.5.0)
+    arel (5.0.1.20140414130214)
+    builder (3.2.2)
+    i18n (0.7.0)
+    jdbc-postgres (9.4.1200)
+    jdbc-sqlite3 (3.8.10.1)
+    json (1.8.3)
+    json (1.8.3-java)
+    minitest (5.8.0)
+    minitest-reporters (1.0.19)
+      ansi
+      builder
+      minitest (>= 5.0)
+      ruby-progressbar
+    pg (0.18.2)
+    rake (10.4.2)
+    ruby-progressbar (1.7.5)
+    sqlite3 (1.3.10)
+    thread_safe (0.3.5)
+    thread_safe (0.3.5-java)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  java
+  ruby
+
+DEPENDENCIES
+  activerecord (~> 4.1.12)
+  activerecord-jdbc-adapter (>= 1.3.17)!
+  activerecord-jdbcpostgresql-adapter
+  activerecord-jdbcsqlite3-adapter
+  minitest-reporters
+  pg
+  rake
+  sqlite3
+
+BUNDLED WITH
+   1.10.6

data/gemfiles/ar42.gemfile

@@ -0,0 +1,3 @@
+eval File.read("#{File.dirname __FILE__}/common.gemfile")
+
+gem 'activerecord', '~>4.2.3'

data/gemfiles/ar42.gemfile.lock

@@ -0,0 +1,69 @@
+GIT
+  remote: git://github.com/jruby/activerecord-jdbc-adapter.git
+  revision: 16446e752f07e03eaa6386184039addb42fc3e60
+  branch: 1-3-stable
+  specs:
+    activerecord-jdbc-adapter (1.3.17)
+      activerecord (>= 2.2)
+    activerecord-jdbcpostgresql-adapter (1.3.17)
+      activerecord-jdbc-adapter (~> 1.3.17)
+      jdbc-postgres (>= 9.1)
+    activerecord-jdbcsqlite3-adapter (1.3.17)
+      activerecord-jdbc-adapter (~> 1.3.17)
+      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 (4.2.3)
+      activesupport (= 4.2.3)
+      builder (~> 3.1)
+    activerecord (4.2.3)
+      activemodel (= 4.2.3)
+      activesupport (= 4.2.3)
+      arel (~> 6.0)
+    activesupport (4.2.3)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    ansi (1.5.0)
+    arel (6.0.3)
+    builder (3.2.2)
+    i18n (0.7.0)
+    json (1.8.3)
+    json (1.8.3-java)
+    minitest (5.8.0)
+    minitest-reporters (1.0.19)
+      ansi
+      builder
+      minitest (>= 5.0)
+      ruby-progressbar
+    pg (0.18.2)
+    rake (10.4.2)
+    ruby-progressbar (1.7.5)
+    sqlite3 (1.3.10)
+    thread_safe (0.3.5)
+    thread_safe (0.3.5-java)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  java
+  ruby
+
+DEPENDENCIES
+  activerecord (~> 4.2.3)
+  activerecord-jdbc-adapter (>= 1.3.17)!
+  activerecord-jdbcpostgresql-adapter
+  activerecord-jdbcsqlite3-adapter
+  minitest-reporters
+  pg
+  rake
+  sqlite3
+
+BUNDLED WITH
+   1.10.6

data/gemfiles/common.gemfile

@@ -0,0 +1,17 @@
+source 'https://rubygems.org'
+
+platform :jruby do
+  gem 'activerecord-jdbc-adapter', '>= 1.3.17',
+      github: 'jruby/activerecord-jdbc-adapter',
+      branch: '1-3-stable'
+  gem 'activerecord-jdbcpostgresql-adapter'
+  gem 'activerecord-jdbcsqlite3-adapter'
+end
+
+platform :ruby do
+  gem 'pg'
+  gem 'sqlite3'
+end
+
+gem 'minitest-reporters'
+gem 'rake'

data/lib/activerecord-time.rb

@@ -1,11 +1,11 @@
 require 'activerecord-time/version'
 require 'active_record/version'
 require 'time_of_day'
-# TODO(uwe): Simplify when we stop supporing ActiveRecord 3.2
+# 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 supporing ActiveRecord 4.0 and 4.1
+# 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'

data/lib/activerecord-time/extension_4_2.rb

@@ -1,5 +1,3 @@
-require 'active_record/type/time'
-
 module ActiveRecord
   module ConnectionAdapters
     module Quoting

data/lib/activerecord-time/extension_until_4_1.rb

@@ -1,5 +1,4 @@
 require 'active_record/connection_adapters/abstract/quoting'
-require 'active_record/connection_adapters/sqlite3_adapter'
 
 module ActiveRecord
   module ConnectionAdapters

data/lib/activerecord-time/version.rb

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

data/matrix_test.rb

@@ -0,0 +1,41 @@
+#!/usr/bin/env ruby -w
+
+require 'yaml'
+travis = YAML.load(File.read('.travis.yml'))
+
+travis['rvm'].each do |ruby|
+  puts '#' * 80
+  puts "Testing #{ruby}"
+  puts
+  system "rvm install #{ruby}"
+  exit $? unless $? == 0
+  system "rvm #{ruby} do gem install bundler"
+  exit $? unless $? == 0
+  travis['gemfile'].each do |gemfile|
+    puts '$' * 80
+    puts "Testing #{gemfile}"
+    puts
+    ENV['BUNDLE_GEMFILE'] = gemfile
+    system "rvm #{ruby} do bundle install"
+    exit $?.exitstatus unless $? == 0
+    travis['env'].each do |env|
+      env.scan(/\b(?<key>[A-Z_]+)="?(?<value>.+?)"?\b/) 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
+    end
+    puts "Testing #{gemfile} OK"
+    puts '$' * 80
+  end
+  puts "Testing #{ruby} OK"
+  puts '#' * 80
+end
+
+print "\033[0;32m"
+print '                        TESTS PASSED OK!'
+puts "\033[0m"

data/test/schema.rb

@@ -2,5 +2,6 @@ ActiveRecord::Schema.define(version: 1) do
   create_table :events do |t|
     t.string :name
     t.time :start_at
+    t.binary :content
   end
 end

data/test/test_helper.rb

@@ -11,6 +11,7 @@ require 'active_record'
 require 'activerecord-time'
 require 'logger'
 require 'fileutils'
+require 'yaml'
 
 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

@@ -39,7 +39,7 @@ class TimeOfDayTest < Minitest::Test
   end
 
   def test_column_type
-    assert_equal [:integer, :string, :time], Event.columns.map(&:type)
+    assert_equal [:integer, :string, :time, :binary], Event.columns.map(&:type)
   end
 
   def test_activerecord
@@ -65,4 +65,19 @@ class TimeOfDayTest < Minitest::Test
     t.destroy
   end
 
+  def test_activerecord_binary_column
+    text = 'Some binary content'
+    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'
+    else
+      e.update_attributes! content: 'Other binary content'
+    end
+    # ODOT
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-time
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Uwe Kubosch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-04 00:00:00.000000000 Z
+date: 2015-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -102,12 +102,21 @@ files:
 - README.md
 - Rakefile
 - activerecord-time.gemspec
+- gemfiles/ar32.gemfile
+- gemfiles/ar32.gemfile.lock
+- gemfiles/ar40.gemfile
+- gemfiles/ar40.gemfile.lock
+- gemfiles/ar41.gemfile
+- gemfiles/ar41.gemfile.lock
+- gemfiles/ar42.gemfile
+- gemfiles/ar42.gemfile.lock
+- gemfiles/common.gemfile
 - lib/activerecord-time.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
+- matrix_test.rb
 - test/database.yml
 - test/schema.rb
 - test/test_helper.rb

data/matrix_test.sh

@@ -1,20 +0,0 @@
-#!/bin/bash -el
-
-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!"
-echo -e "\033[0m"