mongoid 0.4.3 → 0.4.4

data/README.textile

@@ -30,24 +30,23 @@ Example of a simple domain model:
 
 <pre>
   class Person < Mongoid::Document
-    fields :title
+    field :title
+    field :age, :default => 0
     has_many :addresses
     has_one :name
   end
 
   class Address < Mongoid::Document
-    fields \
-      :street,
-      :city,
-      :state,
-      :post_code
+    field :street
+    field :city
+    field :state
+    field :post_code
     belongs_to :person
   end
 
   class Name < Mongoid::Document
-    fields \
-      :first_name,
-      :last_name
+    field :first_name
+    field :last_name
     has_timestamps
   end
 </pre>

data/VERSION

@@ -1 +1 @@
-0.4.3
+0.4.4

data/lib/mongoid/associations/has_many_association.rb

@@ -2,22 +2,23 @@ module Mongoid #:nodoc:
   module Associations #:nodoc:
     class HasManyAssociation < DelegateClass(Array) #:nodoc:
 
-      # Creates the new association by finding the attributes in
-      # the parent document with its name, and instantiating a
-      # new document for each one found. These will then be put in an
-      # internal array.
-      #
-      # This then delegated all methods to the array class since this is
-      # essentially a proxy to an array itself.
-      def initialize(association_name, document)
-        @klass = association_name.to_s.classify.constantize
-        attributes = document.attributes[association_name]
-        @documents = attributes ? attributes.collect do |attribute|
-          child = @klass.new(attribute)
-          child.parent = document
-          child
-        end : []
-        super(@documents)
+      # Appends the object to the +Array+, setting its parent in
+      # the process.
+      def <<(object)
+        object.parentize(@parent)
+        @documents << object
+      end
+
+      # Appends the object to the +Array+, setting its parent in
+      # the process.
+      def push(object)
+        self << object
+      end
+
+      # Appends the object to the +Array+, setting its parent in
+      # the process.
+      def concat(object)
+        self << object
       end
 
       # Builds a new Document and adds it to the association collection. The
@@ -38,6 +39,26 @@ module Mongoid #:nodoc:
         return @documents if param == :all
         return detect { |document| document.id == param }
       end
+
+      # Creates the new association by finding the attributes in
+      # the parent document with its name, and instantiating a
+      # new document for each one found. These will then be put in an
+      # internal array.
+      #
+      # This then delegated all methods to the array class since this is
+      # essentially a proxy to an array itself.
+      def initialize(association_name, document)
+        @parent = document
+        @klass = association_name.to_s.classify.constantize
+        attributes = document.attributes[association_name]
+        @documents = attributes ? attributes.collect do |attribute|
+          child = @klass.new(attribute)
+          child.parent = document
+          child
+        end : []
+        super(@documents)
+      end
+
     end
   end
 end

data/lib/mongoid/document.rb

@@ -28,11 +28,13 @@ module Mongoid #:nodoc:
 
       # Adds the association back to the parent document.
       def belongs_to(association_name)
+        @embedded = true
         add_association(:belongs_to, association_name.to_s.classify, association_name)
       end
 
       # Get the Mongo::Collection associated with this Document.
       def collection
+        return nil if @embedded
         @collection_name = self.to_s.demodulize.tableize
         @collection ||= Mongoid.database.collection(@collection_name)
       end
@@ -119,7 +121,7 @@ module Mongoid #:nodoc:
           0) do |pager|
             results = collection.find(selector, { :sort => params[:sort],
                                                   :limit => pager.per_page,
-                                                  :offset => pager.offset })
+                                                  :skip => pager.offset })
             pager.total_entries = results.count
             pager.replace(results.collect { |doc| new(doc) })
         end
@@ -171,6 +173,7 @@ module Mongoid #:nodoc:
           Mongoid::Associations::Factory.create(type, name, self)
         end
         define_method("#{name}=") do |object|
+          object.parentize(self)
           @attributes[name] = object.mongoidize
         end
       end

data/lib/mongoid/extensions.rb

@@ -1,10 +1,14 @@
 require "mongoid/extensions/array/conversions"
+require "mongoid/extensions/array/parentization"
 require "mongoid/extensions/object/conversions"
+require "mongoid/extensions/object/parentization"
 
 class Array #:nodoc:
   include Mongoid::Extensions::Array::Conversions
+  include Mongoid::Extensions::Array::Parentization
 end
 
 class Object #:nodoc:
   include Mongoid::Extensions::Object::Conversions
+  include Mongoid::Extensions::Object::Parentization
 end

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

@@ -0,0 +1,12 @@
+module Mongoid #:nodoc:
+  module Extensions #:nodoc:
+    module Array #:nodoc:
+      module Parentization #:nodoc:
+        # Adds the parent document to each element in the array.
+        def parentize(parent)
+          each { |obj| obj.parentize(parent) }
+        end
+      end
+    end
+  end
+end

data/lib/mongoid/extensions/object/parentization.rb

@@ -0,0 +1,12 @@
+module Mongoid #:nodoc:
+  module Extensions #:nodoc:
+    module Object #:nodoc:
+      module Parentization #:nodoc:
+        # Sets the parent object
+        def parentize(object)
+          self.parent = object
+        end
+      end
+    end
+  end
+end

data/mongoid.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoid}
-  s.version = "0.4.3"
+  s.version = "0.4.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Durran Jordan"]
@@ -39,7 +39,9 @@ Gem::Specification.new do |s|
      "lib/mongoid/document.rb",
      "lib/mongoid/extensions.rb",
      "lib/mongoid/extensions/array/conversions.rb",
+     "lib/mongoid/extensions/array/parentization.rb",
      "lib/mongoid/extensions/object/conversions.rb",
+     "lib/mongoid/extensions/object/parentization.rb",
      "lib/mongoid/field.rb",
      "mongoid.gemspec",
      "spec/integration/mongoid/document_spec.rb",
@@ -60,7 +62,9 @@ Gem::Specification.new do |s|
      "spec/unit/mongoid/criteria_spec.rb",
      "spec/unit/mongoid/document_spec.rb",
      "spec/unit/mongoid/extensions/array/conversions_spec.rb",
+     "spec/unit/mongoid/extensions/array/parentization_spec.rb",
      "spec/unit/mongoid/extensions/object/conversions_spec.rb",
+     "spec/unit/mongoid/extensions/object/parentization_spec.rb",
      "spec/unit/mongoid/field_spec.rb"
   ]
   s.homepage = %q{http://github.com/durran/mongoid}
@@ -86,7 +90,9 @@ Gem::Specification.new do |s|
      "spec/unit/mongoid/criteria_spec.rb",
      "spec/unit/mongoid/document_spec.rb",
      "spec/unit/mongoid/extensions/array/conversions_spec.rb",
+     "spec/unit/mongoid/extensions/array/parentization_spec.rb",
      "spec/unit/mongoid/extensions/object/conversions_spec.rb",
+     "spec/unit/mongoid/extensions/object/parentization_spec.rb",
      "spec/unit/mongoid/field_spec.rb"
   ]
 

data/spec/integration/mongoid/document_spec.rb

@@ -92,4 +92,24 @@ describe Mongoid::Document do
 
   end
 
+  describe "#save" do
+
+    context "on a has_one association" do
+
+      before do
+        @person = Person.new(:title => "Sir")
+        @name = Name.new(:first_name => "Test")
+        @person.name = @name
+      end
+
+      it "saves the parent document" do
+        @name.save
+        person = Person.find(@person.id.to_s)
+        person.name.first_name.should == @name.first_name
+      end
+
+    end
+
+  end
+
 end

data/spec/unit/mongoid/associations/has_many_association_spec.rb

@@ -40,11 +40,43 @@ describe Mongoid::Associations::HasManyAssociation do
 
     before do
       @association = Mongoid::Associations::HasManyAssociation.new(:addresses, @document)
+      @address = Address.new
     end
 
-    it "appends the document to the end of the array" do
-      @association << Address.new
+    it "adds the parent document before appending to the array" do
+      @association << @address
+      @association.length.should == 3
+      @address.parent.should == @document
+    end
+
+  end
+
+  describe "#concat" do
+
+    before do
+      @association = Mongoid::Associations::HasManyAssociation.new(:addresses, @document)
+      @address = Address.new
+    end
+
+    it "adds the parent document before appending to the array" do
+      @association.concat [@address]
+      @association.length.should == 3
+      @address.parent.should == @document
+    end
+
+  end
+
+  describe "#push" do
+
+    before do
+      @association = Mongoid::Associations::HasManyAssociation.new(:addresses, @document)
+      @address = Address.new
+    end
+
+    it "adds the parent document before appending to the array" do
+      @association.push @address
       @association.length.should == 3
+      @address.parent.should == @document
     end
 
   end

data/spec/unit/mongoid/associations/has_one_association_spec.rb

@@ -7,7 +7,7 @@ describe Mongoid::Associations::HasOneAssociation do
     @document = stub(:attributes => @attributes)
   end
 
-  describe "#method_missing" do
+  describe "#decorate!" do
 
     before do
       @association = Mongoid::Associations::HasOneAssociation.new(:name, @document)

data/spec/unit/mongoid/document_spec.rb

@@ -58,6 +58,20 @@ describe Mongoid::Document do
 
   end
 
+  describe "#association=" do
+
+    before do
+      @name = Name.new
+      @person = Person.new
+    end
+
+    it "parentizes the association" do
+      @person.name = @name
+      @name.parent.should == @person
+    end
+
+  end
+
   describe "#belongs_to" do
 
     it "creates a reader for the association" do
@@ -82,6 +96,18 @@ describe Mongoid::Document do
       Person.collection.name.should == "people"
     end
 
+    context "when document is embedded" do
+
+      before do
+        @address = Address.new
+      end
+
+      it "returns nil" do
+        Address.collection.should be_nil
+      end
+
+    end
+
   end
 
   describe "#field" do
@@ -382,7 +408,7 @@ describe Mongoid::Document do
     context "when pagination parameters are passed" do
 
       it "delegates to will paginate with the results" do
-        @collection.expects(:find).with({ :test => "Test" }, { :sort => nil, :limit => 20, :offset => 20}).returns(@cursor)
+        @collection.expects(:find).with({ :test => "Test" }, { :sort => nil, :limit => 20, :skip => 20}).returns(@cursor)
         Person.paginate(:conditions => { :test => "Test" }, :page => 2, :per_page => 20)
       end
 
@@ -391,7 +417,7 @@ describe Mongoid::Document do
     context "when pagination parameters are not passed" do
 
       it "delegates to will paginate with default values" do
-        @collection.expects(:find).with({ :test => "Test" }, { :sort => nil, :limit => 20, :offset => 0}).returns(@cursor)
+        @collection.expects(:find).with({ :test => "Test" }, { :sort => nil, :limit => 20, :skip => 0}).returns(@cursor)
         Person.paginate(:conditions => { :test => "Test" })
       end
 
@@ -400,7 +426,7 @@ describe Mongoid::Document do
     context "when sorting paramters provided" do
 
       it "adds the sorting parameters in the collection#find" do
-        @collection.expects(:find).with({ :test => "Test" }, { :sort => { :test => -1}, :limit => 20, :offset => 0}).returns(@cursor)
+        @collection.expects(:find).with({ :test => "Test" }, { :sort => { :test => -1}, :limit => 20, :skip => 0}).returns(@cursor)
         Person.paginate(:conditions => { :test => "Test" }, :sort => { :test => -1 })
       end
 

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

@@ -0,0 +1,20 @@
+require File.join(File.dirname(__FILE__), "/../../../../spec_helper.rb")
+
+describe Mongoid::Extensions::Array::Parentization do
+
+  describe "#parentize" do
+
+    before do
+      @parent = stub
+      @child = mock
+      @array = [@child]
+    end
+
+    it "sets the parent on each element" do
+      @child.expects(:parent=).with(@parent)
+      @array.parentize(@parent)
+    end
+
+  end
+
+end

data/spec/unit/mongoid/extensions/object/parentization_spec.rb

@@ -0,0 +1,19 @@
+require File.join(File.dirname(__FILE__), "/../../../../spec_helper.rb")
+
+describe Mongoid::Extensions::Object::Parentization do
+
+  describe "#parentize" do
+
+    before do
+      @parent = Person.new
+      @child = Name.new
+    end
+
+    it "sets the parent on each element" do
+      @child.parentize(@parent)
+      @child.parent.should == @parent
+    end
+
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongoid
 version: !ruby/object:Gem::Version 
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors: 
 - Durran Jordan
@@ -85,7 +85,9 @@ files:
 - lib/mongoid/document.rb
 - lib/mongoid/extensions.rb
 - lib/mongoid/extensions/array/conversions.rb
+- lib/mongoid/extensions/array/parentization.rb
 - lib/mongoid/extensions/object/conversions.rb
+- lib/mongoid/extensions/object/parentization.rb
 - lib/mongoid/field.rb
 - mongoid.gemspec
 - spec/integration/mongoid/document_spec.rb
@@ -106,7 +108,9 @@ files:
 - spec/unit/mongoid/criteria_spec.rb
 - spec/unit/mongoid/document_spec.rb
 - spec/unit/mongoid/extensions/array/conversions_spec.rb
+- spec/unit/mongoid/extensions/array/parentization_spec.rb
 - spec/unit/mongoid/extensions/object/conversions_spec.rb
+- spec/unit/mongoid/extensions/object/parentization_spec.rb
 - spec/unit/mongoid/field_spec.rb
 has_rdoc: true
 homepage: http://github.com/durran/mongoid
@@ -154,5 +158,7 @@ test_files:
 - spec/unit/mongoid/criteria_spec.rb
 - spec/unit/mongoid/document_spec.rb
 - spec/unit/mongoid/extensions/array/conversions_spec.rb
+- spec/unit/mongoid/extensions/array/parentization_spec.rb
 - spec/unit/mongoid/extensions/object/conversions_spec.rb
+- spec/unit/mongoid/extensions/object/parentization_spec.rb
 - spec/unit/mongoid/field_spec.rb