activeentity 0.0.1.beta15 → 0.0.1.beta16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f4a4f6e30f287b1ae750d510743b3cbb3c3ac40f00bcb56e9c5c634de23ce64
-  data.tar.gz: 91a3be9d2223600c26ff56e025ddd37ec3d520951cc033587d196599a8b10e72
+  metadata.gz: 6fc81c04f6aa3b9b2095061533a4e631de8fd2ef7fff0d913514dba7e78058c3
+  data.tar.gz: 6b186abc2ea7c57e96ba9faa4ff77846d649ec84a3ee4174980414e7a306d6de
 SHA512:
-  metadata.gz: 924b81ffdd2d8835492f7566dc70d11486932ff913a3bea4569294545a9f3037b009e147e6bf77c222686a82596bda207620dd2cb07ec8334af9937ab03b7df6
-  data.tar.gz: da1b359c2ae9d9e0a1033bce6934c5fde0a18c96a78a8b63eaab4d5a83f71f75b241a59c5867cecaaff8033113d4c0bc0bdd094d04b3d0f057d113ad7a94c4b5
+  metadata.gz: 0261b0ccacb0996ed08028be638b82606a4e64684cba16dec3d25d1b899533145c5b25e31ddd0a5a4d496d97cc22eba42b4b2cc898c60a266584d69b070446f7
+  data.tar.gz: 0a4648417584703bbf90ae819369b730c2fcb0e5ce3c083d72603bff648b838885b3ededea13f9c3dc5592b31e183eb03e83d22774d80449381edf6d66d089cf

data/README.md

@@ -65,7 +65,7 @@ Supported Active Record validations:
 
 #### `subset` validation
 
-Because Active Entity supports array attribute, for some reason, we may want to test values of an array attribute are all included in a given set.
+Because Active Entity supports array attribute, for some reason, you may want to test values of an array attribute are all included in a given set.
 
 Active Entity provides `subset` validation to achieve that, it usage similar to `inclusion` or `exclusion`
 
@@ -76,9 +76,9 @@ class Steak < ActiveEntity::Base
 end
 ```
 
-#### `uniqueness_in_embedding` validation
+#### `uniqueness_in_embeds` validation
 
-Active Entity provides `uniqueness_in_embedding` validation to test duplicate nesting virtual record.
+Active Entity provides `uniqueness_in_embeds` validation to test duplicate nesting virtual record.
 
 Argument `key` is attribute name of nested model, it also supports multiple attributes by given an array.
 
@@ -101,6 +101,23 @@ class Book < ActiveEntity::Base
 end
 ```
 
+#### `uniqueness_in_active_record` validation
+
+Active Entity provides `uniqueness_in_active_record` validation to test given `scope` doesn't present in ActiveRecord model.
+
+The usage same as [uniqueness](https://guides.rubyonrails.org/active_record_validations.html#uniqueness) in addition you must give a AR model `class_name`
+
+```ruby
+class Candidate < ActiveEntity::Base
+  attribute :name, :string
+
+  validates :name,
+            uniqueness_on_active_record: {
+              class_name: "Staff"
+            }
+end
+```
+
 ### Others
 
 These Active Record feature also available in Active Entity

data/lib/active_entity/attribute_assignment.rb

@@ -6,29 +6,25 @@ module ActiveEntity
   module AttributeAssignment
     include ActiveModel::AttributeAssignment
 
-    def assign_attributes(attributes)
-      super(attributes.dup)
-    end
-
     private
 
       def _assign_attributes(attributes)
-        multi_parameter_attributes  = {}
-        nested_parameter_attributes = {}
+        multi_parameter_attributes = nested_parameter_attributes = nil
 
         attributes.each do |k, v|
           key = k.to_s
 
           if key.include?("(")
-            multi_parameter_attributes[key] = attributes.delete(k)
+            (multi_parameter_attributes ||= {})[key] = v
           elsif v.is_a?(Hash)
-            nested_parameter_attributes[key] = attributes.delete(k)
+            (nested_parameter_attributes ||= {})[key] = v
+          else
+            _assign_attribute(key, v)
           end
         end
-        super(attributes)
 
-        assign_nested_parameter_attributes(nested_parameter_attributes) unless nested_parameter_attributes.empty?
-        assign_multiparameter_attributes(multi_parameter_attributes) unless multi_parameter_attributes.empty?
+        assign_nested_parameter_attributes(nested_parameter_attributes) if nested_parameter_attributes
+        assign_multiparameter_attributes(multi_parameter_attributes) if multi_parameter_attributes
       end
 
       # Assign any deferred nested attributes after the base attributes have been set.

data/lib/active_entity/attribute_methods.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "mutex_m"
+require "active_support/core_ext/enumerable"
 
 module ActiveEntity
   # = Active Entity Attribute Methods
@@ -268,39 +269,6 @@ module ActiveEntity
       write_attribute(attr_name, value)
     end
 
-    # Returns the name of all database fields which have been read from this
-    # model. This can be useful in development mode to determine which fields
-    # need to be selected. For performance critical pages, selecting only the
-    # required fields can be an easy performance win (assuming you aren't using
-    # all of the fields on the model).
-    #
-    # For example:
-    #
-    #   class PostsController < ActionController::Base
-    #     after_action :print_accessed_fields, only: :index
-    #
-    #     def index
-    #       @posts = Post.all
-    #     end
-    #
-    #     private
-    #
-    #     def print_accessed_fields
-    #       p @posts.first.accessed_fields
-    #     end
-    #   end
-    #
-    # Which allows you to quickly change your code to:
-    #
-    #   class PostsController < ActionController::Base
-    #     def index
-    #       @posts = Post.select(:id, :title, :author_id, :updated_at)
-    #     end
-    #   end
-    def accessed_fields
-      @attributes.accessed
-    end
-
     private
 
       def attribute_method?(attr_name)
@@ -308,12 +276,6 @@ module ActiveEntity
         defined?(@attributes) && @attributes.key?(attr_name)
       end
 
-      def attributes_with_values(attribute_names)
-        attribute_names.each_with_object({}) do |name, attrs|
-          attrs[name] = _read_attribute(name)
-        end
-      end
-
       def format_for_inspect(value)
         if value.is_a?(String) && value.length > 50
           "#{value[0, 50]}...".inspect

data/lib/active_entity/gem_version.rb

@@ -10,7 +10,7 @@ module ActiveEntity
     MAJOR = 0
     MINOR = 0
     TINY  = 1
-    PRE   = "beta15"
+    PRE   = "beta16"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

data/lib/active_entity/validations/uniqueness_on_active_record.rb

@@ -27,7 +27,7 @@ module ActiveEntity
           raise ArgumentError, "Must provide one of option :class_name or :class."
         end
         unless @klass < ActiveRecord::Base
-          raise ArgumentError, "Class must be an Active Entity model, but got #{@finder_class}."
+          raise ArgumentError, "Class must be an Active Entity model, but got #{@klass}."
         end
         if @klass.abstract_class?
           raise ArgumentError, "Class can't be an abstract class."
@@ -39,13 +39,6 @@ module ActiveEntity
         value = map_enum_attribute(finder_class, attribute, value)
 
         relation = build_relation(finder_class, attribute, value)
-        if record.persisted?
-          if finder_class.primary_key
-            relation = relation.where.not(finder_class.primary_key => record.id_in_database)
-          else
-            raise UnknownPrimaryKey.new(finder_class, "Cannot validate uniqueness for persisted record without primary key.")
-          end
-        end
         relation = scope_relation(record, relation)
         relation = relation.merge(options[:conditions]) if options[:conditions]
 
@@ -94,11 +87,7 @@ module ActiveEntity
 
       def scope_relation(record, relation)
         Array(options[:scope]).each do |scope_item|
-          scope_value = if record.class._reflect_on_association(scope_item)
-            record.association(scope_item).reader
-          else
-            record._read_attribute(scope_item)
-          end
+          scope_value = record._read_attribute(scope_item)
           relation = relation.where(scope_item => scope_value)
         end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activeentity
 version: !ruby/object:Gem::Version
-  version: 0.0.1.beta15
+  version: 0.0.1.beta16
 platform: ruby
 authors:
 - jasl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-14 00:00:00.000000000 Z
+date: 2020-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport