activeentity 0.0.1.beta14 → 0.0.1.beta15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e54d10db138ce5521aa1ab4fde237c75a7aa3e865973ed5a3ec48a55fbff0e7d
-  data.tar.gz: 2604112ec917bddac683e8416787810075a7df1365903d2e36b40b5bc03e9256
+  metadata.gz: 7f4a4f6e30f287b1ae750d510743b3cbb3c3ac40f00bcb56e9c5c634de23ce64
+  data.tar.gz: 91a3be9d2223600c26ff56e025ddd37ec3d520951cc033587d196599a8b10e72
 SHA512:
-  metadata.gz: 81bb5e2f93bba71814227e5076368816c7b2eb615b1f81c890330b1653f637d8a7a4a9d43533d726b3cafc2a603a1e61c2d29f352c1d64695d02f637559f56c5
-  data.tar.gz: 6624cf0afcdd210b7ae461b67ecb23c7d39332faa61a1c4d23d530c074660aefcb6e209772c4c0c715d772fa7b466dc30d6f0fd8c715f4f6a91b15d040cc4de8
+  metadata.gz: 924b81ffdd2d8835492f7566dc70d11486932ff913a3bea4569294545a9f3037b009e147e6bf77c222686a82596bda207620dd2cb07ec8334af9937ab03b7df6
+  data.tar.gz: da1b359c2ae9d9e0a1033bce6934c5fde0a18c96a78a8b63eaab4d5a83f71f75b241a59c5867cecaaff8033113d4c0bc0bdd094d04b3d0f057d113ad7a94c4b5

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2019 jasl
+Copyright (c) 2020 jasl
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -89,15 +89,15 @@ end
 
 class Reviewer < ActiveEntity::Base
   attribute :first_name, :string
-  attribute :last_name, :string 
+  attribute :last_name, :string
 end
 
 class Book < ActiveEntity::Base
   embeds_many :categories
-  validates :categories, uniqueness_in_embedding: {key: :name}
-  
+  validates :categories, uniqueness_in_embeds: {key: :name}
+
   embeds_many :reviewers
-  validates :categories, uniqueness_in_embedding: {key: [:first_name, :last_name]}
+  validates :categories, uniqueness_in_embeds: {key: [:first_name, :last_name]}
 end
 ```
 

data/Rakefile

@@ -1,21 +1,21 @@
 # frozen_string_literal: true
 
-begin
-  require "bundler/setup"
-rescue LoadError
-  puts "You must `gem install bundler` and `bundle install` to run rake tasks"
-end
-
+require "bundler/setup"
 require "rdoc/task"
 
 RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = "rdoc"
-  rdoc.title    = "MyPlugin"
+  rdoc.title    = "ActiveEntity"
   rdoc.options << "--line-numbers"
   rdoc.rdoc_files.include("README.md")
   rdoc.rdoc_files.include("lib/**/*.rb")
 end
 
+APP_RAKEFILE = File.expand_path("test/dummy/Rakefile", __dir__)
+load "rails/tasks/engine.rake"
+
+load "rails/tasks/statistics.rake"
+
 require "bundler/gem_tasks"
 
 require "rake/testtask"

data/lib/active_entity.rb

@@ -1,15 +1,38 @@
 # frozen_string_literal: true
 
+#--
+# Copyright (c) 2004-2020 David Heinemeier Hansson
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#++
+
 require "active_support"
 require "active_support/rails"
+require "active_model"
 require "yaml"
 
 require "core_ext/array_without_blank"
 
-require "active_model"
-require "active_model/attribute_set"
-
 require "active_entity/version"
+require "active_model/attribute_set"
+require "active_entity/errors"
 
 module ActiveEntity
   extend ActiveSupport::Autoload
@@ -30,13 +53,11 @@ module ActiveEntity
   autoload :Validations
 
   eager_autoload do
-    autoload :ActiveEntityError, "active_entity/errors"
-
     autoload :Aggregations
     autoload :Associations
     autoload :AttributeAssignment
     autoload :AttributeMethods
-    autoload :ValidateEmbeddedAssociation
+    autoload :ValidateEmbedsAssociation
 
     autoload :Type
   end
@@ -51,12 +72,13 @@ module ActiveEntity
 
     eager_autoload do
       autoload :BeforeTypeCast
+      autoload :Dirty
       autoload :PrimaryKey
       autoload :Query
-      autoload :Serialization
       autoload :Read
       autoload :TimeZoneConversion
       autoload :Write
+      autoload :Serialization
     end
   end
 

data/lib/active_entity/aggregations.rb

@@ -133,7 +133,7 @@ module ActiveEntity
       # converted to an instance of value class if necessary.
       #
       # For example, the +NetworkResource+ model has +network_address+ and +cidr_range+ attributes that should be
-      # aggregated using the +NetAddr::CIDR+ value class (http://www.rubydoc.info/gems/netaddr/1.5.0/NetAddr/CIDR).
+      # aggregated using the +NetAddr::CIDR+ value class (https://www.rubydoc.info/gems/netaddr/1.5.0/NetAddr/CIDR).
       # The constructor for the value class is called +create+ and it expects a CIDR address string as a parameter.
       # New values can be assigned to the value object using either another +NetAddr::CIDR+ object, a string
       # or an array. The <tt>:constructor</tt> and <tt>:converter</tt> options can be used to meet
@@ -234,6 +234,7 @@ module ActiveEntity
         end
 
         private
+
           def reader_method(name, class_name, mapping, allow_nil, constructor)
             define_method(name) do
               if @aggregation_cache[name].nil? && (!allow_nil || mapping.any? { |key, _| !_read_attribute(key).nil? })

data/lib/active_entity/associations.rb

@@ -2,8 +2,6 @@
 
 require "active_support/core_ext/enumerable"
 require "active_support/core_ext/string/conversions"
-require "active_support/core_ext/module/remove_method"
-require "active_entity/errors"
 
 module ActiveEntity
   class AssociationNotFoundError < ConfigurationError #:nodoc:
@@ -30,25 +28,24 @@ module ActiveEntity
   module Associations # :nodoc:
     extend ActiveSupport::Autoload
     extend ActiveSupport::Concern
-
     # These classes will be loaded when associations are created.
     # So there is no need to eager load them.
-    module Embedded
+    module Embeds
       extend ActiveSupport::Autoload
 
-      autoload :Association, "active_entity/associations/embedded/association"
-      autoload :SingularAssociation, "active_entity/associations/embedded/singular_association"
-      autoload :CollectionAssociation, "active_entity/associations/embedded/collection_association"
-      autoload :CollectionProxy, "active_entity/associations/embedded/collection_proxy"
+      autoload :Association, "active_entity/associations/embeds/association"
+      autoload :SingularAssociation, "active_entity/associations/embeds/singular_association"
+      autoload :CollectionAssociation, "active_entity/associations/embeds/collection_association"
+      autoload :CollectionProxy, "active_entity/associations/embeds/collection_proxy"
 
       module Builder #:nodoc:
-        autoload :Association,             "active_entity/associations/embedded/builder/association"
-        autoload :SingularAssociation,     "active_entity/associations/embedded/builder/singular_association"
-        autoload :CollectionAssociation,   "active_entity/associations/embedded/builder/collection_association"
+        autoload :Association,             "active_entity/associations/embeds/builder/association"
+        autoload :SingularAssociation,     "active_entity/associations/embeds/builder/singular_association"
+        autoload :CollectionAssociation,   "active_entity/associations/embeds/builder/collection_association"
 
-        autoload :EmbeddedIn,              "active_entity/associations/embedded/builder/embedded_in"
-        autoload :EmbedsOne,               "active_entity/associations/embedded/builder/embeds_one"
-        autoload :EmbedsMany,              "active_entity/associations/embedded/builder/embeds_many"
+        autoload :EmbeddedIn,              "active_entity/associations/embeds/builder/embedded_in"
+        autoload :EmbedsOne,               "active_entity/associations/embeds/builder/embeds_one"
+        autoload :EmbedsMany,              "active_entity/associations/embeds/builder/embeds_many"
       end
 
       eager_autoload do
@@ -60,9 +57,8 @@ module ActiveEntity
 
     def self.eager_load!
       super
-      Embedded.eager_load!
+      Embeds.eager_load!
     end
-
     # Returns the association instance for the given name, instantiating it if it doesn't already exist
     def association(name) #:nodoc:
       association = association_instance_get(name)
@@ -88,10 +84,6 @@ module ActiveEntity
     end
 
     private
-      # Clears out the association cache.
-      def clear_association_cache
-        @association_cache.clear if persisted?
-      end
 
       def init_internals
         @association_cache = {}
@@ -108,19 +100,49 @@ module ActiveEntity
         @association_cache[name] = association
       end
 
+      # \Associations are a set of macro-like class methods for tying objects together through
+      # foreign keys. They express relationships like "Project has one Project Manager"
+      # or "Project belongs to a Portfolio". Each macro adds a number of methods to the
+      # class which are specialized according to the collection or association symbol and the
+      # options hash. It works much the same way as Ruby's own <tt>attr*</tt>
+      # methods.
+      #
+      #   class Project < ActiveEntity::Base
+      #     belongs_to              :portfolio
+      #     has_one                 :project_manager
+      #     has_many                :milestones
+      #     has_and_belongs_to_many :categories
+      #   end
+      #
+      # The project class now has the following methods (and more) to ease the traversal and
+      # manipulation of its relationships:
+      # * <tt>Project#portfolio</tt>, <tt>Project#portfolio=(portfolio)</tt>, <tt>Project#reload_portfolio</tt>
+      # * <tt>Project#project_manager</tt>, <tt>Project#project_manager=(project_manager)</tt>, <tt>Project#reload_project_manager</tt>
+      # * <tt>Project#milestones.empty?</tt>, <tt>Project#milestones.size</tt>, <tt>Project#milestones</tt>, <tt>Project#milestones<<(milestone)</tt>,
+      #   <tt>Project#milestones.delete(milestone)</tt>, <tt>Project#milestones.destroy(milestone)</tt>, <tt>Project#milestones.find(milestone_id)</tt>,
+      #   <tt>Project#milestones.build</tt>, <tt>Project#milestones.create</tt>
+      # * <tt>Project#categories.empty?</tt>, <tt>Project#categories.size</tt>, <tt>Project#categories</tt>, <tt>Project#categories<<(category1)</tt>,
+      #   <tt>Project#categories.delete(category1)</tt>, <tt>Project#categories.destroy(category1)</tt>
+      #
+      # === A word of warning
+      #
+      # Don't create associations that have the same name as {instance methods}[rdoc-ref:ActiveEntity::Core] of
+      # <tt>ActiveEntity::Base</tt>. Since the association adds a method with that name to
+      # its model, using an association with the same name as one provided by <tt>ActiveEntity::Base</tt> will override the method inherited through <tt>ActiveEntity::Base</tt> and will break things.
+      # For instance, +attributes+ and +connection+ would be bad choices for association names, because those names already exist in the list of <tt>ActiveEntity::Base</tt> instance methods.
       module ClassMethods
         def embedded_in(name, **options)
-          reflection = Embedded::Builder::EmbeddedIn.build(self, name, options)
+          reflection = Embeds::Builder::EmbeddedIn.build(self, name, options)
           Reflection.add_reflection self, name, reflection
         end
 
         def embeds_one(name, **options)
-          reflection = Embedded::Builder::EmbedsOne.build(self, name, options)
+          reflection = Embeds::Builder::EmbedsOne.build(self, name, options)
           Reflection.add_reflection self, name, reflection
         end
 
         def embeds_many(name, **options)
-          reflection = Embedded::Builder::EmbedsMany.build(self, name, options)
+          reflection = Embeds::Builder::EmbedsMany.build(self, name, options)
           Reflection.add_reflection self, name, reflection
         end
 
@@ -133,7 +155,7 @@ module ActiveEntity
             end
         end
 
-        def embedded_association_names
+        def embeds_association_names
           @association_names ||=
             if !abstract_class?
               reflections.select { |_, r| r.embedded? }.keys.map(&:to_sym)

data/lib/active_entity/associations/{embedded → embeds}/association.rb

@@ -4,7 +4,7 @@ require "active_support/core_ext/array/wrap"
 
 module ActiveEntity
   module Associations
-    module Embedded
+    module Embeds
       # = Active Entity Associations
       #
       # This is the root class of all associations ('+ Foo' signifies an included module Foo):
@@ -83,7 +83,7 @@ module ActiveEntity
         end
 
         def initialize_attributes(record, attributes = {}) #:nodoc:
-          record.send(:_assign_attributes, attributes) if attributes.any?
+          record.assign_attributes attributes if attributes.any?
           set_inverse_instance(record)
         end
 

data/lib/active_entity/associations/{embedded → embeds}/builder/association.rb

@@ -11,7 +11,7 @@
 #    - CollectionAssociation
 #      - HasManyAssociation
 
-module ActiveEntity::Associations::Embedded::Builder # :nodoc:
+module ActiveEntity::Associations::Embeds::Builder # :nodoc:
   class Association #:nodoc:
     class << self
       attr_accessor :extensions

data/lib/active_entity/associations/{embedded → embeds}/builder/collection_association.rb

@@ -2,7 +2,7 @@
 
 require "active_entity/associations"
 
-module ActiveEntity::Associations::Embedded::Builder # :nodoc:
+module ActiveEntity::Associations::Embeds::Builder # :nodoc:
   class CollectionAssociation < Association #:nodoc:
     CALLBACKS = [:before_add, :after_add, :before_remove, :after_remove]
 

data/lib/active_entity/associations/{embedded → embeds}/builder/embedded_in.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module ActiveEntity::Associations::Embedded::Builder # :nodoc:
+module ActiveEntity::Associations::Embeds::Builder # :nodoc:
   class EmbeddedIn < SingularAssociation #:nodoc:
     def self.macro
       :embedded_in

data/lib/active_entity/associations/{embedded → embeds}/builder/embeds_many.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module ActiveEntity::Associations::Embedded::Builder # :nodoc:
+module ActiveEntity::Associations::Embeds::Builder # :nodoc:
   class EmbedsMany < CollectionAssociation #:nodoc:
     def self.macro
       :embeds_many

data/lib/active_entity/associations/{embedded → embeds}/builder/embeds_one.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module ActiveEntity::Associations::Embedded::Builder # :nodoc:
+module ActiveEntity::Associations::Embeds::Builder # :nodoc:
   class EmbedsOne < SingularAssociation #:nodoc:
     def self.macro
       :embeds_one

data/lib/active_entity/associations/{embedded → embeds}/builder/singular_association.rb

@@ -2,7 +2,7 @@
 
 # This class is inherited by the has_one and belongs_to association classes
 
-module ActiveEntity::Associations::Embedded::Builder # :nodoc:
+module ActiveEntity::Associations::Embeds::Builder # :nodoc:
   class SingularAssociation < Association #:nodoc:
     def self.valid_options(options)
       super + [:inverse_of, :required]

data/lib/active_entity/associations/{embedded → embeds}/collection_association.rb

@@ -2,7 +2,7 @@
 
 module ActiveEntity
   module Associations
-    module Embedded
+    module Embeds
       # = Active Entity Association Collection
       #
       # CollectionAssociation is an abstract class that provides common stuff to

data/lib/active_entity/associations/{embedded → embeds}/collection_proxy.rb

@@ -2,7 +2,7 @@
 
 module ActiveEntity
   module Associations
-    module Embedded
+    module Embeds
       # Association proxies in Active Entity are middlemen between the object that
       # holds the association, known as the <tt>@owner</tt>, and the actual associated
       # object, known as the <tt>@target</tt>. The kind of association any proxy is
@@ -40,7 +40,7 @@ module ActiveEntity
                  :[], :&, :|, :+, :-, :sample, :reverse, :rotate, :compact, :in_groups, :in_groups_of,
                  :find, :last, :take, :blank?, :present?, :empty?, :any?, :one?, :many?, :include?,
                  :to_sentence, :to_formatted_s, :as_json,
-                 :shuffle, :split, :slice, :index, :rindex, to: :records
+                 :shuffle, :split, :slice, :index, :rindex, :size, to: :records
 
         def initialize(klass, association)
           @klass = klass

data/lib/active_entity/associations/{embedded → embeds}/embedded_in_association.rb

@@ -2,7 +2,7 @@
 
 module ActiveEntity
   module Associations
-    module Embedded
+    module Embeds
       # = Active Entity Belongs To Association
       class EmbeddedInAssociation < SingularAssociation #:nodoc:
         def default(&block)

data/lib/active_entity/associations/{embedded → embeds}/embeds_many_association.rb

@@ -2,7 +2,7 @@
 
 module ActiveEntity
   module Associations
-    module Embedded
+    module Embeds
       # = Active Entity Has Many Association
       # This is the proxy that handles a has many association.
       #

data/lib/active_entity/associations/{embedded → embeds}/embeds_one_association.rb

@@ -2,10 +2,11 @@
 
 module ActiveEntity
   module Associations
-    module Embedded
+    module Embeds
       # = Active Entity Has One Association
       class EmbedsOneAssociation < SingularAssociation #:nodoc:
         private
+
           def replace(record)
             self.target =
               if record.is_a? reflection.klass

data/lib/active_entity/associations/{embedded → embeds}/singular_association.rb

@@ -2,7 +2,7 @@
 
 module ActiveEntity
   module Associations
-    module Embedded
+    module Embeds
       class SingularAssociation < Association #:nodoc:
         # Implements the reader method, e.g. foo.bar for Foo.has_one :bar
         def reader

data/lib/active_entity/attribute_assignment.rb

@@ -6,6 +6,10 @@ module ActiveEntity
   module AttributeAssignment
     include ActiveModel::AttributeAssignment
 
+    def assign_attributes(attributes)
+      super(attributes.dup)
+    end
+
     private
 
       def _assign_attributes(attributes)
@@ -13,10 +17,12 @@ module ActiveEntity
         nested_parameter_attributes = {}
 
         attributes.each do |k, v|
-          if k.to_s.include?("(")
-            multi_parameter_attributes[k] = attributes.delete(k)
+          key = k.to_s
+
+          if key.include?("(")
+            multi_parameter_attributes[key] = attributes.delete(k)
           elsif v.is_a?(Hash)
-            nested_parameter_attributes[k] = attributes.delete(k)
+            nested_parameter_attributes[key] = attributes.delete(k)
           end
         end
         super(attributes)