active_type 1.4.0 → 1.7.0

data/lib/active_type/change_association.rb

@@ -15,9 +15,9 @@ module ActiveType
           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))
+            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))
+            public_send(existing_association.macro, association_name, **original_options.merge(new_options))
           end
         else
           raise ArgumentError, "unrecognized association `#{association_name}`"

data/lib/active_type/nested_attributes/association.rb

@@ -42,13 +42,7 @@ module ActiveType
 
       def validate(parent)
         changed_children(parent).each_with_index do |child, index|
-          unless child.valid?
-            child.errors.each do |attribute, message|
-              attribute = @index_errors ? "#{@target_name}[#{index}].#{attribute}" : "#{@target_name}.#{attribute}"
-              parent.errors[attribute] << message
-              parent.errors[attribute].uniq!
-            end
-          end
+          add_errors_to_parent(parent, child, index) unless child.valid?
         end
       end
 
@@ -131,6 +125,24 @@ module ActiveType
         [:build_scope, :find_scope, :scope, :allow_destroy, :reject_if]
       end
 
+      def add_errors_to_parent(parent, child, index)
+        if ActiveRecord::VERSION::MAJOR >= 6 && ActiveRecord::VERSION::MINOR >= 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
+        end
+      end
+
+      def translate_error_attribute(attribute, index)
+        @index_errors ? "#{@target_name}[#{index}].#{attribute}" : "#{@target_name}.#{attribute}"
+      end
     end
 
   end

data/lib/active_type/record_extension/inheritance.rb

@@ -19,7 +19,7 @@ module ActiveType
           options = options.merge(foreign_key: extended_record_base_class.name.foreign_key)
         end
         if ActiveRecord::VERSION::MAJOR > 3
-          [scope, options]
+          [options, scope]
         else
           [options]
         end
@@ -31,7 +31,7 @@ module ActiveType
           @_model_name ||= begin
             if name
               # Namespace detection copied from ActiveModel::Naming
-              namespace = extended_record_base_class.parents.detect do |n|
+              namespace = module_ancestors.detect do |n|
                 n.respond_to?(:use_relative_model_naming?) && n.use_relative_model_naming?
               end
               # We create a Name object, with the parent class name, but self as the @klass reference
@@ -48,6 +48,14 @@ module ActiveType
           end
         end
 
+        def module_ancestors
+          if extended_record_base_class.respond_to?(:module_parents)
+            extended_record_base_class.module_parents
+          else
+            extended_record_base_class.parents
+          end
+        end
+
         def sti_name
           extended_record_base_class.sti_name
         end
@@ -56,12 +64,22 @@ module ActiveType
           extended_record_base_class.descends_from_active_record?
         end
 
-        def has_many(name, *args, &extension)
-          super(name, *Inheritance.add_foreign_key_option(extended_record_base_class, *args), &extension)
+        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?
+            super(name, **new_args, &extension)
+          else
+            super(name, new_scope, **new_args, &extension)
+          end
         end
 
-        def has_one(name, *args, &extension)
-          super(name, *Inheritance.add_foreign_key_option(extended_record_base_class, *args), &extension)
+        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?
+            super(name, **new_args, &extension)
+          else
+            super(name, new_scope, **new_args, &extension)
+          end
         end
 
         private

data/lib/active_type/version.rb

@@ -1,3 +1,3 @@
 module ActiveType
-  VERSION = '1.4.0'
+  VERSION = '1.7.0'
 end

data/lib/active_type/virtual_attributes.rb

@@ -8,6 +8,23 @@ module ActiveType
 
   module VirtualAttributes
 
+    module Serialization
+      extend ActiveSupport::Concern
+
+      def init_with(coder)
+        if coder['virtual_attributes'].present?
+          @virtual_attributes = coder['virtual_attributes']
+        end
+        super(coder)
+      end
+
+      def encode_with(coder)
+        coder['virtual_attributes'] = @virtual_attributes
+        coder['active_type_yaml_version'] = 1
+        super(coder)
+      end
+    end
+
     class VirtualColumn
 
       def initialize(name, type_caster, options)
@@ -110,10 +127,10 @@ module ActiveType
       result
     end
 
-
     extend ActiveSupport::Concern
 
     included do
+      include ActiveType::VirtualAttributes::Serialization
       class_attribute :virtual_columns_hash
       self.virtual_columns_hash = {}
 
@@ -144,28 +161,53 @@ module ActiveType
       @virtual_attributes_cache ||= {}
     end
 
-    def [](name)
+    def read_existing_virtual_attribute(name, &block_when_not_virtual)
       if self.singleton_class._has_virtual_column?(name)
         read_virtual_attribute(name)
       else
-        super
+        yield
       end
     end
 
-    # ActiveRecord 4.2.1
-    def _read_attribute(name)
+    def write_existing_virtual_attribute(name, value, &block_when_not_virtual)
       if self.singleton_class._has_virtual_column?(name)
-        read_virtual_attribute(name)
+        write_virtual_attribute(name, value)
       else
-        super
+        yield
+      end
+    end
+
+    def [](name)
+      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
+    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
     end
 
     def []=(name, value)
-      if self.singleton_class._has_virtual_column?(name)
-        write_virtual_attribute(name, value)
-      else
-        super
+      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
+    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
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_type
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Tobias Kraze
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-27 00:00:00.000000000 Z
+date: 2021-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -59,10 +59,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rspec"
 - ".ruby-version"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - Gemfile.3.2.mysql2
@@ -81,8 +81,12 @@ files:
 - Gemfile.5.2.pg.lock
 - Gemfile.5.2.sqlite3
 - Gemfile.5.2.sqlite3.lock
-- Gemfile.6.0.pg
-- Gemfile.6.0.pg.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.lock
 - LICENSE
 - README.md
@@ -123,7 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Make any Ruby object quack like ActiveRecord

data/.travis.yml

@@ -1,72 +0,0 @@
-language: ruby
-dist: trusty
-services:
-  - postgresql
-rvm:
-  - "2.3.8"
-  - "2.4.6"
-  - "2.5.5"
-  - "2.6.3"
-gemfile:
-  - Gemfile.3.2.mysql2
-  - Gemfile.3.2.sqlite3
-  - Gemfile.4.2.mysql2
-  - Gemfile.4.2.pg
-  - Gemfile.4.2.sqlite3
-  - Gemfile.5.2.mysql2
-  - Gemfile.5.2.sqlite3
-  - Gemfile.5.2.pg
-  - Gemfile.6.0.pg
-before_script:
-  - psql -c 'create database active_type_test;' -U postgres
-  - mysql -e 'create database IF NOT EXISTS active_type_test;'
-script: bundle exec rake spec
-sudo: false
-cache: bundler
-matrix:
-  exclude:
-    - rvm: "2.3.8"
-      gemfile: Gemfile.6.0.pg
-    - rvm: "2.4.6"
-      gemfile: Gemfile.3.2.mysql2
-    - rvm: "2.4.6"
-      gemfile: Gemfile.3.2.sqlite3
-    - rvm: "2.4.6"
-      gemfile: Gemfile.4.2.mysql2
-    - rvm: "2.4.6"
-      gemfile: Gemfile.4.2.pg
-    - rvm: "2.4.6"
-      gemfile: Gemfile.5.2.mysql2
-    - rvm: "2.4.6"
-      gemfile: Gemfile.5.2.pg
-    - rvm: "2.4.6"
-      gemfile: Gemfile.6.0.pg
-    - rvm: "2.5.5"
-      gemfile: Gemfile.3.2.mysql2
-    - rvm: "2.5.5"
-      gemfile: Gemfile.3.2.sqlite3
-    - rvm: "2.5.5"
-      gemfile: Gemfile.4.2.mysql2
-    - rvm: "2.5.5"
-      gemfile: Gemfile.4.2.pg
-    - rvm: "2.5.5"
-      gemfile: Gemfile.4.2.sqlite3
-    - rvm: "2.5.5"
-      gemfile: Gemfile.5.2.mysql2
-    - rvm: "2.5.5"
-      gemfile: Gemfile.5.2.pg
-    - rvm: "2.6.3"
-      gemfile: Gemfile.3.2.mysql2
-    - rvm: "2.6.3"
-      gemfile: Gemfile.3.2.sqlite3
-    - rvm: "2.6.3"
-      gemfile: Gemfile.4.2.mysql2
-    - rvm: "2.6.3"
-      gemfile: Gemfile.4.2.pg
-    - rvm: "2.6.3"
-      gemfile: Gemfile.4.2.sqlite3
-install:
-  - gem install bundler:2.0.2
-  - bundle install --no-deployment --jobs=3 --retry=3 --path=${BUNDLE_PATH:-vendor/bundle}
-addons:
-  postgresql: 9.3

data/Gemfile.6.0.pg.lock

@@ -1,59 +0,0 @@
-PATH
-  remote: .
-  specs:
-    active_type (1.3.2)
-      activerecord (>= 3.2)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activemodel (6.0.0)
-      activesupport (= 6.0.0)
-    activerecord (6.0.0)
-      activemodel (= 6.0.0)
-      activesupport (= 6.0.0)
-    activesupport (6.0.0)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.1, >= 2.1.8)
-    concurrent-ruby (1.1.5)
-    diff-lcs (1.3)
-    gemika (0.3.4)
-    i18n (1.6.0)
-      concurrent-ruby (~> 1.0)
-    minitest (5.11.3)
-    pg (1.1.4)
-    rake (12.3.2)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.0)
-    thread_safe (0.3.6)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
-    zeitwerk (2.1.9)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  active_type!
-  activerecord (~> 6.0.0)
-  gemika
-  pg
-  rake
-  rspec (~> 3.4)
-
-BUNDLED WITH
-   2.0.2