mongo_mapper 0.14.0 → 0.15.4

data/spec/functional/safe_spec.rb

@@ -42,7 +42,7 @@ describe "Safe" do
 
     it "should not raise an error on duplicate IDs" do
       k = @klass.create
-      expect { j = @klass.create(:_id => k.id) }.to_not raise_error
+      lambda { j = @klass.create(:_id => k.id) }.should_not raise_error
     end
   end
 
@@ -61,46 +61,44 @@ describe "Safe" do
 
       it "should raise an error on duplicate IDs" do
         k = @klass.create
-        expect { j = @klass.create(:_id => k.id) }.to raise_error(Mongo::OperationFailure)
+        lambda { j = @klass.create(:_id => k.id) }.should raise_error(Mongo::Error::OperationFailure)
       end
 
       context "using safe setting from class" do
-        it "should pass :w => 1 option to save" do
-          instance = @klass.new(:email => 'john@doe.com')
-          expect_any_instance_of(Mongo::Collection).to receive(:insert).once.with({'_id' => instance.id, 'email' => 'john@doe.com'}, {:w => 1})
-          instance.save!
+        it "should pass :w => 1 option to the collection" do
+          @klass.collection.write_concern.options.should == { w: 1 }
         end
 
         it "should work fine when all is well" do
-          expect {
+          lambda {
             @klass.new(:email => 'john@doe.com').save
-          }.to_not raise_error
+          }.should_not raise_error
         end
 
         it "should raise error when operation fails" do
-          expect {
+          lambda {
             2.times do
               @klass.new(:email => 'john@doe.com').save
             end
-          }.to raise_error(Mongo::OperationFailure)
+          }.should raise_error(Mongo::Error::OperationFailure)
         end
       end
 
       context "overriding safe setting" do
         it "should raise error if safe is true" do
-          expect {
+          lambda {
             2.times do
               @klass.new(:email => 'john@doe.com').save(:safe => true)
             end
-          }.to raise_error(Mongo::OperationFailure)
+          }.should raise_error(Mongo::Error::OperationFailure)
         end
 
         it "should not raise error if safe is false" do
-          expect {
+          lambda {
             2.times do
               @klass.new(:email => 'john@doe.com').save(:safe => false)
             end
-          }.to_not raise_error
+          }.should_not raise_error
         end
       end
     end
@@ -120,44 +118,42 @@ describe "Safe" do
       end
 
       context "using safe setting from class" do
-        it "should pass :safe => options_hash to save" do
-          instance = @klass.new(:email => 'john@doe.com')
-          expect_any_instance_of(Mongo::Collection).to receive(:insert).once.with({'_id' => instance.id, 'email' => 'john@doe.com'}, {:j => true})
-          instance.save!
+        it "should pass :safe => options_hash to the collection" do
+          @klass.collection.write_concern.options.should == { j: true }
         end
 
         it "should work fine when all is well" do
-          expect {
+          lambda {
             @klass.new(:email => 'john@doe.com').save
-          }.to_not raise_error
+          }.should_not raise_error
         end
 
         it "should raise error when operation fails" do
-          expect {
+          lambda {
             2.times do
               @klass.new(:email => 'john@doe.com').save
             end
-          }.to raise_error(Mongo::OperationFailure)
+          }.should raise_error(Mongo::Error::OperationFailure)
         end
       end
 
       context "overriding safe setting" do
         it "should raise error if safe is true" do
-          expect {
+          lambda {
             2.times do
               @klass.new(:email => 'john@doe.com').save(:safe => true)
             end
-          }.to raise_error(Mongo::OperationFailure)
+          }.should raise_error(Mongo::Error::OperationFailure)
         end
 
         it "should not raise error if safe is false" do
-          expect {
+          lambda {
             2.times do
               @klass.new(:email => 'john@doe.com').save(:safe => false)
             end
-          }.to_not raise_error
+          }.should_not raise_error
         end
       end
     end
   end
-end
+end

data/spec/functional/sci_spec.rb

@@ -3,12 +3,12 @@ require 'spec_helper'
 describe "Single collection inheritance (document)" do
   context "without a connection", :without_connection => true do
     it "should attempt to create a connection during inheritance" do
-      expect(Mongo::MongoClient).to_not receive(:new)
+      Mongo::Client.should_not_receive(:new)
       doc = Class.new
       doc.send(:include, MongoMapper::Document)
-      expect {
+      lambda {
         Class.new(doc)
-      }.to_not raise_error
+      }.should_not raise_error
     end
 
     it "should pick up a connection if one wasn't set" do
@@ -17,7 +17,7 @@ describe "Single collection inheritance (document)" do
       klass = Class.new(doc)
       klass.connection.should be_nil
       MongoMapper.connection
-      klass.connection.should be_a Mongo::MongoClient
+      klass.connection.should be_a Mongo::Client
     end
   end
 
@@ -27,7 +27,7 @@ describe "Single collection inheritance (document)" do
         include MongoMapper::Document
         key :name, String
       end
-      DocParent.collection.remove
+      DocParent.collection.drop
 
       class ::DocDaughter < ::DocParent; end
       class ::DocSon < ::DocParent; end
@@ -61,7 +61,7 @@ describe "Single collection inheritance (document)" do
     it "should use the same connection in the subclass" do
       parent_class = Class.new do
         include MongoMapper::Document
-        connection Mongo::MongoClient.new
+        connection Mongo::Client.new(['127.0.0.1:27017'])
       end
 
       child_class = Class.new(parent_class) do
@@ -377,4 +377,4 @@ describe "Single collection inheritance (document)" do
       p.reload.article_parent.sci_polymorphic_posts.all.should include(p)
     end
   end
-end
+end

data/spec/functional/scopes_spec.rb

@@ -170,7 +170,7 @@ describe "Scopes" do
           key   :title, String
           key   :published_at, Time
         end
-        Item.collection.remove
+        Item.collection.drop
 
         class ::Page < ::Item; end
         class ::Blog < ::Item
@@ -200,6 +200,19 @@ describe "Scopes" do
         Blog.scopes.keys.map(&:to_s).should =~ %w(by_slug by_title published)
       end
     end
+
+    context 'with predefined class method name' do
+      it 'should raise ArgumentError' do
+        bad_names = %i(private public protected allocate new name parent superclass reload)
+        bad_names.each do |bad_name|
+          -> {
+            Doc() do
+              scope bad_name, -> {}
+            end
+          }.should raise_error(ArgumentError, /You tried to define a scope named "#{bad_name}"/)
+        end
+      end
+    end
   end
 
   describe "with_scope" do
@@ -434,4 +447,79 @@ describe "Scopes" do
       @klass.unsent.sorted.all.should == [two_days_ago, one_day_ago]
     end
   end
+
+  describe "thread safety" do
+    before do
+      @klass = Doc do
+        key :name, String
+      end
+
+      @threads = []
+    end
+
+    after do
+      @threads.each do |thread|
+        thread.kill
+      end
+    end
+
+    def make_thread(&block)
+      Thread.new(&block).tap do |thread|
+        @threads << thread
+      end
+    end
+
+    def wait_for_threads!
+      @threads.each { |t| t.join }
+    end
+
+    it "should not taint another thread's active scopes" do
+      count_active_scopes = nil
+      second_thread_run = false
+
+      make_thread do
+        @klass.with_scope(name: 'foo') do
+          loop do
+            sleep Float::EPSILON
+            break if second_thread_run
+          end
+        end
+      end
+
+      make_thread do
+        count_active_scopes = @klass.active_scopes.length
+        second_thread_run = true
+      end
+
+      wait_for_threads!
+
+      count_active_scopes.should == 0
+    end
+
+    it "should not taint another thread's count method" do
+      @klass.create!(name: 'foo')
+      @klass.create!(name: 'bar')
+
+      klass_count = nil
+      second_thread_run = false
+
+      make_thread do
+        @klass.with_scope(name: 'foo') do
+          loop do
+            sleep Float::EPSILON
+            break if second_thread_run
+          end
+        end
+      end
+
+      make_thread do
+        klass_count = @klass.count
+        second_thread_run = true
+      end
+
+      wait_for_threads!
+
+      klass_count.should == 2
+    end
+  end
 end

data/spec/functional/static_keys_spec.rb

@@ -92,7 +92,7 @@ describe MongoMapper::Plugins::Keys::Static do
     end
 
     it "should not blow up when loading if there is a key defined in the db that has not been defined (but it should not load it)" do
-      @klass.collection.insert({ :foo => "bar", :valid_key => "something" })
+      @klass.collection.insert_one({ :foo => "bar", :valid_key => "something" })
       @obj = @klass.first
       @obj.valid_key.should == "something"
 
@@ -147,7 +147,7 @@ describe MongoMapper::Plugins::Keys::Static do
 
       lambda {
         @static_key_object['foo'] = 'bar'
-      }.should raise_error
+      }.should raise_error(MongoMapper::Plugins::Keys::Static::MissingKeyError)
     end
   end
 end

data/spec/functional/stats_spec.rb

@@ -13,7 +13,11 @@ describe "Stats" do
 
   context "with no documents present" do
     it "should return nil" do
-      expect(Docs.stats).to eq(nil)
+      if Docs.stats == nil
+        Docs.stats.should == nil
+      else
+        Docs.stats['count'].should == 0
+      end
     end
   end
 
@@ -23,48 +27,60 @@ describe "Stats" do
       Docs.create!
     end
 
+    def get_stats
+      MongoMapper.database.command(:collstats => 'docs').documents[0]
+    end
+
     it "should have the correct count" do
-      expect(Docs.stats.count).to eq(Docs.collection.stats['count'])
+      Docs.stats.count.should == get_stats['count']
     end
 
     it "should have the correct namespace" do
-      expect(Docs.stats.ns).to eq(Docs.collection.stats['ns'])
+      Docs.stats.ns.should == get_stats['ns']
     end
 
     it "should have the correct size" do
-      expect(Docs.stats.size).to eq(Docs.collection.stats['size'])
+      Docs.stats.size.should == get_stats['size']
     end
 
     it "should have the correct storage size" do
-      expect(Docs.stats.storage_size).to eq(Docs.collection.stats['storageSize'])
+      Docs.stats.storage_size.should == get_stats['storageSize']
     end
 
     it "should have the correct average object size" do
-      expect(Docs.stats.avg_obj_size).to eq(Docs.collection.stats['avgObjSize'])
+      Docs.stats.avg_obj_size.should == get_stats['avgObjSize']
     end
 
     it "should have the correct number of extents" do
-      expect(Docs.stats.num_extents).to eq(Docs.collection.stats['numExtents'])
+      if get_stats['numExtents']
+        Docs.stats.num_extents.should == get_stats['numExtents']
+      end
     end
 
     it "should have the correct number of indexes" do
-      expect(Docs.stats.nindexes).to eq(Docs.collection.stats['nindexes'])
+      Docs.stats.nindexes.should == get_stats['nindexes']
     end
 
     it "should have the correct last extent size" do
-      expect(Docs.stats.last_extent_size).to eq(Docs.collection.stats['lastExtentSize'])
+      if get_stats['lastExtentSize']
+        Docs.stats.last_extent_size.should == get_stats['lastExtentSize']
+      end
     end
 
     it "should have the correct padding factor" do
-      expect(Docs.stats.padding_factor).to eq(Docs.collection.stats['paddingFactor'])
+      if get_stats['paddingFactor']
+        Docs.stats.padding_factor.should == get_stats['paddingFactor']
+      end
     end
 
     it "should have the correct user flags" do
-      expect(Docs.stats.user_flags).to eq(Docs.collection.stats['userFlags'])
+      if get_stats['userFlags']
+        Docs.stats.user_flags.should == get_stats['userFlags']
+      end
     end
 
     it "should have the correct total index size" do
-      expect(Docs.stats.total_index_size).to eq(Docs.collection.stats['totalIndexSize'])
+      Docs.stats.total_index_size.should == get_stats['totalIndexSize']
     end
   end
 end

data/spec/functional/strong_parameters_spec.rb

@@ -0,0 +1,49 @@
+require 'spec_helper'
+
+describe "Strong parameters" do
+  context 'A document with strong parameters protection' do
+    if ::ActiveModel.const_defined?(:ForbiddenAttributesProtection)
+      require "action_controller/metal/strong_parameters"
+
+      before do
+        @doc_class = Doc do
+          plugin MongoMapper::Plugins::StrongParameters
+
+          key :name, String
+          key :admin, Boolean, :default => false
+        end
+
+        @doc = @doc_class.create(:name => 'Steve Sloan')
+      end
+
+      let(:params) {
+        {name: "Permitted", admin: true}
+      }
+
+      let(:strong_params) {
+        ActionController::Parameters.new params
+      }
+
+      it "allows assignment of attribute hashes" do
+        @doc.attributes = params
+        @doc.name.should =="Permitted"
+      end
+
+      it "doesn't allow mass assignment of ActionController::Parameters" do
+        lambda {
+          @doc.attributes = strong_params
+        }.should raise_error(ActiveModel::ForbiddenAttributesError)
+      end
+
+      it "does not allow mass assignment of non-permitted attributes" do
+        @doc.attributes = strong_params.permit(:name)
+        @doc.admin.should == false
+      end
+
+      it "allows mass assignment of permitted attributes" do
+        @doc.attributes = strong_params.permit(:name)
+        @doc.name.should == "Permitted"
+      end
+    end
+  end
+end

data/spec/functional/validations_spec.rb

@@ -157,8 +157,7 @@ describe "Validations" do
       doc = @document.new("name" => "joe")
       doc.save.should be_truthy
 
-      allow(@document).to \
-        receive(:first).
+      @document.stub(:first).
         with(:name => 'joe').
         and_return(doc)
 
@@ -171,8 +170,7 @@ describe "Validations" do
       doc = @document.new("name" => "joe")
       doc.save.should be_truthy
 
-      allow(@document).to \
-        receive(:first).
+      @document.stub(:first).
         with(:name => 'joe').
         and_return(doc)
 
@@ -189,8 +187,7 @@ describe "Validations" do
       doc = document.new("name" => "")
       doc.save.should be_truthy
 
-      allow(@document).to \
-        receive(:first).
+      @document.stub(:first).
         with(:name => '').
         and_return(doc)
 
@@ -272,8 +269,7 @@ describe "Validations" do
         doc = @document.new("name" => "joe", "scope" => "one")
         doc.save.should be_truthy
 
-        allow(@document).to \
-          receive(:first).
+        @document.stub(:first).
           with(:name => 'joe', :scope => "one").
           and_return(doc)
 
@@ -285,8 +281,7 @@ describe "Validations" do
         doc = @document.new("name" => "joe", "scope" => "one")
         doc.save.should be_truthy
 
-        allow(@document).to \
-          receive(:first).
+        @document.stub(:first).
           with(:name => 'joe', :scope => 'two').
           and_return(nil)
 
@@ -309,8 +304,7 @@ describe "Validations" do
         doc = @document.new("name" => "joe", "first_scope" => "one", "second_scope" => "two")
         doc.save.should be_truthy
 
-        allow(@document).to \
-          receive(:first).
+        @document.stub(:first).
           with(:name => 'joe', :first_scope => 'one', :second_scope => 'two').
           and_return(doc)
 
@@ -322,8 +316,7 @@ describe "Validations" do
         doc = @document.new("name" => "joe", "first_scope" => "one", "second_scope" => "two")
         doc.save.should be_truthy
 
-        allow(@document).to \
-          receive(:first).
+        @document.stub(:first).
           with(:name => 'joe', :first_scope => 'one', :second_scope => 'one').
           and_return(nil)
 
@@ -403,8 +396,7 @@ describe "Validations" do
   #     doc = @document.create(:name => 'John')
   #     doc.should_not have_error_on(:name)
   #
-  #     allow(@document).to \
-  #       receive(:first).
+  #     @document.stub(:first).
   #       with(:name => 'John').
   #       and_return(doc)
   #