active_type 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87578ffca30cf6e55491dbdf6d2979e5f1417983
-  data.tar.gz: 85c59e32dfd6f173cee644da43706f74e1591d6e
+  metadata.gz: b973cce18664ad143d834c1ab76a67560a7d7625
+  data.tar.gz: 8de998fb74cc5a6bc9217b072461ac293cf83951
 SHA512:
-  metadata.gz: 63c1a195fb0f6cb52ec7cdcfcdf7f32bb78dc8d584edde830eb9de59690b02bc67b2500b1365d4e3f534f2900da9bde01d006d9a74b68a205159f96c433c01dd
-  data.tar.gz: 87f1849abb23e4c2181d3509d6d40d6757f296f011aa8e21d7afb74d6e686b120aa2a76e905ac04a5b126d560200f8e8309188538f160f5053c1f99cdfa6e6fe
+  metadata.gz: 28e1d976f66a72868ce6321a589235bb1536accd6b01fb5312f337d76ad191e3542b324e98e1b640e2718a45b8e423bdae5b1512e75fe50bc3896381bcae4f55
+  data.tar.gz: 1582cff084f91960662efda6b38ce5fa8d5ff4379e11a5b3181b64f70f1021b5b3074ea33c867a362942ae912ca4bcbba942daf53db1874f6548b3daf6b439e3

data/.rspec

@@ -0,0 +1 @@
+--color

data/.travis.yml

@@ -1,10 +1,10 @@
 language: ruby
 rvm:
-  - "1.8.7"
   - "1.9.3"
   - "2.0.0"
   - "2.1.7"
   - "2.2.4"
+  - "2.3.1"
 gemfile:
   - gemfiles/Gemfile.3.2.mysql2
   - gemfiles/Gemfile.3.2.sqlite3
@@ -13,6 +13,9 @@ gemfile:
   - gemfiles/Gemfile.4.2.1.mysql2
   - gemfiles/Gemfile.4.2.1.pg
   - gemfiles/Gemfile.4.2.1.sqlite3
+  - gemfiles/Gemfile.5.0.0.mysql2
+  - gemfiles/Gemfile.5.0.0.pg
+  - gemfiles/Gemfile.5.0.0.sqlite3
 before_script:
   - psql -c 'create database active_type_test;' -U postgres
   - mysql -e 'create database IF NOT EXISTS active_type_test;'
@@ -27,16 +30,6 @@ branches:
     - master
 matrix:
   exclude:
-    - rvm: "1.8.7"
-      gemfile: gemfiles/Gemfile.4.0.sqlite3
-    - rvm: "1.8.7"
-      gemfile: gemfiles/Gemfile.4.1.sqlite3
-    - rvm: "1.8.7"
-      gemfile: gemfiles/Gemfile.4.2.1.sqlite3
-    - rvm: "1.8.7"
-      gemfile: gemfiles/Gemfile.4.2.1.mysql2
-    - rvm: "1.8.7"
-      gemfile: gemfiles/Gemfile.4.2.1.pg
     - rvm: "1.9.3"
       gemfile: gemfiles/Gemfile.4.0.sqlite3
     - rvm: "1.9.3"
@@ -45,6 +38,12 @@ matrix:
       gemfile: gemfiles/Gemfile.4.2.1.pg
     - rvm: "1.9.3"
       gemfile: gemfiles/Gemfile.3.2.mysql2
+    - rvm: "1.9.3"
+      gemfile: gemfiles/Gemfile.5.0.0.sqlite3
+    - rvm: "1.9.3"
+      gemfile: gemfiles/Gemfile.5.0.0.mysql2
+    - rvm: "1.9.3"
+      gemfile: gemfiles/Gemfile.5.0.0.pg
     - rvm: "2.0.0"
       gemfile: gemfiles/Gemfile.4.0.sqlite3
     - rvm: "2.0.0"
@@ -53,6 +52,14 @@ matrix:
       gemfile: gemfiles/Gemfile.4.2.1.pg
     - rvm: "2.0.0"
       gemfile: gemfiles/Gemfile.3.2.mysql2
+    - rvm: "2.0.0"
+      gemfile: gemfiles/Gemfile.4.1.sqlite3
+    - rvm: "2.0.0"
+      gemfile: gemfiles/Gemfile.5.0.0.sqlite3
+    - rvm: "2.0.0"
+      gemfile: gemfiles/Gemfile.5.0.0.mysql2
+    - rvm: "2.0.0"
+      gemfile: gemfiles/Gemfile.5.0.0.pg
     - rvm: "2.1.7"
       gemfile: gemfiles/Gemfile.4.0.sqlite3
     - rvm: "2.1.7"
@@ -61,3 +68,21 @@ matrix:
       gemfile: gemfiles/Gemfile.4.2.1.pg
     - rvm: "2.1.7"
       gemfile: gemfiles/Gemfile.3.2.mysql2
+    - rvm: "2.1.7"
+      gemfile: gemfiles/Gemfile.4.1.sqlite3
+    - rvm: "2.1.7"
+      gemfile: gemfiles/Gemfile.5.0.0.sqlite3
+    - rvm: "2.1.7"
+      gemfile: gemfiles/Gemfile.5.0.0.mysql2
+    - rvm: "2.1.7"
+      gemfile: gemfiles/Gemfile.5.0.0.pg
+    - rvm: "2.2.4"
+      gemfile: gemfiles/Gemfile.4.0.sqlite3
+    - rvm: "2.2.4"
+      gemfile: gemfiles/Gemfile.4.2.1.mysql2
+    - rvm: "2.2.4"
+      gemfile: gemfiles/Gemfile.4.2.1.pg
+    - rvm: "2.2.4"
+      gemfile: gemfiles/Gemfile.3.2.mysql2
+    - rvm: "2.2.4"
+      gemfile: gemfiles/Gemfile.4.1.sqlite3

data/CHANGELOG.md

@@ -4,9 +4,38 @@ All notable changes to this project will be documented in this file.
 
 ActiveType is in a pre-1.0 state. This means that its APIs and behavior are subject to breaking changes without deprecation notices. Until 1.0, version numbers will follow a [Semver][]-ish `0.y.z` format, where `y` is incremented when new features or breaking changes are introduced, and `z` is incremented for lesser changes or bug fixes.
 
-## [Unreleased]
+## [0.6.0][] (2016-07-05)
 
-* Your contribution here!
+* Drop support for 1.8.7.
+* Rails 5 compatibility.
+
+## [0.5.1][] (2016-05-09)
+
+* Fix an issue with incorrectly copied errors on Util.cast.
+
+## [0.5.0][] (2016-04-08)
+
+* Nicer `#inspect` method.
+
+## [0.4.5][] (2016-02-01)
+
+* Fixed issue `#dup`ing `ActiveType::Object`
+
+## [0.4.4][] (2016-01-18)
+
+* Call `#after_commit` for `ActiveType::Object`
+
+## [0.4.3][] (2015-11-11)
+
+* Fix issue with Booleans on mysql.
+
+## [0.4.2][] (2015-09-24)
+
+* Add `attribute_will_change!` for virtual attributes.
+
+## [0.4.1][] (2015-09-24)
+
+* Add `attribute_was` for virtual attributes.
 
 ## [0.4.0][] (2015-06-12)
 

data/README.md

@@ -50,6 +50,23 @@ class SignUp < ActiveType::Record[User]
 end
 ```
 
+
+### A note on Rails 5
+
+Rails 5 comes with its own implementation of `.attribute`. This implementation is functionally very
+similar, but not identical to ActiveType's.
+
+We have decided to continue to use our own implementation. This means that if you use ActiveType, `ActiveRecord::Base.attribute` will be overriden.
+
+The following behaviours are different than in vanilla Rails 5:
+
+- Defaults `proc`s are evaluated in instance context, not class context.
+- Defaults are evaluated lazily.
+- You can override attributes with custom methods and use `super`.
+- Attributes will work on records retrieved via `.find`.
+- Attributes will be duped if you dup the record.
+
+
 ### ActiveType::Object
 
 
@@ -307,14 +324,14 @@ sign_up.is_a?(SignUp) # => true
 Supported Rails versions
 ------------------------
 
-ActiveType is tested against ActiveRecord 3.2, 4.0, 4.1 and 4.2.
+ActiveType is tested against ActiveRecord 3.2, 4.0, 4.1, 4.2 and 5.0.
 
 Later versions might work, earlier will not.
 
 Supported Ruby versions
 ------------------------
 
-ActiveType is tested against MRI 1.8.7 (for 3.2 only), 1.9.3, 2.0.0, 2.1.2.
+ActiveType is tested against 1.9.3, 2.0.0, 2.1.2 (for 4.x only), 2.2.4 and 2.3.1.
 
 
 Installation

data/active_type.gemspec

@@ -21,4 +21,5 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency('activerecord', '>= 3.2')
 
+  s.required_ruby_version = '>= 1.9.3'
 end

data/gemfiles/Gemfile.3.2.mysql2.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    active_type (0.5.0)
+    active_type (0.6.0)
       activerecord (>= 3.2)
 
 GEM
@@ -50,4 +50,4 @@ DEPENDENCIES
   rspec (~> 3.4)
 
 BUNDLED WITH
-   1.11.2
+   1.12.1

data/gemfiles/Gemfile.3.2.sqlite3.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    active_type (0.5.0)
+    active_type (0.6.0)
       activerecord (>= 3.2)
 
 GEM
@@ -50,4 +50,4 @@ DEPENDENCIES
   sqlite3
 
 BUNDLED WITH
-   1.11.2
+   1.12.1

data/gemfiles/Gemfile.4.0.sqlite3.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    active_type (0.5.0)
+    active_type (0.6.0)
       activerecord (>= 3.2)
 
 GEM
@@ -55,4 +55,4 @@ DEPENDENCIES
   sqlite3
 
 BUNDLED WITH
-   1.11.2
+   1.12.1

data/gemfiles/Gemfile.4.1.sqlite3.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    active_type (0.5.0)
+    active_type (0.6.0)
       activerecord (>= 3.2)
 
 GEM
@@ -54,4 +54,4 @@ DEPENDENCIES
   sqlite3
 
 BUNDLED WITH
-   1.11.2
+   1.12.1

data/gemfiles/Gemfile.4.2.1.mysql2.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    active_type (0.5.0)
+    active_type (0.6.0)
       activerecord (>= 3.2)
 
 GEM
@@ -54,4 +54,4 @@ DEPENDENCIES
   rspec (~> 3.4)
 
 BUNDLED WITH
-   1.11.2
+   1.12.1

data/gemfiles/Gemfile.4.2.1.pg.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    active_type (0.5.0)
+    active_type (0.6.0)
       activerecord (>= 3.2)
 
 GEM
@@ -54,4 +54,4 @@ DEPENDENCIES
   rspec (~> 3.4)
 
 BUNDLED WITH
-   1.11.2
+   1.12.1

data/gemfiles/Gemfile.4.2.1.sqlite3.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    active_type (0.5.0)
+    active_type (0.6.0)
       activerecord (>= 3.2)
 
 GEM
@@ -54,4 +54,4 @@ DEPENDENCIES
   sqlite3
 
 BUNDLED WITH
-   1.11.2
+   1.12.1

data/gemfiles/Gemfile.5.0.0.mysql2

@@ -0,0 +1,7 @@
+source 'https://rubygems.org'
+
+gem 'activerecord', '~>5.0.0'
+gem 'rspec', '~>3.4'
+gem 'mysql2', '~> 0.3.17'
+
+gem 'active_type', :path => '..'

data/gemfiles/Gemfile.5.0.0.mysql2.lock

@@ -0,0 +1,54 @@
+PATH
+  remote: ..
+  specs:
+    active_type (0.6.0)
+      activerecord (>= 3.2)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (5.0.0)
+      activesupport (= 5.0.0)
+    activerecord (5.0.0)
+      activemodel (= 5.0.0)
+      activesupport (= 5.0.0)
+      arel (~> 7.0)
+    activesupport (5.0.0)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    arel (7.0.0)
+    concurrent-ruby (1.0.2)
+    diff-lcs (1.2.5)
+    i18n (0.7.0)
+    minitest (5.9.0)
+    mysql2 (0.3.21)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.0)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
+    thread_safe (0.3.5)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  active_type!
+  activerecord (~> 5.0.0)
+  mysql2 (~> 0.3.17)
+  rspec (~> 3.4)
+
+BUNDLED WITH
+   1.12.1

data/gemfiles/Gemfile.5.0.0.pg

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

data/gemfiles/Gemfile.5.0.0.pg.lock

@@ -0,0 +1,54 @@
+PATH
+  remote: ..
+  specs:
+    active_type (0.6.0)
+      activerecord (>= 3.2)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (5.0.0)
+      activesupport (= 5.0.0)
+    activerecord (5.0.0)
+      activemodel (= 5.0.0)
+      activesupport (= 5.0.0)
+      arel (~> 7.0)
+    activesupport (5.0.0)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    arel (7.0.0)
+    concurrent-ruby (1.0.2)
+    diff-lcs (1.2.5)
+    i18n (0.7.0)
+    minitest (5.9.0)
+    pg (0.18.4)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.0)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
+    thread_safe (0.3.5)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  active_type!
+  activerecord (~> 5.0.0)
+  pg
+  rspec (~> 3.4)
+
+BUNDLED WITH
+   1.12.1

data/gemfiles/Gemfile.5.0.0.sqlite3

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

data/gemfiles/Gemfile.5.0.0.sqlite3.lock

@@ -0,0 +1,54 @@
+PATH
+  remote: ..
+  specs:
+    active_type (0.6.0)
+      activerecord (>= 3.2)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (5.0.0)
+      activesupport (= 5.0.0)
+    activerecord (5.0.0)
+      activemodel (= 5.0.0)
+      activesupport (= 5.0.0)
+      arel (~> 7.0)
+    activesupport (5.0.0)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    arel (7.0.0)
+    concurrent-ruby (1.0.2)
+    diff-lcs (1.2.5)
+    i18n (0.7.0)
+    minitest (5.9.0)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.0)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
+    sqlite3 (1.3.11)
+    thread_safe (0.3.5)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  active_type!
+  activerecord (~> 5.0.0)
+  rspec (~> 3.4)
+  sqlite3
+
+BUNDLED WITH
+   1.12.1

data/lib/active_type/extended_record/inheritance.rb

@@ -23,13 +23,48 @@ module ActiveType
 
         private
 
-        def find_sti_class(type_name)
-          sti_class = super
-          if self <= sti_class
-            self
-          else
-            sti_class
+        if ActiveRecord::VERSION::MAJOR < 5
+
+          def find_sti_class(type_name)
+            sti_class = super
+            if self <= sti_class
+              self
+            else
+              sti_class
+            end
           end
+
+        else
+
+          # Rails 5 find_sti_class does a sanity check for proper inheritance that fails for
+          # our usecase
+          # copied from activerecord/lib/active_record/inheritance.rb
+          def find_sti_class(type_name)
+            type_name = base_class.type_for_attribute(inheritance_column).cast(type_name)
+            subclass = begin
+              if store_full_sti_class
+                ActiveSupport::Dependencies.constantize(type_name)
+              else
+                compute_type(type_name)
+              end
+            rescue NameError
+              raise ActiveRecord::SubclassNotFound,
+                "The single-table inheritance mechanism failed to locate the subclass: '#{type_name}'. " \
+                "This error is raised because the column '#{inheritance_column}' is reserved for storing the class in case of inheritance. " \
+                "Please rename this column if you didn't intend it to be used for storing the inheritance class " \
+                "or overwrite #{name}.inheritance_column to use another column for that information."
+            end
+            #### our code starts here
+            if self <= subclass
+              subclass = self
+            end
+            #### our code ends here
+            unless subclass == self || descendants.include?(subclass)
+              raise ActiveRecord::SubclassNotFound, "Invalid single-table inheritance type: #{subclass.name} is not a subclass of #{name}"
+            end
+            subclass
+          end
+
         end
 
       end

data/lib/active_type/nested_attributes/builder.rb

@@ -28,7 +28,7 @@ module ActiveType
       end
 
       def add_attribute(name, options)
-        @owner.attribute(name, options)
+        @owner.attribute(name, :object, options)
       end
 
       def add_writer_method(name, association)
@@ -41,7 +41,7 @@ module ActiveType
       end
 
       def add_autosave(name, association)
-        save_method = "save_associated_records_for_#{name}"
+        save_method = :"save_associated_records_for_#{name}"
         @module.module_eval do
           define_method save_method do
             association.save(self)
@@ -51,7 +51,7 @@ module ActiveType
       end
 
       def add_validation(name, association)
-        validate_method = "validate_associated_records_for_#{name}"
+        validate_method = :"validate_associated_records_for_#{name}"
         @module.module_eval do
           define_method validate_method do
             association.validate(self)

data/lib/active_type/no_table.rb

@@ -1,81 +1,167 @@
 module ActiveType
 
-  module NoTable
+  if ActiveRecord::VERSION::MAJOR < 5
 
-    extend ActiveSupport::Concern
+    module NoTable
 
+      extend ActiveSupport::Concern
 
-    module ClassMethods
+      module ClassMethods
+
+        def column_types
+          {}
+        end
+
+        def columns
+          []
+        end
+
+        def primary_key
+          nil
+        end
+
+        def destroy(*)
+          new
+        end
+
+        def destroy_all(*)
+          []
+        end
+
+        def find_by_sql(*)
+          []
+        end
 
-      def primary_key
-        nil
       end
 
-      def column_types
-        {}
+      def id
+        nil
       end
 
-      def columns
+      def attribute_names
         []
       end
 
-      def destroy(*)
-        new
+      def transaction(&block)
+        @_current_transaction_records ||= []
+        yield
       end
 
-      def destroy_all(*)
-        []
+      def destroy
+        @destroyed = true
+        freeze
       end
 
+      def reload
+        self
+      end
 
-      def find_by_sql(*)
-        []
+
+      private
+
+      def create(*)
+        true
       end
 
-    end
+      def update(*)
+        true
+      end
 
-    def id
-      nil
-    end
+      if ActiveRecord::Base.private_method_defined?(:create_record)
+        def create_record(*)
+          true
+        end
+
+        def update_record(*)
+          true
+        end
+      else
+        def _create_record(*)
+          @new_record = false
+          true
+        end
+
+        def _update_record(*)
+          true
+        end
+      end
 
-    def attribute_names
-      []
     end
 
-    def transaction(&block)
-      @_current_transaction_records ||= []
-      yield
-    end
+  else
 
-    def destroy
-      @destroyed = true
-      freeze
-    end
+    # Rails 5+
 
-    def reload
-      self
-    end
+    module NoTable
 
+      extend ActiveSupport::Concern
 
-    private
+      class DummySchemaCache
 
-    def create(*)
-      true
-    end
+        def columns_hash(table_name)
+          {}
+        end
 
-    def update(*)
-      true
-    end
+        def data_source_exists?(table_name)
+          false
+        end
 
-    if ActiveRecord::Base.private_method_defined?(:create_record)
-      def create_record(*)
+        def clear_data_source_cache!(table_name)
+        end
+
+      end
+
+      class DummyConnection < ActiveRecord::ConnectionAdapters::AbstractAdapter
+
+        attr_reader :schema_cache
+
+        def initialize(*)
+          super
+          @schema_cache = DummySchemaCache.new
+        end
+
+      end
+
+      module ClassMethods
+
+        def connection
+          @connection ||= DummyConnection.new(nil)
+        end
+
+        def destroy(*)
+          new
+        end
+
+        def destroy_all(*)
+          []
+        end
+
+        def find_by_sql(*)
+          []
+        end
+
+      end
+
+      def destroy
+        @destroyed = true
+        freeze
+      end
+
+      def reload
+        self
+      end
+
+
+      private
+
+      def create(*)
         true
       end
 
-      def update_record(*)
+      def update(*)
         true
       end
-    else
+
       def _create_record(*)
         @new_record = false
         true
@@ -84,6 +170,7 @@ module ActiveType
       def _update_record(*)
         true
       end
+
     end
 
   end

data/lib/active_type/type_caster.rb

@@ -4,8 +4,10 @@ module ActiveType
     def self.get(type, connection)
       native_caster = if ActiveRecord::VERSION::STRING < '4.2'
         NativeCasters::DelegateToColumn.new(type)
+      elsif ActiveRecord::VERSION::STRING < '5'
+        NativeCasters::DelegateToRails4Type.new(type, connection)
       else
-        NativeCasters::DelegateToType.new(type, connection)
+        NativeCasters::DelegateToRails5Type.new(type)
       end
       new(type, native_caster)
     end
@@ -62,7 +64,7 @@ module ActiveType
 
       # Adapter for Rails 4.2+.
       # In these versions, casting logic lives in subclasses of ActiveRecord::Type::Value
-      class DelegateToType
+      class DelegateToRails4Type
 
         def initialize(type, connection)
           # The specified type (e.g. "string") may not necessary match the
@@ -87,6 +89,32 @@ module ActiveType
 
       end
 
+      # Adapter for Rails 5+.
+      # In these versions, casting logic lives in subclasses of ActiveRecord::Type::Value
+      class DelegateToRails5Type
+
+        def initialize(type)
+          @active_record_type = lookup(type)
+        end
+
+        def type_cast_from_user(value)
+          @active_record_type.cast(value)
+        end
+
+        private
+
+        def lookup(type)
+          if type.respond_to?(:cast)
+            type
+          else
+            ActiveRecord::Type.lookup(type)
+          end
+        rescue ::ArgumentError => e
+          ActiveRecord::Type::Value.new
+        end
+
+      end
+
     end
 
   end

data/lib/active_type/util.rb

@@ -23,15 +23,24 @@ module ActiveType
         # Rails 3.2, 4.2
         casted.instance_variable_set(:@attributes, record.instance_variable_get(:@attributes))
         # Rails 3.2
-        record.instance_variable_set(:@attributes_cache, record.instance_variable_get(:@attributes_cache))
+        casted.instance_variable_set(:@attributes_cache, record.instance_variable_get(:@attributes_cache))
         # Rails 4.2
         casted.instance_variable_set(:@changed_attributes, record.instance_variable_get(:@changed_attributes))
+        # Rails 5.0
+        casted.instance_variable_set(:@mutation_tracker, record.instance_variable_get(:@mutation_tracker))
         # Rails 3.2, 4.2
         casted.instance_variable_set(:@new_record, record.new_record?)
         # Rails 3.2, 4.2
         casted.instance_variable_set(:@destroyed, record.destroyed?)
         # Rails 3.2, 4.2
-        casted.instance_variable_set(:@errors, record.errors)
+        errors = record.errors
+        if errors.kind_of? ActiveModel::Errors
+          errors = errors.dup
+          # otherwise attributes defined in ActiveType::Record
+          # won't be visible to `errors.add`
+          errors.instance_variable_set(:@base, casted)
+        end
+        casted.instance_variable_set(:@errors, errors)
       end
     end
 

data/lib/active_type/version.rb

@@ -1,3 +1,3 @@
 module ActiveType
-  VERSION = '0.5.0'
+  VERSION = '0.6.0'
 end

data/spec/active_type/nested_attributes_spec.rb

@@ -13,7 +13,11 @@ module NestedAttributesSpec
 
     def check_fail
       if fail_on_save == true
-        false
+        if ActiveRecord::VERSION::MAJOR >= 5
+          throw :abort
+        else
+          false
+        end
       end
     end
 

data/spec/active_type/object_spec.rb

@@ -3,6 +3,12 @@ require 'ostruct'
 
 module ObjectSpec
 
+  def self.type
+    if ActiveRecord::VERSION::MAJOR >= 5
+      @type ||= ActiveModel::Type::Value.new
+    end
+  end
+
   class Object < ActiveType::Object
 
     attribute :virtual_string, :string
@@ -11,6 +17,7 @@ module ObjectSpec
     attribute :virtual_date, :date
     attribute :virtual_boolean, :boolean
     attribute :virtual_attribute
+    attribute :virtual_type_attribute, ObjectSpec.type
 
   end
 
@@ -171,6 +178,10 @@ describe ActiveType::Object do
     describe 'untyped columns' do
       it_should_behave_like 'an untyped column', :virtual_attribute
     end
+
+    describe 'type columns' do
+      it_should_behave_like 'a coercible type column', :virtual_type_attribute, ObjectSpec.type
+    end
   end
 
   describe 'query methods' do
@@ -218,7 +229,7 @@ describe ActiveType::Object do
       subject.virtual_boolean = true
       subject.virtual_attribute = OpenStruct.new({:test => "openstruct"})
 
-      expect(subject.inspect).to eq("#<ObjectSpec::Object virtual_attribute: #<OpenStruct test=\"openstruct\">, virtual_boolean: true, virtual_date: \"#{Date.today}\", virtual_integer: 17, virtual_string: \"string\", virtual_time: \"#{t.to_s(:db)}\">")
+      expect(subject.inspect).to eq("#<ObjectSpec::Object virtual_attribute: #<OpenStruct test=\"openstruct\">, virtual_boolean: true, virtual_date: \"#{Date.today}\", virtual_integer: 17, virtual_string: \"string\", virtual_time: \"#{t.to_s(:db)}\", virtual_type_attribute: nil>")
     end
 
   end
@@ -236,6 +247,7 @@ describe ActiveType::Object do
         "virtual_date" => nil,
         "virtual_boolean" => nil,
         "virtual_attribute" => nil,
+        "virtual_type_attribute" => nil,
       })
     end
 
@@ -252,6 +264,7 @@ describe ActiveType::Object do
         "virtual_boolean" => nil,
         "virtual_attribute" => nil,
         "another_virtual_string" => nil,
+        "virtual_type_attribute" => nil,
       })
     end
 
@@ -268,6 +281,7 @@ describe ActiveType::Object do
         "virtual_boolean" => nil,
         "virtual_attribute" => nil,
         "another_virtual_string" => nil,
+        "virtual_type_attribute" => nil,
       })
     end
 
@@ -381,7 +395,13 @@ describe ActiveType::Object do
     %w[before_validation before_save].each do |callback|
 
       it "aborts the chain when #{callback} returns false" do
-        allow(subject).to receive_messages("#{callback}_callback" => false)
+        if ActiveRecord::VERSION::MAJOR >= 5
+          allow(subject).to receive("#{callback}_callback") do
+            throw(:abort)
+          end
+        else
+          allow(subject).to receive_messages("#{callback}_callback" => false)
+        end
 
         expect(subject.save).to be_falsey
       end
@@ -404,9 +424,17 @@ describe ActiveType::Object do
 
   end
 
+  describe '#id' do
+
+    it 'is nil' do
+      expect(subject.id).to eq nil
+    end
+
+  end
+
   describe '.find' do
     it 'raises an error' do
-      error = if ActiveRecord::VERSION::MAJOR >= 4 && ActiveRecord::VERSION::MINOR >= 1
+      error = if ActiveRecord::VERSION::MAJOR == 4 && ActiveRecord::VERSION::MINOR >= 1
         ActiveRecord::UnknownPrimaryKey
       else
         ActiveRecord::RecordNotFound

data/spec/active_type/record_spec.rb

@@ -3,6 +3,12 @@ require 'ostruct'
 
 module RecordSpec
 
+  def self.type
+    if ActiveRecord::VERSION::MAJOR >= 5
+      @type ||= ActiveModel::Type::Value.new
+    end
+  end
+
   class Record < ActiveType::Record
 
     attribute :virtual_string, :string
@@ -11,6 +17,7 @@ module RecordSpec
     attribute :virtual_date, :date
     attribute :virtual_boolean, :boolean
     attribute :virtual_attribute
+    attribute :virtual_type_attribute, RecordSpec.type
 
   end
 
@@ -58,6 +65,7 @@ end
 describe ActiveType::Record do
 
   subject { RecordSpec::Record.new }
+  t = Time.new(2016, 2, 1, 12)
 
   it 'is a ActiveRecord::Base' do
     expect(subject).to be_a(ActiveRecord::Base)
@@ -70,22 +78,22 @@ describe ActiveType::Record do
   describe 'constructors' do
     subject { RecordSpec::Record }
 
-    it_should_behave_like 'ActiveRecord-like constructors', { :persisted_string => "string", :persisted_integer => 100, :persisted_time => Time.now, :persisted_date => Date.today, :persisted_boolean => true }
+    it_should_behave_like 'ActiveRecord-like constructors', { :persisted_string => "string", :persisted_integer => 100, :persisted_time => t, :persisted_date => Date.today, :persisted_boolean => true }
 
-    it_should_behave_like 'ActiveRecord-like constructors', { :virtual_string => "string", :virtual_integer => 100, :virtual_time => Time.now, :virtual_date => Date.today, :virtual_boolean => true }
+    it_should_behave_like 'ActiveRecord-like constructors', { :virtual_string => "string", :virtual_integer => 100, :virtual_time => t, :virtual_date => Date.today, :virtual_boolean => true }
 
   end
 
   describe 'mass assignment' do
-    it_should_behave_like 'ActiveRecord-like mass assignment', { :persisted_string => "string", :persisted_integer => 100, :persisted_time => Time.now, :persisted_date => Date.today, :persisted_boolean => true }
+    it_should_behave_like 'ActiveRecord-like mass assignment', { :persisted_string => "string", :persisted_integer => 100, :persisted_time => t, :persisted_date => Date.today, :persisted_boolean => true }
 
-    it_should_behave_like 'ActiveRecord-like mass assignment', { :virtual_string => "string", :virtual_integer => 100, :virtual_time => Time.now, :virtual_date => Date.today, :virtual_boolean => true }
+    it_should_behave_like 'ActiveRecord-like mass assignment', { :virtual_string => "string", :virtual_integer => 100, :virtual_time => t, :virtual_date => Date.today, :virtual_boolean => true }
   end
 
   describe 'accessors' do
-    it_should_behave_like 'ActiveRecord-like accessors', { :persisted_string => "string", :persisted_integer => 100, :persisted_time => Time.now, :persisted_date => Date.today, :persisted_boolean => true }
+    it_should_behave_like 'ActiveRecord-like accessors', { :persisted_string => "string", :persisted_integer => 100, :persisted_time => t, :persisted_date => Date.today, :persisted_boolean => true }
 
-    it_should_behave_like 'ActiveRecord-like accessors', { :virtual_string => "string", :virtual_integer => 100, :virtual_time => Time.now, :virtual_date => Date.today, :virtual_boolean => true }
+    it_should_behave_like 'ActiveRecord-like accessors', { :virtual_string => "string", :virtual_integer => 100, :virtual_time => t, :virtual_date => Date.today, :virtual_boolean => true }
   end
 
   describe 'overridable attributes' do
@@ -150,6 +158,10 @@ describe ActiveType::Record do
     describe 'untyped columns' do
       it_should_behave_like 'an untyped column', :virtual_attribute
     end
+
+    describe 'type columns' do
+      it_should_behave_like 'a coercible type column', :virtual_type_attribute, RecordSpec.type
+    end
   end
 
   describe '#inspect' do
@@ -165,7 +177,7 @@ describe ActiveType::Record do
       subject.virtual_boolean = true
       subject.virtual_attribute = OpenStruct.new({:test => "openstruct"})
 
-      expect(subject.inspect).to eq("#<RecordSpec::Record id: nil, persisted_boolean: nil, persisted_date: nil, persisted_integer: 20, persisted_string: \"persisted string\", persisted_time: nil, virtual_attribute: #<OpenStruct test=\"openstruct\">, virtual_boolean: true, virtual_date: \"#{Date.today}\", virtual_integer: 17, virtual_string: \"string\", virtual_time: \"#{t.to_s(:db)}\">")
+      expect(subject.inspect).to eq("#<RecordSpec::Record id: nil, persisted_boolean: nil, persisted_date: nil, persisted_integer: 20, persisted_string: \"persisted string\", persisted_time: nil, virtual_attribute: #<OpenStruct test=\"openstruct\">, virtual_boolean: true, virtual_date: \"#{Date.today}\", virtual_integer: 17, virtual_string: \"string\", virtual_time: \"#{t.to_s(:db)}\", virtual_type_attribute: nil>")
     end
 
   end
@@ -184,12 +196,13 @@ describe ActiveType::Record do
         "virtual_date" => nil,
         "virtual_boolean" => nil,
         "virtual_attribute" => nil,
+        "virtual_type_attribute" => nil,
         "id" => nil,
         "persisted_string" => "string",
         "persisted_integer" => nil,
         "persisted_time" => nil,
         "persisted_date" => nil,
-        "persisted_boolean" => nil
+        "persisted_boolean" => nil,
       })
     end
 
@@ -252,4 +265,10 @@ describe ActiveType::Record do
     it_should_behave_like 'a belongs_to association', :child, RecordSpec::Child
   end
 
+  it 'can access virtual attributes after .find' do
+    subject.save!
+    expect(subject.class.find(subject.id).virtual_string).to eq(nil)
+    expect(subject.class.find(subject.id).virtual_string).to eq(nil)
+  end
+
 end

data/spec/active_type/util_spec.rb

@@ -9,9 +9,12 @@ module UtilSpec
   class ExtendedRecord < ActiveType::Record[BaseRecord]
 
     attribute :virtual_string
+    attribute :virtual_string_for_validation
     after_initialize :set_virtual_string
+    attr_reader :after_initialize_called
 
     def set_virtual_string
+      @after_initialize_called = true
       self.virtual_string = "persisted_string is #{persisted_string}"
     end
 
@@ -84,7 +87,7 @@ describe ActiveType::Util do
       it 'calls after_initialize callbacks of the cast target' do
         base_record = UtilSpec::BaseRecord.create!(:persisted_string => 'foo')
         extended_record = ActiveType::Util.cast(base_record, UtilSpec::ExtendedRecord)
-        expect(extended_record.virtual_string).to be_present
+        expect(extended_record.after_initialize_called).to eq true
       end
 
       it 'lets after_initialize callbacks access attributes (bug in ActiveRecord#becomes)' do
@@ -117,6 +120,17 @@ describe ActiveType::Util do
         expect(extended_record.changes).to eq({ 'persisted_string' => ['foo', 'bar'] })
       end
 
+      it 'associates the error object correctly with the new type (BUGFIX)' do
+        base_record = UtilSpec::BaseRecord.create!(:persisted_string => 'foo')
+        extended_record = ActiveType::Util.cast(base_record, UtilSpec::ExtendedRecord)
+        expect {
+          value = extended_record.virtual_string_for_validation
+          extended_record.errors.add(:virtual_string_for_validation, :empty) if value.nil? || value.empty?
+        }.not_to raise_error
+        expect(extended_record.errors.size).to eq 1
+        expect(base_record.errors.size).to eq 0
+      end
+
     end
 
   end

data/spec/shared_examples/accessors.rb

@@ -1,21 +1,4 @@
-class User < ::ActiveRecord::Base
-end
-
-class Foo < ::ActiveType::Record[User]
-  def new
-    allocate
-  end
-end
-
-
 shared_examples_for "ActiveRecord-like accessors" do |attributes|
-  it 'setup the virtual_attributes instance variable lazy' do
-    expect(Foo.new.virtual_attributes).to eq({})
-  end
-
-  it 'setup the virtual_attributes_cache instance variable lazy' do
-    expect(Foo.new.virtual_attributes_cache).to eq({})
-  end
 
   it 'allows to read and write' do
     attributes.each do |key, value|

data/spec/shared_examples/coercible_columns.rb

@@ -115,7 +115,7 @@ shared_examples_for 'a coercible time column' do |column|
   end
 
   it 'leaves times alone' do
-    time = Time.now
+    time = Time.at(Time.now.to_i)
     subject.send(:"#{column}=", time)
 
     expect(subject.send(column)).to eq(time)
@@ -226,3 +226,23 @@ shared_examples_for 'an untyped column' do |column|
     expect(subject.send(column)).to eq(object)
   end
 end
+
+
+shared_examples_for 'a coercible type column' do |column, type|
+
+  if type
+
+    it 'is nil by default' do
+      expect(subject.send(column)).to be_nil
+    end
+
+    it 'leaves strings alone' do
+      expect(type).to receive(:cast).with('input').and_return('output')
+      subject.send(:"#{column}=", 'input')
+
+      expect(subject.send(column)).to eq('output')
+    end
+
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_type
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Tobias Kraze
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-08 00:00:00.000000000 Z
+date: 2016-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -60,6 +60,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - ".ruby-version"
 - ".travis.yml"
 - CHANGELOG.md
@@ -81,6 +82,12 @@ files:
 - gemfiles/Gemfile.4.2.1.pg.lock
 - gemfiles/Gemfile.4.2.1.sqlite3
 - gemfiles/Gemfile.4.2.1.sqlite3.lock
+- gemfiles/Gemfile.5.0.0.mysql2
+- gemfiles/Gemfile.5.0.0.mysql2.lock
+- gemfiles/Gemfile.5.0.0.pg
+- gemfiles/Gemfile.5.0.0.pg.lock
+- gemfiles/Gemfile.5.0.0.sqlite3
+- gemfiles/Gemfile.5.0.0.sqlite3.lock
 - lib/active_type.rb
 - lib/active_type/extended_record.rb
 - lib/active_type/extended_record/inheritance.rb
@@ -133,7 +140,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -141,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Make any Ruby object quack like ActiveRecord