mongoid 0.11.5 → 0.11.6

data/HISTORY

@@ -1,3 +1,21 @@
+=== 0.11.6
+- Allow namespaced documents to default with:
+  "namespace_modelname"
+
+- Fixed indexing of _type field to only happen on root
+  classes.
+
+- Fixed creation of empty collections for embedded documents.
+
+- Document.store_in now properly resets the collection
+  if the collection had already been accessed.
+
+- Document.find(nil) now raises
+  Mongoid::Errors::InvalidOptions
+
+=== 0.11.5
+- Removed dependency on mongo_ext, since latest version
+  was breaking on various operating systems.
 === 0.11.4
 - Fixed issue with dynamic fields: checking whether
   the document responded to the attribute's method

data/VERSION

@@ -1 +1 @@
-0.11.5
+0.11.6

data/lib/mongoid/document.rb

@@ -15,14 +15,15 @@ module Mongoid #:nodoc:
         class_inheritable_accessor :defaults, :fields
 
         # The same collection is used for the entire class hierarchy.
-        cattr_accessor :_collection, :collection_name, :embedded, :primary_key
+        cattr_accessor :_collection, :collection_name, :embedded, :primary_key, :indexed
 
         # Set the initial values. Defaults and fields get set to a
         # +HashWithIndifferentAccess+ while the collection name will get set to
         # the demodulized class.
+        self.collection_name = self.to_s.underscore.tableize.gsub("/", "_")
         self.defaults = {}.with_indifferent_access
         self.fields = {}.with_indifferent_access
-        self.collection_name ||= self.to_s.demodulize.tableize
+        self.indexed = false
 
         attr_accessor :association_name, :_parent
         attr_reader :attributes, :new_record
@@ -32,12 +33,19 @@ module Mongoid #:nodoc:
         # Define all the callbacks that are accepted by the document.
         define_callbacks :before_create, :before_destroy, :before_save, :before_update, :before_validation
         define_callbacks :after_create, :after_destroy, :after_save, :after_update, :after_validation
-
-        index :_type
       end
     end
 
     module ClassMethods
+      # Add the default indexes to the root document if they do not already
+      # exist. Currently this is only _type.
+      def add_indexes
+        unless indexed
+          self._collection.create_index(:_type, false)
+          self.indexed = true
+        end
+      end
+
       # Returns the collection associated with this +Document+. If the
       # document is embedded, there will be no collection associated
       # with it.
@@ -46,6 +54,7 @@ module Mongoid #:nodoc:
       def collection
         raise Errors::InvalidCollection.new(self) if embedded?
         self._collection ||= Mongoid.database.collection(self.collection_name)
+        add_indexes; self._collection
       end
 
       # return true if the +Document+ is embedded in another +Documnet+.
@@ -106,6 +115,7 @@ module Mongoid #:nodoc:
       # Macro for setting the collection name to store in.
       def store_in(name)
         self.collection_name = name.to_s
+        self._collection = Mongoid.database.collection(name.to_s)
       end
 
       # Returns all types to query for when using this class as the base.

data/lib/mongoid/errors.rb

@@ -13,7 +13,7 @@ module Mongoid #:nodoc
       end
     end
 
-    # Raised when invalid options are passed into a constructor.
+    # Raised when invalid options are passed into a constructor or method.
     class InvalidOptions < RuntimeError; end
 
     # Raised when the database connection has not been set up.

data/lib/mongoid/finders.rb

@@ -9,7 +9,7 @@ module Mongoid #:nodoc:
     #
     # <tt>Person.all(:conditions => { :attribute => "value" })</tt>
     def all(*args)
-      find(*args)
+      find(:all, *args)
     end
 
     # Returns a count of matching records in the database based on the
@@ -43,6 +43,7 @@ module Mongoid #:nodoc:
     #
     # <tt>Person.find(Mongo::ObjectID.new.to_s)</tt>
     def find(*args)
+      raise Errors::InvalidOptions.new("Calling Document#find with nil is invalid") if args[0].nil?
       type = args.delete_at(0) if args[0].is_a?(Symbol)
       criteria = Criteria.translate(self, *args)
       case type
@@ -61,7 +62,7 @@ module Mongoid #:nodoc:
     #
     # <tt>Person.first(:conditions => { :attribute => "value" })</tt>
     def first(*args)
-      find(*args).one
+      find(:first, *args)
     end
 
     # Find the last +Document+ given the conditions.
@@ -72,7 +73,7 @@ module Mongoid #:nodoc:
     #
     # <tt>Person.last(:conditions => { :attribute => "value" })</tt>
     def last(*args)
-      find(*args).last
+      find(:last, *args)
     end
 
     # Will execute a +Criteria+ based on the +DynamicFinder+ that gets

data/mongoid.gemspec

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

data/perf/benchmark.rb

@@ -2,6 +2,11 @@ require "rubygems"
 require "ruby-prof"
 require "mongoid"
 
+connection = Mongo::Connection.new
+Mongoid.database = connection.db("mongoid_perf_test")
+
+Mongoid.database.collection("people").drop
+
 class Person
   include Mongoid::Document
   include Mongoid::Timestamps
@@ -28,7 +33,7 @@ class Address
   field :city
   field :state
   field :post_code
-  field :type
+  field :address_type
   belongs_to :person, :inverse_of => :address
 end
 
@@ -37,15 +42,10 @@ class Phone
   include Mongoid::Timestamps
   field :country_code, :type => Integer
   field :number
-  field :type
+  field :phone_type
   belongs_to :person, :inverse_of => :phones
 end
 
-connection = Mongo::Connection.new
-Mongoid.database = connection.db("mongoid_perf_test")
-
-Mongoid.database.collection("people").drop
-
 RubyProf.start
 
 puts "Starting benchmark..."
@@ -71,4 +71,4 @@ result = RubyProf.stop
 printer = RubyProf::FlatPrinter.new(result)
 printer.print(STDOUT, 0)
 
-Mongoid.database.collection("people").drop
+# Mongoid.database.collection("people").drop

data/spec/integration/mongoid/document_spec.rb

@@ -16,6 +16,10 @@ describe Mongoid::Document do
 
     end
 
+    context "on a namespaced document" do
+      Medical::Patient.collection.name.should == "medical_patients"
+    end
+
   end
 
   describe "#new" do
@@ -230,6 +234,10 @@ describe Mongoid::Document do
       @owner.save
     end
 
+    after do
+      PetOwner.delete_all
+    end
+
     it "is a single object and not an array" do
       @from_db = PetOwner.find(@owner.id)
       @from_db.address.should == @address
@@ -332,6 +340,20 @@ describe Mongoid::Document do
 
   end
 
+  context ".store_in" do
+
+    after do
+      Canvas.store_in(:canvases)
+    end
+
+    it "switches the database collection" do
+      Canvas.collection.name.should == "canvases"
+      Canvas.store_in(:browsers)
+      Canvas.collection.name.should == "browsers"
+    end
+
+  end
+
   context "when has many exists through a has one" do
 
     before do
@@ -474,22 +496,22 @@ describe Mongoid::Document do
       end
 
       it "handles comparisons with todays date"do
-        people = Person.select.where("this.dob < new Date()")
+        people = Person.where("this.dob < new Date()")
         people.first.should == @person
       end
 
       it "handles conparisons with a date range" do
-        people = Person.select.where("new Date(1976, 10, 31) < this.dob && this.dob < new Date()")
+        people = Person.where("new Date(1976, 10, 31) < this.dob && this.dob < new Date()")
         people.first.should == @person
       end
 
       it "handles false comparisons in a date range" do
-        people = Person.select.where("new Date(2005, 10, 31) < this.dob && this.dob < new Date()")
+        people = Person.where("new Date(2005, 10, 31) < this.dob && this.dob < new Date()")
         people.should be_empty
       end
 
       it "handles comparisons with date objects"do
-        people = Person.select.where(:dob => { "$lt" => Date.today.midnight })
+        people = Person.where(:dob => { "$lt" => Date.today.midnight })
         people.first.should == @person
       end
 

data/spec/spec_helper.rb

@@ -13,6 +13,9 @@ Mongoid.database = connection.db("mongoid_test")
 
 Spec::Runner.configure do |config|
   config.mock_with :mocha
+  config.after :suite do
+    Mongoid.database.collections.each(&:drop)
+  end
 end
 
 class MixedDrink
@@ -255,3 +258,17 @@ end
 class Circle < Shape
   field :radius, :type => Integer, :default => 0
 end
+
+# Namespacing test models:
+module Medical
+  class Patient
+    include Mongoid::Document
+    field :name
+    has_many :prescriptions, :class_name => "Medical::Prescription"
+  end
+
+  class Prescription
+    include Mongoid::Document
+    field :name
+  end
+end

data/spec/unit/mongoid/associations_spec.rb

@@ -35,6 +35,22 @@ describe Mongoid::Associations do
 
     end
 
+    context "when child and parent are namespaced" do
+
+      before do
+        @patient = Medical::Patient.new(:name => "Ridley")
+        @prescription = Medical::Prescription.new(:name => "Zoloft")
+        @patient.prescriptions << @prescription
+        @second = @patient.prescriptions.build(:name => "Codeine")
+      end
+
+      it "sets the correct association classes" do
+        @patient.prescriptions.first.should == @prescription
+        @patient.prescriptions.last.should == @second
+      end
+
+    end
+
     context "when setting a parent" do
 
       context "when the child is one level deep" do

data/spec/unit/mongoid/document_spec.rb

@@ -3,12 +3,14 @@ require "spec_helper"
 describe Mongoid::Document do
 
   before do
-    @collection = stub(:name => "people")
-    @canvas_collection = stub(:name => "canvases")
     @database = mock
     Mongoid.stubs(:database).returns(@database)
+    @collection = stub(:name => "people")
+    @canvas_collection = stub(:name => "canvases")
     @database.stubs(:collection).with("people").returns(@collection)
     @database.stubs(:collection).with("canvases").returns(@canvas_collection)
+    @collection.stubs(:create_index).with(:_type, false)
+    @canvas_collection.stubs(:create_index).with(:_type, false)
   end
 
   after do
@@ -705,11 +707,9 @@ describe Mongoid::Document do
 
     context "on a parent class" do
 
-      before do
+      it "sets the collection name and collection for the document" do
+        @database.expects(:collection).with("population").returns(@collection)
         Patient.store_in :population
-      end
-
-      it "sets the collection name for the document" do
         Patient.collection_name.should == "population"
       end
 
@@ -717,15 +717,13 @@ describe Mongoid::Document do
 
     context "on a subclass" do
 
-      before do
-        Firefox.store_in :browsers
-      end
-
       after do
         Firefox.store_in :canvases
       end
 
       it "changes the collection name for the entire hierarchy" do
+        @database.expects(:collection).with("browsers").returns(@collection)
+        Firefox.store_in :browsers
         Canvas.collection_name.should == "browsers"
       end
 

data/spec/unit/mongoid/finders_spec.rb

@@ -95,6 +95,14 @@ describe Mongoid::Finders do
 
     end
 
+    context "when nil passed in" do
+
+      it "raises an error" do
+        lambda { Person.find(nil) }.should raise_error
+      end
+
+    end
+
     context "when finding first" do
 
       it "delegates to criteria" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongoid
 version: !ruby/object:Gem::Version 
-  version: 0.11.5
+  version: 0.11.6
 platform: ruby
 authors: 
 - Durran Jordan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-04 00:00:00 -05:00
+date: 2010-01-05 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency