mongo_mapper 0.15.5 → 0.15.6

data/spec/functional/callbacks_spec.rb

@@ -10,10 +10,14 @@ module CallbacksSupport
       :before_save,       :after_save,
       :before_destroy,    :after_destroy
     ].each do |callback|
-      base.send(callback) do
+      base.send(callback, if: :always_true) do
         history << callback.to_sym
       end
     end
+
+    base.send(:define_method, :always_true) do
+      true
+    end
   end
 
   def history

data/spec/functional/shardable_spec.rb

@@ -1,65 +1,57 @@
 require 'spec_helper'
 
 describe 'Shardable' do
-  let(:sharded_model) {
-    Doc do
-      key :first_name, String
-      key :last_name, String
-      shard_key :first_name, :last_name
-    end
-  }
-
   describe 'shard_key_fields' do
     it 'returns declared field names' do
-      sharded_model.shard_key_fields.should == ['first_name', 'last_name']
+      ShardedModel.shard_key_fields.should == ['first_name']
     end
   end
 
   describe 'shard_key_filter' do
     context 'new record' do
-      let(:document) { sharded_model.new(first_name: 'John', last_name: 'Smith') }
+      let(:document) { ShardedModel.new(first_name: 'John', last_name: 'Smith') }
 
       it 'returns current values' do
-        document.shard_key_filter.should == { 'first_name' => 'John', 'last_name' => 'Smith' }
+        document.shard_key_filter.should == { 'first_name' => 'John' }
       end
     end
 
     context 'persisted record' do
-      let(:document) { sharded_model.create!(first_name: 'John', last_name: 'Smith') }
+      let(:document) { ShardedModel.create!(first_name: 'John', last_name: 'Smith') }
 
       before do
         document.first_name = 'William'
       end
 
       it 'returns persisted values' do
-        document.shard_key_filter.should == { 'first_name' => 'John', 'last_name' => 'Smith' }
+        document.shard_key_filter.should == { 'first_name' => 'John' }
       end
     end
   end
 
   context 'creating new document' do
-    let(:document) { sharded_model.new(first_name: 'John', last_name: 'Smith') }
+    let(:document) { ShardedModel.new(first_name: 'John', last_name: 'Smith') }
 
     it 'inserts new document' do
-      lambda { document.save! }.should change { sharded_model.count }.by(1)
+      lambda { document.save! }.should change { ShardedModel.count }.by(1)
 
-      persisted = sharded_model.find(document.id)
+      persisted = ShardedModel.find(document.id)
       persisted.first_name.should == 'John'
       persisted.last_name.should == 'Smith'
     end
   end
 
   context 'updating persisted document' do
-    let(:document) { sharded_model.create!(first_name: 'John', last_name: 'Smith') }
+    let(:document) { ShardedModel.create!(first_name: 'John', last_name: 'Smith') }
 
     before do
       document.first_name = 'William'
     end
 
     it 'updates persisted document' do
-      lambda { document.save! }.should_not change { sharded_model.count }
+      lambda { document.save! }.should_not change { ShardedModel.count }
 
-      persisted = sharded_model.find(document.id)
+      persisted = ShardedModel.find(document.id)
       persisted.first_name.should == 'William'
       persisted.last_name.should == 'Smith'
     end

data/spec/support/sharded_model.rb

@@ -0,0 +1,24 @@
+class ShardedModel
+  include MongoMapper::Document
+
+  key :first_name, String
+  key :last_name, String
+  shard_key :first_name
+end
+
+if ENV.fetch("ENABLE_SHARDING", "0") == "1"
+  client = MongoMapper.connection
+  database = MongoMapper.database
+
+  # https://www.mongodb.com/docs/manual/reference/command/enableSharding/#mongodb-dbcommand-dbcmd.enableSharding
+  client.use(:admin).command(enableSharding: database.name)
+
+  # https://www.mongodb.com/docs/manual/reference/command/shardCollection/#mongodb-dbcommand-dbcmd.shardCollection
+  # Note: this command automatically creates the index for the empty collection
+  client.use(:admin).command(
+    shardCollection: [database.name, ShardedModel.collection.name].join("."),
+    key: {
+      first_name: "hashed",
+    },
+  )
+end

data/spec/unit/document_spec.rb

@@ -88,7 +88,7 @@ describe "Document" do
     end
 
     it "should be recorded" do
-      Message.descendants.should == [Enter, Exit, Chat]
+      Message.descendants.should contain_exactly(Enter, Exit, Chat)
     end
   end
 

data/spec/unit/embedded_document_spec.rb

@@ -220,10 +220,10 @@ describe "EmbeddedDocument" do
         end
 
         it "should be recorded" do
-          Grandparent.direct_descendants.should == [Parent]
-          Grandparent.descendants.to_set.should == [Parent, Child, OtherChild].to_set
+          Grandparent.direct_descendants.should contain_exactly(Parent)
+          Grandparent.descendants.to_set.should contain_exactly(Parent, Child, OtherChild)
 
-          Parent.descendants.should      == [Child, OtherChild]
+          Parent.descendants.should contain_exactly(Child, OtherChild)
         end
       end
     end

data/spec/unit/mongo_mapper_spec.rb

@@ -71,7 +71,7 @@ describe "MongoMapper" do
         'development' => {'hosts' => ['127.0.0.1:27017'], 'database' => 'test', 'read' => 'primary'}
       }
       logger = double('logger')
-      Mongo::Client.should_receive(:new).with(['127.0.0.1:27017'], :logger => logger, :read => :primary, :database => 'test')
+      Mongo::Client.should_receive(:new).with(['127.0.0.1:27017'], { :logger => logger, :read => :primary, :database => 'test' })
       MongoMapper.connect('development', :logger => logger)
     end
 
@@ -80,7 +80,7 @@ describe "MongoMapper" do
         'development' => {'hosts' => ['192.168.1.1:2222'], 'database' => 'test', 'safe' => true}
       }
       logger = double('logger')
-      Mongo::Client.should_receive(:new).with(['192.168.1.1:2222'], :logger => logger, :safe => true, :database => 'test')
+      Mongo::Client.should_receive(:new).with(['192.168.1.1:2222'], { :logger => logger, :safe => true, :database => 'test' })
       MongoMapper.connect('development', :logger => logger)
     end
 
@@ -89,7 +89,7 @@ describe "MongoMapper" do
         'development' => {'uri' => 'mongodb://127.0.0.1:27017/test', 'options'=> {:foo => 1}}
       }
       logger = double('logger')
-      Mongo::Client.should_receive(:new).with('mongodb://127.0.0.1:27017/test', :logger => logger, :foo => 1)
+      Mongo::Client.should_receive(:new).with('mongodb://127.0.0.1:27017/test', { :logger => logger, :foo => 1 })
       MongoMapper.connect('development', :logger => logger)
     end
 
@@ -97,7 +97,7 @@ describe "MongoMapper" do
       MongoMapper.config = {
         'development' => {'hosts' => ['127.0.0.1:27017'], 'database' => 'test', 'user' => 'john', 'password' => 'secret'}
       }
-      Mongo::Client.should_receive(:new).with(['127.0.0.1:27017'], :database => 'test', :user => 'john', :password => 'secret')
+      Mongo::Client.should_receive(:new).with(['127.0.0.1:27017'], { :database => 'test', :user => 'john', :password => 'secret' })
       MongoMapper.connect('development')
     end
 
@@ -129,9 +129,14 @@ describe "MongoMapper" do
     it "should work as shortcut for setting config, environment and options" do
       config, logger = double('config'), double('logger')
       MongoMapper.should_receive(:config=).with(config)
-      MongoMapper.should_receive(:connect).with('development', :logger => logger)
+      MongoMapper.should_receive(:connect).with('development',  { :logger => logger })
       MongoMapper.should_receive(:handle_passenger_forking).once
       MongoMapper.setup(config, 'development', :logger => logger)
     end
+
+    it "should use the right reconnect method" do
+      Mongo::Client.instance_methods.should_not include(:connect) # v1
+      Mongo::Client.instance_methods.should include(:reconnect) # v1
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongo_mapper
 version: !ruby/object:Gem::Version
-  version: 0.15.5
+  version: 0.15.6
 platform: ruby
 authors:
 - John Nunemaker
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-18 00:00:00.000000000 Z
+date: 2022-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongo
@@ -271,6 +271,7 @@ files:
 - spec/spec_helper.rb
 - spec/support/matchers.rb
 - spec/support/models.rb
+- spec/support/sharded_model.rb
 - spec/unit/associations/base_spec.rb
 - spec/unit/associations/belongs_to_association_spec.rb
 - spec/unit/associations/many_association_spec.rb
@@ -320,7 +321,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: A Ruby Object Mapper for Mongo