mongoid 0.5.4 → 0.5.5

data/README.textile

@@ -56,7 +56,7 @@ Example of a simple domain model:
   end
 </pre>
 
-Mongoid suuports all the basic ActiveRecord creation and persistence methods.
+Mongoid supports all the basic ActiveRecord creation and persistence methods.
 
 Creation:
 

data/VERSION

@@ -1 +1 @@
-0.5.4
+0.5.5

data/lib/mongoid/associations.rb

@@ -47,8 +47,8 @@ module Mongoid # :nodoc:
     #   class Address < Mongoid::Document
     #     belongs_to :person
     #   end
-    def has_many(association_name)
-      add_association(:has_many, association_name.to_s.classify, association_name)
+    def has_many(association_name, options = {})
+      add_association(:has_many, association_name.to_s.classify, association_name, options)
     end
 
     # Adds the association from a parent document to its child. The name
@@ -68,16 +68,16 @@ module Mongoid # :nodoc:
     #   class Address < Mongoid::Document
     #     belongs_to :person
     #   end
-    def has_one(association_name)
-      add_association(:has_one, association_name.to_s.titleize, association_name)
+    def has_one(association_name, options = {})
+      add_association(:has_one, association_name.to_s.titleize, association_name, options)
     end
 
     private
     # Adds the association to the associations hash with the type as the key,
     # then adds the accessors for the association.
-    def add_association(type, class_name, name)
+    def add_association(type, class_name, name, options = {})
       define_method(name) do
-        Associations::Factory.create(type, name, self)
+        Associations::Factory.create(type, name, self, options)
       end
       define_method("#{name}=") do |object|
         object.parentize(self, name)

data/lib/mongoid/associations/belongs_to_association.rb

@@ -21,6 +21,10 @@ module Mongoid #:nodoc:
         @document
       end
 
+      # Delegate equality to the parent document.
+      def ==(other)
+        @document == other
+      end
     end
   end
 end

data/lib/mongoid/associations/factory.rb

@@ -7,11 +7,11 @@ module Mongoid #:nodoc:
       # association.
       #
       # If the type is invalid a InvalidAssociationError will be thrown.
-      def self.create(association_type, association_name, document)
+      def self.create(association_type, association_name, document, options = {})
         case association_type
           when :belongs_to then BelongsToAssociation.new(document)
-          when :has_many then HasManyAssociation.new(association_name, document)
-          when :has_one then HasOneAssociation.new(association_name, document)
+          when :has_many then HasManyAssociation.new(association_name, document, options)
+          when :has_one then HasOneAssociation.new(association_name, document, options)
           else raise InvalidAssociationError
         end
       end

data/lib/mongoid/associations/has_many_association.rb

@@ -51,10 +51,11 @@ module Mongoid #:nodoc:
       #
       # This then delegated all methods to the array class since this is
       # essentially a proxy to an array itself.
-      def initialize(association_name, document)
+      def initialize(name, document, options = {})
         @parent = document
-        @association_name = association_name
-        @klass = @association_name.to_s.classify.constantize
+        @association_name = name
+        class_name = options[:class_name]
+        @klass = class_name ? class_name.constantize : @association_name.to_s.classify.constantize
         attributes = document.attributes[@association_name]
         @documents = attributes ? attributes.collect do |attribute|
           child = @klass.new(attribute)

data/lib/mongoid/associations/has_one_association.rb

@@ -11,14 +11,19 @@ module Mongoid #:nodoc:
       #
       # All method calls on this object will then be delegated
       # to the internal document itself.
-      def initialize(association_name, document)
-        klass = association_name.to_s.titleize.constantize
-        attributes = document.attributes[association_name]
+      def initialize(name, document, options = {})
+        class_name = options[:class_name]
+        klass = class_name ? class_name.constantize : name.to_s.titleize.constantize
+        attributes = document.attributes[name]
         @document = klass.new(attributes)
         @document.parent = document
         decorate!
       end
 
+      # Equality delegates to the document.
+      def ==(other)
+        @document == other
+      end
     end
   end
 end

data/mongoid.gemspec

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

data/spec/spec_helper.rb

@@ -21,7 +21,9 @@ class Person < Mongoid::Document
   field :terms, :type => Boolean
   field :age, :type => Integer
   has_many :addresses
+  has_many :phone_numbers, :class_name => "Phone"
   has_one :name
+  has_one :pet, :class_name => "Animal"
 end
 
 class Address < Mongoid::Document
@@ -33,6 +35,25 @@ class Address < Mongoid::Document
   belongs_to :person
 end
 
+class Phone < Mongoid::Document
+  field :number
+  key :number
+  belongs_to :person
+  has_one :country_code
+end
+
+class CountryCode < Mongoid::Document
+  field :code, :type => Integer
+  key :code
+  belongs_to :phone_number
+end
+
+class Animal < Mongoid::Document
+  field :name
+  key :name
+  belongs_to :person
+end
+
 class Name < Mongoid::Document
   field :first_name
   field :last_name

data/spec/unit/mongoid/associations_spec.rb

@@ -49,6 +49,13 @@ describe Mongoid::Associations do
       address.should respond_to(:person=)
     end
 
+    it "allows the parent to be any type of class" do
+      phone_number = Phone.new(:number => "415-555-1212")
+      code = CountryCode.new(:code => 1)
+      phone_number.country_code = code
+      code.phone_number.should == phone_number
+    end
+
   end
 
   describe "#has_many" do
@@ -86,6 +93,21 @@ describe Mongoid::Associations do
 
     end
 
+    context "when a class_name is supplied" do
+
+      before do
+        @attributes = { :title => "Sir",
+          :phone_numbers => [ { :number => "404-555-1212" } ]
+        }
+        @person = Person.new(@attributes)
+      end
+
+      it "sets the association name" do
+        @person.phone_numbers.first.should == Phone.new(:number => "404-555-1212")
+      end
+
+    end
+
   end
 
   describe "#has_one" do
@@ -121,6 +143,21 @@ describe Mongoid::Associations do
 
     end
 
+    context "when a class_name is supplied" do
+
+      before do
+        @attributes = { :title => "Sir",
+          :pet => { :name => "Fido" }
+        }
+        @person = Person.new(@attributes)
+      end
+
+      it "sets the association name" do
+        @person.pet.should == Animal.new(:name => "Fido")
+      end
+
+    end
+
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongoid
 version: !ruby/object:Gem::Version 
-  version: 0.5.4
+  version: 0.5.5
 platform: ruby
 authors: 
 - Durran Jordan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-28 00:00:00 -04:00
+date: 2009-10-30 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency