active_type 2.5.1 → 2.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f243c433c673eb72dc622d9315f8a68a33b788a4f20cb82a5b480dc82ccb73b9
-  data.tar.gz: f8f6b146776a25cfbcbb3acf8c9fafa46c22e68136ed23a9a004a75af0cf6e05
+  metadata.gz: 28986180d23a749310c496d900fc83b79ca4bfe305704f2bb93ec6a8c69cf131
+  data.tar.gz: 6647ff958ee1be018e654c7689fa333fa3789c1fcb972b6125a4f9e65c0a2aaa
 SHA512:
-  metadata.gz: e4035273c367cb091908f5ad2db1949970e8e323b72629580a11e8309f48aa5ec4eb45e54a7e0c0896cf508c394ac6a0e72b51dc059a1b644751c400964f8319
-  data.tar.gz: 9b79ccb1b3bbdc6dd0ad6c0cec7254a5ed41f18d41020a5c774a021eb898fe721fe3c7918b73253ac88689c54a1430b74f56babc1f40aaad5a705ccf81e55424
+  metadata.gz: 18f57bad0539e91f6725ccfd63ceb6faa32a23d96b9033d0bbc240b62f475dd385d03e395f7ba82646078e64add7bc26241848f0c9177568e29699404355c346
+  data.tar.gz: 13de6f297c36eb2e2dc75c719f1e8a858a783576f9aaf322e4c46654ae8ee578a8299f73aee651bd64e395ec2dd3a09a6fc02f0b4cbc2977a2ba26c7556d3592

data/CHANGELOG.md

@@ -2,6 +2,44 @@
 
 All notable changes to this project will be documented in this file.
 
+## 2.8.0 (2026-01-22)
+* Added: Add support `attributes_for_inspect` on ActiveType::Object.
+  Tanks to @makmic.
+
+## 2.7.1 (2025-11-03)
+* Fixed: Removed some unnecessary files from the packaged gem. Gets rid of symlink warnings during installation.
+
+## 2.7.0 (2025-11-03)
+* Removed: Support for Ruby < 3.1, Rails < 7.
+* Fixed: Exception when using ActiveType::Record with Rails 8.1.
+
+## 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.
+
+## 2.6.3 (2025-08-11)
+
+* Fixed: Autosave on associations will triggers saves when only virtual attributes have changed.
+  Thanks to @RohanM.
+
+## 2.6.2 (2025-02-12)
+
+* Fixed: Issue with `ActiveType::Object` when using an optional `belongs_to` on a virtual attribute.
+  Thanks to @kyanagi.
+
+## 2.6.1 (2025-01-17)
+
+* Fixed: Issue with `ActiveType::Object` when using has_many on Rails 7.2.
+  Thanks to @corableus.
+
+## 2.6.0 (2024-12-20)
+
+* Drop support for Rails < 5, Ruby < 2.7.
+
 ## 2.5.1 (2024-08-14)
 
 * Fixed: Make `ActiveType::Object` work on Rails 7.2.

data/README.md

@@ -1,5 +1,21 @@
-ActiveType [![Tests](https://github.com/makandra/active_type/workflows/Tests/badge.svg)](https://github.com/makandra/active_type/actions)
-==========
+<p>
+  <a href="https://makandra.de/">
+    <picture>
+      <source media="(prefers-color-scheme: light)" srcset="media/makandra-with-bottom-margin.light.svg">
+      <source media="(prefers-color-scheme: dark)" srcset="media/makandra-with-bottom-margin.dark.svg">
+      <img align="right" width="25%" alt="makandra" src="media/makandra-with-bottom-margin.light.svg">
+    </picture>
+  </a>
+
+  <picture>
+    <source media="(prefers-color-scheme: light)" srcset="media/logo.light.shapes.svg">
+    <source media="(prefers-color-scheme: dark)" srcset="media/logo.dark.shapes.svg">
+    <img width="245" alt="active_type" role="heading" aria-level="1" src="media/logo.light.shapes.svg">
+  </picture>
+</p>
+
+[![Tests](https://github.com/makandra/active_type/workflows/Tests/badge.svg)](https://github.com/makandra/active_type/actions)
+
 
 Make any Ruby object quack like ActiveRecord
 --------------------------------------------
@@ -69,7 +85,7 @@ The following behaviours are different than in vanilla Rails 5:
 
 If you need to use `ActiveRecord's` own `.attribute` method, you can still access is as `ar_attribute`:
 
-```
+```rb
 class User < ApplicationRecord
   # use my custom type to serialize to the database
   ar_attribute :password, MyPasswordType.new
@@ -312,7 +328,7 @@ Supported options for `nests_many` / `nests_one` are:
   nests_many :documents, build_scope: proc { Document }, find_scope: proc { Document }
   ```
 
-  All `...scope` options are evaled in the context of the record on first use, and cached. 
+  All `...scope` options are evaled in the context of the record on first use, and cached.
 
 - `allow_destroy`
 
@@ -364,7 +380,7 @@ 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, 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.  
+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)`
 
 
@@ -418,14 +434,14 @@ Now, if you load `credentials`, you will automatically receive records of type `
 Supported Rails versions
 ------------------------
 
-ActiveType is tested against ActiveRecord 5.2, 6.0, 6.1, and 7.0.
+ActiveType is tested against ActiveRecord 7.1, 7.2, 8.0, 8.1.
 
 Later versions might work, earlier will not.
 
 Supported Ruby versions
 ------------------------
 
-ActiveType is tested against 2.5, 2.7, 3.0, and 3.1.
+ActiveType is tested against Ruby 3.1+.
 
 
 Installation
@@ -462,5 +478,3 @@ Credits
 Tobias Kraze from [makandra](http://makandra.com/)
 
 Henning Koch from [makandra](http://makandra.com/)
-
-

data/lib/active_type/change_association.rb

@@ -13,12 +13,8 @@ module ActiveType
             new_scope = nil
           end
           original_options = existing_association.options
-          if ActiveRecord::VERSION::MAJOR > 3
-            new_scope ||= existing_association.scope
-            public_send(existing_association.macro, association_name, new_scope, **original_options.merge(new_options))
-          else
-            public_send(existing_association.macro, association_name, **original_options.merge(new_options))
-          end
+          new_scope ||= existing_association.scope
+          public_send(existing_association.macro, association_name, new_scope, **original_options.merge(new_options))
         else
           raise ArgumentError, "unrecognized association `#{association_name}`"
         end

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/nested_attributes/association.rb

@@ -17,14 +17,7 @@ module ActiveType
         @reject_if = options.delete(:reject_if)
         @options = options.dup
 
-        @index_errors = case
-                        when ActiveRecord::VERSION::MAJOR < 5
-                          @options[:index_errors]
-                        when ActiveRecord::VERSION::MAJOR < 7
-                          @options[:index_errors] || ActiveRecord::Base.index_nested_attribute_errors
-                        else
-                          @options[:index_errors] || ActiveRecord.index_nested_attribute_errors
-                        end
+        @index_errors =  @options[:index_errors] || ActiveRecord.index_nested_attribute_errors
       end
 
       def assign_attributes(parent, attributes)
@@ -97,7 +90,7 @@ module ActiveType
       end
 
       def fetch_child(parent, id)
-        assigned = assigned_children(parent).detect { |r| r.id == id }
+        assigned = assigned_children(parent).detect { |r| r.id.to_s == id.to_s }
         return assigned if assigned
 
         if child = find_scope(parent).find_by_id(id)
@@ -130,17 +123,9 @@ module ActiveType
       end
 
       def add_errors_to_parent(parent, child, index)
-        if Gem::Version.new(ActiveRecord::VERSION::STRING) >= Gem::Version.new("6.1")
-          child.errors.each do |error|
-            attribute = translate_error_attribute(error.attribute, index)
-            parent.errors.add(attribute, error.message)
-          end
-        else
-          child.errors.each do |attribute, message|
-            attribute = translate_error_attribute(attribute, index)
-            parent.errors.add(attribute, message)
-            parent.errors[attribute].uniq!
-          end
+        child.errors.each do |error|
+          attribute = translate_error_attribute(error.attribute, index)
+          parent.errors.add(attribute, error.message)
         end
       end
 

data/lib/active_type/no_table.rb

@@ -1,197 +1,115 @@
 module ActiveType
+  module NoTable
 
-  if ActiveRecord::VERSION::MAJOR < 5
+    extend ActiveSupport::Concern
 
-    module NoTable
-
-      extend ActiveSupport::Concern
-
-      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
+    class DummySchemaCache
 
+      def columns_hash(table_name)
+        {}
       end
 
-      def id
-        nil
+      def columns_hash?(table_name)
+        return false
       end
 
-      def attribute_names
-        []
+      def data_source_exists?(table_name)
+        false
       end
 
-      def transaction(&block)
-        @_current_transaction_records ||= []
-        yield
+      def clear_data_source_cache!(table_name)
       end
 
-      def destroy
-        @destroyed = true
-        freeze
-      end
+    end
 
-      def reload
-        self
+    class DummyPool < ActiveRecord::ConnectionAdapters::NullPool
+      def with_pool_transaction_isolation_level(*_args)
+        yield
       end
+    end
 
+    class DummyConnection < ActiveRecord::ConnectionAdapters::AbstractAdapter
 
-      private
+      attr_reader :schema_cache
 
-      def create(*)
-        true
+      def initialize(*)
+        super
+        @schema_cache = DummySchemaCache.new
+        @pool = DummyPool.new
       end
 
-      def update(*)
-        true
+      def self.quote_column_name(column_name)
+        column_name.to_s
       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
+      def pool
+        @pool
       end
 
     end
 
-  else
-
-    # Rails 5+
-
-    module NoTable
-
-      extend ActiveSupport::Concern
-
-      class DummySchemaCache
-
-        def columns_hash(table_name)
-          {}
-        end
-
-        def columns_hash?(table_name)
-          return false
-        end
-
-        def data_source_exists?(table_name)
-          false
-        end
-
-        def clear_data_source_cache!(table_name)
-        end
+    module ClassMethods
 
+      def connection
+        @connection ||= DummyConnection.new(nil)
       end
 
-      class DummyConnection < ActiveRecord::ConnectionAdapters::AbstractAdapter
-
-        attr_reader :schema_cache
-
-        def initialize(*)
-          super
-          @schema_cache = DummySchemaCache.new
-        end
-
+      def with_connection(**)
+        yield(connection)
       end
 
-      module ClassMethods
-
-        def connection
-          @connection ||= DummyConnection.new(nil)
-        end
-
-        def with_connection(**)
-          yield(connection)
-        end
-
-        def destroy(*)
-          new
-        end
-
-        def destroy_all(*)
-          []
-        end
-
-        def find_by_sql(*)
-          []
-        end
+      def destroy(*)
+        new
+      end
 
-        def _query_by_sql(*)
-          []
-        end
+      def destroy_all(*)
+        []
+      end
 
-        def cached_find_by(*)
-          nil
-        end
+      def find_by_sql(*)
+        []
+      end
 
-        def schema_cache
-          DummySchemaCache.new
-        end
+      def _query_by_sql(*)
+        []
       end
 
-      def destroy
-        @destroyed = true
-        freeze
+      def cached_find_by(*)
+        nil
       end
 
-      def reload
-        self
+      def schema_cache
+        DummySchemaCache.new
       end
+    end
 
+    def destroy
+      @destroyed = true
+      freeze
+    end
 
-      private
+    def reload
+      self
+    end
 
-      def create(*)
-        true
-      end
+    private
 
-      def update(*)
-        true
-      end
+    def create(*)
+      true
+    end
 
-      def _create_record(*)
-        @new_record = false
-        true
-      end
+    def update(*)
+      true
+    end
 
-      def _update_record(*)
-        true
-      end
+    def _create_record(*)
+      @new_record = false
+      true
+    end
 
+    def _update_record(*)
+      true
     end
 
   end
-
 end

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'
 
 module ActiveType
 
@@ -9,6 +10,7 @@ module ActiveType
     include NoTable
     include VirtualAttributes
     include NestedAttributes
+    include Marshalling::Methods
 
   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'
 
 module ActiveType
 
@@ -13,6 +14,7 @@ module ActiveType
     include NestedAttributes
     include RecordExtension
     include ChangeAssociation
+    include Marshalling::Methods
 
   end