mongoid 0.7.9 → 0.7.10

data/VERSION

@@ -1 +1 @@
-0.7.9
+0.7.10

data/lib/mongoid.rb

@@ -21,7 +21,8 @@
 require "rubygems"
 
 gem "activesupport", "2.3.4"
-gem "mongo", "0.16"
+gem "mongo", "0.17"
+gem "mongo_ext", "0.17"
 gem "durran-validatable", "1.8.2"
 gem "will_paginate", "2.3.11"
 
@@ -40,6 +41,7 @@ require "mongoid/commands"
 require "mongoid/criteria"
 require "mongoid/extensions"
 require "mongoid/field"
+require "mongoid/options"
 require "mongoid/timestamps"
 require "mongoid/versioning"
 require "mongoid/document"

data/lib/mongoid/associations.rb

@@ -30,7 +30,7 @@ module Mongoid # :nodoc:
       #
       # Options:
       #
-      # association_name: A +Symbol+ that matches the name of the parent class.
+      # name: A +Symbol+ that matches the name of the parent class.
       #
       # Example:
       #
@@ -41,9 +41,9 @@ module Mongoid # :nodoc:
       #   class Address < Mongoid::Document
       #     belongs_to :person
       #   end
-      def belongs_to(association_name, options = {})
+      def belongs_to(name, options = {})
         @embedded = true
-        add_association(Associations::BelongsTo, association_name, options)
+        add_association(Associations::BelongsTo, Options.new(options.merge(:association_name => name)))
       end
 
       # Adds the association from a parent document to its children. The name
@@ -52,7 +52,7 @@ module Mongoid # :nodoc:
       #
       # Options:
       #
-      # association_name: A +Symbol+ that is the plural child class name.
+      # name: A +Symbol+ that is the plural child class name.
       #
       # Example:
       #
@@ -63,8 +63,8 @@ module Mongoid # :nodoc:
       #   class Address < Mongoid::Document
       #     belongs_to :person
       #   end
-      def has_many(association_name, options = {})
-        add_association(Associations::HasMany, association_name, options)
+      def has_many(name, options = {})
+        add_association(Associations::HasMany, Options.new(options.merge(:association_name => name)))
       end
 
       # Adds the association from a parent document to its child. The name
@@ -73,7 +73,7 @@ module Mongoid # :nodoc:
       #
       # Options:
       #
-      # association_name: A +Symbol+ that is the plural child class name.
+      # name: A +Symbol+ that is the plural child class name.
       #
       # Example:
       #
@@ -84,22 +84,23 @@ module Mongoid # :nodoc:
       #   class Address < Mongoid::Document
       #     belongs_to :person
       #   end
-      def has_one(association_name, options = {})
-        add_association(Associations::HasOne, association_name, options)
+      def has_one(name, options = {})
+        add_association(Associations::HasOne, Options.new(options.merge(:association_name => name)))
       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, name, options = {})
-        associations[name] = type
+      def add_association(type, options)
+        associations[options.association_name] = type
+        name = options.association_name
         define_method(name) do
           return instance_variable_get("@#{name}") if instance_variable_defined?("@#{name}")
-          proxy = Associations::Accessor.get(type, name, self, options)
+          proxy = Associations::Accessor.get(type, self, options)
           instance_variable_set("@#{name}", proxy)
         end
         define_method("#{name}=") do |object|
-          proxy = Associations::Accessor.set(type, name, self, object, options)
+          proxy = Associations::Accessor.set(type, self, object, options)
           instance_variable_set("@#{name}", proxy)
         end
       end

data/lib/mongoid/associations/accessor.rb

@@ -5,8 +5,8 @@ module Mongoid #:nodoc:
         # Gets an association, based on the type provided and
         # passes the name and document into the newly instantiated
         # association.
-        def get(type, name, document, options = {})
-          document ? type.new(name, document, options) : nil
+        def get(type, document, options)
+          document ? type.new(document, options) : nil
         end
 
         # Set an object association. This is used to set the parent reference
@@ -20,8 +20,8 @@ module Mongoid #:nodoc:
         # document: The base document to handle the access for.
         # 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, options)
+        def set(type, document, object, options)
+          type.update(object, document, options)
         end
       end
     end

data/lib/mongoid/associations/belongs_to.rb

@@ -9,7 +9,7 @@ module Mongoid #:nodoc:
       #
       # All method calls on this object will then be delegated
       # to the internal document itself.
-      def initialize(name, document, options = {})
+      def initialize(document, options)
         @document = document.parent
         decorate!
       end
@@ -25,7 +25,7 @@ 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, options = {})
+        def update(parent, child, options)
           name = child.class.name.demodulize.downcase
           has_one = parent.associations[name]
           if has_one

data/lib/mongoid/associations/has_many.rb

@@ -59,11 +59,10 @@ module Mongoid #:nodoc:
       #
       # This then delegated all methods to the array class since this is
       # essentially a proxy to an array itself.
-      def initialize(name, document, options = {})
+      def initialize(document, options)
         @parent = document
-        @association_name = name
-        class_name = options[:class_name]
-        @klass = class_name ? class_name.constantize : @association_name.to_s.classify.constantize
+        @association_name = options.association_name
+        @klass = options.klass
         attributes = document.attributes[@association_name]
         @documents = attributes ? attributes.collect do |attribute|
           child = @klass.instantiate(attribute)
@@ -77,18 +76,17 @@ 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, options = {})
-          parent.attributes.delete(name)
-          class_name = options[:class_name]
-          klass = class_name ? class_name.constantize : name.to_s.classify.constantize
+        def update(children, parent, options)
+          parent.attributes.delete(options.association_name)
+          klass = options.klass
           children.each do |child|
             unless child.respond_to?(:parentize)
               child = klass.new(child)
             end
-            child.parentize(parent, name)
+            child.parentize(parent, options.association_name)
             child.notify
           end
-          new(name, parent, options)
+          new(parent, options)
         end
       end
 

data/lib/mongoid/associations/has_one.rb

@@ -13,25 +13,23 @@ module Mongoid #:nodoc:
       #
       # All method calls on this object will then be delegated
       # to the internal document itself.
-      def initialize(name, document, options = {})
-        class_name = options[:class_name]
-        @klass = class_name ? class_name.constantize : name.to_s.camelize.constantize
-        attributes = document.attributes[name]
+      def initialize(document, options)
+        @klass = options.klass
+        attributes = document.attributes[options.association_name]
         @document = klass.instantiate(attributes || {})
-        @document.parentize(document, name)
+        @document.parentize(document, options.association_name)
         decorate!
       end
 
       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, options = {})
+        def update(child, parent, options)
           unless child.respond_to?(:parentize)
-            class_name = options[:class_name]
-            klass = class_name ? class_name.constantize : name.to_s.camelize.constantize
+            klass = options.klass
             child = klass.new(child)
           end
-          child.parentize(parent, name)
+          child.parentize(parent, options.association_name)
           child.notify
           child
         end

data/lib/mongoid/options.rb

@@ -0,0 +1,30 @@
+module Mongoid #:nodoc:
+  class Options #:nodoc:
+
+    # Create the new +Options+ object, which provides convenience methods for
+    # accessing values out of an options +Hash+.
+    def initialize(attributes = {})
+      @attributes = attributes
+    end
+
+    # Returns the association name of the options.
+    def association_name
+      @attributes[:association_name]
+    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.
+    def klass
+      class_name = @attributes[:class_name]
+      association_name = @attributes[:association_name]
+      class_name ? class_name.constantize : association_name.to_s.classify.constantize
+    end
+
+    # Returns whether or not this association is polymorphic.
+    def polymorphic
+      @attributes[:polymorphic] == true
+    end
+
+  end
+end

data/mongoid.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoid}
-  s.version = "0.7.9"
+  s.version = "0.7.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Durran Jordan"]
@@ -55,6 +55,7 @@ Gem::Specification.new do |s|
      "lib/mongoid/extensions/symbol/inflections.rb",
      "lib/mongoid/extensions/time/conversions.rb",
      "lib/mongoid/field.rb",
+     "lib/mongoid/options.rb",
      "lib/mongoid/timestamps.rb",
      "lib/mongoid/versioning.rb",
      "mongoid.gemspec",
@@ -93,6 +94,7 @@ Gem::Specification.new do |s|
      "spec/unit/mongoid/extensions/symbol/inflections_spec.rb",
      "spec/unit/mongoid/extensions/time/conversions_spec.rb",
      "spec/unit/mongoid/field_spec.rb",
+     "spec/unit/mongoid/options_spec.rb",
      "spec/unit/mongoid/timestamps_spec.rb",
      "spec/unit/mongoid/versioning_spec.rb"
   ]
@@ -135,6 +137,7 @@ Gem::Specification.new do |s|
      "spec/unit/mongoid/extensions/symbol/inflections_spec.rb",
      "spec/unit/mongoid/extensions/time/conversions_spec.rb",
      "spec/unit/mongoid/field_spec.rb",
+     "spec/unit/mongoid/options_spec.rb",
      "spec/unit/mongoid/timestamps_spec.rb",
      "spec/unit/mongoid/versioning_spec.rb"
   ]

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

@@ -12,7 +12,8 @@ describe Mongoid::Associations::Accessor do
     context "when type is has_many" do
 
       it "returns a HasMany" do
-        association = Mongoid::Associations::Accessor.get(Mongoid::Associations::HasMany, :addresses, @document)
+        @options = Mongoid::Options.new(:association_name => :addresses)
+        association = Mongoid::Associations::Accessor.get(Mongoid::Associations::HasMany, @document, @options)
         association.should be_a_kind_of(Mongoid::Associations::HasMany)
       end
 
@@ -23,7 +24,8 @@ describe Mongoid::Associations::Accessor do
       context "when document is not nil" do
 
         it "returns a HasOne" do
-          association = Mongoid::Associations::Accessor.get(Mongoid::Associations::HasOne, :name, @document)
+          @options = Mongoid::Options.new(:association_name => :name)
+          association = Mongoid::Associations::Accessor.get(Mongoid::Associations::HasOne, @document, @options)
           association.should be_a_kind_of(Name)
         end
 
@@ -32,7 +34,8 @@ describe Mongoid::Associations::Accessor do
       context "when document is nil" do
 
         it "returns nil" do
-          association = Mongoid::Associations::Accessor.get(Mongoid::Associations::HasOne, :name, nil)
+          @options = Mongoid::Options.new(:association_name => :name)
+          association = Mongoid::Associations::Accessor.get(Mongoid::Associations::HasOne, nil, @options)
           association.should be_nil
         end
 
@@ -43,7 +46,8 @@ describe Mongoid::Associations::Accessor do
     context "when type is belongs_to" do
 
       it "returns a BelongsTo" do
-        association = Mongoid::Associations::Accessor.get(Mongoid::Associations::BelongsTo, :person, stub(:parent => @document))
+        @options = Mongoid::Options.new(:association_name => :person)
+        association = Mongoid::Associations::Accessor.get(Mongoid::Associations::BelongsTo, stub(:parent => @document), @options)
         association.should be_a_kind_of(Person)
       end
 
@@ -56,8 +60,9 @@ 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::Accessor.set(Mongoid::Associations::HasMany, :addresses, @document, @object)
+        @options = Mongoid::Options.new(:association_name => :addresses)
+        Mongoid::Associations::HasMany.expects(:update).with(@document, @object, @options)
+        Mongoid::Associations::Accessor.set(Mongoid::Associations::HasMany, @document, @object, @options)
       end
 
     end
@@ -65,8 +70,9 @@ 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::Accessor.set(Mongoid::Associations::HasOne, :name, @document, @object)
+        @options = Mongoid::Options.new(:association_name => :name)
+        Mongoid::Associations::HasOne.expects(:update).with(@document, @object, @options)
+        Mongoid::Associations::Accessor.set(Mongoid::Associations::HasOne, @document, @object, @options)
       end
 
     end
@@ -74,8 +80,9 @@ 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::Accessor.set(Mongoid::Associations::BelongsTo, :person, @document, @object)
+        @options = Mongoid::Options.new(:association_name => :person)
+        Mongoid::Associations::BelongsTo.expects(:update).with(@object, @document, @options)
+        Mongoid::Associations::Accessor.set(Mongoid::Associations::BelongsTo, @document, @object, @options)
       end
 
     end

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

@@ -7,7 +7,8 @@ describe Mongoid::Associations::BelongsTo do
     before do
       @parent = Name.new(:first_name => "Drexel")
       @document = stub(:parent => @parent)
-      @association = Mongoid::Associations::BelongsTo.new(:person, @document)
+      @options = Mongoid::Options.new(:association_name => :person)
+      @association = Mongoid::Associations::BelongsTo.new(@document, @options)
     end
 
     context "when finding by id" do
@@ -26,7 +27,8 @@ describe Mongoid::Associations::BelongsTo do
     before do
       @parent = Name.new(:first_name => "Drexel")
       @document = stub(:parent => @parent)
-      @association = Mongoid::Associations::BelongsTo.new(:person, @document)
+      @options = Mongoid::Options.new(:association_name => :person)
+      @association = Mongoid::Associations::BelongsTo.new(@document, @options)
     end
 
     context "when getting values" do
@@ -55,7 +57,8 @@ describe Mongoid::Associations::BelongsTo do
       before do
         @name = Name.new(:first_name => "Test", :last_name => "User")
         @person = Person.new(:title => "Mrs")
-        Mongoid::Associations::BelongsTo.update(@person, @name, :person)
+        @options = Mongoid::Options.new(:association_name => :person)
+        Mongoid::Associations::BelongsTo.update(@person, @name, @options)
       end
 
       it "updates the parent document" do

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

@@ -14,7 +14,7 @@ describe Mongoid::Associations::HasMany do
     before do
       @address = Address.new(:street => "Madison Ave")
       @person = Person.new(:title => "Sir")
-      Mongoid::Associations::HasMany.update([@address], @person, :addresses)
+      Mongoid::Associations::HasMany.update([@address], @person, Mongoid::Options.new(:association_name => :addresses))
     end
 
     it "parentizes the child document" do
@@ -31,7 +31,7 @@ describe Mongoid::Associations::HasMany do
   describe "#[]" do
 
     before do
-      @association = Mongoid::Associations::HasMany.new(:addresses, @document)
+      @association = Mongoid::Associations::HasMany.new(@document, Mongoid::Options.new(:association_name => :addresses))
     end
 
     context "when the index is present in the association" do
@@ -56,7 +56,7 @@ describe Mongoid::Associations::HasMany do
   describe "#<<" do
 
     before do
-      @association = Mongoid::Associations::HasMany.new(:addresses, @document)
+      @association = Mongoid::Associations::HasMany.new(@document, Mongoid::Options.new(:association_name => :addresses))
       @address = Address.new
     end
 
@@ -77,7 +77,7 @@ describe Mongoid::Associations::HasMany do
   describe "#concat" do
 
     before do
-      @association = Mongoid::Associations::HasMany.new(:addresses, @document)
+      @association = Mongoid::Associations::HasMany.new(@document, Mongoid::Options.new(:association_name => :addresses))
       @address = Address.new
     end
 
@@ -92,7 +92,7 @@ describe Mongoid::Associations::HasMany do
   describe "#push" do
 
     before do
-      @association = Mongoid::Associations::HasMany.new(:addresses, @document)
+      @association = Mongoid::Associations::HasMany.new(@document, Mongoid::Options.new(:association_name => :addresses))
       @address = Address.new
     end
 
@@ -107,7 +107,7 @@ describe Mongoid::Associations::HasMany do
   describe "#build" do
 
     before do
-      @association = Mongoid::Associations::HasMany.new(:addresses, @document)
+      @association = Mongoid::Associations::HasMany.new(@document, Mongoid::Options.new(:association_name => :addresses))
     end
 
     it "adds a new document to the array with the suppied parameters" do
@@ -128,7 +128,7 @@ describe Mongoid::Associations::HasMany do
   describe "#find" do
 
     before do
-      @association = Mongoid::Associations::HasMany.new(:addresses, @document)
+      @association = Mongoid::Associations::HasMany.new(@document, Mongoid::Options.new(:association_name => :addresses))
     end
 
     context "when finding all" do
@@ -155,7 +155,7 @@ describe Mongoid::Associations::HasMany do
     context "when there are elements in the array" do
 
       before do
-        @association = Mongoid::Associations::HasMany.new(:addresses, @document)
+        @association = Mongoid::Associations::HasMany.new(@document, Mongoid::Options.new(:association_name => :addresses))
       end
 
       it "returns the first element" do
@@ -168,7 +168,7 @@ describe Mongoid::Associations::HasMany do
     context "when the array is empty" do
 
       before do
-        @association = Mongoid::Associations::HasMany.new(:addresses, Person.new)
+        @association = Mongoid::Associations::HasMany.new(Person.new, Mongoid::Options.new(:association_name => :addresses))
       end
 
       it "returns nil" do
@@ -184,7 +184,7 @@ describe Mongoid::Associations::HasMany do
     context "#length" do
 
       it "returns the length of the delegated array" do
-        @association = Mongoid::Associations::HasMany.new(:addresses, @document)
+        @association = Mongoid::Associations::HasMany.new(@document, Mongoid::Options.new(:association_name => :addresses))
         @association.length.should == 2
       end
 
@@ -195,7 +195,7 @@ describe Mongoid::Associations::HasMany do
   describe "#push" do
 
     before do
-      @association = Mongoid::Associations::HasMany.new(:addresses, @document)
+      @association = Mongoid::Associations::HasMany.new(@document, Mongoid::Options.new(:association_name => :addresses))
     end
 
     it "appends the document to the end of the array" do

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

@@ -12,7 +12,7 @@ describe Mongoid::Associations::HasOne do
     before do
       @name = Name.new(:first_name => "Donald")
       @person = Person.new(:title => "Sir")
-      Mongoid::Associations::HasOne.update(@name, @person, :name)
+      Mongoid::Associations::HasOne.update(@name, @person, Mongoid::Options.new(:association_name => :name))
     end
 
     it "parentizes the child document" do
@@ -29,7 +29,7 @@ describe Mongoid::Associations::HasOne do
   describe "#decorate!" do
 
     before do
-      @association = Mongoid::Associations::HasOne.new(:mixed_drink, @document)
+      @association = Mongoid::Associations::HasOne.new(@document, Mongoid::Options.new(:association_name => :mixed_drink))
     end
 
     context "when getting values" do

data/spec/unit/mongoid/associations_spec.rb

@@ -30,7 +30,7 @@ describe Mongoid::Associations do
 
       it "sets the child attributes on the parent" do
         @person.attributes[:name].should ==
-          HashWithIndifferentAccess.new({ :_id => "test-user", :first_name => "Test", :last_name => "User" })
+          { "_id" => "test-user", "first_name" => "Test", "last_name" => "User" }
       end
 
     end

data/spec/unit/mongoid/options_spec.rb

@@ -0,0 +1,96 @@
+require File.expand_path(File.join(File.dirname(__FILE__), "/../../spec_helper.rb"))
+
+describe Mongoid::Options do
+
+  describe "#association_name" do
+
+    before do
+      @attributes = { :association_name => :addresses }
+      @options = Mongoid::Options.new(@attributes)
+    end
+
+    it "returns the association name" do
+      @options.association_name.should == :addresses
+    end
+
+  end
+
+  describe "#klass" do
+
+    context "when class_name provided" do
+
+      before do
+        @attributes = { :class_name => "Person" }
+        @options = Mongoid::Options.new(@attributes)
+      end
+
+      it "constantizes the class name" do
+        @options.klass.should == Person
+      end
+
+    end
+
+    context "when no class_name provided" do
+
+      context "when association name is singular" do
+
+        before do
+          @attributes = { :association_name => :person }
+          @options = Mongoid::Options.new(@attributes)
+        end
+
+        it "classifies and constantizes the association name" do
+          @options.klass.should == Person
+        end
+
+      end
+
+      context "when association name is plural" do
+
+        before do
+          @attributes = { :association_name => :people }
+          @options = Mongoid::Options.new(@attributes)
+        end
+
+        it "classifies and constantizes the association name" do
+          @options.klass.should == Person
+        end
+
+      end
+
+
+    end
+
+  end
+
+  describe "#polymorphic" do
+
+    context "when attribute provided" do
+
+      before do
+        @attributes = { :polymorphic => true }
+        @options = Mongoid::Options.new(@attributes)
+
+      end
+
+      it "returns the attribute" do
+        @options.polymorphic.should be_true
+      end
+
+    end
+
+    context "when attribute not provided" do
+
+      before do
+        @options = Mongoid::Options.new
+      end
+
+      it "returns false" do
+        @options.polymorphic.should be_false
+      end
+
+    end
+
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongoid
 version: !ruby/object:Gem::Version 
-  version: 0.7.9
+  version: 0.7.10
 platform: ruby
 authors: 
 - Durran Jordan
@@ -111,6 +111,7 @@ files:
 - lib/mongoid/extensions/symbol/inflections.rb
 - lib/mongoid/extensions/time/conversions.rb
 - lib/mongoid/field.rb
+- lib/mongoid/options.rb
 - lib/mongoid/timestamps.rb
 - lib/mongoid/versioning.rb
 - mongoid.gemspec
@@ -149,6 +150,7 @@ files:
 - spec/unit/mongoid/extensions/symbol/inflections_spec.rb
 - spec/unit/mongoid/extensions/time/conversions_spec.rb
 - spec/unit/mongoid/field_spec.rb
+- spec/unit/mongoid/options_spec.rb
 - spec/unit/mongoid/timestamps_spec.rb
 - spec/unit/mongoid/versioning_spec.rb
 has_rdoc: true
@@ -213,5 +215,6 @@ test_files:
 - spec/unit/mongoid/extensions/symbol/inflections_spec.rb
 - spec/unit/mongoid/extensions/time/conversions_spec.rb
 - spec/unit/mongoid/field_spec.rb
+- spec/unit/mongoid/options_spec.rb
 - spec/unit/mongoid/timestamps_spec.rb
 - spec/unit/mongoid/versioning_spec.rb