mongoid 0.6.10 → 0.7.0

data/VERSION

@@ -1 +1 @@
-0.6.10
+0.7.0

data/lib/mongoid/associations/accessor.rb

@@ -21,7 +21,7 @@ module Mongoid #:nodoc:
         # object: The object that was passed in to the setter method.
         # options: optional options.
         def set(type, name, document, object, options ={})
-          type.update(object, document, name)
+          type.update(object, document, name, options)
         end
       end
     end

data/lib/mongoid/associations/belongs_to.rb

@@ -25,12 +25,13 @@ module Mongoid #:nodoc:
         # Perform an update of the relationship of the parent and child. This
         # is initialized by setting a parent object as the association on the
         # +Document+. Will properly set a has_one or a has_many.
-        def update(parent, child, name)
+        def update(parent, child, name, options = {})
           name = child.class.name.demodulize.downcase
           has_one = parent.associations[name]
           child.parentize(parent, name) if has_one
           child.parentize(parent, name.tableize) unless has_one
           child.notify
+          parent
         end
       end
     end

data/lib/mongoid/associations/has_many.rb

@@ -77,12 +77,13 @@ module Mongoid #:nodoc:
         # Perform an update of the relationship of the parent and child. This
         # is initialized by setting the has_many to the supplied +Enumerable+
         # and setting up the parentization.
-        def update(children, parent, name)
+        def update(children, parent, name, options = {})
           parent.attributes.delete(name)
           children.each do |child|
             child.parentize(parent, name)
             child.notify
           end
+          new(name, parent, options)
         end
       end
 

data/lib/mongoid/associations/has_one.rb

@@ -23,7 +23,7 @@ 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.
-        def update(child, parent, name)
+        def update(child, parent, name, options = {})
           child.parentize(parent, name)
           child.notify
           child

data/lib/mongoid/document.rb

@@ -201,12 +201,14 @@ module Mongoid #:nodoc:
       self.class.fields
     end
 
-    # Get the Mongo::ObjectID associated with this object.
+    # Get the id associated with this object.
     # This is in essence the primary key.
     def id
       @attributes[:_id]
     end
 
+    alias :_id :id
+
     # Instantiate a new Document, setting the Document's attributes if given.
     # If no attributes are provided, they will be initialized with an empty Hash.
     def initialize(attrs = {})

data/lib/mongoid/extensions/boolean/conversions.rb

@@ -3,7 +3,8 @@ module Mongoid #:nodoc:
     module Boolean #:nodoc:
       module Conversions #:nodoc:
         def set(value)
-          value.to_s == "true"
+          val = value.to_s
+          val == "true" || val == "1"
         end
         def get(value)
           value

data/mongoid.gemspec

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

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

@@ -56,7 +56,7 @@ describe Mongoid::Associations::Accessor do
     context "when type is has_many" do
 
       it "returns a HasMany" do
-        Mongoid::Associations::HasMany.expects(:update).with(@document, @object, :addresses)
+        Mongoid::Associations::HasMany.expects(:update).with(@document, @object, :addresses, {})
         Mongoid::Associations::Accessor.set(Mongoid::Associations::HasMany, :addresses, @document, @object)
       end
 
@@ -65,7 +65,7 @@ describe Mongoid::Associations::Accessor do
     context "when type is has_one" do
 
       it "returns a HasOne" do
-        Mongoid::Associations::HasOne.expects(:update).with(@document, @object, :name)
+        Mongoid::Associations::HasOne.expects(:update).with(@document, @object, :name, {})
         Mongoid::Associations::Accessor.set(Mongoid::Associations::HasOne, :name, @document, @object)
       end
 
@@ -74,7 +74,7 @@ describe Mongoid::Associations::Accessor do
     context "when type is belongs_to" do
 
       it "returns a BelongsTo" do
-        Mongoid::Associations::BelongsTo.expects(:update).with(@object, @document, :person)
+        Mongoid::Associations::BelongsTo.expects(:update).with(@object, @document, :person, {})
         Mongoid::Associations::Accessor.set(Mongoid::Associations::BelongsTo, :person, @document, @object)
       end
 

data/spec/unit/mongoid/attributes_spec.rb

@@ -33,16 +33,33 @@ describe Mongoid::Attributes do
 
     context "when associations provided in the attributes" do
 
-      before do
-        @name = Name.new(:first_name => "Testy")
-        @attributes = {
-          :name => @name
-        }
-        @person = Person.new(@attributes)
+      context "when association is a has_one" do
+
+        before do
+          @name = Name.new(:first_name => "Testy")
+          @attributes = {
+            :name => @name
+          }
+          @person = Person.new(@attributes)
+        end
+
+        it "sets the associations" do
+          @person.name.should == @name
+        end
+
       end
 
-      it "sets the associations" do
-        @person.name.should == @name
+      context "when association is a belongs_to" do
+
+        before do
+          @person = Person.new
+          @name = Name.new(:first_name => "Tyler", :person => @person)
+        end
+
+        it "sets the association" do
+          @name.person.should == @person
+        end
+
       end
 
     end

data/spec/unit/mongoid/document_spec.rb

@@ -315,6 +315,18 @@ describe Mongoid::Document do
 
   end
 
+  describe "#_id" do
+
+    before do
+      @person = Person.new
+    end
+
+    it "delegates to #id" do
+      @person._id.should == @person.id
+    end
+
+  end
+
   describe "#index" do
 
     context "when unique options are not provided" do

data/spec/unit/mongoid/extensions/boolean/conversions_spec.rb

@@ -20,6 +20,22 @@ describe Mongoid::Extensions::Boolean::Conversions do
 
     end
 
+    context "when 0" do
+
+      it "returns false" do
+        Boolean.set("0").should be_false
+      end
+
+    end
+
+    context "when 1" do
+
+      it "returns true" do
+        Boolean.set("1").should be_true
+      end
+
+    end
+
   end
 
   describe "#get" do

metadata

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