active_type 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d34e93d8bb376b7afcf631c41e4656b34346488e
-  data.tar.gz: 4cfe64618490965f0c4bc1a4dcf6771aca4e6ed8
+  metadata.gz: a2d3c1730d1b0d1175a5ef12eba8ec4f4d39ebbf
+  data.tar.gz: 0bec41f0aaf446a3e96cd006181848e61e293abe
 SHA512:
-  metadata.gz: 85a874cbe804ed0b878d03f085bbaf81a48de22ee94425d4dbc7e01d0d118bbd6affd9f9f39ab4108eb1f25ab980f043e4f7eb0ba348b248b5abc567a5d0c3ea
-  data.tar.gz: b43cc5c7ae0382efc4c9c4de62c68d10078f486d8596f7fc2709ff5eb938536f18a8f4519c7a884028d49ad9671866e6668389ddc71c3c277f8ea30e10b76ded
+  metadata.gz: 05954c59d026aa8b6ec4e4d300287e467fddd527ed788cf0cade8b9da45b6a46f6997990b61b94a2a030c79517057252fa5074af3c6ff9191f97647f95b0db0c
+  data.tar.gz: e966f0029d64e54bf391866d6485abd5f783b9b810b7340207c609c0db66ca558136c84af92db8b236761b7bf069c53cea45209c6136fc830816309a700696ce

data/.travis.yml

@@ -4,10 +4,15 @@ rvm:
   - "1.9.3"
   - "2.0.0"
   - "2.1.2"
+  - "2.2.0"
 gemfile:
   - gemfiles/Gemfile.3.2
   - gemfiles/Gemfile.4.0
   - gemfiles/Gemfile.4.1
+  - gemfiles/Gemfile.4.2
+  - gemfiles/Gemfile.4.2.pg
+before_script:
+  - psql -c 'create database active_type_test;' -U postgres
 script: bundle exec rspec spec
 notifications:
   email:
@@ -21,3 +26,19 @@ matrix:
       gemfile: gemfiles/Gemfile.4.0
     - rvm: "1.8.7"
       gemfile: gemfiles/Gemfile.4.1
+    - rvm: "1.8.7"
+      gemfile: gemfiles/Gemfile.4.2
+    - rvm: "1.8.7"
+      gemfile: gemfiles/Gemfile.4.2.pg
+    - rvm: "1.9.3"
+      gemfile: gemfiles/Gemfile.4.2.pg
+    - rvm: "2.0.0"
+      gemfile: gemfiles/Gemfile.4.2.pg
+    - rvm: "2.1.2"
+      gemfile: gemfiles/Gemfile.3.2
+    - rvm: "2.1.2"
+      gemfile: gemfiles/Gemfile.4.0
+    - rvm: "2.2.0"
+      gemfile: gemfiles/Gemfile.3.2
+    - rvm: "2.2.0"
+      gemfile: gemfiles/Gemfile.4.0

data/README.md

@@ -274,7 +274,7 @@ Supported options for `nests_many` / `nests_one` are:
 Supported Rails versions
 ------------------------
 
-ActiveType is tested against ActiveRecord 3.2, 4.0, 4.1 and 4.2beta.
+ActiveType is tested against ActiveRecord 3.2, 4.0, 4.1 and 4.2.
 
 Later versions might work, earlier will not.
 

data/gemfiles/Gemfile.3.2.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    active_type (0.3.1)
+    active_type (0.3.2)
       activerecord (>= 3.2)
 
 GEM

data/gemfiles/Gemfile.4.0.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    active_type (0.3.1)
+    active_type (0.3.2)
       activerecord (>= 3.2)
 
 GEM

data/gemfiles/Gemfile.4.1.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    active_type (0.3.1)
+    active_type (0.3.2)
       activerecord (>= 3.2)
 
 GEM

data/gemfiles/Gemfile.4.2

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'activerecord', '~>4.2.0.beta1'
+gem 'activerecord', '~>4.2.0'
 gem 'rspec', '<2.99'
 gem 'sqlite3'
 

data/gemfiles/Gemfile.4.2.lock

@@ -1,31 +1,31 @@
 PATH
   remote: ..
   specs:
-    active_type (0.3.1)
+    active_type (0.3.2)
       activerecord (>= 3.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (4.2.0.beta1)
-      activesupport (= 4.2.0.beta1)
+    activemodel (4.2.0)
+      activesupport (= 4.2.0)
       builder (~> 3.1)
-    activerecord (4.2.0.beta1)
-      activemodel (= 4.2.0.beta1)
-      activesupport (= 4.2.0.beta1)
-      arel (>= 6.0.0.beta1, < 6.1)
-    activesupport (4.2.0.beta1)
-      i18n (>= 0.7.0.beta1, < 0.8)
+    activerecord (4.2.0)
+      activemodel (= 4.2.0)
+      activesupport (= 4.2.0)
+      arel (~> 6.0)
+    activesupport (4.2.0)
+      i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.1)
+      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    arel (6.0.0.beta1)
+    arel (6.0.0)
     builder (3.2.2)
     diff-lcs (1.2.5)
-    i18n (0.7.0.beta1)
-    json (1.8.1)
-    minitest (5.4.1)
+    i18n (0.7.0)
+    json (1.8.2)
+    minitest (5.5.1)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
@@ -44,6 +44,6 @@ PLATFORMS
 
 DEPENDENCIES
   active_type!
-  activerecord (~> 4.2.0.beta1)
+  activerecord (~> 4.2.0)
   rspec (< 2.99)
   sqlite3

data/gemfiles/Gemfile.4.2.pg

@@ -0,0 +1,7 @@
+source 'https://rubygems.org'
+
+gem 'activerecord', '~>4.2.0'
+gem 'rspec', '<2.99'
+gem 'pg'
+
+gem 'active_type', :path => '..'

data/gemfiles/Gemfile.4.2.pg.lock

@@ -0,0 +1,49 @@
+PATH
+  remote: ..
+  specs:
+    active_type (0.3.2)
+      activerecord (>= 3.2)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (4.2.0)
+      activesupport (= 4.2.0)
+      builder (~> 3.1)
+    activerecord (4.2.0)
+      activemodel (= 4.2.0)
+      activesupport (= 4.2.0)
+      arel (~> 6.0)
+    activesupport (4.2.0)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    arel (6.0.0)
+    builder (3.2.2)
+    diff-lcs (1.2.5)
+    i18n (0.7.0)
+    json (1.8.2)
+    minitest (5.5.1)
+    pg (0.18.1)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.8)
+    rspec-expectations (2.14.5)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.6)
+    thread_safe (0.3.4)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  active_type!
+  activerecord (~> 4.2.0)
+  pg
+  rspec (< 2.99)

data/lib/active_type/no_table.rb

@@ -7,6 +7,14 @@ module ActiveType
 
     module ClassMethods
 
+      def primary_key
+        nil
+      end
+
+      def column_types
+        {}
+      end
+
       def columns
         []
       end

data/lib/active_type/type_caster.rb

@@ -65,6 +65,14 @@ module ActiveType
       class DelegateToType
 
         def initialize(type, connection)
+          # The specified type (e.g. "string") may not necessary match the
+          # native type ("varchar") expected by the connection adapter.
+          # PostgreSQL is one of these. Perform a translation if the adapter
+          # supports it.
+          if !type.nil? && connection.respond_to?(:native_database_types)
+            native_type = connection.native_database_types[type.to_sym]
+            type = native_type.fetch(:name) unless native_type.nil?
+          end
           @active_record_type = connection.lookup_cast_type(type)
         end
 

data/lib/active_type/version.rb

@@ -1,3 +1,3 @@
 module ActiveType
-  VERSION = '0.3.1'
+  VERSION = '0.3.2'
 end

data/spec/active_type/object_spec.rb

@@ -329,9 +329,14 @@ describe ActiveType::Object do
 
   describe '.find' do
     it 'raises an error' do
+      error = if ActiveRecord::VERSION::MAJOR >= 4 && ActiveRecord::VERSION::MINOR >= 1
+        ActiveRecord::UnknownPrimaryKey
+      else
+        ActiveRecord::RecordNotFound
+      end
       expect do
         ObjectSpec::Object.find(1)
-      end.to raise_error(ActiveRecord::RecordNotFound)
+      end.to raise_error(error)
     end
   end
 

data/spec/support/database.rb

@@ -1,4 +1,19 @@
-ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => ':memory:')
+begin
+  # sqlite?
+  ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => ':memory:')
+rescue Gem::LoadError
+  # pg?
+  if ENV['TRAVIS']
+    ActiveRecord::Base.establish_connection(:adapter => 'postgresql', :database => 'active_type_test', :username => 'postgres')
+  else
+    ActiveRecord::Base.establish_connection(:adapter => 'postgresql', :database => 'active_type_test')
+  end
+
+  connection = ::ActiveRecord::Base.connection
+  connection.tables.each do |table|
+    connection.drop_table table
+  end
+end
 
 ActiveRecord::Migration.class_eval do
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_type
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Tobias Kraze
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-19 00:00:00.000000000 Z
+date: 2015-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -74,6 +74,8 @@ files:
 - gemfiles/Gemfile.4.1.lock
 - gemfiles/Gemfile.4.2
 - gemfiles/Gemfile.4.2.lock
+- gemfiles/Gemfile.4.2.pg
+- gemfiles/Gemfile.4.2.pg.lock
 - lib/active_type.rb
 - lib/active_type/extended_record.rb
 - lib/active_type/extended_record/inheritance.rb