activeentity 0.0.1.beta17 → 6.3.0

data/lib/active_entity/model_schema.rb

@@ -86,16 +86,31 @@ module ActiveEntity
           @load_schema_invoked = true
         end
 
-        def reload_schema_from_cache
-          @attribute_types = nil
-          @default_attributes = nil
-          @attributes_builder = nil
-          @schema_loaded = false
-          @load_schema_invoked = false
-          @attribute_names = nil
-          @yaml_encoder = nil
-          direct_descendants.each do |descendant|
-            descendant.send(:reload_schema_from_cache)
+        if ActiveSupport::VERSION::MAJOR >= 7
+          def reload_schema_from_cache
+            @attribute_types = nil
+            @default_attributes = nil
+            @attributes_builder = nil
+            @schema_loaded = false
+            @load_schema_invoked = false
+            @attribute_names = nil
+            @yaml_encoder = nil
+            subclasses.each do |descendant|
+              descendant.send(:reload_schema_from_cache)
+            end
+          end
+        else
+          def reload_schema_from_cache
+            @attribute_types = nil
+            @default_attributes = nil
+            @attributes_builder = nil
+            @schema_loaded = false
+            @load_schema_invoked = false
+            @attribute_names = nil
+            @yaml_encoder = nil
+            direct_descendants.each do |descendant|
+              descendant.send(:reload_schema_from_cache)
+            end
           end
         end
     end

data/lib/active_entity/type/registry.rb

@@ -1,20 +1,42 @@
 # frozen_string_literal: true
 
-require "active_model/type/registry"
-
 module ActiveEntity
   # :stopdoc:
   module Type
-    class Registry < ActiveModel::Type::Registry
-      def add_modifier(options, klass, **args)
-        registrations << DecorationRegistration.new(options, klass, **args)
+    class Registry # :nodoc:
+      def initialize
+        @registrations = []
       end
 
-      private
+      def initialize_copy(_other)
+        @registrations = @registrations.dup
+      end
+
+      def add_modifier(options, klass, **_args)
+        registrations << DecorationRegistration.new(options, klass)
+      end
 
-        def registration_klass
-          Registration
+      def register(type_name, klass = nil, **options, &block)
+        unless block_given?
+          block = proc { |_, *args| klass.new(*args) }
+          block.ruby2_keywords if block.respond_to?(:ruby2_keywords)
         end
+        registrations << Registration.new(type_name, block, **options)
+      end
+
+      def lookup(symbol, *args, **kwargs)
+        registration = find_registration(symbol, *args, **kwargs)
+
+        if registration
+          registration.call(self, symbol, *args, **kwargs)
+        else
+          raise ArgumentError, "Unknown type #{symbol.inspect}"
+        end
+      end
+
+      private
+
+        attr_reader :registrations
 
         def find_registration(symbol, *args, **kwargs)
           registrations
@@ -23,7 +45,7 @@ module ActiveEntity
         end
     end
 
-    class Registration
+    class Registration # :nodoc:
       def initialize(name, block, override: nil)
         @name = name
         @block = block
@@ -55,7 +77,7 @@ module ActiveEntity
         end
     end
 
-    class DecorationRegistration < Registration
+    class DecorationRegistration < Registration # :nodoc:
       def initialize(options, klass, **)
         @options = options
         @klass = klass
@@ -86,7 +108,5 @@ module ActiveEntity
     end
   end
 
-  class TypeConflictError < StandardError
-  end
   # :startdoc:
 end

data/lib/active_entity/validate_embeds_association.rb

@@ -268,21 +268,16 @@ module ActiveEntity
         unless valid = record.valid?(context)
           indexed_attribute = !index.nil? && (reflection.options[:index_errors] || ActiveEntity::Base.index_nested_attribute_errors)
 
-          record.errors.each do |attribute, message|
+          record.errors.group_by_attribute.each { |attribute, errors|
             attribute = normalize_reflection_attribute(indexed_attribute, reflection, index, attribute)
-            errors[attribute] << message
-            errors[attribute].uniq!
-          end
-
-          record.errors.details.each_key do |attribute|
-            reflection_attribute =
-              normalize_reflection_attribute(indexed_attribute, reflection, index, attribute).to_sym
 
-            record.errors.details[attribute].each do |error|
-              errors.details[reflection_attribute] << error
-              errors.details[reflection_attribute].uniq!
-            end
-          end
+            errors.each { |error|
+              self.errors.import(
+                error,
+                attribute: attribute
+              )
+            }
+          }
         end
 
         valid

data/lib/active_entity/validations/subset.rb

@@ -18,7 +18,7 @@ module ActiveEntity
         end
 
         unless subset?(record, value)
-          record.errors.add(attribute, :non_subset, options.except(:in, :within).merge!(value: value))
+          record.errors.add(attribute, :non_subset, **options.except(:in, :within).merge(value: value))
         end
       end
 

data/lib/active_entity/validations/uniqueness_in_embeds.rb

@@ -48,26 +48,18 @@ module ActiveEntity
 
         duplicate_records.each do |r|
           if key.is_a? Symbol
-            r.errors.add(key, :duplicated, options)
+            r.errors.add(key, :duplicated, **options)
 
             # Hack the record
             normalized_attribute = normalize_attribute(attribute, indexed_attribute, association_or_value.index(r), key)
-            record.errors[normalized_attribute].concat r.errors.messages[key]
-            record.errors[normalized_attribute].uniq!
-
-            record.errors.details[normalized_attribute.to_sym].concat r.errors.details[key]
-            record.errors.details[normalized_attribute.to_sym].uniq!
+            record.errors.import r.errors.where(key).first, attribute: normalized_attribute
           elsif key.is_a? Array
             key.each do |attr|
-              r.errors.add(attr, :duplicated, options)
+              r.errors.add(attr, :duplicated, **options)
 
               # Hack the record
               normalized_attribute = normalize_attribute(attribute, indexed_attribute, association_or_value.index(r), attr)
-              record.errors[normalized_attribute].concat r.errors.messages[attr]
-              record.errors[normalized_attribute].uniq!
-
-              record.errors.details[normalized_attribute.to_sym].concat r.errors.details[attr]
-              record.errors.details[normalized_attribute.to_sym].uniq!
+              record.errors.import r.errors.where(key).first, attribute: normalized_attribute
             end
           end
         end

data/lib/active_entity.rb

@@ -38,6 +38,7 @@ module ActiveEntity
   extend ActiveSupport::Autoload
 
   autoload :Base
+  autoload :Callbacks
   autoload :Core
   autoload :Enum
   autoload :Inheritance

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: activeentity
 version: !ruby/object:Gem::Version
-  version: 0.0.1.beta17
+  version: 6.3.0
 platform: ruby
 authors:
 - jasl
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-13 00:00:00.000000000 Z
+date: 2022-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '8'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '8'
 description: Rails virtual model solution based on ActiveModel design for Rails 6+.
 email:
 - jasl9187@hotmail.com
@@ -135,7 +135,7 @@ homepage: https://github.com/jasl/activeentity
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -146,12 +146,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.3.4
+signing_key:
 specification_version: 4
 summary: Rails virtual model solution based on ActiveModel.
 test_files: []