mongo_mapper 0.15.3 → 0.15.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d5192b00f4bce2f16b7ac329a9bdb059c888ebea3c62ba91e9017a42a43371c
-  data.tar.gz: 9e3f0dca756cb0e260266fa147800c07d02133dfad74376f3aaa169f56d67f36
+  metadata.gz: ab17d58378959cb58a5f2168fe0f9c7740628b4fa470547c708cf9d9740ef668
+  data.tar.gz: fcba32755feb7d0a439f8d2f0217a2a99092b8cf48317ef6b1f13265874595de
 SHA512:
-  metadata.gz: 052506c11e7921c9412fdbbdaeedbc05a199700867502e87c73bb00d4bb649007ed4f5c8f3f57020f96084d26128aaf5ba9973504018a76a1ecf4cd93b014186
-  data.tar.gz: fb775b4103f3eaa22ae76c5e4875d6c3117e44db8c2e6cd39189800d0fcafb63a8d8368a91a195ea8380cf9ce0744431e41e303bec0c478d61c5606d4ca8bd14
+  metadata.gz: 2b0fa4d463705845f6b445c0e4e5d367b931822bb20992704bec606ad133ba4342a426a15785faf237ab91a98b9ff3835c17ee53a520eabe995e129a9c0f3ec6
+  data.tar.gz: cb57c4f3128a2f3dcb2a80dfd61b3ed473931b600876cf1ab5b00c0a51fe14cf0ba7f503e1779470ef9027957252738aa7e0e7bd9136fe20fbbd31d3c6177eda

data/README.md

@@ -6,7 +6,7 @@ A Ruby Object Mapper for Mongo.
 
 [<img src="https://github.com/mongomapper/mongomapper/workflows/Ruby/badge.svg?branch=master" alt="Build Status" />](https://github.com/mongomapper/mongomapper/actions?query=workflow%3ARuby+branch%3Amaster)
 
-[<img src="https://coveralls.io/repos/mongomapper/mongomapper/badge.svg" alt="Coverage Status" />](https://coveralls.io/r/mongomapper/mongomapper)
+<!-- [<img src="https://coveralls.io/repos/mongomapper/mongomapper/badge.svg" alt="Coverage Status" />](https://coveralls.io/r/mongomapper/mongomapper) -->
 
 ## Install
 
@@ -18,16 +18,27 @@ http://mongomapper.com/documentation/
 
 http://rdoc.info/github/mongomapper/mongomapper
 
+## Open Commit Policy
+
+Like Rubinius, we're trying out an "open commit policy".
+
+If you've committed one (code) patch that has been accepted and would like to
+work some more on the project, send an email to Scott Taylor
+<scott@railsnewbie.com> along with your commit sha1.
+
 ## Compatibility
 
 MongoMapper is tested against:
 
-* MRI 2.4 - 2.7
+* MRI 2.4 - 3.0.1
 * JRuby (Versions with 1.9 compatibility)
 
 Additionally, MongoMapper is tested against:
 
-* Rails 5.0+ - 6.0
+* Rails 5.0 - 5.2
+* Rails 6.0 - 6.1
+
+Note, if you are using Ruby 3.0+, you'll need Rails 6.
 
 ## Contributing & Development
 
@@ -37,17 +48,21 @@ Additionally, MongoMapper is tested against:
 
 * Fork the project.
 * Make your feature addition or bug fix. All specs should pass.
-* Add specs for your changes. This is important so I don't break it in a future version unintentionally.
-* 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 ignore it when your pull request is merged.
+* Add specs for your changes. This is important so that it doesn't break in a future version.
+* 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
 
 ## Copyright
 
-Copyright (c) 2009-2020 MongoMapper. See LICENSE for details.
+Copyright (c) 2009-2021 MongoMapper. See LICENSE for details.
 
 ## Contributors
 

data/lib/mongo_mapper/connection.rb

@@ -81,7 +81,7 @@ module MongoMapper
       # :nocov:
       if defined?(PhusionPassenger)
         PhusionPassenger.on_event(:starting_worker_process) do |forked|
-          connection.connect if forked
+          connection.reconnect if forked
         end
       end
       # :nocov:

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/extensions/array.rb

@@ -24,4 +24,4 @@ end
 
 class Array
   include MongoMapper::Extensions::Array
-end
+end

data/lib/mongo_mapper/extensions/binary.rb

@@ -19,4 +19,4 @@ end
 
 class Binary
   extend MongoMapper::Extensions::Binary
-end
+end

data/lib/mongo_mapper/extensions/date.rb

@@ -22,4 +22,4 @@ end
 
 class Date
   extend MongoMapper::Extensions::Date
-end
+end

data/lib/mongo_mapper/extensions/float.rb

@@ -11,4 +11,4 @@ end
 
 class Float
   extend MongoMapper::Extensions::Float
-end
+end

data/lib/mongo_mapper/extensions/hash.rb

@@ -23,4 +23,4 @@ end
 
 class Hash
   include MongoMapper::Extensions::Hash
-end
+end

data/lib/mongo_mapper/extensions/nil_class.rb

@@ -14,5 +14,5 @@ module MongoMapper
 end
 
 class NilClass
-  include MongoMapper::Extensions::NilClass
-end
+  extend MongoMapper::Extensions::NilClass
+end

data/lib/mongo_mapper/extensions/object.rb

@@ -27,4 +27,4 @@ end
 
 class Object
   include MongoMapper::Extensions::Object
-end
+end

data/lib/mongo_mapper/extensions/object_id.rb

@@ -33,4 +33,4 @@ class BSON::ObjectId
   def original_to_json(*args)
     original_as_json.to_json(*args)
   end
-end
+end

data/lib/mongo_mapper/extensions/set.rb

@@ -17,4 +17,4 @@ end
 
 class Set
   extend MongoMapper::Extensions::Set
-end
+end

data/lib/mongo_mapper/extensions/string.rb

@@ -23,4 +23,4 @@ end
 
 class String
   include MongoMapper::Extensions::String
-end
+end

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

@@ -30,12 +30,11 @@ module MongoMapper
         def setup(model)
           model.associations_module.module_eval(<<-end_eval, __FILE__, __LINE__ + 1)
             def #{name}
-              get_proxy(associations[#{name.inspect}])
+              get_proxy(associations[#{name.inspect}]).read
             end
 
             def #{name}=(value)
-              get_proxy(associations[#{name.inspect}]).replace(value)
-              value
+              get_proxy(associations[#{name.inspect}]).write(value)
             end
           end_eval
 

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

@@ -0,0 +1,55 @@
+# encoding: UTF-8
+module MongoMapper
+  module Plugins
+    module Associations
+      class Collection < Proxy
+        include Enumerable
+
+        def to_a
+          load_target
+
+          target.is_a?(Array) ?
+            target :
+            Array(target)
+        end
+
+        alias_method :to_ary, :to_a
+
+        def each(&block)
+          to_a.each(&block)
+        end
+
+        def [](val)
+          objs = to_a
+          objs ? objs[val] : nil
+        end
+
+        def empty?
+          to_a.empty?
+        end
+
+        def size
+          to_a.size
+        end
+
+        def length
+          to_a.length
+        end
+
+        def reset
+          super
+          target = []
+        end
+
+        def read
+          self
+        end
+
+        def write(value)
+          replace(value)
+          read
+        end
+      end
+    end
+  end
+end

data/lib/mongo_mapper/plugins/associations/{many_documents_proxy.rb → proxy/many_documents_proxy.rb}

@@ -76,10 +76,6 @@ module MongoMapper
           @target.each { |doc| doc.save(options) } if @target
         end
 
-        def each(&block)
-          load_target.each(&block)
-        end
-
       protected
 
         def query(options={})

data/lib/mongo_mapper/plugins/associations/{proxy.rb → proxy/proxy.rb}

@@ -1,19 +1,25 @@
 # encoding: UTF-8
 require 'forwardable'
+
 module MongoMapper
   module Plugins
     module Associations
       class Proxy
         extend Forwardable
 
-        alias :proxy_respond_to? :respond_to?
-        alias :proxy_extend :extend
-
-        instance_methods.each { |m| undef_method m unless m =~ /(^__|^nil\?$|^send$|proxy_|^respond_to_missing\?$|^object_id$)/ }
+        class << self
+          def define_proxy_method(method)
+            define_method(method) do |*args, &block|
+              proxy_method(method, *args, &block)
+            end
+          end
+        end
 
         attr_reader :proxy_owner, :association, :target
 
-        alias :proxy_association :association
+        alias_method :proxy_respond_to?, :respond_to?
+        alias_method :proxy_extend, :extend
+        alias_method :proxy_association, :association
 
         def_delegators :proxy_association, :klass, :options
         def_delegator  :klass, :collection
@@ -24,26 +30,31 @@ module MongoMapper
           reset
         end
 
-        # 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.
-        #
-        # In rails 2, this isn't a problem however it also solves an issue where
-        # to_json isn't forwarded because it supports to_json itself
-        def to_json(*options)
-          load_target
-          target.to_json(*options)
-        end
-
-        # see comments to to_json
-        def as_json(*options)
-          load_target
-          target.as_json(*options)
+        [
+          :is_a?,
+          :to_mongo,
+          :==,
+          :!=,
+          :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.
+          #
+          # In rails 2, this isn't a problem however it also solves an issue where
+          # to_json isn't forwarded because it supports to_json itself
+          :to_json,
+          # see comments to to_json
+          :as_json,
+        ].each do |m|
+          define_proxy_method(m)
         end
 
         def inspect
           load_target
-          target.inspect
+          "#<#{self.class.inspect}:#{object_id} #{@target.inspect}>"
         end
 
         def loaded?
@@ -54,21 +65,6 @@ module MongoMapper
           @loaded = true
         end
 
-        def nil?
-          load_target
-          target.nil?
-        end
-
-        def blank?
-          load_target
-          target.blank?
-        end
-
-        def present?
-          load_target
-          target.present?
-        end
-
         def reload
           reset
           load_target
@@ -87,16 +83,7 @@ module MongoMapper
         end
 
         def respond_to?(*args)
-          proxy_respond_to?(*args) || (load_target && target.respond_to?(*args))
-        end
-
-        def send(method, *args, &block)
-          if proxy_respond_to?(method, true)
-            super
-          else
-            load_target
-            target.send(method, *args, &block)
-          end
+          super || (load_target && target.respond_to?(*args))
         end
 
         def read
@@ -104,6 +91,16 @@ module MongoMapper
           @target
         end
 
+        def write(value)
+          replace(value)
+          read
+        end
+
+        def proxy_method(method, *args, &block)
+          load_target
+          target.public_send(method, *args, &block)
+        end
+
       protected
 
         def load_target
@@ -138,9 +135,28 @@ module MongoMapper
           false
         end
 
+        def define_proxy_method(method)
+          metaclass = class << self; self; end
+          metaclass.class_eval do
+            define_proxy_method(method)
+          end
+        end
+
+        def define_and_call_proxy_method(method, *args, &block)
+          define_proxy_method(method)
+          public_send(method, *args, &block)
+        end
+
         def method_missing(method, *args, &block)
-          if load_target
-            target.public_send(method, *args, &block)
+          # load the target just in case it isn't loaded
+          load_target
+
+          # only define the method if the target has the method
+          # NOTE: include private methods!
+          if target.respond_to?(method, true)
+            define_and_call_proxy_method(method, *args, &block)
+          else
+            super
           end
         end
       end

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

@@ -8,20 +8,11 @@ module MongoMapper
 
           model.associations_module.module_eval(<<-end_eval, __FILE__, __LINE__ + 1)
             def #{name}
-              proxy = get_proxy(associations[#{name.inspect}])
-              proxy.nil? ? nil : proxy.read
+              get_proxy(associations[#{name.inspect}]).read
             end
 
             def #{name}=(value)
-              association = associations[#{name.inspect}]
-              proxy = get_proxy(association)
-
-              if proxy.nil? || proxy.target != value
-                proxy = build_proxy(association)
-              end
-
-              proxy.replace(value)
-              proxy.read
+              get_proxy(associations[#{name.inspect}]).write(value)
             end
 
             def #{name}?

data/lib/mongo_mapper/plugins/caching.rb

@@ -9,7 +9,7 @@ module MongoMapper
                       when !persisted?
                         "#{self.class.name}/new"
                       when timestamp = self[:updated_at]
-                        "#{self.class.name}/#{id}-#{timestamp.to_s(:number)}"
+                        "#{self.class.name}/#{id}-#{timestamp.to_formatted_s(:number)}"
                       else
                         "#{self.class.name}/#{id}"
                     end
@@ -18,4 +18,4 @@ module MongoMapper
       end
     end
   end
-end
+end

data/lib/mongo_mapper/plugins/dirty.rb

@@ -38,7 +38,7 @@ module MongoMapper
 
           # typecast to the new value
           old_value = read_key(key_name)
-          new_value = key.get(key.set(value))
+          new_value = key.set(value)
 
           # only mark changed if really changed value (after typecasting)
           unless old_value == new_value

data/lib/mongo_mapper/plugins/embedded_callbacks.rb

@@ -49,9 +49,9 @@ module MongoMapper
                 class << self
                   alias_method :__original_#{callback}, :#{callback}
 
-                  def #{callback}(*args, &block)
+                  def #{callback}(*args, **options, &block)
                     embedded_callbacks_on if @embedded_callbacks_status.nil?
-                    __original_#{callback}(*args, &block)
+                    __original_#{callback}(*args, **options, &block)
                   end
                 end
               CALLBACK

data/lib/mongo_mapper/plugins/keys/key.rb

@@ -61,7 +61,7 @@ module MongoMapper
           # Special Case: Generate default _id on access
           value = default_value if @is_id and !value
 
-          value = type.from_mongo(value)
+          value = type ? type.from_mongo(value) : value
 
           if @typecast
             klass = typecast_class # Don't make this lookup on every call
@@ -76,22 +76,25 @@ module MongoMapper
 
         def set(value)
           # Avoid tap here so we don't have to create a block binding.
-          values = type.to_mongo(value)
+          value = type ? type.to_mongo(value) : value.to_mongo
+
           if @typecast
-            values.map { |v| typecast_class.to_mongo(v) }
+            klass = typecast_class  # Don't make this lookup on every call
+            value.map { |v| klass.to_mongo(v) }
           else
-            values
+            value
           end
         end
 
         def default_value
           return unless default?
+
           if default.instance_of? Proc
-            type.to_mongo default.call
+            default.call
           else
             # Using Marshal is easiest way to get a copy of mutable objects
             # without getting an error on immutable objects
-            type.to_mongo Marshal.load(Marshal.dump(default))
+            Marshal.load(Marshal.dump(default))
           end
         end
 

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/plugins/validations.rb

@@ -54,7 +54,7 @@ module MongoMapper
           conditions[:_id.ne] = record._id if record._id
 
           if @klass.exists?(conditions)
-            record.errors.add(attribute, :taken, options.except(:case_sensitive, :scope).merge(:value => value))
+            record.errors.add(attribute, :taken, **options.except(:case_sensitive, :scope).merge(:value => value))
           end
         end