mongo_mapper 0.15.5 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae0bcdb6320444b591dc779d739c553ba371c86e8465c4547c5e35423fe37ade
-  data.tar.gz: 270341e4efc65ba09578c2ba889c3c2e560610cf6eddfa7889fee19ded37c760
+  metadata.gz: eab0f4521b6ddb6f397e27b3b299fbae43def4a8d5f7b406e18aad7da0a54b37
+  data.tar.gz: 27b79f11695bbf661b6cc892b151287bb90d2c551b57d40181ecceeabf10a786
 SHA512:
-  metadata.gz: 3af02a093ffb4f9b13f48557bd83689c5cdcf35e434c00b152be18ad33e520e9ffbf1b7817b90ac4d363fe6f4452bab2ee66c5c450aca65981cc29ac2e74fe89
-  data.tar.gz: '09f802a3351959d626e23b4a6fa331ef10749a3b2f259440b527b26a25a23d0f0684c1e2bf0001938357e76fe5664da481ff298b572e665ded6afe0feb5fb286'
+  metadata.gz: bd232e1e9ceb0f8c62b17a8d6287aca6d99e97fc22a07b95f423d87e89e9fc0e8a3297800292528051ee3129e96f7f134803f8fd6ad8dd6d191dbf79b8eb452e
+  data.tar.gz: cb0e5ce9ced8a690ae5812a576f749a6d82566c92099c8309f13d46e2a25abf5e61869f111b652576c82fee189a0d7ecfce48b8215f0965749122bb99545bb56

data/README.md

@@ -30,15 +30,16 @@ work some more on the project, send an email to Scott Taylor
 
 MongoMapper is tested against:
 
-* MRI 2.4 - 3.0.1
-* JRuby (Versions with 1.9 compatibility)
+* MRI 2.4 - 3.2
+* JRuby (Versions with 3.1 compatibility)
 
 Additionally, MongoMapper is tested against:
 
 * Rails 5.0 - 5.2
 * Rails 6.0 - 6.1
+* Rails 7.0 - 7.1
 
-Note, if you are using Ruby 3.0+, you'll need Rails 6.
+Note, if you are using Ruby 3.0+, you'll need Rails 6.0+.
 
 ## Contributing & Development
 
@@ -62,7 +63,7 @@ Hit up the Google group: http://groups.google.com/group/mongomapper
 
 ## Copyright
 
-Copyright (c) 2009-2021 MongoMapper. See LICENSE for details.
+Copyright (c) 2009-2022 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/deprecator.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module MongoMapper
+  def self.deprecator # :nodoc:
+    @deprecator ||= ActiveSupport::Deprecation.new("1.0", "mongo_mapper")
+  end
+end

data/lib/mongo_mapper/options.rb

@@ -0,0 +1,13 @@
+module MongoMapper
+  module Options
+    # @api public
+    def filter_attributes=(attributes)
+      @filter_attributes = attributes
+    end
+
+    # @api public
+    def filter_attributes
+      @filter_attributes || []
+    end
+  end
+end

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/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/inspect.rb

@@ -7,10 +7,12 @@ module MongoMapper
       def inspect(include_nil = false)
         keys = include_nil ? key_names : attributes.keys
         attributes_as_nice_string = keys.sort.collect do |name|
-          "#{name}: #{self.send(:"#{name}").inspect}"
+          raw_value = self.send(:"#{name}").inspect
+          filtered_value = MongoMapper::Utils.filter_param(name, raw_value)
+          "#{name}: #{filtered_value}"
         end.join(", ")
         "#<#{self.class} #{attributes_as_nice_string}>"
       end
     end
   end
-end
+end

data/lib/mongo_mapper/plugins/keys.rb

@@ -442,7 +442,7 @@ module MongoMapper
       end
 
       def set_parent_document(key, value)
-        if key.type and value.instance_of?(key.type) && key.embeddable? && value.respond_to?(:_parent_document)
+        if key.type and value.kind_of?(key.type) && key.embeddable? && value.respond_to?(:_parent_document)
           value._parent_document = self
         end
       end
@@ -477,7 +477,9 @@ module MongoMapper
       def initialize_default_values(except = {})
         @__mm_default_keys.each do |key|
           if !(except && except.key?(key.name))
-            internal_write_key key.name, key.default_value, false
+            value = key.default_value
+            value = key.type ? key.type.to_mongo(value) : value
+            internal_write_key key.name, value, false
           end
         end
       end

data/lib/mongo_mapper/plugins/strong_parameters.rb

@@ -6,7 +6,11 @@ module MongoMapper
       included do
         include ::ActiveModel::ForbiddenAttributesProtection
         class << self
-          deprecate :attr_protected, :attr_accessible
+          if ::ActiveSupport.version >= Gem::Version.new("7.1")
+            deprecate :attr_protected, :attr_accessible, deprecator: ::MongoMapper.deprecator
+          else
+            deprecate :attr_protected, :attr_accessible
+          end
         end
       end
 
@@ -23,4 +27,4 @@ module MongoMapper
       end
     end
   end
-end
+end

data/lib/mongo_mapper/plugins.rb

@@ -1,7 +1,15 @@
 # encoding: UTF-8
 module MongoMapper
   module Plugins
-    include ActiveSupport::DescendantsTracker
+    if defined?(ActiveSupport::DescendantsTracker::DescendantsArray)
+      DescendantsArray = ::ActiveSupport::DescendantsTracker::DescendantsArray
+    else
+      DescendantsArray = ::Array
+    end
+
+    def self.direct_descendants_hash
+      @direct_descendants_hash ||= Hash.new { |h,k| h[k] = DescendantsArray.new }
+    end
 
     def plugins
       @plugins ||= []
@@ -14,9 +22,18 @@ module MongoMapper
       plugins << mod
     end
 
+    def direct_descendants
+      Plugins.direct_descendants_hash[self]
+    end
+
     def included(base = nil)
       direct_descendants << base if base
       super
     end
+
+    def inherited(subclass)
+      direct_descendants << subclass
+      super
+    end
   end
 end

data/lib/mongo_mapper/railtie.rb

@@ -41,6 +41,18 @@ module MongoMapper
       end
     end
 
+    if Rails.version >= "6.0"
+      initializer "mongo_mapper.filter_attributes=" do |app|
+        ActiveSupport.on_load(:mongo_mapper) do
+          MongoMapper.filter_attributes += app.config.filter_parameters
+        end
+      end
+    end
+
+    initializer "mongo_mapper.deprecator" do |app|
+      app.deprecators[:mongo_mapper] = MongoMapper.deprecator if app.respond_to?(:deprecators)
+    end
+
     # This sets the database configuration and establishes the connection.
     initializer "mongo_mapper.initialize_database" do |app|
       config_file = Rails.root.join('config/mongo.yml')

data/lib/mongo_mapper/utils.rb

@@ -8,5 +8,17 @@ module MongoMapper
       safe = {:w => safe} if safe.is_a? Integer
       safe
     end
+
+    def self.filter_param(name, raw_value)
+      if ActiveSupport.version >= Gem::Version.new("6.0")
+        @filter ||= begin
+          require "active_support/parameter_filter"
+          ActiveSupport::ParameterFilter.new(MongoMapper.filter_attributes)
+        end
+        @filter.filter_param(name, raw_value)
+      else
+        raw_value
+      end
+    end
   end
 end

data/lib/mongo_mapper/version.rb

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

data/lib/mongo_mapper.rb

@@ -4,6 +4,7 @@ require 'active_support'
 require 'active_support/core_ext'
 require 'active_model'
 require 'activemodel-serializers-xml'
+require 'mongo_mapper/deprecator'
 require "mongo_mapper/railtie" if defined?(Rails)
 
 I18n.load_path << File.expand_path('../mongo_mapper/locale/en.yml', __FILE__)
@@ -25,6 +26,7 @@ module MongoMapper
   autoload :Translation,            'mongo_mapper/translation'
   autoload :Version,                'mongo_mapper/version'
   autoload :Utils,                  'mongo_mapper/utils'
+  autoload :Options,                'mongo_mapper/options'
 
   module Middleware
     autoload :IdentityMap, 'mongo_mapper/middleware/identity_map'
@@ -96,6 +98,7 @@ module MongoMapper
   end
 
   extend Connection
+  extend Options
 end
 
 Dir[File.join(File.dirname(__FILE__), 'mongo_mapper', 'extensions', '*.rb')].each do |extension|