mongo_mapper 0.13.0.beta2 → 0.15.0

data/spec/functional/touch_spec.rb

@@ -16,7 +16,7 @@ describe "Touch" do
         end
 
         doc.reload
-        doc.updated_at.should_not == old_updated_at      
+        doc.updated_at.should_not == old_updated_at
       end
     end
 
@@ -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
@@ -79,7 +79,7 @@ describe "Touch" do
 
           @post.reload.updated_at.should_not == orig_updated_at
         end
-        
+
         it "should when the child is updated" do
           @comment.save
           old_updated_at = @post.updated_at
@@ -88,7 +88,7 @@ describe "Touch" do
           end
           @post.reload.updated_at.should_not == old_updated_at
         end
-        
+
         it "should when the child is touched" do
           @comment.save
           old_updated_at = @post.updated_at
@@ -117,9 +117,9 @@ describe "Touch" do
         Timecop.freeze(Time.now + 1.day) do
           comment.save
         end
-      
+
         post.reload.updated_at.should == post.created_at
       end
     end
   end
-end
+end

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

@@ -0,0 +1,51 @@
+if defined?(Encoding) && Encoding.default_external != "UTF-8"
+  Encoding.default_external = "UTF-8"
+end
+
+describe "The library itself" do
+  def check_for_tab_characters(filename)
+    failing_lines = []
+    File.readlines(filename).each_with_index do |line,number|
+      failing_lines << number + 1 if line =~ /\t/
+    end
+
+    unless failing_lines.empty?
+      "#{filename} has tab characters on lines #{failing_lines.join(', ')}"
+    end
+  end
+
+  def check_for_extra_spaces(filename)
+    failing_lines = []
+    File.readlines(filename).each_with_index do |line,number|
+      next if line =~ /^\s+#.*\s+\n$/
+      failing_lines << number + 1 if line =~ /\s+\n$/
+    end
+
+    unless failing_lines.empty?
+      "#{filename} has spaces on the EOL on lines #{failing_lines.join(', ')}"
+    end
+  end
+
+  RSpec::Matchers.define :be_well_formed do
+    failure_message do |actual|
+      actual.join("\n")
+    end
+
+    match do |actual|
+      actual.empty?
+    end
+  end
+
+  it "has no malformed whitespace" do
+    exempt = /\.gitmodules|\.marshal|fixtures|vendor|ssl_certs|kill|LICENSE/
+    error_messages = []
+    Dir.chdir(File.expand_path("../..", __FILE__)) do
+      `git ls-files`.split("\n").each do |filename|
+        next if filename =~ exempt
+        error_messages << check_for_tab_characters(filename)
+        error_messages << check_for_extra_spaces(filename)
+      end
+    end
+    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

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