mongo_mapper 0.13.0 → 0.15.1

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

data/spec/support/matchers.rb

@@ -1,24 +1,15 @@
 RSpec::Matchers.define :have_error_on do |*args|
-  @message = nil
-  @attributes = [args]
-
-  chain :or do |*args|
-    @attributes << args
-  end
-
   match do |model|
+    field = args.dup.shift
+    error_messages = args
+
     model.valid?
-    @has_errors = @attributes.detect {|attribute| model.errors[attribute[0]].present? }
-    if @message
-      !!@has_errors && model.errors[@has_errors[0]].include?(@has_errors[1])
-    else
-      !!@has_errors
-    end
+    model.errors[field].any?
   end
 end
 
 RSpec::Matchers.define :have_index do |index_name|
   match do |model|
-    model.collection.index_information.detect { |index| index[0] == index_name }.present?
+    model.collection.indexes.get(index_name).present?
   end
 end

data/spec/unit/associations/base_spec.rb

@@ -12,7 +12,7 @@ module AssociationSpec
 
     it "should also allow options when initializing" do
       base = ManyAssociation.new(:foos, :polymorphic => true)
-      base.options[:polymorphic].should be_true
+      base.options[:polymorphic].should be_truthy
     end
 
     context "klass" do
@@ -28,31 +28,31 @@ module AssociationSpec
 
     context "polymorphic?" do
       it "should be true if polymorphic" do
-        ManyAssociation.new(:foos, :polymorphic => true).polymorphic?.should be_true
+        ManyAssociation.new(:foos, :polymorphic => true).polymorphic?.should be_truthy
       end
 
       it "should be false if not polymorphic" do
-        ManyAssociation.new(:bars).polymorphic?.should be_false
+        ManyAssociation.new(:bars).polymorphic?.should be_falsey
       end
     end
 
     context "as?" do
       it "should be true if one" do
-        OneAssociation.new(:foo, :as => :commentable).as?.should be_true
+        OneAssociation.new(:foo, :as => :commentable).as?.should be_truthy
       end
 
       it "should be false if not one" do
-        ManyAssociation.new(:foo).as?.should be_false
+        ManyAssociation.new(:foo).as?.should be_falsey
       end
     end
 
     context "in_array?" do
       it "should be true if one" do
-        OneAssociation.new(:foo, :in => :list_ids).in_array?.should be_true
+        OneAssociation.new(:foo, :in => :list_ids).in_array?.should be_truthy
       end
 
       it "should be false if not one" do
-        ManyAssociation.new(:foo).in_array?.should be_false
+        ManyAssociation.new(:foo).in_array?.should be_falsey
       end
     end
 
@@ -98,15 +98,15 @@ module AssociationSpec
     context "embeddable?" do
       it "should be true if class is embeddable" do
         base = ManyAssociation.new(:medias)
-        base.embeddable?.should be_true
+        base.embeddable?.should be_truthy
       end
 
       it "should be false if class is not embeddable" do
         base = ManyAssociation.new(:statuses)
-        base.embeddable?.should be_false
+        base.embeddable?.should be_falsey
 
         base = BelongsToAssociation.new(:project)
-        base.embeddable?.should be_false
+        base.embeddable?.should be_falsey
       end
     end
 
@@ -134,11 +134,11 @@ module AssociationSpec
 
     context "touch?" do
       it "should be true if touch" do
-        BelongsToAssociation.new(:car, :touch => true).touch?.should be_true
+        BelongsToAssociation.new(:car, :touch => true).touch?.should be_truthy
       end
 
       it "should be false if not touch" do
-        BelongsToAssociation.new(:car).touch?.should be_false
+        BelongsToAssociation.new(:car).touch?.should be_falsey
       end
     end
 

data/spec/unit/associations/belongs_to_association_spec.rb

@@ -18,12 +18,12 @@ module BelongsToAssociation
     context "embeddable?" do
       it "should be false even if class is embeddable" do
         base = BelongsToAssociation.new(:address)
-        base.embeddable?.should be_false
+        base.embeddable?.should be_falsey
       end
 
       it "should be false if class is not embeddable" do
         base = BelongsToAssociation.new(:project)
-        base.embeddable?.should be_false
+        base.embeddable?.should be_falsey
       end
     end
   end

data/spec/unit/associations/many_association_spec.rb

@@ -25,12 +25,12 @@ module ManyAssociationSpec
     context "embeddable?" do
       it "should be true if class is embeddable" do
         base = ManyAssociation.new(:medias)
-        base.embeddable?.should be_true
+        base.embeddable?.should be_truthy
       end
 
       it "should be false if class is not embeddable" do
         base = ManyAssociation.new(:statuses)
-        base.embeddable?.should be_false
+        base.embeddable?.should be_falsey
       end
     end
 

data/spec/unit/associations/one_association_spec.rb

@@ -14,12 +14,12 @@ module OneAssociationSpec
     context "embeddable?" do
       it "should be true if class is embeddable" do
         base = OneAssociation.new(:media)
-        base.embeddable?.should be_true
+        base.embeddable?.should be_truthy
       end
 
       it "should be false if class is not embeddable" do
         base = OneAssociation.new(:project)
-        base.embeddable?.should be_false
+        base.embeddable?.should be_falsey
       end
     end
 

data/spec/unit/associations/proxy_spec.rb

@@ -18,10 +18,8 @@ end
 
 describe "Proxy" do
   before do
-    @owner = double('owner')
-    @owner.stub(:new?).and_return(false)
-    @association = double('association')
-    @association.stub(:options).and_return({:extend => []})
+    @owner = double('owner', :new? => false)
+    @association = double('association', :options => {:extend => []})
 
     @proxy       = FakeProxy.new(@owner, @association)
     @nil_proxy   = FakeNilProxy.new(@owner, @association)
@@ -39,50 +37,46 @@ describe "Proxy" do
 
   context "nil?" do
     it "should be true if nil" do
-      @nil_proxy.nil?.should be_true
+      @nil_proxy.nil?.should be_truthy
     end
 
     it "should be false if not nil" do
-      @proxy.nil?.should be_false
+      @proxy.nil?.should be_falsey
     end
   end
 
   context "blank?" do
     it "should be true if blank" do
-      @blank_proxy.blank?.should be_true
-      @nil_proxy.blank?.should be_true
+      @blank_proxy.blank?.should be_truthy
+      @nil_proxy.blank?.should be_truthy
     end
 
     it "should be false if not blank" do
-      @proxy.blank?.should be_false
+      @proxy.blank?.should be_falsey
     end
   end
 
   context "present?" do
     it "should be true if present" do
-      @proxy.present?.should be_true
+      @proxy.present?.should be_truthy
     end
 
     it "should be false if not present" do
-      @blank_proxy.present?.should be_false
-      @nil_proxy.present?.should be_false
+      @blank_proxy.present?.should be_falsey
+      @nil_proxy.present?.should be_falsey
     end
   end
 
   it "should delegate respond_to? to target" do
-    @proxy.respond_to?(:each).should be_true
-    @proxy.respond_to?(:size).should be_true
-    @proxy.respond_to?(:gsub).should be_false
+    @proxy.respond_to?(:each).should be_truthy
+    @proxy.respond_to?(:size).should be_truthy
+    @proxy.respond_to?(:gsub).should be_falsey
   end
 
   it "should alias proxy owner to owner" do
     @proxy.proxy_owner.should == @owner
   end
 
-  it "should alias proxy target to target" do
-    @proxy.proxy_target.should == @target
-  end
-
   context "send" do
     it "should work if proxy responds to method" do
       @proxy.send(:reset)
@@ -94,7 +88,12 @@ describe "Proxy" do
     end
 
     it "should not work if neither the proxy or target respond to method" do
-      lambda { @proxy.send(:gsub) }.should raise_error
+      lambda { @proxy.send(:gsub) }.should raise_error(NoMethodError)
+    end
+
+    it "should work if a proc is passed" do
+      p = Proc.new {|x| x+1}
+      @proxy.send(:collect, &p).should == [2,3]
     end
   end
 end

data/spec/unit/clone_spec.rb

@@ -45,7 +45,7 @@ describe "Clone" do
       end
 
       it "should clone a cloned document" do
-        expect { @doc.clone.clone }.to_not raise_error
+        lambda { @doc.clone.clone }.should_not raise_error
         @doc.clone.clone.id.should be_a BSON::ObjectId
       end
     end

data/spec/unit/document_spec.rb

@@ -8,7 +8,7 @@ describe "Document" do
     end
 
     it "should return false for embeddable" do
-      Doc().embeddable?.should be_false
+      Doc().embeddable?.should be_falsey
     end
 
     it "should have logger method" do
@@ -21,11 +21,11 @@ describe "Document" do
     end
 
     it "should have a connection" do
-      @document.connection.should be_instance_of(Mongo::MongoClient)
+      @document.connection.should be_instance_of(Mongo::Client)
     end
 
     it "should allow setting different connection without affecting the default" do
-      conn = Mongo::MongoClient.new
+      conn = Mongo::Client.new(['127.0.0.1:27001'])
       @document.connection conn
       @document.connection.should == conn
       @document.connection.should_not == MongoMapper.connection
@@ -122,8 +122,8 @@ describe "Document" do
     it "should use default values if defined for keys" do
       @document.key :active, Boolean, :default => true
 
-      @document.new.active.should be_true
-      @document.new(:active => false).active.should be_false
+      @document.new.active.should be_truthy
+      @document.new(:active => false).active.should be_falsey
     end
 
     it "should use default values if defined even when custom data type" do
@@ -147,14 +147,14 @@ describe "Document" do
 
     context "new?" do
       it "should be true if no id" do
-        @document.new.new?.should be_true
+        @document.new.new?.should be_truthy
       end
 
       it "should be true if id but using custom id and not saved yet" do
         @document.key :_id, String
-        doc = silence_stderr { @document.new }
+        doc = suppress_stderr { @document.new }
         doc.id = '1234'
-        doc.new?.should be_true
+        doc.new?.should be_truthy
       end
     end
 

data/spec/unit/dynamic_finder_spec.rb

@@ -10,28 +10,28 @@ describe "DynamicFinder" do
 
   context "found?" do
     it "should be true for find_by" do
-      DynamicFinder.new(:find_by_foo).found?.should be_true
+      DynamicFinder.new(:find_by_foo).found?.should be_truthy
     end
 
     it "should be true for find_by with !" do
-      DynamicFinder.new(:find_by_foo!).found?.should be_true
+      DynamicFinder.new(:find_by_foo!).found?.should be_truthy
     end
 
     it "should be true for find_all_by" do
-      DynamicFinder.new(:find_all_by_foo).found?.should be_true
+      DynamicFinder.new(:find_all_by_foo).found?.should be_truthy
     end
 
     it "should be true for find_or_initialize_by" do
-      DynamicFinder.new(:find_or_initialize_by_foo).found?.should be_true
+      DynamicFinder.new(:find_or_initialize_by_foo).found?.should be_truthy
     end
 
     it "should be true for find_or_create_by" do
-      DynamicFinder.new(:find_or_create_by_foo).found?.should be_true
+      DynamicFinder.new(:find_or_create_by_foo).found?.should be_truthy
     end
 
     it "should be false for anything else" do
       [:foobar, :bazwick].each do |method|
-        DynamicFinder.new(method).found?.should be_false
+        DynamicFinder.new(method).found?.should be_falsey
       end
     end
   end
@@ -65,7 +65,7 @@ describe "DynamicFinder" do
     end
 
     it "should set bang to false" do
-      DynamicFinder.new(:find_by_foo).bang.should be_false
+      DynamicFinder.new(:find_by_foo).bang.should be_falsey
     end
   end
 
@@ -83,7 +83,7 @@ describe "DynamicFinder" do
     end
 
     it "should set bang to true" do
-      DynamicFinder.new(:find_by_foo!).bang.should be_true
+      DynamicFinder.new(:find_by_foo!).bang.should be_truthy
     end
   end
 

data/spec/unit/embedded_document_spec.rb

@@ -66,12 +66,12 @@ describe "EmbeddedDocument" do
       end
 
       it "should know it is using object id" do
-        @klass.using_object_id?.should be_true
+        @klass.using_object_id?.should be_truthy
       end
 
       it "should know it is not using object id if _id type is changed" do
         @klass.key :_id, String
-        @klass.using_object_id?.should be_false
+        @klass.using_object_id?.should be_falsey
       end
     end
 
@@ -83,7 +83,7 @@ describe "EmbeddedDocument" do
       end
 
       it "should return false for embeddable" do
-        EDoc().embeddable?.should be_true
+        EDoc().embeddable?.should be_truthy
       end
 
       context "#to_mongo" do
@@ -96,7 +96,7 @@ describe "EmbeddedDocument" do
         it "should convert to_mongo for other values" do
           doc = @klass.new(:foo => 'bar')
           to_mongo = @klass.to_mongo(doc)
-          to_mongo.is_a?(Hash).should be_true
+          to_mongo.is_a?(Hash).should be_truthy
           to_mongo['foo'].should == 'bar'
         end
       end
@@ -115,7 +115,7 @@ describe "EmbeddedDocument" do
 
         it "should be instance if hash of attributes" do
           doc = @klass.from_mongo({:foo => 'bar'})
-          doc.instance_of?(@klass).should be_true
+          doc.instance_of?(@klass).should be_truthy
           doc.foo.should == 'bar'
         end
       end
@@ -140,13 +140,13 @@ describe "EmbeddedDocument" do
           key = @document.key(:name, String, :required => true)
           key.name.should == 'name'
           key.type.should == String
-          key.options[:required].should be_true
+          key.options[:required].should be_truthy
         end
 
         it "should work with name and options" do
           key = @document.key(:name, :required => true)
           key.name.should == 'name'
-          key.options[:required].should be_true
+          key.options[:required].should be_truthy
         end
 
         it "should be tracked per document" do
@@ -206,11 +206,11 @@ describe "EmbeddedDocument" do
         end
 
         it "should not add anonymous objects to the ancestor tree" do
-          OtherChild.ancestors.any? { |a| a.name.blank? }.should be_false
+          OtherChild.ancestors.any? { |a| a.name.blank? }.should be_falsey
         end
 
         it "should not include descendant keys" do
-          lambda { Parent.new.other_child }.should raise_error
+          lambda { Parent.new.other_child }.should raise_error(NoMethodError)
         end
       end
 
@@ -308,7 +308,7 @@ describe "EmbeddedDocument" do
         end
 
         it "should not throw error if initialized with nil" do
-          expect { @document.new(nil) }.to_not raise_error
+          lambda { @document.new(nil) }.should_not raise_error
         end
       end
 
@@ -422,7 +422,7 @@ describe "EmbeddedDocument" do
           it "should create key and write value for missing key" do
             doc = @document.new
             doc[:foo] = 'string'
-            doc.class.keys.include?('foo').should be_true
+            doc.class.keys.include?('foo').should be_truthy
             doc[:foo].should == 'string'
           end
 
@@ -550,9 +550,9 @@ describe "EmbeddedDocument" do
       context "checking if a keys value is present" do
         it "should work for defined keys" do
           doc = @document.new
-          doc.name?.should be_false
+          doc.name?.should be_falsey
           doc.name = 'John'
-          doc.name?.should be_true
+          doc.name?.should be_truthy
         end
 
         it "should raise no method error for undefined keys" do
@@ -590,16 +590,16 @@ describe "EmbeddedDocument" do
         end
 
         it "should be equal if id and class are the same" do
-          (@document.new('_id' => @oid) == @document.new('_id' => @oid)).should be_true
+          (@document.new('_id' => @oid) == @document.new('_id' => @oid)).should be_truthy
         end
 
         it "should not be equal if class same but id different" do
-          (@document.new('_id' => @oid) == @document.new('_id' => BSON::ObjectId.new)).should be_false
+          (@document.new('_id' => @oid) == @document.new('_id' => BSON::ObjectId.new)).should be_falsey
         end
 
         it "should not be equal if id same but class different" do
           another_document = Doc()
-          (@document.new('_id' => @oid) == another_document.new('_id' => @oid)).should be_false
+          (@document.new('_id' => @oid) == another_document.new('_id' => @oid)).should be_falsey
         end
       end
 
@@ -661,16 +661,15 @@ describe "EmbeddedDocument" do
 
          it "should should raise errors when invalid" do
            @doc.name = ''
-           expect { @doc.save! }.to raise_error(MongoMapper::DocumentNotValid)
+           lambda { @doc.save! }.should raise_error(MongoMapper::DocumentNotValid)
          end
 
          it "should should raise errors when root document is invalid" do
            @root.name = ''
            @root.save(:validate => false)
-           expect{ @doc.save! }.to raise_error(MongoMapper::DocumentNotValid)
+           lambda { @doc.save! }.should raise_error(MongoMapper::DocumentNotValid)
          end
        end
     end # instance of a embedded document
   end
 end
-