mongoid 0.8.8 → 0.8.9

data/VERSION

@@ -1 +1 @@
-0.8.8
+0.8.9

data/lib/mongoid/associations/has_many.rb

@@ -86,15 +86,8 @@ module Mongoid #:nodoc:
         # is initialized by setting the has_many to the supplied +Enumerable+
         # and setting up the parentization.
         def update(children, parent, options)
-          parent.attributes.delete(options.name)
-          klass = options.klass
-          children.each do |child|
-            unless child.respond_to?(:parentize)
-              child = klass.new(child)
-            end
-            child.parentize(parent, options.name)
-            child.notify
-          end
+          parent.remove_attribute(options.name)
+          children.assimilate(parent, options)
           new(parent, options)
         end
       end

data/lib/mongoid/associations/has_one.rb

@@ -39,15 +39,19 @@ module Mongoid #:nodoc:
 
       class << self
         # Perform an update of the relationship of the parent and child. This
-        # is initialized by setting the has_one to the supplied child.
+        # will assimilate the child +Document+ into the parent's object graph.
+        #
+        # Options:
+        #
+        # child: The child +Document+ or +Hash+.
+        # parent: The parent +Document+ to update.
+        # options: The association +Options+
+        #
+        # Example:
+        #
+        # <tt>HasOne.update({:first_name => "Hank"}, person, options)</tt>
         def update(child, parent, options)
-          unless child.respond_to?(:parentize)
-            klass = options.klass
-            child = klass.new(child)
-          end
-          child.parentize(parent, options.name)
-          child.notify
-          child
+          child.assimilate(parent, options)
         end
       end
 

data/lib/mongoid/document.rb

@@ -121,6 +121,26 @@ module Mongoid #:nodoc:
         other.attributes.except(:modified_at).except(:created_at)
     end
 
+    # Introduces a child object into the +Document+ object graph. This will
+    # set up the relationships between the parent and child and update the
+    # attributes of the parent +Document+.
+    #
+    # Options:
+    #
+    # parent: The +Document+ to assimilate with.
+    # options: The association +Options+ for the child.
+    #
+    # Example:
+    #
+    # <tt>name.assimilate(person, options)</tt>
+    #
+    # Returns: The child +Document+.
+    def assimilate(parent, options)
+      parentize(parent, options.name)
+      notify
+      self
+    end
+
     # Clone the current +Document+. This will return all attributes with the
     # exception of the document's id and versions.
     def clone
@@ -252,6 +272,20 @@ module Mongoid #:nodoc:
       fields[name].get(@attributes[name])
     end
 
+    # Remove a value from the +Document+ attributes. If the value does not exist
+    # it will fail gracefully.
+    #
+    # Options:
+    #
+    # name: The name of the attribute to remove.
+    #
+    # Example:
+    #
+    # <tt>person.remove_attribute(:title)</tt>
+    def remove_attribute(name)
+      @attributes.delete(name)
+    end
+
     # Reloads the +Document+ attributes from the database.
     def reload
       @attributes = collection.find_one(:_id => id).with_indifferent_access

data/lib/mongoid/extensions.rb

@@ -1,3 +1,4 @@
+require "mongoid/extensions/array/assimilation"
 require "mongoid/extensions/array/conversions"
 require "mongoid/extensions/array/parentization"
 require "mongoid/extensions/boolean/conversions"
@@ -5,6 +6,7 @@ require "mongoid/extensions/date/conversions"
 require "mongoid/extensions/datetime/conversions"
 require "mongoid/extensions/float/conversions"
 require "mongoid/extensions/hash/accessors"
+require "mongoid/extensions/hash/assimilation"
 require "mongoid/extensions/hash/conversions"
 require "mongoid/extensions/integer/conversions"
 require "mongoid/extensions/object/conversions"
@@ -14,6 +16,7 @@ require "mongoid/extensions/symbol/inflections"
 require "mongoid/extensions/time/conversions"
 
 class Array #:nodoc:
+  include Mongoid::Extensions::Array::Assimilation
   include Mongoid::Extensions::Array::Conversions
   include Mongoid::Extensions::Array::Parentization
 end
@@ -36,6 +39,7 @@ end
 
 class Hash #:nodoc
   include Mongoid::Extensions::Hash::Accessors
+  include Mongoid::Extensions::Hash::Assimilation
   extend Mongoid::Extensions::Hash::Conversions
 end
 

data/lib/mongoid/extensions/array/assimilation.rb

@@ -0,0 +1,25 @@
+module Mongoid #:nodoc:
+  module Extensions #:nodoc:
+    module Array #:nodoc:
+      module Assimilation #:nodoc:
+        # Introduces a child object into the +Document+ object graph. This will
+        # set up the relationships between the parent and child and update the
+        # attributes of the parent +Document+.
+        #
+        # Options:
+        #
+        # parent: The +Document+ to assimilate into.
+        # options: The association +Options+ for the child.
+        #
+        # Example:
+        #
+        # <tt>[{:street => "Queen St."}, {:street => "King St."}].assimilate(person, options)</tt>
+        #
+        # Returns: The child +Document+.
+        def assimilate(parent, options)
+          each { |child| child.assimilate(parent, options) }
+        end
+      end
+    end
+  end
+end

data/lib/mongoid/extensions/hash/assimilation.rb

@@ -0,0 +1,27 @@
+module Mongoid #:nodoc:
+  module Extensions #:nodoc:
+    module Hash #:nodoc:
+      module Assimilation #:nodoc:
+        # Introduces a child object into the +Document+ object graph. This will
+        # set up the relationships between the parent and child and update the
+        # attributes of the parent +Document+.
+        #
+        # Options:
+        #
+        # parent: The +Document+ to assimilate into.
+        # options: The association +Options+ for the child.
+        #
+        # Example:
+        #
+        # <tt>{:first_name => "Hank", :last_name => "Moody"}.assimilate(name, options)</tt>
+        #
+        # Returns: The child +Document+.
+        def assimilate(parent, options)
+          klass = options.klass
+          child = klass.new(self)
+          child.assimilate(parent, options)
+        end
+      end
+    end
+  end
+end

data/mongoid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoid}
-  s.version = "0.8.8"
+  s.version = "0.8.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Durran Jordan"]
-  s.date = %q{2009-11-24}
+  s.date = %q{2009-11-26}
   s.email = %q{durran@gmail.com}
   s.extra_rdoc_files = [
     "README.textile"
@@ -41,6 +41,7 @@ Gem::Specification.new do |s|
      "lib/mongoid/criteria.rb",
      "lib/mongoid/document.rb",
      "lib/mongoid/extensions.rb",
+     "lib/mongoid/extensions/array/assimilation.rb",
      "lib/mongoid/extensions/array/conversions.rb",
      "lib/mongoid/extensions/array/parentization.rb",
      "lib/mongoid/extensions/boolean/conversions.rb",
@@ -48,6 +49,7 @@ Gem::Specification.new do |s|
      "lib/mongoid/extensions/datetime/conversions.rb",
      "lib/mongoid/extensions/float/conversions.rb",
      "lib/mongoid/extensions/hash/accessors.rb",
+     "lib/mongoid/extensions/hash/assimilation.rb",
      "lib/mongoid/extensions/hash/conversions.rb",
      "lib/mongoid/extensions/integer/conversions.rb",
      "lib/mongoid/extensions/object/casting.rb",
@@ -83,6 +85,7 @@ Gem::Specification.new do |s|
      "spec/unit/mongoid/commands_spec.rb",
      "spec/unit/mongoid/criteria_spec.rb",
      "spec/unit/mongoid/document_spec.rb",
+     "spec/unit/mongoid/extensions/array/assimilation_spec.rb",
      "spec/unit/mongoid/extensions/array/conversions_spec.rb",
      "spec/unit/mongoid/extensions/array/parentization_spec.rb",
      "spec/unit/mongoid/extensions/boolean/conversions_spec.rb",
@@ -90,6 +93,7 @@ Gem::Specification.new do |s|
      "spec/unit/mongoid/extensions/datetime/conversions_spec.rb",
      "spec/unit/mongoid/extensions/float/conversions_spec.rb",
      "spec/unit/mongoid/extensions/hash/accessors_spec.rb",
+     "spec/unit/mongoid/extensions/hash/assimilation_spec.rb",
      "spec/unit/mongoid/extensions/hash/conversions_spec.rb",
      "spec/unit/mongoid/extensions/integer/conversions_spec.rb",
      "spec/unit/mongoid/extensions/object/conversions_spec.rb",
@@ -128,6 +132,7 @@ Gem::Specification.new do |s|
      "spec/unit/mongoid/commands_spec.rb",
      "spec/unit/mongoid/criteria_spec.rb",
      "spec/unit/mongoid/document_spec.rb",
+     "spec/unit/mongoid/extensions/array/assimilation_spec.rb",
      "spec/unit/mongoid/extensions/array/conversions_spec.rb",
      "spec/unit/mongoid/extensions/array/parentization_spec.rb",
      "spec/unit/mongoid/extensions/boolean/conversions_spec.rb",
@@ -135,6 +140,7 @@ Gem::Specification.new do |s|
      "spec/unit/mongoid/extensions/datetime/conversions_spec.rb",
      "spec/unit/mongoid/extensions/float/conversions_spec.rb",
      "spec/unit/mongoid/extensions/hash/accessors_spec.rb",
+     "spec/unit/mongoid/extensions/hash/assimilation_spec.rb",
      "spec/unit/mongoid/extensions/hash/conversions_spec.rb",
      "spec/unit/mongoid/extensions/integer/conversions_spec.rb",
      "spec/unit/mongoid/extensions/object/conversions_spec.rb",

data/spec/unit/mongoid/document_spec.rb

@@ -56,6 +56,21 @@ describe Mongoid::Document do
 
   end
 
+  describe "#assimilate" do
+
+    before do
+      @child = Name.new(:first_name => "Hank", :last_name => "Moody")
+      @parent = Person.new(:title => "Mr.")
+      @options = Mongoid::Associations::Options.new(:name => :name)
+    end
+
+    it "sets up all associations in the object graph" do
+      @child.assimilate(@parent, @options)
+      @parent.name.should == @child
+    end
+
+  end
+
   describe "#clone" do
 
     before do
@@ -445,6 +460,30 @@ describe Mongoid::Document do
 
   end
 
+  describe "#remove_attribute" do
+
+    context "when the attribute exists" do
+
+      it "removes the attribute" do
+        person = Person.new(:title => "Sir")
+        person.remove_attribute(:title)
+        person.title.should be_nil
+      end
+
+    end
+
+    context "when the attribute does not exist" do
+
+      it "does nothing" do
+        person = Person.new
+        person.remove_attribute(:title)
+        person.title.should be_nil
+      end
+
+    end
+
+  end
+
   describe "#reload" do
 
     before do

data/spec/unit/mongoid/extensions/array/assimilation_spec.rb

@@ -0,0 +1,24 @@
+require File.expand_path(File.join(File.dirname(__FILE__), "/../../../../spec_helper.rb"))
+
+describe Mongoid::Extensions::Array::Assimilation do
+
+  describe "#assimilate" do
+
+    before do
+      @address_one = { :street => "Circular Quay" }
+      @address_two = Address.new(:street => "King St.")
+      @parent = Person.new(:title => "Mr.")
+      @options = Mongoid::Associations::Options.new(:name => :addresses)
+      @child = [@address_one, @address_two]
+    end
+
+    it "incorporates the hash into the object graph" do
+      @child.assimilate(@parent, @options)
+      @parent.addresses.size.should == 2
+      @parent.addresses.first.street.should == "Circular Quay"
+      @parent.addresses.last.street.should == "King St."
+    end
+
+  end
+
+end

data/spec/unit/mongoid/extensions/hash/assimilation_spec.rb

@@ -0,0 +1,21 @@
+require File.expand_path(File.join(File.dirname(__FILE__), "/../../../../spec_helper.rb"))
+
+describe Mongoid::Extensions::Hash::Assimilation do
+
+  describe "#assimilate" do
+
+    before do
+      @child = { :first_name => "Hank", :last_name => "Moody" }
+      @parent = Person.new(:title => "Mr.")
+      @options = Mongoid::Associations::Options.new(:name => :name)
+    end
+
+    it "incorporates the hash into the object graph" do
+      @child.assimilate(@parent, @options)
+      @parent.name.first_name.should == "Hank"
+      @parent.name.last_name.should == "Moody"
+    end
+
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongoid
 version: !ruby/object:Gem::Version 
-  version: 0.8.8
+  version: 0.8.9
 platform: ruby
 authors: 
 - Durran Jordan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-24 00:00:00 -05:00
+date: 2009-11-26 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -97,6 +97,7 @@ files:
 - lib/mongoid/criteria.rb
 - lib/mongoid/document.rb
 - lib/mongoid/extensions.rb
+- lib/mongoid/extensions/array/assimilation.rb
 - lib/mongoid/extensions/array/conversions.rb
 - lib/mongoid/extensions/array/parentization.rb
 - lib/mongoid/extensions/boolean/conversions.rb
@@ -104,6 +105,7 @@ files:
 - lib/mongoid/extensions/datetime/conversions.rb
 - lib/mongoid/extensions/float/conversions.rb
 - lib/mongoid/extensions/hash/accessors.rb
+- lib/mongoid/extensions/hash/assimilation.rb
 - lib/mongoid/extensions/hash/conversions.rb
 - lib/mongoid/extensions/integer/conversions.rb
 - lib/mongoid/extensions/object/casting.rb
@@ -139,6 +141,7 @@ files:
 - spec/unit/mongoid/commands_spec.rb
 - spec/unit/mongoid/criteria_spec.rb
 - spec/unit/mongoid/document_spec.rb
+- spec/unit/mongoid/extensions/array/assimilation_spec.rb
 - spec/unit/mongoid/extensions/array/conversions_spec.rb
 - spec/unit/mongoid/extensions/array/parentization_spec.rb
 - spec/unit/mongoid/extensions/boolean/conversions_spec.rb
@@ -146,6 +149,7 @@ files:
 - spec/unit/mongoid/extensions/datetime/conversions_spec.rb
 - spec/unit/mongoid/extensions/float/conversions_spec.rb
 - spec/unit/mongoid/extensions/hash/accessors_spec.rb
+- spec/unit/mongoid/extensions/hash/assimilation_spec.rb
 - spec/unit/mongoid/extensions/hash/conversions_spec.rb
 - spec/unit/mongoid/extensions/integer/conversions_spec.rb
 - spec/unit/mongoid/extensions/object/conversions_spec.rb
@@ -206,6 +210,7 @@ test_files:
 - spec/unit/mongoid/commands_spec.rb
 - spec/unit/mongoid/criteria_spec.rb
 - spec/unit/mongoid/document_spec.rb
+- spec/unit/mongoid/extensions/array/assimilation_spec.rb
 - spec/unit/mongoid/extensions/array/conversions_spec.rb
 - spec/unit/mongoid/extensions/array/parentization_spec.rb
 - spec/unit/mongoid/extensions/boolean/conversions_spec.rb
@@ -213,6 +218,7 @@ test_files:
 - spec/unit/mongoid/extensions/datetime/conversions_spec.rb
 - spec/unit/mongoid/extensions/float/conversions_spec.rb
 - spec/unit/mongoid/extensions/hash/accessors_spec.rb
+- spec/unit/mongoid/extensions/hash/assimilation_spec.rb
 - spec/unit/mongoid/extensions/hash/conversions_spec.rb
 - spec/unit/mongoid/extensions/integer/conversions_spec.rb
 - spec/unit/mongoid/extensions/object/conversions_spec.rb