mongoid 0.9.5 → 0.9.6

data/README.textile

@@ -31,7 +31,8 @@
 Initialize Mongoid:
 
 <pre>
-  Mongoid.connect_to("myapp_database_name")
+  connection = Mongo::Connection.new
+  Mongoid.database = connection.db("my_db_name")
 </pre>
 
 Example of a simple domain model:

data/VERSION

@@ -1 +1 @@
-0.9.5
+0.9.6

data/lib/mongoid.rb

@@ -52,7 +52,10 @@ require "mongoid/document"
 module Mongoid
 
   # Raised when the database connection has not been set up.
-  class NoConnectionError < RuntimeError; end
+  class InvalidDatabaseError < RuntimeError; end
+
+  # Raised when invalid options are passed into a constructor.
+  class InvalidOptionsError < RuntimeError; end
 
   # Raised when an association is defined on the class, but the
   # attribute in the hash is not an Array or Hash, or when
@@ -74,21 +77,15 @@ module Mongoid
     end
   end
 
-  # Raised when invalid options are passed into a constructor.
-  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)
-    @@connection ||= Mongo::Connection.new
-    @@database ||= @@connection.db(name)
+  # Sets the Mongo::DB to be used.
+  def self.database=(db)
+    raise InvalidDatabaseError.new("Database should be a Mongo::DB, not #{db.class.name}") unless db.kind_of?(Mongo::DB)
+    @@database = db
   end
 
-  # Get the MongoDB database. If initialization via Mongoid.connect_to()
-  # has not happened, an exception will occur.
+  # Returns the Mongo::DB to use or raise an error if none was set.
   def self.database
-    raise NoConnectionError unless @@database
-    @@database
+    @@database || (raise InvalidDatabaseError.new("No database has been set"))
   end
 
 end

data/lib/mongoid/commands/delete_all.rb

@@ -13,8 +13,10 @@ module Mongoid #:nodoc:
       # Example:
       #
       # <tt>DeleteAll.execute(Person, :conditions => { :field => "value" })</tt>
-      def self.execute(klass, params)
-        klass.find(:all, params).each { |doc| Delete.execute(doc) }
+      def self.execute(klass, params = nil)
+        params ? klass.find(:all, params).each do
+          |doc| Delete.execute(doc)
+        end : klass.collection.drop
       end
     end
   end

data/lib/mongoid/criteria.rb

@@ -60,7 +60,7 @@ module Mongoid #:nodoc:
     #
     # Options:
     #
-    # selections: A +Hash+ where the key is the field name and the value is an
+    # attributes: A +Hash+ where the key is the field name and the value is an
     # +Array+ of values that must all match.
     #
     # Example:
@@ -70,8 +70,8 @@ module Mongoid #:nodoc:
     # <tt>criteria.all(:field1 => ["value1", "value2"], :field2 => ["value1"])</tt>
     #
     # Returns: <tt>self</tt>
-    def all(selections = {})
-      selections.each { |key, value| @selector[key] = { "$all" => value } }; self
+    def all(attributes = {})
+      update_selector(attributes, "$all")
     end
 
     # Adds a criterion to the +Criteria+ that specifies values that must
@@ -125,7 +125,7 @@ module Mongoid #:nodoc:
     #
     # Options:
     #
-    # excludes: A +Hash+ where the key is the field name and the value is a
+    # attributes: A +Hash+ where the key is the field name and the value is a
     # value that must not be equal to the corresponding field value in the database.
     #
     # Example:
@@ -135,8 +135,8 @@ module Mongoid #:nodoc:
     # <tt>criteria.excludes(:field1 => "value1", :field2 => "value1")</tt>
     #
     # Returns: <tt>self</tt>
-    def excludes(exclusions = {})
-      exclusions.each { |key, value| @selector[key] = { "$ne" => value } }; self
+    def excludes(attributes = {})
+      update_selector(attributes, "$ne")
     end
 
     # Adds a criterion to the +Criteria+ that specifies additional options
@@ -194,7 +194,7 @@ module Mongoid #:nodoc:
     #
     # Options:
     #
-    # inclusions: A +Hash+ where the key is the field name and the value is an
+    # attributes: A +Hash+ where the key is the field name and the value is an
     # +Array+ of values that any can match.
     #
     # Example:
@@ -204,8 +204,8 @@ module Mongoid #:nodoc:
     # <tt>criteria.in(:field1 => ["value1", "value2"], :field2 => ["value1"])</tt>
     #
     # Returns: <tt>self</tt>
-    def in(inclusions = {})
-      inclusions.each { |key, value| @selector[key] = { "$in" => value } }; self
+    def in(attributes = {})
+      update_selector(attributes, "$in")
     end
 
     # Adds a criterion to the +Criteria+ that specifies an id that must be matched.
@@ -510,5 +510,10 @@ module Mongoid #:nodoc:
       end
     end
 
+    # Update the selector setting the operator on the value for each key in the
+    # supplied attributes +Hash+.
+    def update_selector(attributes, operator)
+      attributes.each { |key, value| @selector[key] = { operator => value } }; self
+    end
   end
 end

data/lib/mongoid/extensions/hash/accessors.rb

@@ -4,15 +4,11 @@ module Mongoid #:nodoc:
     module Hash #:nodoc:
       module Accessors #:nodoc:
         def insert(key, attrs)
-          if key.singular?
-            self[key] = attrs unless self[key]
-            self[key] = self[key].merge(attrs) if self[key]
+          elements = self[key]
+          if elements
+            elements.update(attrs)
           else
-            if elements = self[key]
-              elements.update(attrs)
-            else
-              self[key] = [attrs]
-            end
+            self[key] = key.singular? ? attrs : [attrs]
           end
         end
       end

data/mongoid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoid}
-  s.version = "0.9.5"
+  s.version = "0.9.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Durran Jordan"]
-  s.date = %q{2009-12-08}
+  s.date = %q{2009-12-09}
   s.email = %q{durran@gmail.com}
   s.extra_rdoc_files = [
     "README.textile"
@@ -112,7 +112,8 @@ Gem::Specification.new do |s|
      "spec/unit/mongoid/field_spec.rb",
      "spec/unit/mongoid/finders_spec.rb",
      "spec/unit/mongoid/timestamps_spec.rb",
-     "spec/unit/mongoid/versioning_spec.rb"
+     "spec/unit/mongoid/versioning_spec.rb",
+     "spec/unit/mongoid_spec.rb"
   ]
   s.homepage = %q{http://github.com/durran/mongoid}
   s.rdoc_options = ["--charset=UTF-8"]
@@ -163,7 +164,8 @@ Gem::Specification.new do |s|
      "spec/unit/mongoid/field_spec.rb",
      "spec/unit/mongoid/finders_spec.rb",
      "spec/unit/mongoid/timestamps_spec.rb",
-     "spec/unit/mongoid/versioning_spec.rb"
+     "spec/unit/mongoid/versioning_spec.rb",
+     "spec/unit/mongoid_spec.rb"
   ]
 
   if s.respond_to? :specification_version then

data/spec/spec_helper.rb

@@ -8,7 +8,8 @@ require "mocha"
 require "mongoid"
 require "spec"
 
-Mongoid.connect_to("mongoid_test")
+connection = Mongo::Connection.new
+Mongoid.database = connection.db("mongoid_test")
 
 Spec::Runner.configure do |config|
   config.mock_with :mocha

data/spec/unit/mongoid/commands/delete_all_spec.rb

@@ -8,13 +8,34 @@ describe Mongoid::Commands::DeleteAll do
       @doc = mock
       @docs = [@doc]
       @klass = mock
-      @conditions = { :conditions => { :title => "Sir" } }
     end
 
-    it "destroys each document that the criteria finds" do
-      @klass.expects(:find).with(:all, @conditions).returns(@docs)
-      Mongoid::Commands::Delete.expects(:execute).with(@doc)
-      Mongoid::Commands::DeleteAll.execute(@klass, @conditions)
+    context "when conditions supplied" do
+
+      before do
+        @conditions = { :conditions => { :title => "Sir" } }
+      end
+
+      it "deletes each document that the criteria finds" do
+        @klass.expects(:find).with(:all, @conditions).returns(@docs)
+        Mongoid::Commands::Delete.expects(:execute).with(@doc)
+        Mongoid::Commands::DeleteAll.execute(@klass, @conditions)
+      end
+
+    end
+
+    context "when no conditions supplied" do
+
+      before do
+        @collection = mock
+      end
+
+      it "drops the collection" do
+        @klass.expects(:collection).returns(@collection)
+        @collection.expects(:drop)
+        Mongoid::Commands::DeleteAll.execute(@klass)
+      end
+
     end
 
   end

data/spec/unit/mongoid/extensions/hash/accessors_spec.rb

@@ -71,7 +71,7 @@ describe Mongoid::Extensions::Hash::Accessors do
           @new = { :_id => 2, :first_name => "Test2", :last_name => "User2" }
         end
 
-        it "updates the existing attribute" do
+        it "adds the new attribute" do
           @hash.insert(:name, @new)
           @hash[:name].should == @new
         end

data/spec/unit/mongoid_spec.rb

@@ -0,0 +1,17 @@
+require "spec_helper"
+
+describe Mongoid do
+
+  describe ".database=" do
+
+    context "when object provided is not a Mongo::DB" do
+
+      it "raises an error" do
+        lambda { Mongoid.database = "Test" }.should raise_error
+      end
+
+    end
+
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongoid
 version: !ruby/object:Gem::Version 
-  version: 0.9.5
+  version: 0.9.6
 platform: ruby
 authors: 
 - Durran Jordan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-08 00:00:00 -05:00
+date: 2009-12-09 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -189,6 +189,7 @@ files:
 - spec/unit/mongoid/finders_spec.rb
 - spec/unit/mongoid/timestamps_spec.rb
 - spec/unit/mongoid/versioning_spec.rb
+- spec/unit/mongoid_spec.rb
 has_rdoc: true
 homepage: http://github.com/durran/mongoid
 licenses: []
@@ -262,3 +263,4 @@ test_files:
 - spec/unit/mongoid/finders_spec.rb
 - spec/unit/mongoid/timestamps_spec.rb
 - spec/unit/mongoid/versioning_spec.rb
+- spec/unit/mongoid_spec.rb