mongo_mapper 0.14.0 → 0.15.1

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

metadata

@@ -1,73 +1,87 @@
 --- !ruby/object:Gem::Specification
 name: mongo_mapper
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.15.1
 platform: ruby
 authors:
 - John Nunemaker
 - Chris Heald
 - Scott Taylor
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-01-20 00:00:00.000000000 Z
+date: 2020-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activemodel
+  name: mongo
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: plucky
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: plucky
+  name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: mongo
+  name: activemodel-serializers-xml
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.0'
 description: MongoMapper is a Object-Document Mapper for Ruby and Rails
 email:
 - nunemaker@gmail.com
@@ -79,7 +93,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - LICENSE
-- README.rdoc
+- README.md
 - UPGRADES
 - bin/mmconsole
 - examples/attr_accessible.rb
@@ -111,7 +125,6 @@ files:
 - lib/mongo_mapper/extensions/nil_class.rb
 - lib/mongo_mapper/extensions/object.rb
 - lib/mongo_mapper/extensions/object_id.rb
-- lib/mongo_mapper/extensions/ordered_hash.rb
 - lib/mongo_mapper/extensions/set.rb
 - lib/mongo_mapper/extensions/string.rb
 - lib/mongo_mapper/extensions/symbol.rb
@@ -129,6 +142,7 @@ files:
 - lib/mongo_mapper/plugins/associations/collection.rb
 - lib/mongo_mapper/plugins/associations/embedded_collection.rb
 - lib/mongo_mapper/plugins/associations/in_array_proxy.rb
+- lib/mongo_mapper/plugins/associations/in_foreign_array_proxy.rb
 - lib/mongo_mapper/plugins/associations/many_association.rb
 - lib/mongo_mapper/plugins/associations/many_documents_as_proxy.rb
 - lib/mongo_mapper/plugins/associations/many_documents_proxy.rb
@@ -175,6 +189,7 @@ files:
 - lib/mongo_mapper/plugins/scopes.rb
 - lib/mongo_mapper/plugins/serialization.rb
 - lib/mongo_mapper/plugins/stats.rb
+- lib/mongo_mapper/plugins/strong_parameters.rb
 - lib/mongo_mapper/plugins/timestamps.rb
 - lib/mongo_mapper/plugins/touch.rb
 - lib/mongo_mapper/plugins/userstamps.rb
@@ -188,10 +203,12 @@ files:
 - lib/rails/generators/mongo_mapper/config/templates/mongo.yml
 - lib/rails/generators/mongo_mapper/model/model_generator.rb
 - lib/rails/generators/mongo_mapper/model/templates/model.rb
+- spec/examples.txt
 - spec/functional/accessible_spec.rb
 - spec/functional/associations/belongs_to_polymorphic_proxy_spec.rb
 - spec/functional/associations/belongs_to_proxy_spec.rb
 - spec/functional/associations/in_array_proxy_spec.rb
+- spec/functional/associations/in_foreign_array_proxy_spec.rb
 - spec/functional/associations/many_documents_as_proxy_spec.rb
 - spec/functional/associations/many_documents_proxy_spec.rb
 - spec/functional/associations/many_embedded_polymorphic_proxy_spec.rb
@@ -228,6 +245,7 @@ files:
 - spec/functional/scopes_spec.rb
 - spec/functional/static_keys_spec.rb
 - spec/functional/stats_spec.rb
+- spec/functional/strong_parameters_spec.rb
 - spec/functional/timestamps_spec.rb
 - spec/functional/touch_spec.rb
 - spec/functional/userstamps_spec.rb
@@ -270,7 +288,7 @@ homepage: http://mongomapper.com
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -285,9 +303,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.8
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: A Ruby Object Mapper for Mongo
 test_files: []

data/lib/mongo_mapper/extensions/ordered_hash.rb

@@ -1,23 +0,0 @@
-# encoding: UTF-8
-# This class exists to make sure that Hash's extensions don't end up giving us unordered hashes.
-# :nocov:
-if RUBY_VERSION < "1.9"
-  module MongoMapper
-    module Extensions
-      module OrderedHash
-        def to_mongo(value)
-          value
-        end
-
-        def from_mongo(value)
-          value
-        end
-      end
-    end
-  end
-
-  class BSON::OrderedHash
-    extend MongoMapper::Extensions::OrderedHash
-  end
-end
-# :nocov: