mongo_mapper 0.15.4 → 0.15.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 290286ec91fda33bce766c8cacff110abd4027b200fa5279c2ca8afdf68d3ad3
-  data.tar.gz: b38548fb44300f730c70e0e43abe48a7a9785f884d8b28d3d7447afc78a77ec5
+  metadata.gz: ae0bcdb6320444b591dc779d739c553ba371c86e8465c4547c5e35423fe37ade
+  data.tar.gz: 270341e4efc65ba09578c2ba889c3c2e560610cf6eddfa7889fee19ded37c760
 SHA512:
-  metadata.gz: eef0f965e3d2b23cafcbfe6d3c39581ef4556e2b606a1668e3c26a2817bd4a75a94635c5102795171f4deeef6a0b52c74ff3bcac6f81c83a69e69d746f369a0b
-  data.tar.gz: '058f0007e68c8e8d3bbe5ea9236615ba252a44b12c5e91042390a8f920a4127cbe2950e8748f088daab02e8a7b8c6eb0a10b226c378cf4330951b1f8e94db898'
+  metadata.gz: 3af02a093ffb4f9b13f48557bd83689c5cdcf35e434c00b152be18ad33e520e9ffbf1b7817b90ac4d363fe6f4452bab2ee66c5c450aca65981cc29ac2e74fe89
+  data.tar.gz: '09f802a3351959d626e23b4a6fa331ef10749a3b2f259440b527b26a25a23d0f0684c1e2bf0001938357e76fe5664da481ff298b572e665ded6afe0feb5fb286'

data/README.md

@@ -52,6 +52,10 @@ Note, if you are using Ruby 3.0+, you'll need Rails 6.
 * Commit, do not mess with Rakefile, version, or history. If you want to have your own version, that is fine but bump version in a commit by itself in another branch so a maintainer can ignore it when your pull request is merged.
 * Send a pull request. Bonus points for topic branches.
 
+## How to release
+
+See `HOW_TO_RELEASE.md`
+
 ## Problems or Questions?
 
 Hit up the Google group: http://groups.google.com/group/mongomapper

data/lib/mongo_mapper/document.rb

@@ -39,6 +39,7 @@ module MongoMapper
     include Plugins::PartialUpdates
     include Plugins::IdentityMap
     include Plugins::CounterCache
+    include Plugins::Shardable
 
     included do
       extend Plugins

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

@@ -38,6 +38,7 @@ module MongoMapper
           :nil?,
           :blank?,
           :present?,
+          :hash,
           # Active support in rails 3 beta 4 can override to_json after this is loaded,
           # at least when run in mongomapper tests. The implementation was changed in master
           # some time after this, so not sure whether this is still a problem.

data/lib/mongo_mapper/plugins/keys.rb

@@ -251,12 +251,24 @@ module MongoMapper
 
         def remove_validate_callbacks(a_name)
           chain = _validate_callbacks.dup.reject do |callback|
-            f = callback.raw_filter
+            f = callback_filter(callback)
             f.respond_to?(:attributes) && f.attributes == a_name
           end
           reset_callbacks(:validate)
           chain.each do |callback|
-            set_callback 'validate', callback.raw_filter
+            set_callback 'validate', callback_filter(callback)
+          end
+        end
+
+        # The interface to obtain @filter from ActiveSupport::Callbacks::Callback has changed since rails 7.0.
+        # https://github.com/rails/rails/commit/d5ac941ddc3de7ad1aaff80ed67aa04fb626a263#diff-bf79b7ea0085308139af6de0afad9a9f22f13d4563cc56d784994414d88c5dd1
+        if ActiveSupport::VERSION::MAJOR >= 7
+          def callback_filter(callback)
+            callback.filter
+          end
+        else
+          def callback_filter(callback)
+            callback.raw_filter
           end
         end
       end

data/lib/mongo_mapper/plugins/querying.rb

@@ -148,7 +148,7 @@ module MongoMapper
         when :insert
           collection.insert_one(update, query_options)
         when :save
-          collection.update_one({:_id => _id}, update, query_options.merge(upsert: true))
+          collection.update_one({:_id => _id}.merge(shard_key_filter), update, query_options.merge(upsert: true))
         when :update
           update.stringify_keys!
 
@@ -180,4 +180,4 @@ module MongoMapper
       end
     end
   end
-end
+end

data/lib/mongo_mapper/plugins/shardable.rb

@@ -0,0 +1,30 @@
+module MongoMapper
+  module Plugins
+    module Shardable
+      extend ActiveSupport::Concern
+
+      included do
+        class_attribute :shard_key_fields
+        self.shard_key_fields = []
+      end
+
+      def shard_key_filter
+        filter = {}
+        shard_key_fields.each do |field|
+          filter[field] = if new_record?
+            send(field)
+          else
+            changed_attributes.key?(field) ? changed_attributes[field] : send(field)
+          end
+        end
+        filter
+      end
+
+      module ClassMethods
+        def shard_key(*fields)
+          self.shard_key_fields = fields.map(&:to_s).freeze
+        end
+      end
+    end
+  end
+end

data/lib/mongo_mapper/version.rb

@@ -1,4 +1,4 @@
 # encoding: UTF-8
 module MongoMapper
-  Version = '0.15.4'
+  Version = '0.15.5'
 end

data/lib/mongo_mapper.rb

@@ -60,6 +60,7 @@ module MongoMapper
     autoload :Safe,               'mongo_mapper/plugins/safe'
     autoload :Sci,                'mongo_mapper/plugins/sci'
     autoload :Scopes,             'mongo_mapper/plugins/scopes'
+    autoload :Shardable,          'mongo_mapper/plugins/shardable'
     autoload :Serialization,      'mongo_mapper/plugins/serialization'
     autoload :Stats,              'mongo_mapper/plugins/stats'
     autoload :StrongParameters,   'mongo_mapper/plugins/strong_parameters'