active_type 2.5.1 → 2.8.0

data/lib/active_type/record_extension/inheritance.rb

@@ -18,11 +18,7 @@ module ActiveType
         unless options[:foreign_key] || options[:as]
           options = options.merge(foreign_key: extended_record_base_class.name.foreign_key)
         end
-        if ActiveRecord::VERSION::MAJOR > 3
-          [options, scope]
-        else
-          [options]
-        end
+        [options, scope]
       end
 
       module ClassMethods
@@ -66,7 +62,7 @@ module ActiveType
 
         def has_many(name, scope=nil, *args, &extension)
           new_args, new_scope = Inheritance.add_foreign_key_option(extended_record_base_class, scope, *args)
-          if ActiveRecord::VERSION::MAJOR <= 3 || new_scope.nil?
+          if new_scope.nil?
             super(name, **new_args, &extension)
           else
             super(name, new_scope, **new_args, &extension)
@@ -75,7 +71,7 @@ module ActiveType
 
         def has_one(name, scope=nil, *args, &extension)
           new_args, new_scope = Inheritance.add_foreign_key_option(extended_record_base_class, scope, *args)
-          if ActiveRecord::VERSION::MAJOR <= 3 || new_scope.nil?
+          if new_scope.nil?
             super(name, **new_args, &extension)
           else
             super(name, new_scope, **new_args, &extension)
@@ -84,79 +80,48 @@ module ActiveType
 
         private
 
-        if ActiveRecord::VERSION::MAJOR < 5
-
-          def find_sti_class(type_name)
-            sti_class = super
-
-            # Consider this class hierarchy
-            # class Parent < ActiveRecord::Base; end
-            # class Child < Parent; end
-            # class ExtendedParent < ActiveType::Record[Parent]; end
-            # class ExtendedChild < ActiveType::Record[Child]; end
-            if self < sti_class
-              # i.e. ExtendendChild.find(child.id)
-              # => self = ExtendedChild; sti_class = Child
-              # instantiate as ExtendedChild
-              self
-            elsif sti_class < extended_record_base_class
-              # i.e. ExtendedParent.find(child.id)
-              # => sti_class = Child; self = ExtendedParent; extended_record_base_class = Parent
-              # There is no really good solution here, since we cannot instantiate as both ExtendedParent
-              # and Child. We opt to instantiate as ExtendedParent, since the other option can be
-              # achieved by using Parent.find(child.id)
-              self
+        # 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
+              type_name.constantize
             else
-              sti_class
+              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
-
-        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
-                type_name.constantize
-              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
-            # Consider this class hierarchy
-            # class Parent < ActiveRecord::Base; end
-            # class Child < Parent; end
-            # class ExtendedParent < ActiveType::Record[Parent]; end
-            # class ExtendedChild < ActiveType::Record[Child]; end
-            if self < subclass
-              # i.e. ExtendendChild.find(child.id)
-              # => self = ExtendedChild; subclass = Child
-              # instantiate as ExtendedChild
-              subclass = self
-            elsif subclass < extended_record_base_class
-              # i.e. ExtendedParent.find(child.id)
-              # => subclass = Child; self = ExtendedParent; extended_record_base_class = Parent
-              # There is no really good solution here, since we cannot instantiate as both ExtendedParent
-              # and Child. We opt to instantiate as ExtendedParent, since the other option can be
-              # achieved by using Parent.find(child.id)
-              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
+          #### our code starts here
+          # Consider this class hierarchy
+          # class Parent < ActiveRecord::Base; end
+          # class Child < Parent; end
+          # class ExtendedParent < ActiveType::Record[Parent]; end
+          # class ExtendedChild < ActiveType::Record[Child]; end
+          if self < subclass
+            # i.e. ExtendendChild.find(child.id)
+            # => self = ExtendedChild; subclass = Child
+            # instantiate as ExtendedChild
+            subclass = self
+          elsif subclass < extended_record_base_class
+            # i.e. ExtendedParent.find(child.id)
+            # => subclass = Child; self = ExtendedParent; extended_record_base_class = Parent
+            # There is no really good solution here, since we cannot instantiate as both ExtendedParent
+            # and Child. We opt to instantiate as ExtendedParent, since the other option can be
+            # achieved by using Parent.find(child.id)
+            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

data/lib/active_type/type_caster.rb

@@ -2,13 +2,7 @@ module ActiveType
   class TypeCaster
 
     def self.get(type)
-      native_caster = if ActiveRecord::VERSION::STRING < '4.2'
-        NativeCasters::DelegateToColumn.new(type)
-      elsif ActiveRecord::VERSION::STRING < '5'
-        NativeCasters::DelegateToRails4Type.new(type)
-      else
-        NativeCasters::DelegateToRails5Type.new(type)
-      end
+      native_caster = NativeCasters::DelegateToRailsType.new(type)
       new(type, native_caster)
     end
 
@@ -104,7 +98,7 @@ module ActiveType
 
       # Adapter for Rails 5+.
       # In these versions, casting logic lives in subclasses of ActiveRecord::Type::Value
-      class DelegateToRails5Type
+      class DelegateToRailsType
 
         def initialize(type)
           @active_record_type = lookup(type)

data/lib/active_type/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveType
-  VERSION = '2.5.1'
+  VERSION = '2.8.0'
 end

data/lib/active_type/virtual_attributes.rb

@@ -134,6 +134,19 @@ module ActiveType
       result
     end
 
+    def self.attribute_for_inspect(value)
+      if value.is_a?(String) && value.length > 50
+        "#{value[0, 50]}...".inspect
+      elsif value.is_a?(Date) || value.is_a?(Time)
+        %("#{value.to_formatted_s(:db)}")
+      elsif value.is_a?(Array) && value.size > 10
+        inspected = value.first(10).inspect
+        %(#{inspected[0...-1]}, ...])
+      else
+        value.inspect
+      end
+    end
+
     extend ActiveSupport::Concern
 
     included do
@@ -141,6 +154,14 @@ module ActiveType
       class_attribute :virtual_columns_hash
       self.virtual_columns_hash = {}
 
+      if respond_to?(:attributes_for_inspect)
+        # 7.1 had [:id] as a default, we want a consistent default across all versions
+        self.attributes_for_inspect = :all
+      else
+        # ActiveRecord < 7.2
+        class_attribute :attributes_for_inspect, instance_accessor: false, default: :all
+      end
+
       class << self
         if method_defined?(:attribute)
           alias_method :ar_attribute, :attribute
@@ -189,34 +210,24 @@ module ActiveType
       read_existing_virtual_attribute(name) { super }
     end
 
-    if ActiveRecord::VERSION::STRING >= '4.2.0'
-      def _read_attribute(name)
-        read_existing_virtual_attribute(name) { super }
-      end
+    def _read_attribute(name)
+      read_existing_virtual_attribute(name) { super }
     end
 
-    if ActiveRecord::VERSION::STRING < '4.2.0' || ActiveRecord::VERSION::STRING >= '6.1.0'
-      # in 6.1, read_attribute does not call _read_attribute
-      def read_attribute(name)
-        read_existing_virtual_attribute(name) { super }
-      end
+    def read_attribute(name)
+      read_existing_virtual_attribute(name) { super }
     end
 
     def []=(name, value)
       write_existing_virtual_attribute(name, value) { super }
     end
 
-    if ActiveRecord::VERSION::STRING >= '5.2.0'
-      def _write_attribute(name, value)
-        write_existing_virtual_attribute(name, value) { super }
-      end
+    def _write_attribute(name, value)
+      write_existing_virtual_attribute(name, value) { super }
     end
 
-    if ActiveRecord::VERSION::STRING < '5.2.0' || ActiveRecord::VERSION::STRING >= '6.1.0'
-      # in 6.1, write_attribute does not call _write_attribute
-      def write_attribute(name, value)
-        write_existing_virtual_attribute(name, value) { super }
-      end
+    def write_attribute(name, value)
+      write_existing_virtual_attribute(name, value) { super }
     end
 
     def attributes
@@ -229,6 +240,10 @@ module ActiveType
       self.class._virtual_column_names.any? { |attr| virtual_attributes_were[attr] != send(attr) } || super
     end
 
+    def changed_for_autosave?
+      changed? || super
+    end
+
     def changes
       changes = self.class._virtual_column_names.each_with_object({}) do |attr, changes|
         current_value = send(attr)
@@ -239,14 +254,21 @@ module ActiveType
       super.merge(changes)
     end
 
-    if ActiveRecord::VERSION::MAJOR >= 4
-      def changes_applied
+    def attribute_changed?(attr, **)
+      attr = attr.to_s
+      if virtual_attributes.key?(attr)
+        virtual_attributes_were[attr] != send(attr)
+      else
         super
+      end
+    end
 
-        virtual_attributes.each do |attr, _|
-          value = read_virtual_attribute(attr)
-          virtual_attributes_were[attr] = value.duplicable? ? value.clone : value
-        end
+    def changes_applied
+      super
+
+      virtual_attributes.each do |attr, _|
+        value = read_virtual_attribute(attr)
+        virtual_attributes_were[attr] = value.duplicable? ? value.clone : value
       end
     end
 
@@ -269,25 +291,28 @@ module ActiveType
       virtual_attributes[name] = value
     end
 
-    # Returns the contents of the record as a nicely formatted string.
+    def attributes_for_inspect
+      self.class.attributes_for_inspect == :all ? attributes.keys : self.class.attributes_for_inspect
+    end
+
     def inspect
-      inspection = attributes.collect do |name, value|
-        "#{name}: #{VirtualAttributes.attribute_for_inspect(value)}"
-      end.sort.compact.join(", ")
-      "#<#{self.class} #{inspection}>"
+      inspect_with_attributes(attributes_for_inspect)
     end
 
-    def self.attribute_for_inspect(value)
-      if value.is_a?(String) && value.length > 50
-        "#{value[0, 50]}...".inspect
-      elsif value.is_a?(Date) || value.is_a?(Time)
-        %("#{value.to_formatted_s(:db)}")
-      elsif value.is_a?(Array) && value.size > 10
-        inspected = value.first(10).inspect
-        %(#{inspected[0...-1]}, ...])
-      else
-        value.inspect
-      end
+    def full_inspect
+      inspect_with_attributes(attributes.keys)
+    end
+
+    # Returns the contents of the record as a nicely formatted string.
+    def inspect_with_attributes(attribute_names)
+      inspection = attribute_names.collect do |name|
+        name = name.to_s
+        if attributes.key?(name)
+          value = attributes[name]
+          "#{name}: #{VirtualAttributes.attribute_for_inspect(value)}"
+        end
+      end.compact.sort.join(", ")
+      "#<#{self.class} #{inspection}>"
     end
 
     private

data/lib/active_type.rb

@@ -4,13 +4,6 @@ require 'active_type/version'
 
 require 'active_record'
 
-if ActiveRecord::VERSION::STRING == '4.2.0'
-  raise(<<-MESSAGE.strip_heredoc)
-    ActiveType is not compatible with ActiveRecord 4.2.0. Please upgrade to 4.2.1
-    For details see https://github.com/makandra/active_type/issues/31
-  MESSAGE
-end
-
 module ActiveType
   extend ActiveSupport::Autoload
 

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_type
 version: !ruby/object:Gem::Version
-  version: 2.5.1
+  version: 2.8.0
 platform: ruby
 authors:
 - Tobias Kraze
 - Henning Koch
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-08-14 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -45,57 +44,26 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '6.1'
 description: Make any Ruby object quack like ActiveRecord
 email: tobias.kraze@makandra.de
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/workflows/test.yml"
-- ".gitignore"
-- ".rspec"
-- ".ruby-version"
 - CHANGELOG.md
-- Gemfile
-- Gemfile.5.2.mysql2
-- Gemfile.5.2.mysql2.lock
-- Gemfile.5.2.pg
-- Gemfile.5.2.pg.lock
-- Gemfile.5.2.sqlite3
-- Gemfile.5.2.sqlite3.lock
-- Gemfile.6.0.sqlite3
-- Gemfile.6.0.sqlite3.lock
-- Gemfile.6.1.pg
-- Gemfile.6.1.pg.lock
-- Gemfile.6.1.sqlite3
-- Gemfile.6.1.sqlite3.lock
-- Gemfile.7.0.pg
-- Gemfile.7.0.pg.lock
-- Gemfile.7.0.sqlite3
-- Gemfile.7.0.sqlite3.lock
-- Gemfile.7.1.pg
-- Gemfile.7.1.pg.lock
-- Gemfile.7.1.sqlite3
-- Gemfile.7.1.sqlite3.lock
-- Gemfile.7.2.pg
-- Gemfile.7.2.pg.lock
-- Gemfile.7.2.sqlite3
-- Gemfile.7.2.sqlite3.lock
-- Gemfile.lock
 - LICENSE
 - README.md
-- Rakefile
-- 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
@@ -121,7 +89,6 @@ 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: 
 rdoc_options: []
 require_paths:
 - lib
@@ -129,15 +96,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
-signing_key: 
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Make any Ruby object quack like ActiveRecord
 test_files: []

data/.github/workflows/test.yml

@@ -1,134 +0,0 @@
-name: Tests
-
-on:
-  push:
-    branches: [main]
-  pull_request:
-    branches: [main]
-
-jobs:
-  test_sqlite:
-    runs-on: ubuntu-20.04
-
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - ruby: "2.5.5"
-            gemfile: Gemfile.5.2.sqlite3
-          - ruby: "2.7.7"
-            gemfile: Gemfile.5.2.sqlite3
-          - ruby: "3.0.5"
-            gemfile: Gemfile.6.0.sqlite3
-          - ruby: "3.0.5"
-            gemfile: Gemfile.6.1.sqlite3
-          - ruby: "3.0.5"
-            gemfile: Gemfile.7.0.sqlite3
-          - ruby: "3.1.3"
-            gemfile: Gemfile.7.0.sqlite3
-          - ruby: "3.2.0"
-            gemfile: Gemfile.7.0.sqlite3
-          - ruby: "3.2.0"
-            gemfile: Gemfile.7.1.sqlite3
-          - ruby: "3.2.0"
-            gemfile: Gemfile.7.2.sqlite3
-    env:
-      BUNDLE_GEMFILE: ${{ matrix.gemfile }}
-
-    steps:
-      - uses: actions/checkout@v3
-      - name: Install ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-          bundler-cache: true
-      - name: Run tests
-        run: bundle exec rake spec
-
-  test_mysql:
-    runs-on: ubuntu-20.04
-
-    services:
-      mysql:
-        image: mysql:5.6
-        env:
-          MYSQL_ROOT_PASSWORD: password
-        ports:
-          - 3306:3306
-        options: >-
-          --health-cmd="mysqladmin ping"
-          --health-interval=10s
-          --health-timeout=5s
-          --health-retries=3
-
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - ruby: "2.7.7"
-            gemfile: Gemfile.5.2.mysql2
-    env:
-      BUNDLE_GEMFILE: ${{ matrix.gemfile }}
-
-    steps:
-      - uses: actions/checkout@v3
-      - name: Install ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-          bundler-cache: true
-      - name: Setup databases
-        run: |
-          mysql -e 'create database IF NOT EXISTS active_type_test;' -u root --password=password -P 3306 -h 127.0.0.1
-      - name: Run tests
-        run: bundle exec rake spec
-
-  test_pg:
-    runs-on: ubuntu-20.04
-
-    services:
-      postgres:
-        image: postgres
-        env:
-          POSTGRES_PASSWORD: postgres
-          POSTGRES_DB: active_type_test
-        options: >-
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-        ports:
-          - 5432:5432
-
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - ruby: "2.5.5"
-            gemfile: Gemfile.5.2.pg
-          - ruby: "2.7.7"
-            gemfile: Gemfile.5.2.pg
-          - ruby: "3.0.5"
-            gemfile: Gemfile.6.1.pg
-          - ruby: "3.0.5"
-            gemfile: Gemfile.7.0.pg
-          - ruby: "3.1.3"
-            gemfile: Gemfile.7.0.pg
-          - ruby: "3.2.0"
-            gemfile: Gemfile.7.0.pg
-          - ruby: "3.2.0"
-            gemfile: Gemfile.7.1.pg
-          - ruby: "3.2.0"
-            gemfile: Gemfile.7.2.pg
-    env:
-      BUNDLE_GEMFILE: ${{ matrix.gemfile }}
-
-    steps:
-      - uses: actions/checkout@v3
-      - name: Install ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-          bundler-cache: true
-      - name: Run tests
-        run: bundle exec rake spec

data/.gitignore

@@ -1,8 +0,0 @@
-doc
-pkg
-tags
-*.gem
-.idea
-tmp
-spec/support/database.yml
-.bundle

data/.rspec

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

data/.ruby-version

@@ -1 +0,0 @@
-3.2

data/Gemfile

@@ -1 +0,0 @@
-Gemfile.7.0.sqlite3

data/Gemfile.5.2.mysql2

@@ -1,9 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'activerecord', '~>5.1.0'
-gem 'rspec', '~>3.4'
-gem 'mysql2'
-gem 'rake'
-gem 'gemika'
-
-gem 'active_type', :path => '.'

data/Gemfile.5.2.mysql2.lock

@@ -1,59 +0,0 @@
-PATH
-  remote: .
-  specs:
-    active_type (2.5.1)
-      activerecord (>= 3.2)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activemodel (5.1.7)
-      activesupport (= 5.1.7)
-    activerecord (5.1.7)
-      activemodel (= 5.1.7)
-      activesupport (= 5.1.7)
-      arel (~> 8.0)
-    activesupport (5.1.7)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    arel (8.0.0)
-    concurrent-ruby (1.1.7)
-    diff-lcs (1.4.4)
-    gemika (0.5.0)
-    i18n (1.8.5)
-      concurrent-ruby (~> 1.0)
-    minitest (5.14.2)
-    mysql2 (0.5.3)
-    rake (13.0.1)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.0)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.0)
-    thread_safe (0.3.6)
-    tzinfo (1.2.8)
-      thread_safe (~> 0.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  active_type!
-  activerecord (~> 5.1.0)
-  gemika
-  mysql2
-  rake
-  rspec (~> 3.4)
-
-BUNDLED WITH
-   2.2.27