active_type 1.9.0 → 2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21de85e1b19fed7dd547f3301c82ec967997b7fed1d8b063b674e15f538bcc49
-  data.tar.gz: 3e8b54eb5b1573b0d3284e7f6c216099d165b44c485f8881226a99447d78c18a
+  metadata.gz: b0d4c00a8c504822572083cb1a051ff4582c5e0638bc4eca0f064df38f175b2e
+  data.tar.gz: b38c8570c9ecf88d267ae7f6e46bd1773c5658494a329b6ae00de114ce274d01
 SHA512:
-  metadata.gz: 04dc0427781f01314b7535b97bca3d002489ec9db45e6231e428e050d732c80d70ef07a1300e4dc8ba306aa3e3ea55ab124a7b6245c1928ed0909b24df798d2d
-  data.tar.gz: ebd393afc5b781ef4fd2edb3951b6d7c50ba691687c2c0a52ec76fbe013b9756776e61f4a655d3ce6221ed148c8aefff9d1cf770d95669f98102069affa67b72
+  metadata.gz: 925a22fc4566431fc6fa4c3a22cdb86d2889e2c6066ece8a652b98fc8b2a81267c3c4221dc3429bbae7cc34bf9a14534d75b6f0e286c78b95909e581a27e840b
+  data.tar.gz: '097eafa44f1c006d76185d0e697bcca2072e820e019c84327432e18d4bf767925f69b988c468a82978fc5cfcfe2a21751b714dd2914adbcc94065ca70aba4a09'

data/.github/workflows/test.yml

@@ -14,12 +14,8 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - ruby: "2.3.8"
-            gemfile: Gemfile.3.2.sqlite3
-          - ruby: "2.3.8"
+          - ruby: "2.5.5"
             gemfile: Gemfile.4.2.sqlite3
-          - ruby: "2.3.8"
-            gemfile: Gemfile.5.2.sqlite3
           - ruby: "2.5.5"
             gemfile: Gemfile.5.2.sqlite3
           - ruby: "2.5.5"
@@ -80,12 +76,8 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - ruby: "2.3.8"
-            gemfile: Gemfile.3.2.mysql2
-          - ruby: "2.3.8"
+          - ruby: "2.5.5"
             gemfile: Gemfile.4.2.mysql2
-          - ruby: "2.3.8"
-            gemfile: Gemfile.5.2.mysql2
           - ruby: "2.6.3"
             gemfile: Gemfile.5.2.mysql2
           - ruby: "2.7.2"
@@ -135,9 +127,9 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - ruby: "2.3.8"
+          - ruby: "2.5.5"
             gemfile: Gemfile.4.2.pg
-          - ruby: "2.3.8"
+          - ruby: "2.5.5"
             gemfile: Gemfile.5.2.pg
           - ruby: "2.5.5"
             gemfile: Gemfile.6.1.pg

data/.ruby-version

@@ -1 +1 @@
-2.3.8
+2.7.2

data/CHANGELOG.md

@@ -4,6 +4,23 @@ All notable changes to this project will be documented in this file.
 
 ## Unreleased changes
 
+## 2.0.0 (2021-11-24)
+
+* Added: Casting is prevented when the base record has changes in its already loaded associations, because those would be lost. Option `force: true` can be used to override this and still do the cast (this is not recommended).
+* Added: After casting, the base record will not be usable any more. The base record and the newly created casted record share state which is unexpected. Option `force: true` can be used to override this, so the base record is still usable (this is not recommended).
+
+## 1.10.1 (2021-10-19)
+
+* Removed: When casting an unsaved record, the new record will no longer have the same associations as the base record. This was introduced with version 1.8.0 and lead to issues (#147 and #148). Therefore the change was rolled back.
+
+## 1.10.0 (2021-08-11)
+
+* Removed: Tests for Ruby 2.4 and ActiveRecord 3.2.
+
+## 1.9.1 (2021-06-29)
+
+* Fixed: Retain `#mutations_from_database` when using ActiveType.cast (Rails 5.2+). Thanks to @unrooty-infinum.
+
 ## 1.9.0 (2021-05-20)
 
 * Fixed: Extended records now use their own I18n namespace when looking up translations for models or attributes.

data/Gemfile

@@ -1 +1 @@
-Gemfile.5.2.pg
+./Gemfile.5.2.pg

data/Gemfile.4.2.mysql2.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active_type (1.6.0)
+    active_type (2.0)
       activerecord (>= 3.2)
 
 GEM
@@ -58,4 +58,4 @@ DEPENDENCIES
   rspec (~> 3.4)
 
 BUNDLED WITH
-   2.1.4
+   2.2.16

data/Gemfile.4.2.pg.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active_type (1.6.0)
+    active_type (2.0)
       activerecord (>= 3.2)
 
 GEM
@@ -58,4 +58,4 @@ DEPENDENCIES
   rspec (~> 3.4)
 
 BUNDLED WITH
-   2.1.4
+   2.2.16

data/Gemfile.4.2.sqlite3.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active_type (1.6.0)
+    active_type (2.0)
       activerecord (>= 3.2)
 
 GEM
@@ -58,4 +58,4 @@ DEPENDENCIES
   sqlite3
 
 BUNDLED WITH
-   2.1.4
+   2.2.16

data/Gemfile.5.2.mysql2.lock

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

data/Gemfile.5.2.pg.lock

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

data/Gemfile.5.2.sqlite3.lock

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

data/Gemfile.6.0.sqlite3.lock

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

data/Gemfile.6.1.pg.lock

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

data/Gemfile.6.1.sqlite3.lock

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

data/Gemfile.lock

@@ -1 +1 @@
-Gemfile.5.2.pg.lock
+./Gemfile.5.2.pg.lock

data/README.md

@@ -364,8 +364,10 @@ sign_up.is_a?(SignUp) # => true
 This is basically like [`ActiveRecord#becomes`](http://apidock.com/rails/v4.2.1/ActiveRecord/Persistence/becomes), but with less bugs and more consistent behavior.
 
 **Note that `cast` is destructive.** The originally casted record (`user`) and the returned record (`sign_up`)
-share internal state (such as attributes). To avoid unexpected behavior, do not use the original record
-after casting it.
+share internal state (such as attributes). To avoid unexpected behavior, the original record will raise an error when trying to change or persist it. Also, casting of a record that has changes in its loaded associations is prevented, because those changes would be lost.  
+If you know what you are doing and absolutely want that, you may use the option `force: true` to allow this potentially problematic behaviour, e.g. `sign_up = ActiveType.cast(user, SignUp, force: true)`
+
+
 
 You can also cast an entire relation (scope) to a relation of an `ActiveType::Record`:
 
@@ -405,14 +407,14 @@ Now, if you load `credentials`, you will automatically receive records of type `
 Supported Rails versions
 ------------------------
 
-ActiveType is tested against ActiveRecord 3.2, 4.2, 5.1, 5.2, 6.0 and 6.1.
+ActiveType is tested against ActiveRecord 4.2, 5.1, 5.2, 6.0 and 6.1.
 
 Later versions might work, earlier will not.
 
 Supported Ruby versions
 ------------------------
 
-ActiveType is tested against 2.3, 2.4, 2.5 and 3.0.
+ActiveType is tested against 2.5, 2.6, 2.7 and 3.0.
 
 
 Installation

data/lib/active_type/mutation_after_cast_error.rb

@@ -0,0 +1,6 @@
+module ActiveType
+
+  class MutationAfterCastError < StandardError
+  end
+
+end

data/lib/active_type/not_castable_error.rb

@@ -0,0 +1,6 @@
+module ActiveType
+
+  class NotCastableError < StandardError
+  end
+
+end

data/lib/active_type/util/unmutable_attributes.rb

@@ -0,0 +1,32 @@
+require 'active_type/mutation_after_cast_error'
+
+module ActiveType
+  module Util
+
+    # This object is used as a substitute for a record's @attributes.
+    # Reading from the original @attributes is still allowed, to enable
+    # `#inspect` and similar functions.
+    # But the @attributes can no longer be mutated and will raise instead.
+    class UnmutableAttributes
+
+      attr_reader :original_attributes
+
+      def initialize(attributes)
+        @original_attributes = attributes
+      end
+
+      def fetch_value(key)
+        original_attributes.fetch_value(key)
+      end
+
+      def key?(key)
+        original_attributes.key?(key)
+      end
+
+      def method_missing(*args)
+        raise MutationAfterCastError, 'Changing a record that has been used to create an ActiveType::Record could have unexpected side effects!'
+      end
+
+    end
+  end
+end

data/lib/active_type/util.rb

@@ -1,11 +1,14 @@
+require 'active_type/not_castable_error'
+require 'active_type/util/unmutable_attributes'
+
 module ActiveType
   module Util
 
-    def cast(object, klass)
+    def cast(object, klass, force: false)
       if object.is_a?(ActiveRecord::Relation)
         cast_relation(object, klass)
       elsif object.is_a?(ActiveRecord::Base)
-        cast_record(object, klass)
+        cast_record(object, klass, force: force)
       else
         raise ArgumentError, "Don't know how to cast #{object.inspect}"
       end
@@ -17,7 +20,11 @@ module ActiveType
 
     private
 
-    def cast_record(record, klass)
+    def cast_record(record, klass, force: false)
+      if associations_touched?(record) && !force
+        raise NotCastableError, 'Record has changes in its loaded associations!'
+      end
+
       # record.becomes(klass).dup
       klass.new do |casted|
         using_single_table_inheritance = using_single_table_inheritance?(klass, casted)
@@ -34,8 +41,8 @@ module ActiveType
         casted.instance_variable_set(:@new_record, record.new_record?)
         # Rails 3.2, 4.2
         casted.instance_variable_set(:@destroyed, record.destroyed?)
-
-        casted.instance_variable_set(:@association_cache, record.instance_variable_get(:@association_cache))
+        # Rails 5.2+
+        casted.instance_variable_set(:@mutations_from_database, record.instance_variable_get(:@mutations_from_database))
 
         # Rails 3.2, 4.2
         errors = record.errors
@@ -48,6 +55,11 @@ module ActiveType
         casted.instance_variable_set(:@errors, errors)
 
         casted[klass.inheritance_column] = klass.sti_name if using_single_table_inheritance
+
+        if !force
+          make_record_unusable(record)
+        end
+        casted
       end
     end
 
@@ -61,6 +73,23 @@ module ActiveType
       scoped(klass).merge(scoped(relation))
     end
 
+    def associations_touched?(record)
+      return false unless record.instance_variable_get(:@association_cache)
+
+      !!record.instance_variable_get(:@association_cache)[:associated_records]&.target&.any? do |target|
+        target.changed?
+      end
+    end
+
+    def make_record_unusable(record)
+      # Changing and saving the base record may lead to unexpected behaviour,
+      # since the casted record may have different changes in its autosave
+      # associations and will be saved to the same record in the database as
+      # the casted record. Therefore we prevent that.
+      original_attributes = record.instance_variable_get(:@attributes)
+      record.instance_variable_set(:@attributes, UnmutableAttributes.new(original_attributes) )
+    end
+
     extend self
 
   end

data/lib/active_type/version.rb

@@ -1,3 +1,3 @@
 module ActiveType
-  VERSION = '1.9.0'
+  VERSION = '2.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_type
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: '2.0'
 platform: ruby
 authors:
 - Tobias Kraze
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-20 00:00:00.000000000 Z
+date: 2021-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -65,10 +65,6 @@ files:
 - ".ruby-version"
 - CHANGELOG.md
 - Gemfile
-- Gemfile.3.2.mysql2
-- Gemfile.3.2.mysql2.lock
-- Gemfile.3.2.sqlite3
-- Gemfile.3.2.sqlite3.lock
 - Gemfile.4.2.mysql2
 - Gemfile.4.2.mysql2.lock
 - Gemfile.4.2.pg
@@ -94,18 +90,21 @@ files:
 - active_type.gemspec
 - lib/active_type.rb
 - lib/active_type/change_association.rb
+- lib/active_type/mutation_after_cast_error.rb
 - lib/active_type/nested_attributes.rb
 - lib/active_type/nested_attributes/association.rb
 - lib/active_type/nested_attributes/builder.rb
 - lib/active_type/nested_attributes/nests_many_association.rb
 - lib/active_type/nested_attributes/nests_one_association.rb
 - lib/active_type/no_table.rb
+- lib/active_type/not_castable_error.rb
 - lib/active_type/object.rb
 - lib/active_type/record.rb
 - lib/active_type/record_extension.rb
 - lib/active_type/record_extension/inheritance.rb
 - lib/active_type/type_caster.rb
 - lib/active_type/util.rb
+- lib/active_type/util/unmutable_attributes.rb
 - lib/active_type/version.rb
 - lib/active_type/virtual_attributes.rb
 homepage: https://github.com/makandra/active_type
@@ -127,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.17
+rubygems_version: 3.2.15
 signing_key: 
 specification_version: 4
 summary: Make any Ruby object quack like ActiveRecord

data/Gemfile.3.2.mysql2

@@ -1,10 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'activerecord', '~> 3.2.22.5'
-gem 'rspec', '~> 3.4'
-gem 'mysql2', git: 'https://github.com/makandra/mysql2', branch: '0.3.x-lts'
-gem 'rake'
-gem 'gemika'
-
-gem 'active_type', :path => '.'
-gem 'i18n', '=0.6.11' # 0.7 no longer builds for Ruby 1.8.7

data/Gemfile.3.2.mysql2.lock

@@ -1,63 +0,0 @@
-GIT
-  remote: https://github.com/makandra/mysql2
-  revision: c920d41e43c4722d4c065d2ea9d21494c560bd85
-  branch: 0.3.x-lts
-  specs:
-    mysql2 (0.3.21)
-
-PATH
-  remote: .
-  specs:
-    active_type (1.6.0)
-      activerecord (>= 3.2)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activemodel (3.2.22.5)
-      activesupport (= 3.2.22.5)
-      builder (~> 3.0.0)
-    activerecord (3.2.22.5)
-      activemodel (= 3.2.22.5)
-      activesupport (= 3.2.22.5)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activesupport (3.2.22.5)
-      i18n (~> 0.6, >= 0.6.4)
-      multi_json (~> 1.0)
-    arel (3.0.3)
-    builder (3.0.4)
-    diff-lcs (1.2.5)
-    gemika (0.4.1)
-    i18n (0.6.11)
-    multi_json (1.13.1)
-    rake (10.4.2)
-    rspec (3.4.0)
-      rspec-core (~> 3.4.0)
-      rspec-expectations (~> 3.4.0)
-      rspec-mocks (~> 3.4.0)
-    rspec-core (3.4.1)
-      rspec-support (~> 3.4.0)
-    rspec-expectations (3.4.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-mocks (3.4.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-support (3.4.1)
-    tzinfo (0.3.55)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  active_type!
-  activerecord (~> 3.2.22.5)
-  gemika
-  i18n (= 0.6.11)
-  mysql2!
-  rake
-  rspec (~> 3.4)
-
-BUNDLED WITH
-   2.1.4

data/Gemfile.3.2.sqlite3

@@ -1,10 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'activerecord', '~> 3.2.22.5'
-gem 'rspec', '~>3.4'
-gem 'sqlite3'
-gem 'rake'
-gem 'gemika'
-
-gem 'active_type', :path => '.'
-gem 'i18n', '=0.6.11' # 0.7 no longer builds for Ruby 1.8.7

data/Gemfile.3.2.sqlite3.lock

@@ -1,57 +0,0 @@
-PATH
-  remote: .
-  specs:
-    active_type (1.6.0)
-      activerecord (>= 3.2)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activemodel (3.2.22.5)
-      activesupport (= 3.2.22.5)
-      builder (~> 3.0.0)
-    activerecord (3.2.22.5)
-      activemodel (= 3.2.22.5)
-      activesupport (= 3.2.22.5)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activesupport (3.2.22.5)
-      i18n (~> 0.6, >= 0.6.4)
-      multi_json (~> 1.0)
-    arel (3.0.3)
-    builder (3.0.4)
-    diff-lcs (1.2.5)
-    gemika (0.4.1)
-    i18n (0.6.11)
-    multi_json (1.13.1)
-    rake (10.4.2)
-    rspec (3.4.0)
-      rspec-core (~> 3.4.0)
-      rspec-expectations (~> 3.4.0)
-      rspec-mocks (~> 3.4.0)
-    rspec-core (3.4.1)
-      rspec-support (~> 3.4.0)
-    rspec-expectations (3.4.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-mocks (3.4.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-support (3.4.1)
-    sqlite3 (1.3.11)
-    tzinfo (0.3.55)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  active_type!
-  activerecord (~> 3.2.22.5)
-  gemika
-  i18n (= 0.6.11)
-  rake
-  rspec (~> 3.4)
-  sqlite3
-
-BUNDLED WITH
-   2.1.4