mongo_mapper 0.14.0 → 0.15.4

data/spec/unit/inspect_spec.rb

@@ -31,7 +31,7 @@ describe "Inspect" do
       klass.many :pets, :class => pets
 
       doc = klass.new(:pets => [{:name => "Kitten"}])
-      doc.inspect.should =~ /_id:.*, pets: \[.*_id.*, name: "Kitten".*\]/
+      doc.inspect.should =~ /_id:.*, pets: .*\[.*_id.*, name: "Kitten".*\]/
     end
 
     it "should include embedded document" do

data/spec/unit/key_spec.rb

@@ -1,6 +1,5 @@
 require 'spec_helper'
 
-
 class FooType < Struct.new(:bar)
   def self.to_mongo(value)
     'to_mongo'
@@ -56,23 +55,24 @@ describe "Key" do
     it "should work with name and options" do
       key = Key.new(:foo, :required => true)
       key.name.should == 'foo'
+      key.type.should be_nil
       key.options[:required].should be_truthy
     end
 
     it "should not permit reserved names" do
-      expect { Key.new(:id) }.to raise_error(/reserved/)
+      lambda { Key.new(:id) }.should raise_error(/reserved/)
     end
 
     it "should not permit bad names" do
-      expect { Key.new(:"id.bar") }.to raise_error(/must match/)
+      lambda { Key.new(:"id.bar") }.should raise_error(/must match/)
     end
 
     it "should permit bad names if __dynamic" do
-      expect { Key.new(:"id.bar", :__dynamic => true) }.to_not raise_error
+      lambda { Key.new(:"id.bar", :__dynamic => true) }.should_not raise_error
     end
 
     it "should permit bad names if it is not to create accessors" do
-      expect { Key.new(:"id.bar", :accessors => :skip) }.to_not raise_error
+      lambda { Key.new(:"id.bar", :accessors => :skip) }.should_not raise_error
     end
   end
 
@@ -112,7 +112,12 @@ describe "Key" do
     subject { @key }
 
     it "should cast each element correctly" do
-      ids = [BSON::ObjectId.new, BSON::ObjectId.new, BSON::ObjectId.new.to_s, BSON::ObjectId.new.to_s]
+      ids = [
+        BSON::ObjectId.new,
+        BSON::ObjectId.new,
+        BSON::ObjectId.new.to_s,
+        BSON::ObjectId.new.to_s
+      ]
       subject.set(ids).should == ids.map { |id| ObjectId.to_mongo(id) }
     end
   end
@@ -149,33 +154,33 @@ describe "Key" do
     context "with :read" do
       let(:accessor) { :read }
 
-      it { expect( subject.read_accessor? ).to be_truthy }
-      it { expect( subject.write_accessor? ).to be_falsey }
-      it { expect( subject.predicate_accessor? ).to be_falsey }
+      it { subject.read_accessor?.should be_truthy }
+      it { subject.write_accessor?.should be_falsey }
+      it { subject.predicate_accessor?.should be_falsey }
     end
 
     context "with :write" do
       let(:accessor) { :write }
 
-      it { expect( subject.read_accessor? ).to be_falsey }
-      it { expect( subject.write_accessor? ).to be_truthy }
-      it { expect( subject.predicate_accessor? ).to be_falsey }
+      it { subject.read_accessor?.should be_falsey }
+      it { subject.write_accessor?.should be_truthy }
+      it { subject.predicate_accessor?.should be_falsey }
     end
 
     context "with :predicate" do
       let(:accessor) { :predicate }
 
-      it { expect( subject.read_accessor? ).to be_falsey }
-      it { expect( subject.write_accessor? ).to be_falsey }
-      it { expect( subject.predicate_accessor? ).to be_truthy }
+      it { subject.read_accessor?.should be_falsey }
+      it { subject.write_accessor?.should be_falsey }
+      it { subject.predicate_accessor?.should be_truthy }
     end
 
     context "with an array of options" do
       let(:accessor) { [:read, :write] }
 
-      it { expect( subject.read_accessor? ).to be_truthy }
-      it { expect( subject.write_accessor? ).to be_truthy }
-      it { expect( subject.predicate_accessor? ).to be_falsey }
+      it { subject.read_accessor?.should be_truthy }
+      it { subject.write_accessor?.should be_truthy }
+      it { subject.predicate_accessor?.should be_falsey }
     end
   end
 

data/spec/unit/keys_spec.rb

@@ -1,6 +1,5 @@
 require 'spec_helper'
 
-
 describe "Key" do
   context ".new with no id and _id of type integer" do
     it "should not error" do
@@ -9,7 +8,7 @@ describe "Key" do
           key :_id, Integer
         end
         # No sensible default id for integer, people better pass them in if they user this
-        silence_stderr { klass.new.id.should be_nil }
+        suppress_stderr { klass.new.id.should be_nil }
       }.should_not raise_error
     end
   end
@@ -30,7 +29,7 @@ describe "Key" do
         key :_id, Integer
       end
       doc = klass.new
-      expect(doc).to receive(:warn).once
+      doc.should_receive(:warn).once
       doc.assign({:x => :y})
     end
   end
@@ -82,11 +81,11 @@ describe "Key" do
     end
 
     it "should use []= for keys instead of public writer" do
-      expect {
+      lambda {
         doc = @klass.first
         doc.user['id'].should   == 1
         doc.user['name'].should == 'John Nunemaker'
-      }.to_not raise_error
+      }.should_not raise_error
     end
   end
 
@@ -141,15 +140,25 @@ describe "Key" do
         key :value, Integer, :default => lambda { counter += 1 }
       end
 
-      expect { instance = klass.create }.to change { counter }.by(1)
-      expect {
+      lambda { instance = klass.create }.should change { counter }.by(1)
+      lambda {
         instance.reload.value.should == 1
 
         instance.value = 10
         instance.save
 
         instance.reload.value.should == 10
-      }.to_not change { counter }
+      }.should_not change { counter }
+    end
+  end
+
+  context "with attributes key" do
+    it "should raise an error" do
+      lambda do
+        klass = Doc do
+          key :attributes, Hash
+        end
+      end.should raise_error("`attributes` is a reserved key name")
     end
   end
 end # KeyTest

data/spec/unit/mongo_mapper_spec.rb

@@ -3,23 +3,28 @@ require 'spec_helper'
 class Address; end
 
 describe "MongoMapper" do
-  it "should be able to write and read connection" do
-    conn = Mongo::MongoClient.new
+  it "should be able to write and read connection", :without_connection do
+    conn = Mongo::Client.new(['127.0.0.1:27001'])
     MongoMapper.connection = conn
     MongoMapper.connection.should == conn
   end
 
-  it "should default connection to new mongo ruby driver" do
+  it "should default connection to new mongo ruby driver", :without_connection do
     MongoMapper.connection = nil
-    MongoMapper.connection.should be_instance_of(Mongo::MongoClient)
+    MongoMapper.connection.should be_instance_of(Mongo::Client)
   end
 
-  it "should be able to write and read default database" do
-    MongoMapper.database = 'test'
-    MongoMapper.database.should be_instance_of(Mongo::DB)
+  it "should be able to read default database" do
+    MongoMapper.database.should be_instance_of(Mongo::Database)
     MongoMapper.database.name.should == 'test'
   end
 
+  it "should be able to write default database", :without_connection  do
+    MongoMapper.database = 'test-2'
+    MongoMapper.database.should be_instance_of(Mongo::Database)
+    MongoMapper.database.name.should == 'test-2'
+  end
+
   it "should have document not found error" do
     lambda {
       MongoMapper::DocumentNotFound
@@ -35,96 +40,64 @@ describe "MongoMapper" do
     MongoMapper.config.should == config
   end
 
-  context "connecting to environment from config" do
-    it "should work without authentication" do
-      MongoMapper.config = {
-        'development' => {'host' => '127.0.0.1', 'port' => 27017, 'database' => 'test'}
-      }
-      expect(Mongo::MongoClient).to receive(:new).with('127.0.0.1', 27017, {})
-      expect(MongoMapper).to receive(:database=).with('test')
-      expect_any_instance_of(Mongo::DB).to receive(:authenticate).never
-      MongoMapper.connect('development')
-    end
+  context "connecting to environment from config", :without_connection do
 
     it "should work without authentication using uri" do
       MongoMapper.config = {
         'development' => {'uri' => 'mongodb://127.0.0.1:27017/test'}
       }
-      expect(Mongo::MongoClient).to receive(:new).with('127.0.0.1', 27017, {})
-      expect(MongoMapper).to receive(:database=).with('test')
-      expect_any_instance_of(Mongo::DB).to receive(:authenticate).never
+      Mongo::Client.should_receive(:new).with('mongodb://127.0.0.1:27017/test', {})
       MongoMapper.connect('development')
     end
 
-    it "should work with sinatra environment symbol" do
+    it "should work without authentication using hosts" do
       MongoMapper.config = {
-        'development' => {'host' => '127.0.0.1', 'port' => 27017, 'database' => 'test'}
+        'development' => {'hosts' => ['127.0.0.1:27017']}
       }
-      expect(Mongo::MongoClient).to receive(:new).with('127.0.0.1', 27017, {})
-      expect(MongoMapper).to receive(:database=).with('test')
-      expect_any_instance_of(Mongo::DB).to receive(:authenticate).never
-      MongoMapper.connect(:development)
-    end
-
-    it "should work with options" do
-      MongoMapper.config = {
-        'development' => {'host' => '127.0.0.1', 'port' => 27017, 'database' => 'test'}
-      }
-      connection, logger = double('connection'), double('logger')
-      expect(Mongo::MongoClient).to receive(:new).with('127.0.0.1', 27017, :logger => logger)
-      MongoMapper.connect('development', :logger => logger)
-    end
-
-    it "should pass along ssl when true" do
-      MongoMapper.config = {
-        'development' => {'host' => '127.0.0.1', 'port' => 27017, 'database' => 'test', 'ssl' => true}
-      }
-      connection, logger = double('connection'), double('logger')
-      expect(Mongo::MongoClient).to receive(:new).with('127.0.0.1', 27017, :logger => logger, :ssl => true)
-      MongoMapper.connect('development', :logger => logger)
+      Mongo::Client.should_receive(:new).with(['127.0.0.1:27017'], {})
+      MongoMapper.connect('development')
     end
 
-    it "should pass along ssl when false" do
+    it "should work without authentication using host" do
       MongoMapper.config = {
-        'development' => {'host' => '127.0.0.1', 'port' => 27017, 'database' => 'test', 'ssl' => false}
+        'development' => {'host' => '127.0.0.1:27017'}
       }
-      connection, logger = double('connection'), double('logger')
-      expect(Mongo::MongoClient).to receive(:new).with('127.0.0.1', 27017, :logger => logger, :ssl => false)
-      MongoMapper.connect('development', :logger => logger)
+      Mongo::Client.should_receive(:new).with(['127.0.0.1:27017'], {})
+      MongoMapper.connect('development')
     end
 
     it "should convert read preferences to symbols" do
       MongoMapper.config = {
-        'development' => {'host' => '127.0.0.1', 'port' => 27017, 'database' => 'test', 'options' =>  {'read' => 'primary'}}
+        'development' => {'hosts' => ['127.0.0.1:27017'], 'database' => 'test', 'read' => 'primary'}
       }
-      connection, logger = double('connection'), double('logger')
-      expect(Mongo::MongoClient).to receive(:new).with('127.0.0.1', 27017, :logger => logger, :read => :primary)
+      logger = double('logger')
+      Mongo::Client.should_receive(:new).with(['127.0.0.1:27017'], :logger => logger, :read => :primary, :database => 'test')
       MongoMapper.connect('development', :logger => logger)
     end
 
     it "should work with options from config" do
       MongoMapper.config = {
-        'development' => {'host' => '192.168.1.1', 'port' => 2222, 'database' => 'test', 'options' => {'safe' => true}}
+        'development' => {'hosts' => ['192.168.1.1:2222'], 'database' => 'test', 'safe' => true}
       }
-      connection, logger = double('connection'), double('logger')
-      expect(Mongo::MongoClient).to receive(:new).with('192.168.1.1', 2222, :logger => logger, :safe => true)
+      logger = double('logger')
+      Mongo::Client.should_receive(:new).with(['192.168.1.1:2222'], :logger => logger, :safe => true, :database => 'test')
       MongoMapper.connect('development', :logger => logger)
     end
 
     it "should work with options using uri" do
       MongoMapper.config = {
-        'development' => {'uri' => 'mongodb://127.0.0.1:27017/test'}
+        'development' => {'uri' => 'mongodb://127.0.0.1:27017/test', 'options'=> {:foo => 1}}
       }
-      connection, logger = double('connection'), double('logger')
-      expect(Mongo::MongoClient).to receive(:new).with('127.0.0.1', 27017, :logger => logger)
+      logger = double('logger')
+      Mongo::Client.should_receive(:new).with('mongodb://127.0.0.1:27017/test', :logger => logger, :foo => 1)
       MongoMapper.connect('development', :logger => logger)
     end
 
     it "should work with authentication" do
       MongoMapper.config = {
-        'development' => {'host' => '127.0.0.1', 'port' => 27017, 'database' => 'test', 'username' => 'john', 'password' => 'secret'}
+        'development' => {'hosts' => ['127.0.0.1:27017'], 'database' => 'test', 'user' => 'john', 'password' => 'secret'}
       }
-      expect_any_instance_of(Mongo::DB).to receive(:authenticate).with('john', 'secret')
+      Mongo::Client.should_receive(:new).with(['127.0.0.1:27017'], :database => 'test', :user => 'john', :password => 'secret')
       MongoMapper.connect('development')
     end
 
@@ -132,7 +105,7 @@ describe "MongoMapper" do
       MongoMapper.config = {
         'development' => {'uri' => 'mongodb://john:secret@127.0.0.1:27017/test'}
       }
-      expect_any_instance_of(Mongo::DB).to receive(:authenticate).with('john', 'secret')
+      Mongo::Client.should_receive(:new).with('mongodb://john:secret@127.0.0.1:27017/test', {})
       MongoMapper.connect('development')
     end
 
@@ -140,44 +113,24 @@ describe "MongoMapper" do
       MongoMapper.config = {
         'development' => {'uri' => 'mysql://127.0.0.1:5336/foo'}
       }
-      expect { MongoMapper.connect('development') }.to raise_error(MongoMapper::InvalidScheme)
+      lambda { MongoMapper.connect('development') }.should raise_error(Mongo::Error::InvalidURI)
     end
 
-    it "should create a replica set connection if config contains multiple hosts in the old format" do
+    it 'should forbid use of port' do
       MongoMapper.config = {
-        'development' => {
-          'hosts' => [ ['127.0.0.1', 27017], ['localhost', 27017] ],
-          'database' => 'test'
-        }
+        'development' => {'host' => '192.168.1.1', 'port' => '27017', 'database' => 'test', 'safe' => true}
       }
-
-      expect(Mongo::MongoReplicaSetClient).to receive(:new).with( ['127.0.0.1', 27017], ['localhost', 27017], {'read_secondary' => true} )
-      expect(MongoMapper).to receive(:database=).with('test')
-      expect_any_instance_of(Mongo::DB).to receive(:authenticate).never
-      MongoMapper.connect('development', 'read_secondary' => true)
+      lambda { MongoMapper.connect('development') }.should raise_error(RuntimeError)
     end
 
-    it "should create a replica set connection if config contains multiple hosts in the new format" do
-      MongoMapper.config = {
-        'development' => {
-          'hosts' => ['127.0.0.1:27017', 'localhost:27017'],
-          'database' => 'test'
-        }
-      }
-
-      expect(Mongo::MongoReplicaSetClient).to receive(:new).with( ['127.0.0.1:27017', 'localhost:27017'], {'read_secondary' => true} )
-      expect(MongoMapper).to receive(:database=).with('test')
-      expect_any_instance_of(Mongo::DB).to receive(:authenticate).never
-      MongoMapper.connect('development', 'read_secondary' => true)
-    end
   end
 
   context "setup" do
     it "should work as shortcut for setting config, environment and options" do
       config, logger = double('config'), double('logger')
-      expect(MongoMapper).to receive(:config=).with(config)
-      expect(MongoMapper).to receive(:connect).with('development', :logger => logger)
-      expect(MongoMapper).to receive(:handle_passenger_forking).once
+      MongoMapper.should_receive(:config=).with(config)
+      MongoMapper.should_receive(:connect).with('development', :logger => logger)
+      MongoMapper.should_receive(:handle_passenger_forking).once
       MongoMapper.setup(config, 'development', :logger => logger)
     end
   end

data/spec/unit/rails_spec.rb

@@ -163,7 +163,7 @@ describe "Rails integration" do
 
         it "should array representation of id if persisted" do
           @klass.new.tap do |doc|
-            expect(doc).to receive(:persisted?).and_return(true)
+            doc.should_receive(:persisted?).and_return(true)
             doc.to_param.should == doc.id.to_s
           end
         end
@@ -178,7 +178,7 @@ describe "Rails integration" do
 
         it "should array representation of id if persisted" do
           @klass.new.tap do |doc|
-            expect(doc).to receive(:persisted?).and_return(true)
+            doc.should_receive(:persisted?).and_return(true)
             doc.to_key.should == [doc.id]
           end
         end

data/spec/unit/validations_spec.rb

@@ -157,19 +157,19 @@ describe "Validations" do
       end # numericality of
 
       context "validating presence of" do
-           it "should work with validates_presence_of macro" do
-             @document.key :name, String
-             @document.validates_presence_of :name
-             doc = @document.new
-             doc.should have_error_on(:name)
-           end
-
-           it "should work with :required shortcut on key definition" do
-             @document.key :name, String, :required => true
-             doc = @document.new
-             doc.should have_error_on(:name)
-           end
-         end
+        it "should work with validates_presence_of macro" do
+          @document.key :name, String
+          @document.validates_presence_of :name
+          doc = @document.new
+          doc.should have_error_on(:name)
+        end
+
+        it "should work with :required shortcut on key definition" do
+          @document.key :name, String, :required => true
+          doc = @document.new
+          doc.should have_error_on(:name)
+        end
+      end
 
       context "validating exclusion of" do
         it "should throw error if enumerator not provided" do
@@ -436,19 +436,19 @@ describe "Validations" do
       end # numericality of
 
       context "validating presence of" do
-         it "should work with validates_presence_of macro" do
+        it "should work with validates_presence_of macro" do
            @embedded_doc.key :name, String
            @embedded_doc.validates_presence_of :name
            doc = @embedded_doc.new
            doc.should have_error_on(:name)
-         end
+        end
 
-         it "should work with :required shortcut on key definition" do
+        it "should work with :required shortcut on key definition" do
            @embedded_doc.key :name, String, :required => true
            doc = @embedded_doc.new
            doc.should have_error_on(:name)
-         end
-       end
+        end
+      end
 
       context "validating exclusion of" do
         it "should throw error if enumerator not provided" do