mongoid 0.8.6 → 0.8.7

data/README.textile

@@ -47,13 +47,14 @@ Example of a simple domain model:
     field :city
     field :state
     field :post_code
-    belongs_to :person
+    belongs_to :person, :inverse_of => :addresses
   end
 
   class Name < Mongoid::Document
     include Mongoid::Timestamps
     field :first_name
     field :last_name
+    belongs_to :person, :inverse_of => :name
   end
 </pre>
 
@@ -110,7 +111,7 @@ Old School:
 New School:
 
 <pre>
-  Person.select(:first_name, :last_name).where(:title => "Sir").skip(10).limit(10).execute
+  Person.select(:first_name, :last_name).where(:title => "Sir").skip(10).limit(10).paginate
   Person.select(:title).aggregate
   Criteria.translate(:conditions => { :title => "Sir" }).execute
 </pre>

data/VERSION

@@ -1 +1 @@
-0.8.6
+0.8.7

data/lib/mongoid.rb

@@ -72,6 +72,9 @@ module Mongoid
     end
   end
 
+  # Raised when invalid options are passed into an association.
+  class InvalidOptionsError < RuntimeError; end
+
   # Connect to the database name supplied. This should be run
   # for initial setup, potentially in a rails initializer.
   def self.connect_to(name)

data/lib/mongoid/associations.rb

@@ -39,9 +39,12 @@ module Mongoid # :nodoc:
       #   end
       #
       #   class Address < Mongoid::Document
-      #     belongs_to :person
+      #     belongs_to :person, :inverse_of => :addresses
       #   end
       def belongs_to(name, options = {})
+        unless options.has_key?(:inverse_of)
+          raise InvalidOptionsError.new("Options for belongs_to association must include :inverse_of")
+        end
         @embedded = true
         add_association(Associations::BelongsTo, Associations::Options.new(options.merge(:name => name)))
       end
@@ -61,7 +64,7 @@ module Mongoid # :nodoc:
       #   end
       #
       #   class Address < Mongoid::Document
-      #     belongs_to :person
+      #     belongs_to :person, :inverse_of => :addresses
       #   end
       def has_many(name, options = {})
         add_association(Associations::HasMany, Associations::Options.new(options.merge(:name => name)))

data/lib/mongoid/associations/belongs_to.rb

@@ -26,13 +26,7 @@ module Mongoid #:nodoc:
         # 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, options)
-          name = child.class.name.demodulize.downcase
-          has_one = parent.associations[name]
-          if has_one
-            child.parentize(parent, name)
-          else
-            child.parentize(parent, name.tableize)
-          end
+          child.parentize(parent, options.inverse_of)
           child.notify
           parent
         end

data/lib/mongoid/associations/options.rb

@@ -13,6 +13,11 @@ module Mongoid #:nodoc:
         @attributes[:name]
       end
 
+      # Returns the name of the inverse_of association
+      def inverse_of
+        @attributes[:inverse_of]
+      end
+
       # Return a +Class+ for the options. If a class_name was provided, then the
       # constantized class_name will be returned. If not, a constant based on the
       # association name will be returned.

data/mongoid.gemspec

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

data/spec/spec_helper.rb

@@ -53,20 +53,20 @@ end
 class CountryCode < Mongoid::Document
   field :code, :type => Integer
   key :code
-  belongs_to :phone_number
+  belongs_to :phone_number, :inverse_of => :country_codes
 end
 
 class Phone < Mongoid::Document
   field :number
   key :number
-  belongs_to :person
+  belongs_to :person, :inverse_of => :phone_numbers
   has_one :country_code
 end
 
 class Animal < Mongoid::Document
   field :name
   key :name
-  belongs_to :person
+  belongs_to :person, :inverse_of => :pet
 end
 
 class PetOwner < Mongoid::Document
@@ -78,12 +78,12 @@ class Pet < Mongoid::Document
   field :name
   field :weight, :type => Float, :default => 0.0
   has_many :vet_visits
-  belongs_to :pet_owner
+  belongs_to :pet_owner, :inverse_of => :pet
 end
 
 class VetVisit < Mongoid::Document
   field :date, :type => Date
-  belongs_to :pet
+  belongs_to :pet, :inverse_of => :vet_visits
 end
 
 class Address < Mongoid::Document
@@ -92,14 +92,14 @@ class Address < Mongoid::Document
   field :state
   field :post_code
   key :street
-  belongs_to :addressable
+  belongs_to :addressable, :inverse_of => :addresses
 end
 
 class Name < Mongoid::Document
   field :first_name
   field :last_name
   key :first_name, :last_name
-  belongs_to :person
+  belongs_to :person, :inverse_of => :name
 end
 
 class Comment < Mongoid::Document

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

@@ -57,7 +57,7 @@ describe Mongoid::Associations::BelongsTo do
       before do
         @name = Name.new(:first_name => "Test", :last_name => "User")
         @person = Person.new(:title => "Mrs")
-        @options = Mongoid::Associations::Options.new(:name => :person)
+        @options = Mongoid::Associations::Options.new(:name => :person, :inverse_of => :name)
         Mongoid::Associations::BelongsTo.update(@person, @name, @options)
       end
 
@@ -74,7 +74,8 @@ describe Mongoid::Associations::BelongsTo do
       before do
         @address = Address.new(:street => "Broadway")
         @person = Person.new(:title => "Mrs")
-        Mongoid::Associations::BelongsTo.update(@person, @address, :person)
+        @options = Mongoid::Associations::Options.new(:name => :person, :inverse_of => :addresses)
+        Mongoid::Associations::BelongsTo.update(@person, @address, @options)
       end
 
       it "updates the parent document" do

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

@@ -15,6 +15,19 @@ describe Mongoid::Associations::Options do
 
   end
 
+  describe "#inverse_of" do
+
+    before do
+      @attributes = { :inverse_of => :addresses }
+      @options = Mongoid::Associations::Options.new(@attributes)
+    end
+
+    it "returns the inverse_of value" do
+      @options.inverse_of.should == :addresses
+    end
+
+  end
+
   describe "#klass" do
 
     context "when class_name provided" do

metadata

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