active_type 2.6.4 → 2.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a0b2f6fb30a96dbcbbbce17bd19e3476ff6aa723506c511992a2635a6871d97
-  data.tar.gz: ea1191cda8575afdcb7b912d3f921f2d5b8f0fe3dc9f7ffca0547d86693d5d1e
+  metadata.gz: 39d607fc50012b8348c3536df88b78c30bcadaf6c01deb45fdca664b240061b5
+  data.tar.gz: 554cc69f58a1bf21ece2ad1b5246559f937abd44e6dc4eb5aea5abfb212fbf9a
 SHA512:
-  metadata.gz: 012e905251e98a6da960f5c1f04ca30d55d6af090812e31e5bb13dfa4832128d9cfd9128552a5e2118d23d97e09016070c094d46d39e0101f15df8e61d66914c
-  data.tar.gz: 62a7496d44a532065c92cf4b8d75971cb3333eb82d7456a6fa9d31529f40327cf720a7115859319dc79182a2020987e7a23512f1551ab36b9336e82241ab02b1
+  metadata.gz: 68442050e7771c3e6a5889eda945635a4a9be009657692bdc43918815119d911b46c507d93e31142f46555c5b43ffe6b5b6ebe34b0a25336f10e953fe8e51e97
+  data.tar.gz: a126fbbfe0b5741ef6d49a641d907dd3857971ad3938f234778e375c0bc0e6d46cae23125f6eb36aea1c4fab1ba25d21579ceef22b21f1117ae6fa25ea3028cb

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 All notable changes to this project will be documented in this file.
 
+## 2.6.5 (2025-10-16)
+
+* Fixed: ActiveType::Object and ActiveType::Record are now serialized/deserialized correctly using Marshal.dump/Marshal.load
+
 ## 2.6.4 (2025-09-11)
 
 * Fixed: When using nests_many, nested updates, with preloaded records, using string ids will no longer cause additional DB queries.

data/Gemfile.6.1.pg.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active_type (2.6.3)
+    active_type (2.6.5)
       activerecord (>= 6.1)
 
 GEM

data/Gemfile.6.1.sqlite3.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active_type (2.6.3)
+    active_type (2.6.5)
       activerecord (>= 6.1)
 
 GEM

data/Gemfile.7.1.pg.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active_type (2.6.3)
+    active_type (2.6.5)
       activerecord (>= 6.1)
 
 GEM

data/Gemfile.7.1.sqlite3.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active_type (2.6.3)
+    active_type (2.6.5)
       activerecord (>= 6.1)
 
 GEM

data/Gemfile.7.2.mysql2.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active_type (2.6.3)
+    active_type (2.6.5)
       activerecord (>= 6.1)
 
 GEM

data/Gemfile.7.2.pg.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active_type (2.6.3)
+    active_type (2.6.5)
       activerecord (>= 6.1)
 
 GEM

data/Gemfile.7.2.sqlite3.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active_type (2.6.3)
+    active_type (2.6.5)
       activerecord (>= 6.1)
 
 GEM

data/Gemfile.8.0.sqlite3.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active_type (2.6.3)
+    active_type (2.6.5)
       activerecord (>= 6.1)
 
 GEM

data/lib/active_type/marshalling.rb

@@ -0,0 +1,62 @@
+module ActiveType
+  module Marshalling
+    # With 7.1 rails defines its own marshal_dump and marshal_load methods,
+    # which selectively only dump and load the record´s attributes and some more stuff, but not our @virtual_attributes.
+    # Whether these new methods are actually used, depends on ActiveRecord::Marshalling.format_version
+    # For format_version = 6.1 active record uses the default ruby implementation for dumping and loading.
+    # For format_version = 7.1 active record uses a custom implementation, which we need to override.
+    #
+    # format_version can also be dynamically changed during runtime, on change we need to define or undefine our marshal_dump dynamically, because:
+    # * We cannot check the format_version at runtime within marshal_dump or marshal_load,
+    #   as we can´t just super to the default for the wrong version, because there is no method to super to.
+    #   (The default implementation is a ruby internal, not a real method.)
+    # * We cannot override the methods at load time only when format version is 7.1,
+    #   because format version usually gets set after our initialisation and could change at any time.
+    #
+    # Two facts about ruby also help us with that (also see https://ruby-doc.org/core-2.6.8/Marshal.html):
+    # * A custom marshal_load is only used, when marshal_dump is also defined. So we can keep marshal_dump always defined.
+    #   (If either is missing, ruby will use _dump and _load)
+    # * If a serialized object is dumped using _dump it will be loaded using _load, never marshal_load, so a record
+    #   serialized with format_version = 6.1 using _dump, will always load using _load, ignoring whether marshal_load is defined or not.
+    #   This ensures objects will always be deserialized with the method they were serialized with. We don´t need to worry about that.
+
+    class << self
+      attr_reader :format_version
+
+      def format_version=(version)
+        case version
+        when 6.1
+          Methods.remove_method(:marshal_dump) if Methods.method_defined?(:marshal_dump)
+        when 7.1
+          Methods.alias_method(:marshal_dump, :_marshal_dump_7_1)
+        else
+          raise ArgumentError, "Unknown marshalling format: #{version.inspect}"
+        end
+        @format_version = version
+      end
+    end
+
+    module ActiveRecordMarshallingExtension
+      def format_version=(version)
+        ActiveType::Marshalling.format_version = version
+        super(version)
+      end
+    end
+
+    module Methods
+      def _marshal_dump_7_1
+        [super, @virtual_attributes]
+      end
+
+      def marshal_load(state)
+        super_attributes, @virtual_attributes = state
+        super(super_attributes)
+      end
+    end
+
+  end
+end
+
+ActiveRecord::Marshalling.singleton_class.prepend(ActiveType::Marshalling::ActiveRecordMarshallingExtension)
+# Set ActiveType´s format_version to ActiveRecord´s, in case ActiveRecord uses the default value, which is set before we are loaded.
+ActiveType::Marshalling.format_version = ActiveRecord::Marshalling.format_version

data/lib/active_type/object.rb

@@ -1,6 +1,7 @@
 require 'active_type/no_table'
 require 'active_type/virtual_attributes'
 require 'active_type/nested_attributes'
+require 'active_type/marshalling' if ActiveRecord::VERSION::MAJOR >= 7 && ActiveRecord::VERSION::MINOR >= 1
 
 module ActiveType
 
@@ -9,6 +10,7 @@ module ActiveType
     include NoTable
     include VirtualAttributes
     include NestedAttributes
+    include Marshalling::Methods if ActiveRecord::VERSION::MAJOR >= 7 && ActiveRecord::VERSION::MINOR >= 1
 
   end
 

data/lib/active_type/record.rb

@@ -2,6 +2,7 @@ require 'active_type/virtual_attributes'
 require 'active_type/record_extension'
 require 'active_type/nested_attributes'
 require 'active_type/change_association'
+require 'active_type/marshalling' if ActiveRecord::VERSION::MAJOR >= 7 && ActiveRecord::VERSION::MINOR >= 1
 
 module ActiveType
 
@@ -13,6 +14,7 @@ module ActiveType
     include NestedAttributes
     include RecordExtension
     include ChangeAssociation
+    include Marshalling::Methods if ActiveRecord::VERSION::MAJOR >= 7 && ActiveRecord::VERSION::MINOR >= 1
 
   end
 

data/lib/active_type/version.rb

@@ -1,3 +1,3 @@
 module ActiveType
-  VERSION = '2.6.4'
+  VERSION = '2.6.5'
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: active_type
 version: !ruby/object:Gem::Version
-  version: 2.6.4
+  version: 2.6.5
 platform: ruby
 authors:
 - Tobias Kraze
 - Henning Koch
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2025-09-11 00:00:00.000000000 Z
+date: 2025-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -88,6 +88,7 @@ files:
 - active_type.gemspec
 - lib/active_type.rb
 - lib/active_type/change_association.rb
+- lib/active_type/marshalling.rb
 - lib/active_type/mutation_after_cast_error.rb
 - lib/active_type/nested_attributes.rb
 - lib/active_type/nested_attributes/association.rb
@@ -119,7 +120,7 @@ metadata:
   bug_tracker_uri: https://github.com/makandra/active_type/issues
   changelog_uri: https://github.com/makandra/active_type/blob/master/CHANGELOG.md
   rubygems_mfa_required: 'true'
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -135,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.4.10
-signing_key:
+signing_key: 
 specification_version: 4
 summary: Make any Ruby object quack like ActiveRecord
 test_files: []