mongoid 1.1.4 → 1.2.0

data/perf/benchmark.rb

@@ -3,10 +3,12 @@ require "ruby-prof"
 require "benchmark"
 require "mongoid"
 
-connection = Mongo::Connection.new
-Mongoid.database = connection.db("mongoid_perf_test")
+Mongoid.configure do |config|
+  config.persist_in_safe_mode = false
+  config.master = Mongo::Connection.new.db("mongoid_perf_test")
+end
 
-Mongoid.database.collection("people").drop
+Mongoid.master.collection("people").drop
 
 class Person
   include Mongoid::Document

data/spec/integration/mongoid/associations_spec.rb

@@ -118,6 +118,18 @@ describe Mongoid::Associations do
       from_db.posts.should == [@post]
     end
 
+    context "when adding a new association" do
+
+      before do
+        @new_post = Post.new(:title => "New")
+        @person.posts << @new_post
+      end
+
+      it "rememoizes the new association" do
+        @person.posts.should == [ @post, @new_post ]
+      end
+    end
+
     context "when building" do
 
       before do

data/spec/integration/mongoid/contexts/enumerable_spec.rb

@@ -0,0 +1,20 @@
+require "spec_helper"
+
+describe Mongoid::Contexts::Enumerable do
+
+  before do
+    @person = Person.new(:title => "Sir")
+    10.times do |n|
+      @person.addresses << Address.new(:number => n, :street => "Upper Street")
+    end
+  end
+
+  describe "#paginate" do
+
+    it "paginates the embedded documents" do
+      addresses = @person.addresses.paginate(:page => nil, :per_page => 5)
+      addresses.current_page.should == 1
+      addresses.size.should == 5
+    end
+  end
+end

data/spec/integration/mongoid/criteria_spec.rb

@@ -2,6 +2,34 @@ require "spec_helper"
 
 describe Mongoid::Criteria do
 
+  describe "#excludes" do
+
+    before do
+      @person = Person.create(:title => "Sir", :age => 100, :aliases => ["D", "Durran"], :ssn => "666666666")
+    end
+
+    after do
+      Person.delete_all
+    end
+
+    context "when passed id" do
+
+      it "it properly excludes ids" do
+        Person.criteria.excludes(:id => @person.id).entries.should be_empty
+      end
+
+    end
+
+    context "when passed _id" do
+
+      it "it properly excludes ids" do
+        Person.criteria.excludes(:_id => @person.id).entries.should be_empty
+      end
+
+    end
+
+  end
+
   describe "#max" do
 
     before do

data/spec/integration/mongoid/document_spec.rb

@@ -41,7 +41,7 @@ describe Mongoid::Document do
 
     it "gets a new or current database connection" do
       person = Person.new
-      person.collection.should be_a_kind_of(Mongo::Collection)
+      person.collection.should be_a_kind_of(Mongoid::Collection)
     end
 
   end

data/spec/integration/mongoid/inheritance_spec.rb

@@ -16,7 +16,7 @@ describe Mongoid::Document do
     end
 
     it "saves in the same collection as the root" do
-      collection = Mongoid.database.collection("canvases")
+      collection = Mongoid.master.collection("canvases")
       attributes = collection.find({ :name => "Test"}, {}).next_document
       attributes["version"].should == 3
       attributes["name"].should == "Test"
@@ -34,7 +34,7 @@ describe Mongoid::Document do
     end
 
     it "saves in the same collection as the root" do
-      collection = Mongoid.database.collection("canvases")
+      collection = Mongoid.master.collection("canvases")
       attributes = collection.find({ :name => "Testy"}, {}).next_document
       attributes["version"].should == 2
       attributes["name"].should == "Testy"

data/spec/models/person.rb

@@ -94,4 +94,4 @@ end
 
 class Doctor < Person
   field :specialty
-end
+end

data/spec/spec_helper.rb

@@ -12,15 +12,20 @@ require "mocha"
 require "mongoid"
 require "spec"
 
-Mongoid.config do |config|
-  config.database = Mongo::Connection.new.db("mongoid_test")
+Mongoid.configure do |config|
+  name = "mongoid_test"
+  host = "localhost"
+  config.master = Mongo::Connection.new.db(name)
+  # config.slaves = [
+    # Mongo::Connection.new(host, 27018, :slave_ok => true).db(name)
+  # ]
 end
 
-Dir[File.join(MODELS, "*.rb")].each {|file| require File.basename(file) }
+Dir[ File.join(MODELS, "*.rb") ].sort.each { |file| require File.basename(file) }
 
 Spec::Runner.configure do |config|
   config.mock_with :mocha
   config.after :suite do
-    Mongoid.database.collections.each(&:drop)
+    Mongoid.master.collections.each(&:drop)
   end
 end

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

@@ -399,6 +399,25 @@ describe Mongoid::Associations::HasMany do
 
   end
 
+  describe "#paginate" do
+
+    before do
+      @association = Mongoid::Associations::HasMany.new(
+        @document,
+        Mongoid::Associations::Options.new(:name => :addresses)
+      )
+      @options = { :page => 1, :per_page => 10 }
+      @criteria = mock
+    end
+
+    it "creates a criteria and paginates it" do
+      Mongoid::Criteria.expects(:translate).with(Address, @options).returns(@criteria)
+      @criteria.expects(:documents=).with(@association.target)
+      @criteria.expects(:paginate).returns([])
+      @association.paginate(@options).should == []
+    end
+  end
+
   describe "#push" do
 
     before do

data/spec/unit/mongoid/associations_spec.rb

@@ -417,6 +417,15 @@ describe Mongoid::Associations do
       @game.should respond_to(:person)
     end
 
+    context "when document is root level" do
+
+      it "puts an index on the foreign key" do
+        Game.expects(:index).with("person_id")
+        Game.belongs_to_related :person
+      end
+
+    end
+
   end
 
   describe ".has_one_related" do

data/spec/unit/mongoid/attributes_spec.rb

@@ -118,7 +118,7 @@ describe Mongoid::Attributes do
   describe "#method_missing" do
 
     before do
-      Mongoid.allow_dynamic_fields = true
+      Mongoid.configure.allow_dynamic_fields = true
       @attributes = {
         :testing => "Testing"
       }
@@ -155,7 +155,7 @@ describe Mongoid::Attributes do
       context "when allowing dynamic fields" do
 
         before do
-          Mongoid.allow_dynamic_fields = true
+          Mongoid.configure.allow_dynamic_fields = true
           @person = Person.new(@attributes)
         end
 
@@ -180,7 +180,7 @@ describe Mongoid::Attributes do
       context "when not allowing dynamic fields" do
 
         before do
-          Mongoid.allow_dynamic_fields = false
+          Mongoid.configure.allow_dynamic_fields = false
           Person.fields.delete(:nofieldstring)
           @attributes = {
             :nofieldstring => "Testing"
@@ -188,7 +188,7 @@ describe Mongoid::Attributes do
         end
 
         after do
-          Mongoid.allow_dynamic_fields = true
+          Mongoid.configure.allow_dynamic_fields = true
         end
 
         it "raises an error" do

data/spec/unit/mongoid/collection_spec.rb

@@ -0,0 +1,113 @@
+require "spec_helper"
+
+describe Mongoid::Collection do
+
+  let(:master) do
+    stub.quacks_like(Mongoid::Collections::Master.allocate)
+  end
+
+  let(:slaves) do
+    stub.quacks_like(Mongoid::Collections::Slaves.allocate)
+  end
+
+  let(:collection) do
+    Mongoid::Collection.new("people")
+  end
+
+  before do
+    collection.instance_variable_set(:@master, master)
+    collection.instance_variable_set(:@slaves, slaves)
+  end
+
+  context "Mongo::Collection write operations" do
+
+    Mongoid::Collections::Operations::WRITE.each do |name|
+
+      it "defines #{name}" do
+        collection.should respond_to(name)
+      end
+    end
+
+  end
+
+  context "Mongo::Collection read operations" do
+
+    Mongoid::Collections::Operations::READ.each do |name|
+
+      it "defines #{name}" do
+        collection.should respond_to(name)
+      end
+    end
+  end
+
+  describe "#directed" do
+
+    context "when the counter is less than the maximum" do
+
+      before do
+        collection.instance_variable_set(:@counter, 0)
+      end
+
+      it "delegates to the master" do
+        collection.directed.should == master
+      end
+
+      it "increments the counter" do
+        collection.directed
+        collection.counter.should == 1
+      end
+    end
+
+    context "when the counter is at the max" do
+
+      before do
+        slaves.expects(:empty?).returns(false)
+        collection.instance_variable_set(:@counter, 10)
+      end
+
+      it "delegates to the slave" do
+        collection.directed.should == slaves
+      end
+
+      it "resets the counter" do
+        collection.directed
+        collection.counter.should == 0
+      end
+    end
+
+    context "when the slave does not exist" do
+
+      before do
+        collection.instance_variable_set(:@counter, 10)
+        slaves.expects(:empty?).returns(true)
+      end
+
+      it "delegates to the master" do
+        collection.directed.should == master
+      end
+    end
+  end
+
+  describe "#find" do
+
+    before do
+      @cursor = stub.quacks_like(Mongoid::Cursor.allocate)
+      master.expects(:find).with({ :test => "value" }, {}).returns(@mongo_cursor)
+      Mongoid::Cursor.expects(:new).with(collection, @mongo_cursor).returns(@cursor)
+    end
+
+    it "finds are returns a cursor" do
+      collection.find({ :test => "value"}).should == @cursor
+    end
+
+    context "when a block is supplied" do
+
+      it "yields to the cursor and closes it" do
+        @cursor.expects(:close).returns(true)
+        collection.find({ :test => "value" }) do |cur|
+          cur.should == @cursor
+        end
+      end
+    end
+  end
+end

data/spec/unit/mongoid/collections/cyclic_iterator_spec.rb

@@ -0,0 +1,75 @@
+require "spec_helper"
+
+describe Mongoid::Collections::CyclicIterator do
+
+  before do
+    @first = stub
+    @second = stub
+    @third = stub
+    @fourth = stub
+  end
+
+  let(:array) do
+    [ @first, @second, @third, @fourth ]
+  end
+
+  describe "#initialize" do
+
+    let(:iterator) do
+      Mongoid::Collections::CyclicIterator.new(array)
+    end
+
+    it "defaults the counter to -1" do
+      iterator.counter.should == -1
+    end
+  end
+
+  describe "#next" do
+
+    context "when the iterator has just been created" do
+
+      let(:iterator) do
+        Mongoid::Collections::CyclicIterator.new(array)
+      end
+
+      it "returns the first element" do
+        iterator.next.should == @first
+      end
+    end
+
+    context "when the iterator is in the middle" do
+
+      let(:iterator) do
+        Mongoid::Collections::CyclicIterator.new(array)
+      end
+
+      before do
+        2.times { iterator.next }
+      end
+
+      it "returns the next element given the index" do
+        iterator.next.should == @third
+      end
+    end
+
+    context "when the iterator is on the last element" do
+
+      let(:iterator) do
+        Mongoid::Collections::CyclicIterator.new(array)
+      end
+
+      before do
+        4.times { iterator.next }
+      end
+
+      it "returns the first element" do
+        iterator.next.should == @first
+      end
+
+      it "resets the counter" do
+        iterator.next
+        iterator.counter.should == 0
+      end
+    end
+  end
+end

data/spec/unit/mongoid/collections/master_spec.rb

@@ -0,0 +1,41 @@
+require "spec_helper"
+
+describe Mongoid::Collections::Master do
+
+  let(:collection) do
+    stub.quacks_like(Mongo::Collection.allocate)
+  end
+
+  let(:db) do
+    stub.quacks_like(Mongo::DB.allocate)
+  end
+
+  let(:master) do
+    Mongoid::Collections::Master.new(db, "people")
+  end
+
+  before do
+    db.expects(:collection).with("people").returns(collection)
+  end
+
+  context "Mongo::Collection operations" do
+
+    Mongoid::Collections::Operations::ALL.each do |name|
+
+      it "defines #{name}" do
+        master.should respond_to(name)
+      end
+
+      describe "##{name}" do
+
+        before do
+          collection.expects(name)
+        end
+
+        it "delegates to the collection" do
+          master.send(name)
+        end
+      end
+    end
+  end
+end