mongo_mapper 0.15.3 → 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/keys_spec.rb

@@ -352,6 +352,19 @@ describe "Keys" do
     it 'should remove the key' do
       DocWithRemovedKey.keys.should_not have_key "_something"
     end
+  end
+
+  describe "default with no type" do
+    it "should work (regression)" do
+      doc = Doc do
+        key :a_num, default: 0
+      end
 
+      instance = doc.new
+      instance.a_num.should == 0
+
+      instance = doc.new(a_num: 10)
+      instance.a_num.should == 10
+    end
   end
 end

data/spec/functional/shardable_spec.rb

@@ -0,0 +1,59 @@
+require 'spec_helper'
+
+describe 'Shardable' do
+  describe 'shard_key_fields' do
+    it 'returns declared field names' do
+      ShardedModel.shard_key_fields.should == ['first_name']
+    end
+  end
+
+  describe 'shard_key_filter' do
+    context 'new record' do
+      let(:document) { ShardedModel.new(first_name: 'John', last_name: 'Smith') }
+
+      it 'returns current values' do
+        document.shard_key_filter.should == { 'first_name' => 'John' }
+      end
+    end
+
+    context 'persisted record' do
+      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' }
+      end
+    end
+  end
+
+  context 'creating new document' do
+    let(:document) { ShardedModel.new(first_name: 'John', last_name: 'Smith') }
+
+    it 'inserts new document' do
+      lambda { document.save! }.should change { ShardedModel.count }.by(1)
+
+      persisted = ShardedModel.find(document.id)
+      persisted.first_name.should == 'John'
+      persisted.last_name.should == 'Smith'
+    end
+  end
+
+  context 'updating persisted document' do
+    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 { ShardedModel.count }
+
+      persisted = ShardedModel.find(document.id)
+      persisted.first_name.should == 'William'
+      persisted.last_name.should == 'Smith'
+    end
+  end
+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/associations/proxy_spec.rb

@@ -1,19 +1,19 @@
 require 'spec_helper'
 
 class FakeNilProxy < MongoMapper::Plugins::Associations::Proxy
-  def find_target; nil end
+  def load_target; @target ||= nil end
 end
 
 class FakeBlankProxy < MongoMapper::Plugins::Associations::Proxy
-  def find_target; '' end
+  def load_target; @target ||= '' end
 end
 
 class FakeNumberProxy < MongoMapper::Plugins::Associations::Proxy
-  def find_target; 17 end
+  def load_target; @target ||= 17 end
 end
 
 class FakeProxy < MongoMapper::Plugins::Associations::Proxy
-  def find_target; [1, 2] end
+  def load_target; @target ||= [1, 2] end
 end
 
 describe "Proxy" do
@@ -32,7 +32,7 @@ describe "Proxy" do
   end
 
   it "should be able to inspect the proxy" do
-    @proxy.inspect.should == '[1, 2]'
+    @proxy.inspect.should == "#<FakeProxy:#{@proxy.object_id} [1, 2]>"
   end
 
   context "nil?" do
@@ -108,4 +108,17 @@ describe "Proxy" do
       lambda { @proxy.private_foo }.should raise_error(NoMethodError, /private method `private_foo' called/)
     end
   end
+
+  context "hash" do
+    it "should return the same value for the same proxy" do
+      proxy_a = FakeProxy.new(@owner, @association)
+      proxy_b = FakeProxy.new(@owner, @association)
+
+      proxy_a.hash.should == proxy_b.hash
+    end
+
+    it "should return different values for different proxies" do
+      @proxy.hash.should_not == @nil_proxy.hash
+    end
+  end
 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/extensions_spec.rb

@@ -192,15 +192,21 @@ describe "Support" do
     end
   end
 
-  context "NilClass#from_mongo" do
+  context "NilClass.from_mongo" do
     it "should return nil" do
-      nil.from_mongo(nil).should be_nil
+      NilClass.from_mongo(nil).should be_nil
+    end
+  end
+
+  context "NilClass.to_mongo" do
+    it "should return nil" do
+      NilClass.to_mongo(nil).should be_nil
     end
   end
 
   context "NilClass#to_mongo" do
     it "should return nil" do
-      nil.to_mongo(nil).should be_nil
+      nil.to_mongo.should be_nil
     end
   end
 

data/spec/unit/inspect_spec.rb

@@ -31,7 +31,7 @@ describe "Inspect" do
       klass.many :pets, :class => pets
 
       doc = klass.new(:pets => [{:name => "Kitten"}])
-      doc.inspect.should =~ /_id:.*, pets: \[.*_id.*, name: "Kitten".*\]/
+      doc.inspect.should =~ /_id:.*, pets: .*\[.*_id.*, name: "Kitten".*\]/
     end
 
     it "should include embedded document" do

data/spec/unit/key_spec.rb

@@ -55,6 +55,7 @@ describe "Key" do
     it "should work with name and options" do
       key = Key.new(:foo, :required => true)
       key.name.should == 'foo'
+      key.type.should be_nil
       key.options[:required].should be_truthy
     end
 
@@ -111,7 +112,12 @@ describe "Key" do
     subject { @key }
 
     it "should cast each element correctly" do
-      ids = [BSON::ObjectId.new, BSON::ObjectId.new, BSON::ObjectId.new.to_s, BSON::ObjectId.new.to_s]
+      ids = [
+        BSON::ObjectId.new,
+        BSON::ObjectId.new,
+        BSON::ObjectId.new.to_s,
+        BSON::ObjectId.new.to_s
+      ]
       subject.set(ids).should == ids.map { |id| ObjectId.to_mongo(id) }
     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.3
+  version: 0.15.6
 platform: ruby
 authors:
 - John Nunemaker
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-11 00:00:00.000000000 Z
+date: 2022-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongo
@@ -82,6 +82,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: rexml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: MongoMapper is a Object-Document Mapper for Ruby and Rails
 email:
 - nunemaker@gmail.com
@@ -137,24 +151,24 @@ files:
 - lib/mongo_mapper/plugins/associations.rb
 - lib/mongo_mapper/plugins/associations/base.rb
 - lib/mongo_mapper/plugins/associations/belongs_to_association.rb
-- lib/mongo_mapper/plugins/associations/belongs_to_polymorphic_proxy.rb
-- lib/mongo_mapper/plugins/associations/belongs_to_proxy.rb
-- 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
-- lib/mongo_mapper/plugins/associations/many_embedded_polymorphic_proxy.rb
-- lib/mongo_mapper/plugins/associations/many_embedded_proxy.rb
-- lib/mongo_mapper/plugins/associations/many_polymorphic_proxy.rb
-- lib/mongo_mapper/plugins/associations/one_as_proxy.rb
 - lib/mongo_mapper/plugins/associations/one_association.rb
-- lib/mongo_mapper/plugins/associations/one_embedded_polymorphic_proxy.rb
-- lib/mongo_mapper/plugins/associations/one_embedded_proxy.rb
-- lib/mongo_mapper/plugins/associations/one_proxy.rb
-- lib/mongo_mapper/plugins/associations/proxy.rb
+- lib/mongo_mapper/plugins/associations/proxy/belongs_to_polymorphic_proxy.rb
+- lib/mongo_mapper/plugins/associations/proxy/belongs_to_proxy.rb
+- lib/mongo_mapper/plugins/associations/proxy/collection.rb
+- lib/mongo_mapper/plugins/associations/proxy/embedded_collection.rb
+- lib/mongo_mapper/plugins/associations/proxy/in_array_proxy.rb
+- lib/mongo_mapper/plugins/associations/proxy/in_foreign_array_proxy.rb
+- lib/mongo_mapper/plugins/associations/proxy/many_documents_as_proxy.rb
+- lib/mongo_mapper/plugins/associations/proxy/many_documents_proxy.rb
+- lib/mongo_mapper/plugins/associations/proxy/many_embedded_polymorphic_proxy.rb
+- lib/mongo_mapper/plugins/associations/proxy/many_embedded_proxy.rb
+- lib/mongo_mapper/plugins/associations/proxy/many_polymorphic_proxy.rb
+- lib/mongo_mapper/plugins/associations/proxy/one_as_proxy.rb
+- lib/mongo_mapper/plugins/associations/proxy/one_embedded_polymorphic_proxy.rb
+- lib/mongo_mapper/plugins/associations/proxy/one_embedded_proxy.rb
+- lib/mongo_mapper/plugins/associations/proxy/one_proxy.rb
+- lib/mongo_mapper/plugins/associations/proxy/proxy.rb
 - lib/mongo_mapper/plugins/associations/single_association.rb
 - lib/mongo_mapper/plugins/caching.rb
 - lib/mongo_mapper/plugins/callbacks.rb
@@ -188,6 +202,7 @@ files:
 - lib/mongo_mapper/plugins/sci.rb
 - lib/mongo_mapper/plugins/scopes.rb
 - lib/mongo_mapper/plugins/serialization.rb
+- lib/mongo_mapper/plugins/shardable.rb
 - lib/mongo_mapper/plugins/stats.rb
 - lib/mongo_mapper/plugins/strong_parameters.rb
 - lib/mongo_mapper/plugins/timestamps.rb
@@ -244,6 +259,7 @@ files:
 - spec/functional/safe_spec.rb
 - spec/functional/sci_spec.rb
 - spec/functional/scopes_spec.rb
+- spec/functional/shardable_spec.rb
 - spec/functional/static_keys_spec.rb
 - spec/functional/stats_spec.rb
 - spec/functional/strong_parameters_spec.rb
@@ -255,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
@@ -304,7 +321,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: A Ruby Object Mapper for Mongo

data/lib/mongo_mapper/plugins/associations/collection.rb

@@ -1,29 +0,0 @@
-# encoding: UTF-8
-module MongoMapper
-  module Plugins
-    module Associations
-      class Collection < Proxy
-        def to_ary
-          load_target
-          if target.is_a?(Array)
-            target.to_ary
-          else
-            Array(target)
-          end
-        end
-
-        alias_method :to_a, :to_ary
-
-        def include?(*args)
-          load_target
-          target.include?(*args)
-        end
-
-        def reset
-          super
-          target = []
-        end
-      end
-    end
-  end
-end