mongoid 0.11.9 → 0.12.0

data/HISTORY

@@ -1,3 +1,43 @@
+=== 0.12.0
+- Has one now works as expected:
+
+  - Has one associations will return nil, instead
+    of the proxy if the association has not been
+    set.
+
+  - Building/creating a has one is no longer handled
+    by calling the Document#association#build() or create(),
+    this is now handled by Document#build_name and
+    Document#create_name where "name" is the name
+    of the has one association.
+
+  - Passing a _type attribute to the #build_name
+    and #create_name methods will build/create
+    objects of that type, useful for creating
+    specific subclasses.
+
+  - The existing #build and #create methods will be
+    removed in the next release.
+
+- Removed all dynamic finders. If you need to have
+  functionality similar to "find_or_(create|initialize)_by"
+  you can use the 2 new finders:
+
+  - Document.find_or_create_by(attributes): Will
+    look for a document in the database with the
+    supplied attributes, if found it will return the
+    document otherwise will create a new one with
+    the supplied attributes.
+
+  - Document.find_or_initialize_by(attributes): Will
+    look for a document in the database with the
+    supplied attributes, if found it will return the
+    document otherwise will instantiate a new one with
+    the supplied attributes.
+
+- Fixed issue with empty hashes and arrays not getting
+  set on document instantiation.
+
 === 0.11.9
 - Fixed issue with non-us time zones and formats
   parsing incorrectly.

data/VERSION

@@ -1 +1 @@
-0.11.9
+0.12.0

data/lib/mongoid.rb

@@ -44,7 +44,6 @@ require "mongoid/commands"
 require "mongoid/config"
 require "mongoid/complex_criterion"
 require "mongoid/criteria"
-require "mongoid/dynamic_finder"
 require "mongoid/extensions"
 require "mongoid/errors"
 require "mongoid/field"

data/lib/mongoid/associations.rb

@@ -154,10 +154,11 @@ module Mongoid # :nodoc:
       #     belongs_to :person
       #   end
       def has_one(name, options = {})
-        add_association(
-          Associations::HasOne,
-          Associations::Options.new(options.merge(:name => name))
-        )
+        opts = Associations::Options.new(options.merge(:name => name))
+        type = Associations::HasOne
+        add_association(type, opts)
+        add_builder(type, opts)
+        add_creator(type, opts)
       end
 
       # Adds a relational association from the Document to one Document in
@@ -211,6 +212,25 @@ module Mongoid # :nodoc:
           reset(name) { type.update(object, self, options) }
         end
       end
+
+      # Adds a builder for a has_one association. This comes in the form of
+      # build_name(attributes)
+      def add_builder(type, options)
+        name = options.name
+        define_method("build_#{name}") do |attrs|
+          reset(name) { type.new(self, attrs, options) }
+        end
+      end
+
+      # Adds a creator for a has_one association. This comes in the form of
+      # create_name(attributes)
+      def add_creator(type, options)
+        name = options.name
+        define_method("create_#{name}") do |attrs|
+          document = send("build_#{name}", attrs)
+          document.save; document
+        end
+      end
     end
   end
 end

data/lib/mongoid/associations/has_one.rb

@@ -33,17 +33,13 @@ module Mongoid #:nodoc:
       # options: The association options.
       def initialize(document, attributes, options)
         @parent, @options, @association_name = document, options, options.name
-        unless attributes.nil?
-          klass = attributes[:_type] ? attributes[:_type].constantize : nil
-          @document = attributes.assimilate(@parent, @options, klass)
-        else
-          @document = nil
-        end
+        klass = attributes[:_type] ? attributes[:_type].constantize : nil
+        @document = attributes.assimilate(@parent, @options, klass)
       end
 
       # Delegate all missing methods over to the +Document+.
       def method_missing(name, *args, &block)
-        @document.send(name, *args, &block) unless @document.nil?
+        @document.send(name, *args, &block)
       end
 
       # Used for setting the association via a nested attributes setter on the
@@ -52,11 +48,6 @@ module Mongoid #:nodoc:
         build(attributes)
       end
 
-      # This should delegate to the document.
-      def nil?
-        @document.nil?
-      end
-
       # This will get deprecated
       def to_a
         [@document]
@@ -64,7 +55,7 @@ module Mongoid #:nodoc:
 
       # Need to override here for when the underlying document is nil.
       def valid?
-        @document ? @document.valid? : false
+        @document.valid?
       end
 
       class << self
@@ -77,6 +68,7 @@ module Mongoid #:nodoc:
         # options: The association options.
         def instantiate(document, options)
           attributes = document.attributes[options.name]
+          return nil if attributes.blank?
           new(document, attributes, options)
         end
 
@@ -98,11 +90,7 @@ module Mongoid #:nodoc:
         #
         # <tt>HasOne.update({:first_name => "Hank"}, person, options)</tt>
         def update(child, parent, options)
-          if child.nil?
-            return parent.attributes[options.name] = nil
-          else
-            return child.assimilate(parent, options)
-          end
+          child.assimilate(parent, options)
         end
       end
 

data/lib/mongoid/attributes.rb

@@ -17,7 +17,7 @@ module Mongoid #:nodoc:
           if Mongoid.allow_dynamic_fields && !respond_to?("#{key}=")
             @attributes[key] = value
           else
-            send("#{key}=", value) unless value.blank?
+            send("#{key}=", value) unless (value.is_a?(String) && value.blank?)
           end
         end
       end
@@ -123,8 +123,12 @@ module Mongoid #:nodoc:
           define_method("#{name}_attributes=") do |attrs|
             reject(attrs, options)
             association = send(name)
-            update(association, true)
-            association.nested_build(attrs)
+            if association
+              update(association, true)
+              association.nested_build(attrs)
+            else
+              send("build_#{name}", attrs)
+            end
           end
         end
       end

data/lib/mongoid/extensions.rb

@@ -12,6 +12,7 @@ require "mongoid/extensions/hash/assimilation"
 require "mongoid/extensions/hash/conversions"
 require "mongoid/extensions/hash/criteria_helpers"
 require "mongoid/extensions/integer/conversions"
+require "mongoid/extensions/nil/assimilation"
 require "mongoid/extensions/object/conversions"
 require "mongoid/extensions/string/conversions"
 require "mongoid/extensions/string/inflections"
@@ -52,6 +53,10 @@ class Integer #:nodoc
   extend Mongoid::Extensions::Integer::Conversions
 end
 
+class NilClass #:nodoc
+  include Mongoid::Extensions::Nil::Assimilation
+end
+
 class Object #:nodoc:
   include Mongoid::Extensions::Object::Conversions
 end

data/lib/mongoid/extensions/nil/assimilation.rb

@@ -0,0 +1,13 @@
+# encoding: utf-8
+module Mongoid #:nodoc:
+  module Extensions #:nodoc:
+    module Nil #:nodoc:
+      module Assimilation #:nodoc:
+        # Will remove the child object from the parent.
+        def assimilate(parent, options, type = nil)
+          parent.remove_attribute(options.name); self
+        end
+      end
+    end
+  end
+end

data/lib/mongoid/finders.rb

@@ -54,6 +54,30 @@ module Mongoid #:nodoc:
       end
     end
 
+    # Find the first +Document+ given the conditions, or creates a new document
+    # with the conditions that were supplied
+    #
+    # Options:
+    #
+    # args: A +Hash+ of attributes
+    #
+    # <tt>Person.find_or_create_by(:attribute => "value")</tt>
+    def find_or_create_by(attrs = {})
+      first(:conditions => attrs) || self.create(attrs)
+    end
+
+    # Find the first +Document+ given the conditions, or instantiates a new document
+    # with the conditions that were supplied
+    #
+    # Options:
+    #
+    # args: A +Hash+ of attributes
+    #
+    # <tt>Person.find_or_initialize_by(:attribute => "value")</tt>
+    def find_or_initialize_by(attrs = {})
+      first(:conditions => attrs) || self.new(attrs)
+    end
+
     # Find the first +Document+ given the conditions.
     #
     # Options:
@@ -102,12 +126,12 @@ module Mongoid #:nodoc:
     # Example:
     #
     # <tt>Person.find_all_by_title_and_age("Sir", 30)</tt>
-    def method_missing(name, *args)
-      dyna = DynamicFinder.new(name, *args)
-      finder, conditions = dyna.finder, dyna.conditions
-      results = find(finder, :conditions => conditions)
-      results ? results : dyna.create(self)
-    end
+    # def method_missing(name, *args)
+      # dyna = DynamicFinder.new(name, *args)
+      # finder, conditions = dyna.finder, dyna.conditions
+      # results = find(finder, :conditions => conditions)
+      # results ? results : dyna.create(self)
+    # end
 
     # Convenience method for returning the min value of a field.
     #

data/mongoid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoid}
-  s.version = "0.11.9"
+  s.version = "0.12.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Durran Jordan"]
-  s.date = %q{2010-01-07}
+  s.date = %q{2010-01-08}
   s.email = %q{durran@gmail.com}
   s.extra_rdoc_files = [
     "README.textile"
@@ -45,7 +45,6 @@ Gem::Specification.new do |s|
      "lib/mongoid/config.rb",
      "lib/mongoid/criteria.rb",
      "lib/mongoid/document.rb",
-     "lib/mongoid/dynamic_finder.rb",
      "lib/mongoid/errors.rb",
      "lib/mongoid/extensions.rb",
      "lib/mongoid/extensions/array/accessors.rb",
@@ -61,6 +60,7 @@ Gem::Specification.new do |s|
      "lib/mongoid/extensions/hash/conversions.rb",
      "lib/mongoid/extensions/hash/criteria_helpers.rb",
      "lib/mongoid/extensions/integer/conversions.rb",
+     "lib/mongoid/extensions/nil/assimilation.rb",
      "lib/mongoid/extensions/object/conversions.rb",
      "lib/mongoid/extensions/string/conversions.rb",
      "lib/mongoid/extensions/string/inflections.rb",
@@ -100,7 +100,6 @@ Gem::Specification.new do |s|
      "spec/unit/mongoid/config_spec.rb",
      "spec/unit/mongoid/criteria_spec.rb",
      "spec/unit/mongoid/document_spec.rb",
-     "spec/unit/mongoid/dynamic_finder_spec.rb",
      "spec/unit/mongoid/errors_spec.rb",
      "spec/unit/mongoid/extensions/array/accessors_spec.rb",
      "spec/unit/mongoid/extensions/array/assimilation_spec.rb",
@@ -115,6 +114,7 @@ Gem::Specification.new do |s|
      "spec/unit/mongoid/extensions/hash/conversions_spec.rb",
      "spec/unit/mongoid/extensions/hash/criteria_helpers_spec.rb",
      "spec/unit/mongoid/extensions/integer/conversions_spec.rb",
+     "spec/unit/mongoid/extensions/nil/assimilation_spec.rb",
      "spec/unit/mongoid/extensions/object/conversions_spec.rb",
      "spec/unit/mongoid/extensions/string/conversions_spec.rb",
      "spec/unit/mongoid/extensions/string/inflections_spec.rb",
@@ -159,7 +159,6 @@ Gem::Specification.new do |s|
      "spec/unit/mongoid/config_spec.rb",
      "spec/unit/mongoid/criteria_spec.rb",
      "spec/unit/mongoid/document_spec.rb",
-     "spec/unit/mongoid/dynamic_finder_spec.rb",
      "spec/unit/mongoid/errors_spec.rb",
      "spec/unit/mongoid/extensions/array/accessors_spec.rb",
      "spec/unit/mongoid/extensions/array/assimilation_spec.rb",
@@ -174,6 +173,7 @@ Gem::Specification.new do |s|
      "spec/unit/mongoid/extensions/hash/conversions_spec.rb",
      "spec/unit/mongoid/extensions/hash/criteria_helpers_spec.rb",
      "spec/unit/mongoid/extensions/integer/conversions_spec.rb",
+     "spec/unit/mongoid/extensions/nil/assimilation_spec.rb",
      "spec/unit/mongoid/extensions/object/conversions_spec.rb",
      "spec/unit/mongoid/extensions/string/conversions_spec.rb",
      "spec/unit/mongoid/extensions/string/inflections_spec.rb",

data/spec/integration/mongoid/associations_spec.rb

@@ -72,7 +72,7 @@ describe Mongoid::Associations do
 
       before do
         @address = @person.addresses.create(:street => "Oxford St")
-        @name = @person.name.create(:first_name => "Gordon")
+        @name = @person.create_name(:first_name => "Gordon")
       end
 
       it "persists all the associations properly" do
@@ -91,7 +91,7 @@ describe Mongoid::Associations do
       it "persists all the associations properly" do
         from_db = Person.find(@person.id)
         phone = from_db.phone_numbers.first
-        phone.country_code.create(:code => 1)
+        phone.create_country_code(:code => 1)
         from_db.phone_numbers.first.country_code.code.should == 1
       end
 

data/spec/integration/mongoid/document_spec.rb

@@ -106,58 +106,72 @@ describe Mongoid::Document do
       before do
         @person = Person.create(:title => "Lead")
         @person.addresses.create(:street => "1st Street")
-        @person.name.create(:first_name => "Emmanuel")
+        @person.create_name(:first_name => "Emmanuel")
         @person.save
       end
 
       it "deletes the document" do
         @person.addresses.first.destroy
+        @person.name.should_not be_nil
         @person.name.destroy
         @person.addresses.first.should be_nil
-        @person.name.document.should be_nil
+        @person.name.should be_nil
       end
 
     end
 
   end
 
-  context "using dynamic finders" do
+  context ".find_or_create_by" do
 
     before do
-      @person = Person.create(:title => "Mr", :age => 25)
+      @person = Person.create(:title => "Senior")
     end
 
-    context "finding by a single attribute" do
+    context "when the document is found" do
 
-      it "returns found documents" do
-        Person.find_by_title("Mr").should == @person
+      it "returns the document" do
+        Person.find_or_create_by(:title => "Senior").should == @person
       end
 
     end
 
-    context "finding by multiple attributes" do
+    context "when the document is not found" do
 
-      it "returns found documents" do
-        Person.find_by_title_and_age("Mr", 25).should == @person
+      it "creates a new document" do
+        person = Person.find_or_create_by(:title => "Senorita")
+        person.title.should == "Senorita"
+        person.should_not be_a_new_record
       end
 
     end
 
-    context "finding all by a single attribute" do
+  end
+
+  context ".find_or_initialize_by" do
+
+    before do
+      @person = Person.create(:title => "Senior")
+    end
+
+    context "when the document is found" do
 
-      it "returns found documents" do
-        Person.find_all_by_title("Mr").should == [@person]
+      it "returns the document" do
+        Person.find_or_initialize_by(:title => "Senior").should == @person
       end
 
     end
 
-    context "finding all by multiple attributes" do
+    context "when the document is not found" do
 
-      it "returns found documents" do
-        Person.find_all_by_title_and_age("Mr", 25).should == [@person]
+      it "returns a new document" do
+        person = Person.find_or_initialize_by(:title => "Senorita")
+        person.title.should == "Senorita"
+        person.should be_a_new_record
       end
 
     end
+
   end
 
   describe "#find" do
@@ -204,18 +218,6 @@ describe Mongoid::Document do
 
   end
 
-  describe "#find_by_id" do
-
-    before do
-      @person = Person.create
-    end
-
-    it "returns the document with the matching id" do
-      Person.find_by_id(@person.id).should == @person
-    end
-
-  end
-
   describe "#group" do
 
     before do

data/spec/spec_helper.rb

@@ -35,6 +35,7 @@ class Person
   field :employer_id
   field :lunch_time, :type => Time
   field :aliases, :type => Array
+  field :map, :type => Hash
   field :score, :type => Integer
 
   attr_reader :rescored

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

@@ -91,15 +91,52 @@ describe Mongoid::Associations::HasOne do
 
   end
 
-  describe "#initialize" do
+  describe ".instantiate" do
+
+    context "when the attributes are nil" do
+
+      before do
+        @document = Person.new
+        @association = Mongoid::Associations::HasOne.instantiate(
+          @document,
+          Mongoid::Associations::Options.new(:name => :name)
+        )
+      end
+
+      it "returns nil" do
+        @association.should be_nil
+      end
+
+    end
+
+    context "when attributes are empty" do
+
+      before do
+        @document = stub(:attributes => { :name => {} })
+        @association = Mongoid::Associations::HasOne.instantiate(
+          @document,
+          Mongoid::Associations::Options.new(:name => :name)
+        )
+      end
+
+      it "returns nil" do
+        @association.should be_nil
+      end
 
-    before do
-      @document = stub(:attributes => { :writer => { :speed => 500, :_type => "HtmlWriter" } }, :update => true)
-      @options = Mongoid::Associations::Options.new(:name => :writer)
     end
 
-    it "delegates to new" do
-      Mongoid::Associations::HasOne.new(@document, @document.attributes[:writer], @options)
+    context "when attributes exist" do
+
+      before do
+        @document = stub(:attributes => { :name => { :first_name => "Test" } })
+        @options = Mongoid::Associations::Options.new(:name => :name)
+      end
+
+      it "delegates to new" do
+        Mongoid::Associations::HasOne.expects(:new).with(@document, { :first_name => "Test" }, @options)
+        Mongoid::Associations::HasOne.instantiate(@document, @options)
+      end
+
     end
 
   end
@@ -131,34 +168,6 @@ describe Mongoid::Associations::HasOne do
 
     end
 
-    context "when the document is nil" do
-
-      before do
-        @association = Mongoid::Associations::HasOne.new(
-          @document,
-          {},
-          Mongoid::Associations::Options.new(:name => :mixed_drink)
-        )
-      end
-
-      describe "#new_record?" do
-
-        it "returns true" do
-          @association.should be_new_record
-        end
-
-      end
-
-      context "attribute getters" do
-
-        it "returns nil" do
-          @association.name.should be_nil
-        end
-
-      end
-
-    end
-
   end
 
   describe "#nested_build" do
@@ -182,24 +191,6 @@ describe Mongoid::Associations::HasOne do
 
   end
 
-  describe ".instantiate" do
-
-    context "when attributes exist" do
-
-      before do
-        @document = stub(:attributes => { :name => { :first_name => "Test" } })
-        @options = Mongoid::Associations::Options.new(:name => :name)
-      end
-
-      it "delegates to new" do
-        Mongoid::Associations::HasOne.expects(:new).with(@document, { :first_name => "Test" }, @options)
-        Mongoid::Associations::HasOne.instantiate(@document, @options)
-      end
-
-    end
-
-  end
-
   describe ".macro" do
 
     it "returns :has_one" do
@@ -255,20 +246,6 @@ describe Mongoid::Associations::HasOne do
 
   describe "#valid?" do
 
-    context "when the document is nil" do
-
-      before do
-        @document = stub(:attributes => {})
-        @options = Mongoid::Associations::Options.new(:name => :name)
-        @association = Mongoid::Associations::HasOne.instantiate(@document, @options)
-      end
-
-      it "returns false" do
-        @association.valid?.should be_false
-      end
-
-    end
-
     context "when the document is not nil" do
 
       before do

data/spec/unit/mongoid/associations_spec.rb

@@ -139,6 +139,104 @@ describe Mongoid::Associations do
 
   end
 
+  describe "#build_*" do
+
+    before do
+      @canvas = Canvas.new
+    end
+
+    context "when type is passed in" do
+
+      before do
+        @writer = @canvas.build_writer(:speed => 250, :_type => "HtmlWriter")
+      end
+
+      it "returns a new document" do
+        @writer.should_not be_nil
+      end
+
+      it "returns the properly typed document" do
+        @writer.should be_a_kind_of(HtmlWriter)
+      end
+
+      it "sets the appropriate attributes" do
+        @writer.speed.should == 250
+      end
+
+    end
+
+    context "when type is not passed in" do
+
+      before do
+        @writer = @canvas.build_writer(:speed => 250)
+      end
+
+      it "returns a new document" do
+        @writer.should_not be_nil
+      end
+
+      it "returns the properly typed document" do
+        @writer.should be_a_kind_of(Writer)
+      end
+
+      it "sets the appropriate attributes" do
+        @writer.speed.should == 250
+      end
+
+    end
+
+  end
+
+  describe "#create_*" do
+
+    before do
+      @canvas = Canvas.new
+    end
+
+    context "when type is passed in" do
+
+      before do
+        Mongoid::Commands::Save.expects(:execute)
+        @writer = @canvas.create_writer(:speed => 250, :_type => "HtmlWriter")
+      end
+
+      it "returns a new document" do
+        @writer.should_not be_nil
+      end
+
+      it "returns the properly typed document" do
+        @writer.should be_a_kind_of(HtmlWriter)
+      end
+
+      it "sets the appropriate attributes" do
+        @writer.speed.should == 250
+      end
+
+    end
+
+    context "when type is not passed in" do
+
+      before do
+        Mongoid::Commands::Save.expects(:execute)
+        @writer = @canvas.create_writer(:speed => 250, :_type => "HtmlWriter")
+      end
+
+      it "returns a new document" do
+        @writer.should_not be_nil
+      end
+
+      it "returns the properly typed document" do
+        @writer.should be_a_kind_of(Writer)
+      end
+
+      it "sets the appropriate attributes" do
+        @writer.speed.should == 250
+      end
+
+    end
+
+  end
+
   describe ".has_many" do
 
     it "adds a new Association to the collection" do
@@ -208,19 +306,28 @@ describe Mongoid::Associations do
 
   describe ".has_one" do
 
+    before do
+      @person = Person.new
+    end
+
     it "adds a new Association to the document" do
-      person = Person.new
-      person.name.first_name.should be_nil
+      @person.name.should be_nil
     end
 
     it "creates a reader for the association" do
-      person = Person.new
-      person.should respond_to(:name)
+      @person.should respond_to(:name)
     end
 
     it "creates a writer for the association" do
-      person = Person.new
-      person.should respond_to(:name=)
+      @person.should respond_to(:name=)
+    end
+
+    it "creates a builder for the association" do
+      @person.should respond_to(:build_name)
+    end
+
+    it "creates a creator for the association" do
+      @person.should respond_to(:create_name)
     end
 
     context "when setting the association directly" do

data/spec/unit/mongoid/attributes_spec.rb

@@ -233,6 +233,36 @@ describe Mongoid::Attributes do
 
     end
 
+    context "when an empty array is provided in the attributes" do
+
+      before do
+        @attributes = {
+          :aliases => []
+        }
+        @person = Person.new(@attributes)
+      end
+
+      it "sets the empty array" do
+        @person.aliases.should == []
+      end
+
+    end
+
+    context "when an empty hash is provided in the attributes" do
+
+      before do
+        @attributes = {
+          :map => {}
+        }
+        @person = Person.new(@attributes)
+      end
+
+      it "sets the empty hash" do
+        @person.map.should == {}
+      end
+
+    end
+
   end
 
   context "updating when attributes already exist" do

data/spec/unit/mongoid/document_spec.rb

@@ -660,7 +660,7 @@ describe Mongoid::Document do
 
       it "removes the child document attributes" do
         @person.remove(@name)
-        @person.name.document.should be_nil
+        @person.name.should be_nil
       end
 
     end

data/spec/unit/mongoid/extensions/nil/assimilation_spec.rb

@@ -0,0 +1,24 @@
+require "spec_helper"
+
+describe Mongoid::Extensions::Nil::Assimilation do
+
+  describe "#assimilate" do
+
+    before do
+      @name = Name.new(:first_name => "Durran")
+      @parent = Person.new(:title => "Mr.", :name => @name)
+      @options = Mongoid::Associations::Options.new(:name => :name)
+    end
+
+    it "removes the child attribute from the parent" do
+      nil.assimilate(@parent, @options)
+      @parent.attributes[:name].should be_nil
+    end
+
+    it "returns nil" do
+      nil.assimilate(@parent, @options).should be_nil
+    end
+
+  end
+
+end

data/spec/unit/mongoid/finders_spec.rb

@@ -140,16 +140,74 @@ describe Mongoid::Finders do
 
   end
 
-  describe ".find_by_id" do
+  describe ".find_or_create_by" do
 
     before do
+      @person = Person.new(:age => 30)
       @criteria = mock
     end
 
-    it "delegates to find with an id parameter" do
-      Mongoid::Criteria.expects(:translate).with(Person, :conditions => { "_id" => "1" }).returns(@criteria)
-      @criteria.expects(:one).returns(Person.new)
-      Person.find_by_id("1")
+    context "when the document is found" do
+
+      it "returns the document" do
+        Mongoid::Criteria.expects(:translate).with(
+          Person, :conditions => { :age => 30 }
+        ).returns(@criteria)
+        @criteria.expects(:one).returns(@person)
+        Person.find_or_create_by(:age => 30).should == @person
+      end
+
+    end
+
+    context "when the document is not found" do
+
+      it "creates a new document" do
+        Mongoid::Criteria.expects(:translate).with(
+          Person, :conditions => { :age => 30 }
+        ).returns(@criteria)
+        @criteria.expects(:one).returns(nil)
+        Person.expects(:create).returns(@person)
+        person = Person.find_or_create_by(:age => 30)
+        person.should be_a_kind_of(Person)
+        person.age.should == 30
+      end
+
+    end
+
+  end
+
+  describe ".find_or_initialize_by" do
+
+    before do
+      @person = Person.new(:age => 30)
+      @criteria = mock
+    end
+
+    context "when the document is found" do
+
+      it "returns the document" do
+        Mongoid::Criteria.expects(:translate).with(
+          Person, :conditions => { :age => 30 }
+        ).returns(@criteria)
+        @criteria.expects(:one).returns(@person)
+        Person.find_or_initialize_by(:age => 30).should == @person
+      end
+
+    end
+
+    context "when the document is not found" do
+
+      it "returns a new document with the conditions" do
+        Mongoid::Criteria.expects(:translate).with(
+          Person, :conditions => { :age => 30 }
+        ).returns(@criteria)
+        @criteria.expects(:one).returns(nil)
+        person = Person.find_or_initialize_by(:age => 30)
+        person.should be_a_kind_of(Person)
+        person.should be_a_new_record
+        person.age.should == 30
+      end
+
     end
 
   end
@@ -211,59 +269,6 @@ describe Mongoid::Finders do
 
   end
 
-  describe ".method_missing" do
-
-    context "with a finder method name" do
-
-      before do
-        @criteria = stub
-        @document = stub
-        @conditions = { "title" => "Sir", "age" => 30 }
-      end
-
-      it "executes the finder" do
-        Mongoid::Criteria.expects(:translate).with(Person, :conditions => @conditions).returns(@criteria)
-        @criteria.expects(:one).returns(@document)
-        Person.find_by_title_and_age("Sir", 30)
-      end
-
-    end
-
-    context "with a finder or creation method name" do
-
-      before do
-        @criteria = stub
-        @document = stub
-        @conditions = { "title" => "Sir", "age" => 30 }
-      end
-
-      context "when document is found" do
-
-        it "returns the document" do
-          Mongoid::Criteria.expects(:translate).with(Person, :conditions => @conditions).returns(@criteria)
-          @criteria.expects(:one).returns(@document)
-          Person.find_or_initialize_by_title_and_age("Sir", 30).should == @document
-        end
-
-      end
-
-      context "when document is not found" do
-
-        it "instantiates a new document" do
-          Mongoid::Criteria.expects(:translate).with(Person, :conditions => @conditions).returns(@criteria)
-          @criteria.expects(:one).returns(nil)
-          new_doc = Person.find_or_initialize_by_title_and_age("Sir", 30)
-          new_doc.new_record?.should be_true
-          new_doc.title.should == "Sir"
-          new_doc.age.should == 30
-        end
-
-      end
-
-    end
-
-  end
-
   describe ".min" do
 
     before do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongoid
 version: !ruby/object:Gem::Version 
-  version: 0.11.9
+  version: 0.12.0
 platform: ruby
 authors: 
 - Durran Jordan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-07 00:00:00 -05:00
+date: 2010-01-08 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -111,7 +111,6 @@ files:
 - lib/mongoid/config.rb
 - lib/mongoid/criteria.rb
 - lib/mongoid/document.rb
-- lib/mongoid/dynamic_finder.rb
 - lib/mongoid/errors.rb
 - lib/mongoid/extensions.rb
 - lib/mongoid/extensions/array/accessors.rb
@@ -127,6 +126,7 @@ files:
 - lib/mongoid/extensions/hash/conversions.rb
 - lib/mongoid/extensions/hash/criteria_helpers.rb
 - lib/mongoid/extensions/integer/conversions.rb
+- lib/mongoid/extensions/nil/assimilation.rb
 - lib/mongoid/extensions/object/conversions.rb
 - lib/mongoid/extensions/string/conversions.rb
 - lib/mongoid/extensions/string/inflections.rb
@@ -166,7 +166,6 @@ files:
 - spec/unit/mongoid/config_spec.rb
 - spec/unit/mongoid/criteria_spec.rb
 - spec/unit/mongoid/document_spec.rb
-- spec/unit/mongoid/dynamic_finder_spec.rb
 - spec/unit/mongoid/errors_spec.rb
 - spec/unit/mongoid/extensions/array/accessors_spec.rb
 - spec/unit/mongoid/extensions/array/assimilation_spec.rb
@@ -181,6 +180,7 @@ files:
 - spec/unit/mongoid/extensions/hash/conversions_spec.rb
 - spec/unit/mongoid/extensions/hash/criteria_helpers_spec.rb
 - spec/unit/mongoid/extensions/integer/conversions_spec.rb
+- spec/unit/mongoid/extensions/nil/assimilation_spec.rb
 - spec/unit/mongoid/extensions/object/conversions_spec.rb
 - spec/unit/mongoid/extensions/string/conversions_spec.rb
 - spec/unit/mongoid/extensions/string/inflections_spec.rb
@@ -247,7 +247,6 @@ test_files:
 - spec/unit/mongoid/config_spec.rb
 - spec/unit/mongoid/criteria_spec.rb
 - spec/unit/mongoid/document_spec.rb
-- spec/unit/mongoid/dynamic_finder_spec.rb
 - spec/unit/mongoid/errors_spec.rb
 - spec/unit/mongoid/extensions/array/accessors_spec.rb
 - spec/unit/mongoid/extensions/array/assimilation_spec.rb
@@ -262,6 +261,7 @@ test_files:
 - spec/unit/mongoid/extensions/hash/conversions_spec.rb
 - spec/unit/mongoid/extensions/hash/criteria_helpers_spec.rb
 - spec/unit/mongoid/extensions/integer/conversions_spec.rb
+- spec/unit/mongoid/extensions/nil/assimilation_spec.rb
 - spec/unit/mongoid/extensions/object/conversions_spec.rb
 - spec/unit/mongoid/extensions/string/conversions_spec.rb
 - spec/unit/mongoid/extensions/string/inflections_spec.rb

data/lib/mongoid/dynamic_finder.rb

@@ -1,65 +0,0 @@
-# encoding: utf-8
-module Mongoid #:nodoc:
-  class DynamicFinder
-    # Regex for standard dynamic finder methods.
-    FINDER = /^find_(all_by|last_by|by)_([_a-zA-Z]\w*)$/
-    # Regex for finder methods that create objects if nothing found.
-    CREATOR = /^find_or_(initialize|create)_by_([_a-zA-Z]\w*)$/
-
-    attr_reader :conditions, :finder
-
-    # Creates a new DynamicFinder given the supplied method name. This parses
-    # the name and sets up the appropriate finder type and attribute names in
-    # order to perform the search.
-    #
-    # Options:
-    #
-    # method: The name of the dynamic finder method.
-    #
-    # Example:
-    #
-    # <tt>DynamicFinder.new(:find_by_title_and_age)</tt>
-    def initialize(method, *args)
-      @finder, @args = :first, args
-      case method.to_s
-      when FINDER
-        @finder = :all if $1 == "all_by"
-        @finder = :last if $1 == "last_by"
-        names = $2
-      when CREATOR then
-        @creator = ($1 == "initialize") ? :instantiate : :create
-        names = $2
-      else
-        @finder = nil
-      end
-      @attributes = names && names.split("_and_")
-      generate_conditions
-    end
-
-    # Will create a new +Document+ based on the type of creator keyword in the
-    # method, given the supplied class.
-    #
-    # Options:
-    #
-    # klass: The +Document+ class to be instantiated.
-    #
-    # Example:
-    #
-    # <tt>finder.create(Person)</tt>
-    def create(klass)
-      klass.send(@creator, @conditions) if @creator
-    end
-
-    protected
-    def generate_conditions
-      if @attributes
-        @conditions = {}.with_indifferent_access
-        @attributes.each_with_index do |attr, index|
-          attr = "_id" if attr == "id"
-          @conditions[attr] = @args[index]
-        end
-      end
-    end
-
-  end
-end

data/spec/unit/mongoid/dynamic_finder_spec.rb

@@ -1,145 +0,0 @@
-require "spec_helper"
-
-describe Mongoid::DynamicFinder do
-
-  describe "#conditions" do
-
-    before do
-      @finder = Mongoid::DynamicFinder.new(:find_by_title_and_age, "Sir", 30)
-      @conditions = { "title" => "Sir", "age" => 30 }
-    end
-
-    it "returns the conditions hash for the criteria" do
-      @finder.conditions.should == @conditions
-    end
-
-    context "when id is an attribute" do
-
-      before do
-        @finder = Mongoid::DynamicFinder.new(:find_by_id, "5")
-        @conditions = { "_id" => "5" }
-      end
-
-      it "converts to _id" do
-        @finder.conditions.should == @conditions
-      end
-
-    end
-
-  end
-
-  describe "#create" do
-
-    context "when initializing" do
-
-      before do
-        @finder = Mongoid::DynamicFinder.new(:find_or_initialize_by_title_and_age, "Sir", 30)
-      end
-
-      it "instantiates a new document" do
-        person = @finder.create(Person)
-        person.title.should == "Sir"
-        person.age.should == 30
-      end
-
-    end
-
-    context "when creating" do
-
-      before do
-        @finder = Mongoid::DynamicFinder.new(:find_or_create_by_title_and_age, "Sir", 30)
-        @person = stub
-      end
-
-      it "creates a new document" do
-        Person.expects(:create).with(@finder.conditions).returns(@person)
-        person = @finder.create(Person)
-        person.should == @person
-      end
-
-    end
-
-  end
-
-  describe ".initialize" do
-
-    context "when find_by*" do
-
-      before do
-        @finder = Mongoid::DynamicFinder.new(:find_by_title_and_age, "Sir", 30)
-      end
-
-      it "sets a first finder and attributes" do
-        @finder.finder.should == :first
-        @finder.conditions.should == { "title" => "Sir", "age" => 30 }
-      end
-
-    end
-
-    context "when find_all_by*" do
-
-      before do
-        @finder = Mongoid::DynamicFinder.new(:find_all_by_title_and_age, "Sir", 30)
-      end
-
-      it "sets an all finder and attributes" do
-        @finder.finder.should == :all
-        @finder.conditions.should == { "title" => "Sir", "age" => 30 }
-      end
-
-    end
-
-    context "when find_last_by*" do
-
-      before do
-        @finder = Mongoid::DynamicFinder.new(:find_last_by_title_and_age, "Sir", 30)
-      end
-
-      it "sets a last finder and attributes" do
-        @finder.finder.should == :last
-        @finder.conditions.should == { "title" => "Sir", "age" => 30 }
-      end
-
-    end
-
-    context "when find_or_initialize_by*" do
-
-      before do
-        @finder = Mongoid::DynamicFinder.new(:find_or_initialize_by_title_and_age, "Sir", 30)
-      end
-
-      it "sets a first finder with attributes or a new" do
-        @finder.finder.should == :first
-        @finder.conditions.should == { "title" => "Sir", "age" => 30 }
-      end
-
-    end
-
-    context "when find_or_create_by*" do
-
-      before do
-        @finder = Mongoid::DynamicFinder.new(:find_or_create_by_title_and_age, "Sir", 30)
-      end
-
-      it "sets a first finder with attributes or a create" do
-        @finder.finder.should == :first
-        @finder.conditions.should == { "title" => "Sir", "age" => 30 }
-      end
-
-    end
-
-    context "when invalid finder name" do
-
-      before do
-        @finder = Mongoid::DynamicFinder.new(:bleh)
-      end
-
-      it "sets a nil finder" do
-        @finder.finder.should be_nil
-      end
-
-    end
-
-  end
-
-end