mongoid 0.11.3 → 0.11.4

data/HISTORY

@@ -1,3 +1,11 @@
+=== 0.11.4
+- Fixed issue with dynamic fields: checking whether
+  the document responded to the attribute's method
+  should have checked the setter and not the getter
+
+- Fixed has_one associations not being able to be
+  set to nil.
+
 === 0.11.3
 - Fixed issue with Document#save! not calling before
   and after create callbacks if document is new

data/VERSION

@@ -1 +1 @@
-0.11.3
+0.11.4

data/lib/mongoid/associations/has_one.rb

@@ -36,13 +36,14 @@ module Mongoid #:nodoc:
         unless attributes.nil?
           klass = attributes[:_type] ? attributes[:_type].constantize : nil
           @document = attributes.assimilate(@parent, @options, klass)
+        else
+          @document = nil
         end
       end
 
       # Delegate all missing methods over to the +Document+.
       def method_missing(name, *args, &block)
-        @document = {}.assimilate(@parent, @options) if @document.nil?
-        @document.send(name, *args, &block)
+        @document.send(name, *args, &block) unless @document.nil?
       end
 
       # Used for setting the association via a nested attributes setter on the
@@ -51,6 +52,16 @@ module Mongoid #:nodoc:
         build(attributes)
       end
 
+      # This should delegate to the document.
+      def nil?
+        @document.nil?
+      end
+
+      # This will get deprecated
+      def to_a
+        [@document]
+      end
+
       # Need to override here for when the underlying document is nil.
       def valid?
         @document ? @document.valid? : false
@@ -87,7 +98,11 @@ module Mongoid #:nodoc:
         #
         # <tt>HasOne.update({:first_name => "Hank"}, person, options)</tt>
         def update(child, parent, options)
-          child.assimilate(parent, options)
+          if child.nil?
+            return parent.attributes[options.name] = nil
+          else
+            return child.assimilate(parent, options)
+          end
         end
       end
 

data/lib/mongoid/attributes.rb

@@ -14,7 +14,7 @@ module Mongoid #:nodoc:
       # put into the document's attributes.
       def process(attrs = {})
         attrs.each_pair do |key, value|
-          unless respond_to?(key)
+          unless respond_to?("#{key}=")
             self.class.field key, :type => value.class if Mongoid.allow_dynamic_fields
           end
           send("#{key}=", value) unless value.blank?

data/mongoid.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoid}
-  s.version = "0.11.3"
+  s.version = "0.11.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Durran Jordan"]

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

@@ -210,23 +210,45 @@ describe Mongoid::Associations::HasOne do
 
   describe ".update" do
 
-    before do
-      @name = Name.new(:first_name => "Donald")
-      @person = Person.new(:title => "Sir")
-      Mongoid::Associations::HasOne.update(
-        @name,
-        @person,
-        Mongoid::Associations::Options.new(:name => :name)
-      )
-    end
+    context "when setting to a non-nil value" do
+
+      before do
+        @name = Name.new(:first_name => "Donald")
+        @person = Person.new(:title => "Sir")
+        Mongoid::Associations::HasOne.update(
+          @name,
+          @person,
+          Mongoid::Associations::Options.new(:name => :name)
+        )
+      end
+
+      it "parentizes the child document" do
+        @name._parent.should == @person
+      end
+
+      it "sets the attributes of the child on the parent" do
+        @person.attributes[:name].should ==
+          { "_id" => "donald", "first_name" => "Donald", "_type" => "Name" }
+      end
 
-    it "parentizes the child document" do
-      @name._parent.should == @person
     end
 
-    it "sets the attributes of the child on the parent" do
-      @person.attributes[:name].should ==
-        { "_id" => "donald", "first_name" => "Donald", "_type" => "Name" }
+    context "when setting the object to nil" do
+
+      before do
+        @name = Name.new(:first_name => "Donald")
+        @person = Person.new(:title => "Sir")
+        Mongoid::Associations::HasOne.update(
+          nil,
+          @person,
+          Mongoid::Associations::Options.new(:name => :name)
+        )
+      end
+
+      it "clears out the association" do
+        @person.name.should be_nil
+      end
+
     end
 
   end

data/spec/unit/mongoid/attributes_spec.rb

@@ -96,7 +96,8 @@ describe Mongoid::Attributes do
       before do
         @attributes = {
           :nofieldstring => "Testing",
-          :nofieldint => 5
+          :nofieldint => 5,
+          :employer => Employer.new
         }
       end
 
@@ -127,6 +128,15 @@ describe Mongoid::Attributes do
 
         end
 
+        context "when a method has been defined for the attribute" do
+
+          it "does not create the field" do
+            @person.fields.keys.should_not include("employer")
+            @person.fields.keys.should_not include("employer=")
+          end
+
+        end
+
       end
 
       context "when not allowing dynamic fields" do

data/spec/unit/mongoid/document_spec.rb

@@ -954,11 +954,11 @@ describe Mongoid::Document do
 
           context "when the associated is nil" do
 
-            it "returns false" do
+            it "returns true" do
               Person.class_eval do
                 validates_associated :name
               end
-              @person.valid?.should be_false
+              @person.valid?.should be_true
             end
 
           end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongoid
 version: !ruby/object:Gem::Version 
-  version: 0.11.3
+  version: 0.11.4
 platform: ruby
 authors: 
 - Durran Jordan