active_type 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7180486f774d7be6e2e72c7a143ce953fa4dfb53
-  data.tar.gz: a3e11be0ca7a917b94ee3d9dfe5de50cab2d2ef9
+  metadata.gz: 614f88d296a3773a1c03c6a3dad9473e345dcfd5
+  data.tar.gz: cccb5d3fb673acdde82a14c9b7156dfd5623587a
 SHA512:
-  metadata.gz: 7f3a7e25ee5308b7391998653c11742ace74366ad096381306fb13692c2e58093a598c7a2e82963009e3f2daac59b161365082e1e032056cc475f8fe18340079
-  data.tar.gz: 626eda35b1cf0536d46956cda85843d88e92a056b2a62ad1194310347f7c91d4614c02ffe473d9df71294246e86287bd35ffb8b913051413bac12879a89520f0
+  metadata.gz: 055145ac7031800c9a64ccb5b60dd16712eb02d2e0fac0fb5f4c5fbb3131188329b280482e76849d77abb6a78fd8a5dfa5e0bf0328908e125321e779dec4a68f
+  data.tar.gz: 0232544fbd3b0d789bfd272ebc28faf08b2327c1f452dca80aab8ba4fe27629d796efc4e3de0393411964d4b87b1aeb44b860e30f939018348f19d6390b63628

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 and 4.1.
+ActiveType is tested against ActiveRecord 3.2, 4.0, 4.1 and 4.2beta.
 
 Later versions might work, earlier will not.
 

data/gemfiles/Gemfile.3.2.lock

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

data/gemfiles/Gemfile.4.0.lock

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

data/gemfiles/Gemfile.4.1.lock

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

data/gemfiles/Gemfile.4.2

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

data/gemfiles/Gemfile.4.2.lock

@@ -0,0 +1,49 @@
+PATH
+  remote: ..
+  specs:
+    active_type (0.3.0)
+      activerecord (>= 3.2)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (4.2.0.beta1)
+      activesupport (= 4.2.0.beta1)
+      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)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.1)
+      tzinfo (~> 1.1)
+    arel (6.0.0.beta1)
+    builder (3.2.2)
+    diff-lcs (1.2.5)
+    i18n (0.7.0.beta1)
+    json (1.8.1)
+    minitest (5.4.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)
+    sqlite3 (1.3.9)
+    thread_safe (0.3.4)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  active_type!
+  activerecord (~> 4.2.0.beta1)
+  rspec (< 2.99)
+  sqlite3

data/lib/active_type/nested_attributes/association.rb

@@ -106,7 +106,8 @@ module ActiveType
       end
 
       def truthy?(value)
-        ActiveRecord::ConnectionAdapters::Column.value_to_boolean(value)
+        @boolean_type_caster ||= TypeCaster.get(:boolean, @owner.connection)
+        @boolean_type_caster.type_cast_from_user(value)
       end
 
       def reject?(parent, attributes)

data/lib/active_type/type_caster.rb

@@ -0,0 +1,81 @@
+module ActiveType
+  class TypeCaster
+
+    def self.get(type, connection)
+      native_caster = if ActiveRecord::VERSION::STRING < '4.2'
+        NativeCasters::DelegateToColumn.new(type)
+      else
+        NativeCasters::DelegateToType.new(type, connection)
+      end
+      new(type, native_caster)
+    end
+
+    def initialize(type, native_caster)
+      @type = type
+      @native_caster = native_caster
+    end
+
+    def type_cast_from_user(value)
+      # For some reason, Rails defines additional type casting logic
+      # outside the classes that have that responsibility.
+      case @type
+      when :integer
+        if value == ''
+          nil
+        else
+          native_type_cast_from_user(value)
+        end
+      when :timestamp, :datetime
+        time = native_type_cast_from_user(value)
+        if time && ActiveRecord::Base.time_zone_aware_attributes
+          time = ActiveSupport::TimeWithZone.new(nil, Time.zone, time)
+        end
+        time
+      else
+        native_type_cast_from_user(value)
+      end
+    end
+
+    def native_type_cast_from_user(value)
+      @native_caster.type_cast_from_user(value)
+    end
+
+    module NativeCasters
+
+      # Adapter for Rails 3.0 - 4.1.
+      # In these versions, casting logic lives in ActiveRecord::ConnectionAdapters::Colum
+      class DelegateToColumn
+
+        def initialize(type)
+          # the Column initializer expects type as returned from the database, and
+          # resolves them to our types
+          # fortunately, for all types wie support, type.to_s is a valid sql_type
+          sql_type = type.to_s
+          @column = ActiveRecord::ConnectionAdapters::Column.new('foo', nil, sql_type)
+        end
+
+        def type_cast_from_user(value)
+          @column.type_cast(value)
+        end
+
+      end
+
+      # Adapter for Rails 4.2+.
+      # In these versions, casting logic lives in subclasses of ActiveRecord::Type::Value
+      class DelegateToType
+
+        def initialize(type, connection)
+          @active_record_type = connection.lookup_cast_type(type)
+        end
+
+        def type_cast_from_user(value)
+          @active_record_type.type_cast_from_user(value)
+        end
+
+      end
+
+    end
+
+  end
+
+end

data/lib/active_type/version.rb

@@ -1,3 +1,3 @@
 module ActiveType
-  VERSION = '0.2.1'
+  VERSION = '0.3.0'
 end

data/lib/active_type/virtual_attributes.rb

@@ -1,3 +1,5 @@
+require 'active_type/type_caster'
+
 module ActiveType
 
   class InvalidAttributeNameError < ::StandardError; end
@@ -6,43 +8,16 @@ module ActiveType
 
   module VirtualAttributes
 
-    class VirtualColumn < ActiveRecord::ConnectionAdapters::Column
+    class VirtualColumn
 
-      def initialize(name, type, options)
+      def initialize(name, type_caster, options)
         @name = name
-        @type = type
+        @type_caster = type_caster
         @options = options
       end
 
       def type_cast(value)
-        case @type
-        when :integer
-          case value
-          when FalseClass
-            0
-          when TrueClass
-            1
-          when "", nil
-            nil
-          else
-            value.to_i
-          end
-        when :timestamp, :datetime
-          if ActiveRecord::Base.time_zone_aware_attributes
-            time = super
-            if time
-              ActiveSupport::TimeWithZone.new(nil, Time.zone, time)
-            else
-              time
-            end
-          else
-            super
-          end
-        when nil
-          value
-        else
-          super
-        end
+        @type_caster.type_cast_from_user(value)
       end
 
       def default_value(object)
@@ -70,7 +45,9 @@ module ActiveType
       private
 
       def add_virtual_column(name, type, options)
-        @owner.virtual_columns_hash = @owner.virtual_columns_hash.merge(name.to_s => VirtualColumn.new(name, type, options.slice(:default)))
+        type_caster = TypeCaster.get(type, @owner.connection)
+        column = VirtualColumn.new(name, type_caster, options.slice(:default))
+        @owner.virtual_columns_hash = @owner.virtual_columns_hash.merge(name.to_s => column)
       end
 
       def build_reader(name)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_type
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Tobias Kraze
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-06 00:00:00.000000000 Z
+date: 2014-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,6 +72,8 @@ files:
 - gemfiles/Gemfile.4.0.lock
 - gemfiles/Gemfile.4.1
 - gemfiles/Gemfile.4.1.lock
+- gemfiles/Gemfile.4.2
+- gemfiles/Gemfile.4.2.lock
 - lib/active_type.rb
 - lib/active_type/extended_record.rb
 - lib/active_type/extended_record/inheritance.rb
@@ -83,6 +85,7 @@ files:
 - lib/active_type/no_table.rb
 - lib/active_type/object.rb
 - lib/active_type/record.rb
+- lib/active_type/type_caster.rb
 - lib/active_type/version.rb
 - lib/active_type/virtual_attributes.rb
 - spec/active_type/extended_record/single_table_inheritance_spec.rb