mongoid 1.2.11 → 1.2.12

data/VERSION

@@ -1 +1 @@
-1.2.11
+1.2.12

data/lib/mongoid/associations/has_many.rb

@@ -8,11 +8,11 @@ module Mongoid #:nodoc:
 
       # Appends the object to the +Array+, setting its parent in
       # the process.
-      def <<(*objects)
-        objects.flatten.each do |object|
-          object.parentize(@parent, @association_name)
-          @target << object
-          object.notify
+      def <<(*documents)
+        documents.flatten.each do |doc|
+          doc.parentize(@parent, @association_name)
+          @target << doc
+          doc.notify
         end
       end
 
@@ -22,9 +22,9 @@ module Mongoid #:nodoc:
       # Clears the association, and notifies the parents of the removal.
       def clear
         unless @target.empty?
-          object = @target.first
-          object.changed(true)
-          object.notify_observers(object, true)
+          document = @target.first
+          document.changed(true)
+          document.notify_observers(document, true)
           @target.clear
         end
       end
@@ -37,11 +37,11 @@ module Mongoid #:nodoc:
       #
       # The newly created Document.
       def build(attrs = {}, type = nil)
-        object = type ? type.instantiate : @klass.instantiate
-        object.parentize(@parent, @association_name)
-        object.write_attributes(attrs)
-        @target << object
-        object
+        document = type ? type.instantiate : @klass.instantiate
+        document.parentize(@parent, @association_name)
+        document.write_attributes(attrs)
+        @target << document
+        document
       end
 
       # Creates a new Document and adds it to the association collection. The
@@ -51,13 +51,28 @@ module Mongoid #:nodoc:
       #
       # Returns:
       #
-      # Rhe newly created Document.
+      # The newly created Document.
       def create(attrs = {}, type = nil)
-        object = build(attrs, type)
-        object.run_callbacks(:before_create)
-        object.save
-        object.run_callbacks(:after_create)
-        object
+        document = build(attrs, type)
+        document.run_callbacks(:before_create)
+        document.run_callbacks(:after_create) if document.save
+        document
+      end
+
+      # Creates a new Document and adds it to the association collection. The
+      # document created will be of the same class as the others in the
+      # association, and the attributes will be passed into the constructor and
+      # the new object will then be saved. If validation fails an error will
+      # get raised.
+      #
+      # Returns:
+      #
+      # The newly created Document.
+      def create!(attrs = {}, type = nil)
+        document = create(attrs, type)
+        errors = document.errors
+        raise Errors::Validations.new(errors) unless errors.empty?
+        document
       end
 
       # Finds a document in this association.
@@ -176,7 +191,6 @@ module Mongoid #:nodoc:
           instantiate(parent, options)
         end
       end
-
     end
   end
 end

data/mongoid.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoid}
-  s.version = "1.2.11"
+  s.version = "1.2.12"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Durran Jordan"]
@@ -130,6 +130,7 @@ Gem::Specification.new do |s|
      "spec/integration/mongoid/named_scope_spec.rb",
      "spec/models/address.rb",
      "spec/models/animal.rb",
+     "spec/models/callbacks.rb",
      "spec/models/comment.rb",
      "spec/models/country_code.rb",
      "spec/models/employer.rb",
@@ -253,6 +254,7 @@ Gem::Specification.new do |s|
      "spec/integration/mongoid/named_scope_spec.rb",
      "spec/models/address.rb",
      "spec/models/animal.rb",
+     "spec/models/callbacks.rb",
      "spec/models/comment.rb",
      "spec/models/country_code.rb",
      "spec/models/employer.rb",

data/spec/integration/mongoid/associations_spec.rb

@@ -49,6 +49,16 @@ describe Mongoid::Associations do
 
   end
 
+  context "creation of an embedded association on a callback" do
+
+    it "allows the use of create!" do
+      artist = Artist.create!(:name => "Depeche Mode")
+      artist.songs.size.should == 2
+      artist.songs.first.title.should == "0"
+      artist.songs.last.title.should == "1"
+    end
+  end
+
   context "criteria on has many embedded associations" do
 
     before do

data/spec/models/callbacks.rb

@@ -0,0 +1,18 @@
+class Artist
+  include Mongoid::Document
+  field :name
+  has_many :songs
+
+  after_create :create_songs
+
+  protected
+  def create_songs
+    2.times { |n| songs.create!(:title => "#{n}") }
+  end
+end
+
+class Song
+  include Mongoid::Document
+  field :title
+  belongs_to :artist, :inverse_of => :songs
+end

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

@@ -166,6 +166,49 @@ describe Mongoid::Associations::HasMany do
 
   end
 
+  describe "#create!" do
+
+    context "when validations pass" do
+
+      before do
+        @association = Mongoid::Associations::HasMany.new(
+          @document,
+          Mongoid::Associations::Options.new(:name => :addresses)
+        )
+        @address = mock(:parentize => true, :write_attributes => true, :errors => [])
+        Address.expects(:instantiate).returns(@address)
+        @address.expects(:run_callbacks).with(:before_create)
+        @address.expects(:run_callbacks).with(:after_create)
+      end
+
+      it "builds and saves a new object" do
+        @address.expects(:save).returns(true)
+        address = @association.create!({ :street => "Yet Another" })
+        address.should == @address
+      end
+    end
+
+    context "when validations fail" do
+
+      before do
+        @association = Mongoid::Associations::HasMany.new(
+          @document,
+          Mongoid::Associations::Options.new(:name => :addresses)
+        )
+        @address = mock(:parentize => true, :write_attributes => true, :errors => [ "test" ])
+        Address.expects(:instantiate).returns(@address)
+        @address.expects(:run_callbacks).with(:before_create)
+      end
+
+      it "builds and saves a new object" do
+        @address.expects(:save).returns(false)
+        lambda {
+          @association.create!({ :street => "Yet Another" })
+        }.should raise_error(Mongoid::Errors::Validations)
+      end
+    end
+  end
+
   describe "#concat" do
 
     before do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 2
-  - 11
-  version: 1.2.11
+  - 12
+  version: 1.2.12
 platform: ruby
 authors: 
 - Durran Jordan
@@ -224,6 +224,7 @@ files:
 - spec/integration/mongoid/named_scope_spec.rb
 - spec/models/address.rb
 - spec/models/animal.rb
+- spec/models/callbacks.rb
 - spec/models/comment.rb
 - spec/models/country_code.rb
 - spec/models/employer.rb
@@ -371,6 +372,7 @@ test_files:
 - spec/integration/mongoid/named_scope_spec.rb
 - spec/models/address.rb
 - spec/models/animal.rb
+- spec/models/callbacks.rb
 - spec/models/comment.rb
 - spec/models/country_code.rb
 - spec/models/employer.rb