mongo_mapper 0.13.1 → 0.15.2

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,52 +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'])
-    end
-
-    it "should have the correct system flags" do
-      expect(Docs.stats.system_flags).to eq(Docs.collection.stats['systemFlags'])
+      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/touch_spec.rb

@@ -61,7 +61,7 @@ describe "Touch" do
 
       it 'should not be true by default' do
         @comment_class.belongs_to :post, :class => @post_class
-        @comment_class.associations[:post].touch?.should_not be_true
+        @comment_class.associations[:post].touch?.should_not be_truthy
       end
 
       context 'touch the parent when true' do

data/spec/functional/validations_spec.rb

@@ -57,7 +57,7 @@ describe "Validations" do
 
     it "should create a new document" do
       instance = @document.create!(:name => "James")
-      instance.new_record?.should be_false
+      instance.new_record?.should be_falsey
     end
   end
 
@@ -140,7 +140,7 @@ describe "Validations" do
         validates_uniqueness_of :name, :scope => :adult
       end
       doc = document.new("name" => "joe", :adult => true)
-      doc.save.should be_true
+      doc.save.should be_truthy
 
       doc2 = document.new("name" => "joe", :adult => false)
       doc2.should be_valid
@@ -149,31 +149,30 @@ describe "Validations" do
     it "should work with i18n taken message" do
       @document.create(:name => 'joe')
       doc = @document.create(:name => 'joe')
-      doc.should have_error_on(:name, 'has already been taken')
+      doc.should have_error_on(:name)
+      doc.errors[:name].should == ['has already been taken']
     end
 
     it "should allow to update an object" do
       doc = @document.new("name" => "joe")
-      doc.save.should be_true
+      doc.save.should be_truthy
 
-      @document \
-        .stub(:first) \
-        .with(:name => 'joe') \
-        .and_return(doc)
+      @document.stub(:first).
+        with(:name => 'joe').
+        and_return(doc)
 
       doc.name = "joe"
-      doc.valid?.should be_true
+      doc.valid?.should be_truthy
       doc.should_not have_error_on(:name)
     end
 
     it "should fail if object name is not unique" do
       doc = @document.new("name" => "joe")
-      doc.save.should be_true
+      doc.save.should be_truthy
 
-      @document \
-        .stub(:first) \
-        .with(:name => 'joe') \
-        .and_return(doc)
+      @document.stub(:first).
+        with(:name => 'joe').
+        and_return(doc)
 
       doc2 = @document.new("name" => "joe")
       doc2.should have_error_on(:name)
@@ -186,12 +185,11 @@ describe "Validations" do
       end
 
       doc = document.new("name" => "")
-      doc.save.should be_true
+      doc.save.should be_truthy
 
-      document \
-        .stub(:first) \
-        .with(:name => '') \
-        .and_return(doc)
+      @document.stub(:first).
+        with(:name => '').
+        and_return(doc)
 
       doc2 = document.new("name" => "")
       doc2.should_not have_error_on(:name)
@@ -204,7 +202,7 @@ describe "Validations" do
       end
 
       doc = document.new('name' => nil)
-      doc.save.should be_true
+      doc.save.should be_truthy
 
       doc2 = document.new('name' => nil)
       doc2.should_not have_error_on(:name)
@@ -217,7 +215,7 @@ describe "Validations" do
       end
 
       doc = document.new("name" => "BLAMMO")
-      doc.save.should be_true
+      doc.save.should be_truthy
 
       doc2 = document.new("name" => "blammo")
       doc2.should_not have_error_on(:name)
@@ -233,7 +231,7 @@ describe "Validations" do
 
       it "should fail on entries that differ only in case" do
         doc = @document.new("name" => "BLAMMO")
-        doc.save.should be_true
+        doc.save.should be_truthy
 
         doc2 = @document.new("name" => "blammo")
         doc2.should have_error_on(:name)
@@ -251,10 +249,10 @@ describe "Validations" do
 
       it "should check for uniqueness using entire string" do
         doc = @document.new("name" => "John Doe")
-        doc.save.should be_true
+        doc.save.should be_truthy
 
         doc2 = @document.new("name" => "John")
-        doc2.valid?.should be_true
+        doc2.valid?.should be_truthy
       end
     end
 
@@ -269,12 +267,11 @@ describe "Validations" do
 
       it "should fail if the same name exists in the scope" do
         doc = @document.new("name" => "joe", "scope" => "one")
-        doc.save.should be_true
+        doc.save.should be_truthy
 
-        @document \
-          .stub(:first) \
-          .with(:name => 'joe', :scope => "one") \
-          .and_return(doc)
+        @document.stub(:first).
+          with(:name => 'joe', :scope => "one").
+          and_return(doc)
 
         doc2 = @document.new("name" => "joe", "scope" => "one")
         doc2.should have_error_on(:name)
@@ -282,12 +279,11 @@ describe "Validations" do
 
       it "should pass if the same name exists in a different scope" do
         doc = @document.new("name" => "joe", "scope" => "one")
-        doc.save.should be_true
+        doc.save.should be_truthy
 
-        @document \
-          .stub(:first) \
-          .with(:name => 'joe', :scope => 'two') \
-          .and_return(nil)
+        @document.stub(:first).
+          with(:name => 'joe', :scope => 'two').
+          and_return(nil)
 
         doc2 = @document.new("name" => "joe", "scope" => "two")
         doc2.should_not have_error_on(:name)
@@ -306,12 +302,11 @@ describe "Validations" do
 
       it "should fail if the same name exists in the scope" do
         doc = @document.new("name" => "joe", "first_scope" => "one", "second_scope" => "two")
-        doc.save.should be_true
+        doc.save.should be_truthy
 
-        @document \
-          .stub(:first) \
-          .with(:name => 'joe', :first_scope => 'one', :second_scope => 'two') \
-          .and_return(doc)
+        @document.stub(:first).
+          with(:name => 'joe', :first_scope => 'one', :second_scope => 'two').
+          and_return(doc)
 
         doc2 = @document.new("name" => "joe", "first_scope" => "one", "second_scope" => "two")
         doc2.should have_error_on(:name)
@@ -319,12 +314,11 @@ describe "Validations" do
 
       it "should pass if the same name exists in a different scope" do
         doc = @document.new("name" => "joe", "first_scope" => "one", "second_scope" => "two")
-        doc.save.should be_true
+        doc.save.should be_truthy
 
-        @document \
-          .stub(:first) \
-          .with(:name => 'joe', :first_scope => 'one', :second_scope => 'one') \
-          .and_return(nil)
+        @document.stub(:first).
+          with(:name => 'joe', :first_scope => 'one', :second_scope => 'one').
+          and_return(nil)
 
         doc2 = @document.new("name" => "joe", "first_scope" => "one", "second_scope" => "one")
         doc2.should_not have_error_on(:name)
@@ -345,21 +339,21 @@ describe "Validations" do
 
     it "should pass if there are no associated docs" do
       doc = @root_class.new
-      doc.save.should be_true
+      doc.save.should be_truthy
     end
 
     it "should pass if the associated doc is valid" do
       doc = @root_class.new
       doc.children.build(:name => 'Joe')
-      doc.save.should be_true
+      doc.save.should be_truthy
     end
 
     it "should fail if the associated doc is invalid" do
       doc = @root_class.new
       doc.children.build
-      doc.should have_error_on(:children, 'are invalid')
+      doc.should have_error_on(:children)
+      doc.errors[:children].should == ['are invalid']
     end
-
   end
 
   context "validating associated docs with custom context" do
@@ -377,22 +371,22 @@ describe "Validations" do
 
     it "should pass if there are no associated docs" do
       doc = @root_class.new
-      doc.valid?(:custom_context).should be_true
+      doc.valid?(:custom_context).should be_truthy
     end
 
     it "should pass if the associated doc is valid" do
       doc = @root_class.new
       doc.children.build(:name => 'George')
-      doc.valid?(:custom_context).should be_true
+      doc.valid?(:custom_context).should be_truthy
     end
 
     it "should fail if the associated doc is invalid" do
       doc = @root_class.new
       doc.children.build(:name => 'Bob')
-      doc.valid?(:custom_context).should_not be_true
+      doc.valid?(:custom_context).should_not be_truthy
     end
-
   end
+
   # context "validates uniqueness of with :unique shortcut" do
   #   it "should work" do
   #     @document = Doc do
@@ -402,13 +396,13 @@ describe "Validations" do
   #     doc = @document.create(:name => 'John')
   #     doc.should_not have_error_on(:name)
   #
-  #     @document \
-  #       .stub(:first) \
-  #       .with(:name => 'John') \
-  #       .and_return(doc)
+  #     @document.stub(:first).
+  #       with(:name => 'John').
+  #       and_return(doc)
   #
   #     second_john = @document.create(:name => 'John')
-  #     second_john.should have_error_on(:name, 'has already been taken')
+  #     second_john.should have_error_on(:name)
+  #     second_john.errors[:name].should == ['has already been taken']
   #   end
   # end
 end

data/spec/quality_spec.rb

@@ -27,7 +27,7 @@ describe "The library itself" do
   end
 
   RSpec::Matchers.define :be_well_formed do
-    failure_message_for_should do |actual|
+    failure_message do |actual|
       actual.join("\n")
     end
 
@@ -46,6 +46,6 @@ describe "The library itself" do
         error_messages << check_for_extra_spaces(filename)
       end
     end
-    expect(error_messages.compact).to be_well_formed
+    error_messages.compact.should be_well_formed
   end
 end

data/spec/spec_helper.rb

@@ -2,10 +2,15 @@ $:.unshift(File.expand_path('../../lib', __FILE__))
 
 require 'rubygems'
 require 'bundler/setup'
+Bundler.require(:default)
 require 'fileutils'
 require 'timecop'
 require "generator_spec/test_case"
 
+if RUBY_ENGINE == "ruby" && RUBY_VERSION >= '2.3'
+  require 'byebug'
+end
+
 if RUBY_PLATFORM != "java"
   if ENV['TRAVIS']
     require 'coveralls'
@@ -39,7 +44,7 @@ def Doc(name='Class', &block)
   end
 
   klass.class_eval(&block) if block_given?
-  klass.collection.remove
+  klass.collection.drop
   klass
 end
 
@@ -58,24 +63,47 @@ def EDoc(name='Class', &block)
 end
 
 def drop_indexes(klass)
-  klass.collection.drop_indexes if klass.database.collection_names.include?(klass.collection.name)
+  klass.collection.indexes.drop_all if klass.database.collection_names.include?(klass.collection.name)
 end
 
 log_dir = File.expand_path('../../log', __FILE__)
 FileUtils.mkdir_p(log_dir) unless File.exist?(log_dir)
 logger = Logger.new(log_dir + '/test.log')
 
-MongoMapper.connection = Mongo::MongoClient.new('127.0.0.1', 27017, :logger => logger)
-MongoMapper.database = "test"
-MongoMapper.database.collections.each { |c| c.drop_indexes }
+Mongo::Logger.logger = logger
+
+MongoMapper.connection = Mongo::Client.new(['127.0.0.1:27017'], :database => 'test')
+MongoMapper.database.collections.each { |c| c.indexes.drop_all }
 Dir[File.dirname(__FILE__) + "/support/**/*.rb"].each {|f| require f}
 
-RSpec.configure do |c|
-  c.treat_symbols_as_metadata_keys_with_true_values = true
-  c.around(:each, :without_connection) do |example|
+RSpec.configure do |config|
+  config.example_status_persistence_file_path = "./spec/examples.txt"
+
+  config.expect_with :rspec do |c|
+    c.syntax = :should
+  end
+
+  config.mock_with :rspec do |mocks|
+    mocks.syntax = :should
+  end
+
+  config.around(:each, :without_connection) do |example|
     old, MongoMapper.connection = MongoMapper.connection, nil
     example.run
     MongoMapper.connection = old
   end
-end
 
+  def suppress_stderr
+    begin
+      original_stderr = $stderr.clone
+      $stderr.reopen(File.new('/dev/null', 'w'))
+      retval = yield
+    rescue Exception => e
+      $stderr.reopen(original_stderr)
+      raise e
+    ensure
+      $stderr.reopen(original_stderr)
+    end
+    retval
+  end
+end