mongoid 0.10.1 → 0.10.2

data/VERSION

@@ -1 +1 @@
-0.10.1
+0.10.2

data/lib/mongoid.rb

@@ -33,6 +33,7 @@ require "time"
 require "validatable"
 require "active_support/callbacks"
 require "active_support/core_ext"
+require "active_support/inflector"
 require "active_support/time_with_zone"
 require "will_paginate/collection"
 require "mongo"

data/lib/mongoid/associations/belongs_to_related.rb

@@ -33,7 +33,7 @@ module Mongoid #:nodoc:
         # options: The association +Options+.
         def instantiate(document, options)
           foreign_key = document.send(options.foreign_key)
-          foreign_key.nil? ? nil : new(document, foreign_key, options)
+          foreign_key.blank? ? nil : new(document, foreign_key, options)
         end
 
         # Returns the macro used to create the association.
@@ -54,7 +54,8 @@ module Mongoid #:nodoc:
         #
         # <tt>BelongsToRelated.update(game, person, options)</tt>
         def update(related, parent, options)
-          parent.send("#{options.foreign_key}=", related.id); related
+          parent.send("#{options.foreign_key}=", related.id) if related
+          related
         end
       end
 

data/lib/mongoid/associations/has_many.rb

@@ -4,7 +4,7 @@ module Mongoid #:nodoc:
     class HasMany
       include Proxy
 
-      attr_accessor :association_name, :klass
+      attr_accessor :association_name, :klass, :options
 
       # Appends the object to the +Array+, setting its parent in
       # the process.
@@ -68,7 +68,7 @@ module Mongoid #:nodoc:
       # This then delegated all methods to the array class since this is
       # essentially a proxy to an array itself.
       def initialize(document, options)
-        @parent, @association_name, @klass = document, options.name, options.klass
+        @parent, @association_name, @klass, @options = document, options.name, options.klass, options
         attributes = document.attributes[@association_name]
         @documents = attributes ? attributes.collect do |attribute|
           child = @klass.instantiate(attribute)

data/lib/mongoid/associations/has_many_related.rb

@@ -21,7 +21,8 @@ module Mongoid #:nodoc:
       #
       # Returns the newly created object.
       def build(attributes = {})
-        object = @klass.instantiate(attributes.merge(@foreign_key => @parent.id))
+        name = @parent.class.to_s.underscore
+        object = @klass.instantiate(attributes.merge(name => @parent))
         @documents << object
         object
       end
@@ -42,6 +43,12 @@ module Mongoid #:nodoc:
         object.save
       end
 
+      # Finds a document in this association.
+      # If an id is passed, will return the document for that id.
+      def find(id)
+        @klass.find(id)
+      end
+
       # Initializing a related association only requires looking up the objects
       # by their ids.
       #

data/lib/mongoid/associations/has_one_related.rb

@@ -11,7 +11,8 @@ module Mongoid #:nodoc:
       # Returns the newly created object.
       def build(attributes = {})
         @document = @klass.instantiate(attributes)
-        @document.send("#{@foreign_key}=", @parent.id)
+        name = @parent.class.to_s.underscore
+        @document.send("#{name}=", @parent)
       end
 
       # Builds a new Document and sets it as the association, then saves the

data/lib/mongoid/attributes.rb

@@ -82,8 +82,8 @@ module Mongoid #:nodoc:
       #
       # This will also cause the observing +Document+ to notify it's parent if
       # there is any.
-      def write_attributes(attrs)
-        process(attrs)
+      def write_attributes(attrs = nil)
+        process(attrs || {})
         notify
       end
 

data/lib/mongoid/document.rb

@@ -66,7 +66,7 @@ module Mongoid #:nodoc:
       # Adds an index on the field specified. Options can be :unique => true or
       # :unique => false. It will default to the latter.
       def index(name, options = { :unique => false })
-        collection.create_index(name, options)
+        collection.create_index(name, options[:unique])
       end
 
       # Instantiate a new object, only when loaded from the database.

data/lib/mongoid/extensions/string/inflections.rb

@@ -4,6 +4,11 @@ module Mongoid #:nodoc:
     module String #:nodoc:
       module Inflections #:nodoc:
 
+        ActiveSupport::Inflector.inflections do |inflect|
+          inflect.singular("address", "address")
+          inflect.singular("addresses", "address")
+        end
+
         REVERSALS = {
           "asc" => "desc",
           "ascending" => "descending",

data/mongoid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoid}
-  s.version = "0.10.1"
+  s.version = "0.10.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Durran Jordan"]
-  s.date = %q{2009-12-24}
+  s.date = %q{2009-12-25}
   s.email = %q{durran@gmail.com}
   s.extra_rdoc_files = [
     "README.textile"

data/perf/benchmark.rb

@@ -7,7 +7,7 @@ class Person < Mongoid::Document
   include Mongoid::Versioning
   field :birth_date, :type => Date
   has_one :name
-  has_many :addresses
+  has_one :address
   has_many :phones
 end
 
@@ -26,7 +26,7 @@ class Address < Mongoid::Document
   field :state
   field :post_code
   field :type
-  belongs_to :person, :inverse_of => :addresses
+  belongs_to :person, :inverse_of => :address
 end
 
 class Phone < Mongoid::Document
@@ -58,7 +58,7 @@ puts "Starting benchmark..."
   )
   phone = Phone.new(:country_code => 1, :number => "415-555-1212", :type => "Mobile")
   person.name = name
-  person.addresses << address
+  person.address = address
   person.phones << phone
   person.save
 end

data/spec/integration/mongoid/associations_spec.rb

@@ -22,7 +22,11 @@ describe Mongoid::Associations do
       @from_db.game.should == @game
     end
 
-    it "sets the reverse association" do
+    it "sets the reverse association before save" do
+      @game.person.should == @person
+    end
+
+    it "sets the reverse association after save" do
       @from_db = Game.find(@game.id)
       @game.person.should == @person
     end
@@ -43,6 +47,19 @@ describe Mongoid::Associations do
       @from_db.posts.should == [@post]
     end
 
+    context "when building" do
+
+      before do
+        @person = Person.new(:title => "Mr")
+        @post = @person.posts.build(:title => "First")
+      end
+
+      it "sets the reverse association" do
+        @post.person.should == @person
+      end
+
+    end
+
   end
 
   context "nested embedded associations" do

data/spec/integration/mongoid/document_spec.rb

@@ -18,11 +18,13 @@ describe Mongoid::Document do
   describe "#count" do
 
     before do
-      Person.create(:title => "Sir")
+      5.times do |n|
+        Person.create(:title => "Sir")
+      end
     end
 
     it "returns the count" do
-      Person.count.should == 1
+      Person.count.should == 5
     end
 
   end

data/spec/spec_helper.rb

@@ -101,6 +101,7 @@ end
 class PetOwner < Mongoid::Document
   field :title
   has_one :pet
+  has_one :address
 end
 
 class Pet < Mongoid::Document

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

@@ -107,6 +107,14 @@ describe Mongoid::Associations::BelongsToRelated do
       Mongoid::Associations::BelongsToRelated.update(@related, @child, @options).should == @related
     end
 
+    context "when related is nil" do
+
+      it "returns nil" do
+        Mongoid::Associations::BelongsToRelated.update(nil, @child, @options).should be_nil
+      end
+
+    end
+
   end
 
 end

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

@@ -86,6 +86,11 @@ describe Mongoid::Associations::HasManyRelated do
       @association.build(:title => "Sassy").title.should == "Sassy"
     end
 
+    it "sets the parent object reference on the child" do
+      @association.build(:title => "Sassy")
+      @association.first.person.should == @parent
+    end
+
   end
 
   describe "#concat" do
@@ -162,6 +167,30 @@ describe Mongoid::Associations::HasManyRelated do
 
   end
 
+  describe "#find" do
+
+    before do
+      @parent = stub(:id => "5", :class => Person)
+      Post.expects(:all).returns([])
+      @association = Mongoid::Associations::HasManyRelated.new(@parent, options)
+    end
+
+    context "when finding by id" do
+
+      before do
+        @post = stub
+      end
+
+      it "returns the document in the array with that id" do
+        Post.expects(:find).with("5").returns(@post)
+        post = @association.find("5")
+        post.should == @post
+      end
+
+    end
+
+  end
+
   describe ".initialize" do
 
     context "when related id has been set" do

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

@@ -23,6 +23,11 @@ describe Mongoid::Associations::HasOneRelated do
       @association.person_id.should == @parent.id
     end
 
+    it "sets the parent object reference on the child" do
+      @association.build(:score => 100)
+      @association.person.should == @parent
+    end
+
   end
 
   describe "#create" do

data/spec/unit/mongoid/attributes_spec.rb

@@ -265,6 +265,11 @@ describe Mongoid::Attributes do
         @person.age.should == 50
       end
 
+      it "allows passing of nil" do
+        @person.write_attributes(nil)
+        @person.age.should == 100
+      end
+
     end
 
     context "on a parent document" do

data/spec/unit/mongoid/document_spec.rb

@@ -270,7 +270,7 @@ describe Mongoid::Document do
     context "when unique options are not provided" do
 
       it "delegates to collection with unique => false" do
-        @collection.expects(:create_index).with(:title, :unique => false)
+        @collection.expects(:create_index).with(:title, false)
         Person.index :title
       end
 
@@ -279,7 +279,7 @@ describe Mongoid::Document do
     context "when unique option is provided" do
 
       it "delegates to collection with unique option" do
-        @collection.expects(:create_index).with(:title, :unique => true)
+        @collection.expects(:create_index).with(:title, true)
         Person.index :title, :unique => true
       end
 

data/spec/unit/mongoid/extensions/string/inflections_spec.rb

@@ -10,6 +10,14 @@ describe Mongoid::Extensions::String::Inflections do
         "bat".singular?.should be_true
       end
 
+      context "when string is added to inflections" do
+
+        it "returns true" do
+          "address".singular?.should be_true
+        end
+
+      end
+
     end
 
     context "when plural" do
@@ -18,6 +26,14 @@ describe Mongoid::Extensions::String::Inflections do
         "bats".singular?.should be_false
       end
 
+      context "when string is added to inflections" do
+
+        it "returns false" do
+          "addresses".singular?.should be_false
+        end
+
+      end
+
     end
 
   end
@@ -30,6 +46,14 @@ describe Mongoid::Extensions::String::Inflections do
         "bat".plural?.should be_false
       end
 
+      context "when string is added to inflections" do
+
+        it "returns false" do
+          "address".plural?.should be_false
+        end
+
+      end
+
     end
 
     context "when plural" do
@@ -38,6 +62,14 @@ describe Mongoid::Extensions::String::Inflections do
         "bats".plural?.should be_true
       end
 
+      context "when string is added to inflections" do
+
+        it "returns true" do
+          "addresses".plural?.should be_true
+        end
+
+      end
+
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongoid
 version: !ruby/object:Gem::Version 
-  version: 0.10.1
+  version: 0.10.2
 platform: ruby
 authors: 
 - Durran Jordan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-24 00:00:00 -05:00
+date: 2009-12-25 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency