mongoid 1.1.4 → 1.2.0

data/spec/unit/mongoid/criterion/exclusion_spec.rb

@@ -27,6 +27,32 @@ describe Mongoid::Criterion::Exclusion do
       @criteria.excludes(:title => "Bad").should == @criteria
     end
 
+    context "when passing an id" do
+
+      it "accepts id" do
+        @criteria.excludes(:id => "1")
+        @criteria.selector.should ==
+          { :_type =>
+              { "$in" =>
+                ["Doctor", "Person"]
+              },
+            :_id => { "$ne" => "1" }
+          }
+      end
+
+      it "accepts _id" do
+        @criteria.excludes(:_id => "1")
+        @criteria.selector.should ==
+          { :_type =>
+              { "$in" =>
+                ["Doctor", "Person"]
+              },
+            :_id => { "$ne" => "1" }
+          }
+      end
+
+    end
+
   end
 
   describe "#not_in" do

data/spec/unit/mongoid/criterion/optional_spec.rb

@@ -139,6 +139,19 @@ describe Mongoid::Criterion::Optional do
 
     end
 
+    context "when an argument is provided" do
+
+      before do
+        @criteria = Mongoid::Criteria.new(Person)
+        @criteria.offset(40)
+      end
+
+      it "delegates to skip" do
+        @criteria.options[:skip].should == 40
+      end
+
+    end
+
     context "when no option exists" do
 
       context "when page option exists" do

data/spec/unit/mongoid/cursor_spec.rb

@@ -0,0 +1,74 @@
+require "spec_helper"
+
+describe Mongoid::Cursor do
+
+  let(:collection) do
+    stub.quacks_like(Mongoid::Collection.allocate)
+  end
+
+  let(:proxy) do
+    stub.quacks_like(Mongo::Cursor.allocate)
+  end
+
+  let(:cursor) do
+    Mongoid::Cursor.new(collection, proxy)
+  end
+
+  (Mongoid::Cursor::OPERATIONS - [ :timeout ]).each do |name|
+
+    describe "##{name}" do
+
+      before do
+        proxy.expects(name)
+      end
+
+      it "delegates to the proxy" do
+        cursor.send(name)
+      end
+    end
+  end
+
+  describe "#collection" do
+
+    it "returns the mongoid collection" do
+      cursor.collection.should == collection
+    end
+  end
+
+  describe "#each" do
+
+    before do
+      proxy.expects(:each).yields({ "_type" => "Person" })
+    end
+
+    it "yields to the next document" do
+      cursor.each do |doc|
+        doc.attributes.except(:_id).should == Person.new.attributes.except(:_id)
+      end
+    end
+  end
+
+  describe "#next_document" do
+
+    before do
+      proxy.expects(:next_document).returns({ "_type" => "Person" })
+    end
+
+    it "returns the next document from the proxied cursor" do
+      doc = cursor.next_document
+      doc.attributes.except(:_id).should == Person.new.attributes.except(:_id)
+    end
+  end
+
+  describe "#to_a" do
+
+    before do
+      proxy.expects(:to_a).returns([{ "_type" => "Person" }])
+    end
+
+    it "converts the proxy cursor to an array of documents" do
+      docs = cursor.to_a
+      docs[0].attributes.except(:_id).should == Person.new.attributes.except(:_id)
+    end
+  end
+end

data/spec/unit/mongoid/document_spec.rb

@@ -4,11 +4,10 @@ describe Mongoid::Document do
 
   before do
     @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)
+    Mongoid::Collection.stubs(:new).with("people").returns(@collection)
+    Mongoid::Collection.stubs(:new).with("canvases").returns(@canvas_collection)
     @collection.stubs(:create_index).with(:_type, false)
     @canvas_collection.stubs(:create_index).with(:_type, false)
   end
@@ -553,7 +552,7 @@ describe Mongoid::Document do
     context "on a parent class" do
 
       it "sets the collection name and collection for the document" do
-        @database.expects(:collection).with("population").returns(@collection)
+        Mongoid::Collection.expects(:new).with("population").returns(@collection)
         Patient.store_in :population
         Patient.collection_name.should == "population"
       end
@@ -567,7 +566,7 @@ describe Mongoid::Document do
       end
 
       it "changes the collection name for the entire hierarchy" do
-        @database.expects(:collection).with("browsers").returns(@collection)
+        Mongoid::Collection.expects(:new).with("browsers").returns(@collection)
         Firefox.store_in :browsers
         Canvas.collection_name.should == "browsers"
       end

data/spec/unit/mongoid/errors_spec.rb

@@ -46,16 +46,12 @@ describe Mongoid::Errors do
 
     describe "#message" do
 
-      context "default" do
-
-        before do
-          @error = Mongoid::Errors::InvalidDatabase.new
-        end
-
-        it "returns the class name" do
-          @error.message.should == @error.class.name
-        end
+      before do
+        @error = Mongoid::Errors::InvalidDatabase.new("Test")
+      end
 
+      it "returns a message with the bad db object class" do
+        @error.message.should include("String")
       end
 
     end

data/spec/unit/mongoid/extensions/string/inflections_spec.rb

@@ -24,8 +24,27 @@ describe Mongoid::Extensions::String::Inflections do
 
   describe "#identify" do
 
-    it "converts the string to all lowercase and dashed" do
-      "A Midnight Summer Night's Dream".identify.should == "a-midnight-summer-nights-dream"
+    context "when parameterizing composite keys" do
+
+      it "converts the string to all lowercase and dashed" do
+        "A Midsummer Night's Dream".identify.should == "a-midsummer-night-quo-s-dream"
+      end
+
+    end
+
+    context "when not parameterizing keys" do
+
+      before do
+        Mongoid.parameterize_keys = false
+      end
+
+      after do
+        Mongoid.parameterize_keys = true
+      end
+
+      it "does nothing to the keys" do
+        "A Midsummer Night's Dream".identify.should == "A Midsummer Night's Dream"
+      end
     end
 
   end

data/spec/unit/mongoid/factory_spec.rb

@@ -0,0 +1,16 @@
+require "spec_helper"
+
+describe Mongoid::Factory do
+
+  describe ".build" do
+
+    before do
+      @attributes = { "_type" => "Person", "title" => "Sir" }
+    end
+
+    it "instantiates based on the type" do
+      person = Mongoid::Factory.build(@attributes)
+      person.title.should == "Sir"
+    end
+  end
+end

data/spec/unit/mongoid_spec.rb

@@ -2,12 +2,12 @@ require "spec_helper"
 
 describe Mongoid do
 
-  describe ".config" do
+  describe ".configure" do
 
     context "when no block supplied" do
 
       it "returns the config singleton" do
-        Mongoid.config.should == Mongoid::Config.instance
+        Mongoid.configure.should == Mongoid::Config.instance
       end
 
     end
@@ -15,13 +15,13 @@ describe Mongoid do
     context "when a block is supplied" do
 
       before do
-        Mongoid.config do |config|
+        Mongoid.configure do |config|
           config.allow_dynamic_fields = false
         end
       end
 
       after do
-        Mongoid.config do |config|
+        Mongoid.configure do |config|
           config.allow_dynamic_fields = true
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongoid
 version: !ruby/object:Gem::Version 
-  version: 1.1.4
+  version: 1.2.0
 platform: ruby
 authors: 
 - Durran Jordan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-26 00:00:00 -05:00
+date: 2010-02-07 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -43,7 +43,7 @@ dependencies:
         version: 2.0.1
     version: 
 - !ruby/object:Gem::Dependency 
-  name: leshill-will_paginate
+  name: will_paginate
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
@@ -101,6 +101,12 @@ files:
 - lib/mongoid/associations/proxy.rb
 - lib/mongoid/attributes.rb
 - lib/mongoid/callbacks.rb
+- lib/mongoid/collection.rb
+- lib/mongoid/collections/cyclic_iterator.rb
+- lib/mongoid/collections/master.rb
+- lib/mongoid/collections/mimic.rb
+- lib/mongoid/collections/operations.rb
+- lib/mongoid/collections/slaves.rb
 - lib/mongoid/commands.rb
 - lib/mongoid/commands/create.rb
 - lib/mongoid/commands/delete.rb
@@ -120,10 +126,12 @@ files:
 - lib/mongoid/criterion/exclusion.rb
 - lib/mongoid/criterion/inclusion.rb
 - lib/mongoid/criterion/optional.rb
+- lib/mongoid/cursor.rb
 - lib/mongoid/document.rb
 - lib/mongoid/errors.rb
 - lib/mongoid/extensions.rb
 - lib/mongoid/extensions/array/accessors.rb
+- lib/mongoid/extensions/array/aliasing.rb
 - lib/mongoid/extensions/array/assimilation.rb
 - lib/mongoid/extensions/array/conversions.rb
 - lib/mongoid/extensions/array/parentization.rb
@@ -144,6 +152,7 @@ files:
 - lib/mongoid/extensions/string/inflections.rb
 - lib/mongoid/extensions/symbol/inflections.rb
 - lib/mongoid/extensions/time/conversions.rb
+- lib/mongoid/factory.rb
 - lib/mongoid/field.rb
 - lib/mongoid/fields.rb
 - lib/mongoid/finders.rb
@@ -171,6 +180,7 @@ files:
 - spec/integration/mongoid/associations_spec.rb
 - spec/integration/mongoid/attributes_spec.rb
 - spec/integration/mongoid/commands_spec.rb
+- spec/integration/mongoid/contexts/enumerable_spec.rb
 - spec/integration/mongoid/criteria_spec.rb
 - spec/integration/mongoid/document_spec.rb
 - spec/integration/mongoid/extensions_spec.rb
@@ -208,6 +218,11 @@ files:
 - spec/unit/mongoid/associations_spec.rb
 - spec/unit/mongoid/attributes_spec.rb
 - spec/unit/mongoid/callbacks_spec.rb
+- spec/unit/mongoid/collection_spec.rb
+- spec/unit/mongoid/collections/cyclic_iterator_spec.rb
+- spec/unit/mongoid/collections/master_spec.rb
+- spec/unit/mongoid/collections/mimic_spec.rb
+- spec/unit/mongoid/collections/slaves_spec.rb
 - spec/unit/mongoid/commands/create_spec.rb
 - spec/unit/mongoid/commands/delete_all_spec.rb
 - spec/unit/mongoid/commands/delete_spec.rb
@@ -223,6 +238,7 @@ files:
 - spec/unit/mongoid/criterion/exclusion_spec.rb
 - spec/unit/mongoid/criterion/inclusion_spec.rb
 - spec/unit/mongoid/criterion/optional_spec.rb
+- spec/unit/mongoid/cursor_spec.rb
 - spec/unit/mongoid/document_spec.rb
 - spec/unit/mongoid/errors_spec.rb
 - spec/unit/mongoid/extensions/array/accessors_spec.rb
@@ -246,6 +262,7 @@ files:
 - spec/unit/mongoid/extensions/string/inflections_spec.rb
 - spec/unit/mongoid/extensions/symbol/inflections_spec.rb
 - spec/unit/mongoid/extensions/time/conversions_spec.rb
+- spec/unit/mongoid/factory_spec.rb
 - spec/unit/mongoid/field_spec.rb
 - spec/unit/mongoid/fields_spec.rb
 - spec/unit/mongoid/finders_spec.rb
@@ -301,6 +318,7 @@ test_files:
 - spec/integration/mongoid/associations_spec.rb
 - spec/integration/mongoid/attributes_spec.rb
 - spec/integration/mongoid/commands_spec.rb
+- spec/integration/mongoid/contexts/enumerable_spec.rb
 - spec/integration/mongoid/criteria_spec.rb
 - spec/integration/mongoid/document_spec.rb
 - spec/integration/mongoid/extensions_spec.rb
@@ -337,6 +355,11 @@ test_files:
 - spec/unit/mongoid/associations_spec.rb
 - spec/unit/mongoid/attributes_spec.rb
 - spec/unit/mongoid/callbacks_spec.rb
+- spec/unit/mongoid/collection_spec.rb
+- spec/unit/mongoid/collections/cyclic_iterator_spec.rb
+- spec/unit/mongoid/collections/master_spec.rb
+- spec/unit/mongoid/collections/mimic_spec.rb
+- spec/unit/mongoid/collections/slaves_spec.rb
 - spec/unit/mongoid/commands/create_spec.rb
 - spec/unit/mongoid/commands/delete_all_spec.rb
 - spec/unit/mongoid/commands/delete_spec.rb
@@ -352,6 +375,7 @@ test_files:
 - spec/unit/mongoid/criterion/exclusion_spec.rb
 - spec/unit/mongoid/criterion/inclusion_spec.rb
 - spec/unit/mongoid/criterion/optional_spec.rb
+- spec/unit/mongoid/cursor_spec.rb
 - spec/unit/mongoid/document_spec.rb
 - spec/unit/mongoid/errors_spec.rb
 - spec/unit/mongoid/extensions/array/accessors_spec.rb
@@ -375,6 +399,7 @@ test_files:
 - spec/unit/mongoid/extensions/string/inflections_spec.rb
 - spec/unit/mongoid/extensions/symbol/inflections_spec.rb
 - spec/unit/mongoid/extensions/time/conversions_spec.rb
+- spec/unit/mongoid/factory_spec.rb
 - spec/unit/mongoid/field_spec.rb
 - spec/unit/mongoid/fields_spec.rb
 - spec/unit/mongoid/finders_spec.rb