mongo_mapper 0.17.0 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74ec9f278a24ea6d1a430b798204b50f2e69e96f5d01d3cd564a4a582b3683c8
-  data.tar.gz: d803b9283fcef845d9d841d2d93dba96084bdeb55c316b0f9350e304e2fbe809
+  metadata.gz: 6ec1c126e62ca7c8293e2d3da8387c17b95e30f638c42bfa8a5b9010b0d110fc
+  data.tar.gz: 57010306ab64acc07a5fc30b7e61122162ae3e94aa78a04bbeb4f91aa111a82b
 SHA512:
-  metadata.gz: e58932d6d99c84dd711aaac5162fa4ac7e6fd518e187f9c544e2498fb215aa3ab21f6f70e27abfddb312a594c0ec115a217eede15772202a8e6c24b6b51dc051
-  data.tar.gz: 23f13767289d092fb1aad74fb4dc18d92a573b42fd4bf938b426ea15fcfdc317de252c6100a3687a11e7edce855bfa13a10e3e956e2e2eb182314208182b0351
+  metadata.gz: 5de8997f8a45d23f14e523863873284c773a640246d50ea73257701d5019ced9b069c6a520551c4479920029ff0754d24a52f3cc357ba08e737b50ffdb2bfe03
+  data.tar.gz: 476c8854930a1168abf1deb171caa11dc2f882a7bc0e4c23e683d850d923ac9cb82a384ae2be17ad920a5092422b528fd19acbe36c2870428ed9a068821836c7

data/README.md

@@ -30,7 +30,7 @@ work some more on the project, send an email to Scott Taylor
 
 MongoMapper is tested against:
 
-- MRI 2.4 - 3.2
+- MRI 2.4 - 4.0
 - JRuby (Versions with 3.1 compatibility)
 
 Additionally, MongoMapper is tested against:
@@ -38,9 +38,13 @@ Additionally, MongoMapper is tested against:
 - Rails 5.0 - 5.2
 - Rails 6.0 - 6.1
 - Rails 7.0 - 7.2
-- Rails 8.0
+- Rails 8.0 - 8.1
 
-Note, if you are using Ruby 3.0+, you'll need Rails 6.0+.
+### Notes
+
+- if you are using Ruby >= 3.0, you'll need Rails >= 6.0.
+- if you are using Ruby >= 3.4 and Rails <= 7.0, you'll need to add the drb gem to your Gemfile
+- if you are using Ruby >= 3.4 and Rails <= 7.1, you'll need to add the mutex_m gem to your Gemfile
 
 ## Contributing & Development
 

data/lib/mongo_mapper/connection.rb

@@ -50,6 +50,11 @@ module MongoMapper
       config[environment.to_s]
     end
 
+    MONGOMAPPER_WRAPPING_LIBRARY = {
+      name: 'MongoMapper',
+      version: Version,
+    }.freeze
+
     def connect(environment, options={})
       raise 'Set config before connecting. MongoMapper.config = {...}' if config.blank?
       env = config_for_environment(environment).dup
@@ -68,6 +73,8 @@ module MongoMapper
       end
 
       options[:read] = options[:read].to_sym if options[:read].is_a? String
+      options[:wrapping_libraries] = [MONGOMAPPER_WRAPPING_LIBRARY]
+
       MongoMapper.connection = Mongo::Client.new(addresses_or_uri, options)
     end
 
@@ -77,6 +84,19 @@ module MongoMapper
       connect(environment, options)
     end
 
+    def setup_with_config_file(path, environment, options={})
+      source = ERB.new(File.read(path)).result
+
+      yaml_major, yaml_minor, _ = Gem::Version.new(YAML::VERSION).segments
+      config = if yaml_major >= 4 || (yaml_major == 3 && yaml_minor >= 1)
+        YAML.safe_load(source, aliases: true)
+      else
+        YAML.safe_load(source, [], [], true)
+      end
+
+      MongoMapper.setup(config, environment, options)
+    end
+
     def handle_passenger_forking
       # :nocov:
       if defined?(PhusionPassenger)

data/lib/mongo_mapper/document.rb

@@ -40,6 +40,7 @@ module MongoMapper
     include Plugins::IdentityMap
     include Plugins::CounterCache
     include Plugins::Shardable
+    include Plugins::GlobalID if defined?(::GlobalID)
 
     included do
       extend Plugins

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

@@ -3,7 +3,7 @@ module MongoMapper
   module Plugins
     module Associations
       class Base
-        attr_reader :name, :options, :query_options
+        attr_reader :name, :options, :query_options, :foreign_key, :ivar
 
         # Options that should not be considered MongoDB query options/criteria
         AssociationOptions = [:as, :class, :class_name, :dependent, :extend, :foreign_key, :in, :from, :polymorphic, :autosave, :touch, :counter_cache, :ordered]
@@ -13,6 +13,8 @@ module MongoMapper
           options.symbolize_keys!
           options[:extend] = modularized_extensions(extension, options[:extend])
           separate_options_and_conditions
+          @foreign_key = (options[:foreign_key] || "#{name}_id").freeze
+          @ivar = "@_#{name}".freeze
         end
 
         def class_name
@@ -63,14 +65,6 @@ module MongoMapper
           @options[:as] || self.name
         end
 
-        def foreign_key
-          @options[:foreign_key] || "#{name}_id"
-        end
-
-        def ivar
-          @ivar ||= "@_#{name}"
-        end
-
         # :nocov:
         def proxy_class
           raise NotImplementedError

data/lib/mongo_mapper/plugins/global_id.rb

@@ -0,0 +1,8 @@
+# encoding: UTF-8
+module MongoMapper
+  module Plugins
+    module GlobalID
+      include ::GlobalID::Identification
+    end
+  end
+end

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

@@ -35,11 +35,12 @@ module MongoMapper
         def load_from_database(attrs, with_cast = false)
           return super if !self.class.static_keys || !attrs.respond_to?(:each)
 
-          attrs = attrs.select { |key, _| self.class.key?(key) }
+          embedded_keys = self.class.embedded_associations.map(&:name).map(&:to_s)
+          attrs = attrs.select { |key, _| self.class.key?(key) || key.in?(embedded_keys) }
 
           super(attrs, with_cast)
         end
       end
     end
   end
-end
+end

data/lib/mongo_mapper/railtie.rb

@@ -57,8 +57,7 @@ module MongoMapper
     initializer "mongo_mapper.initialize_database" do |app|
       config_file = Rails.root.join('config/mongo.yml')
       if config_file.file?
-        config = YAML.load(ERB.new(config_file.read).result)
-        MongoMapper.setup(config, Rails.env, :logger => Rails.logger)
+        MongoMapper.setup_with_config_file(config_file, Rails.env, :logger => Rails.logger)
       end
     end
   end

data/lib/mongo_mapper/version.rb

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

data/lib/mongo_mapper.rb

@@ -6,6 +6,10 @@ require 'active_model'
 require 'activemodel-serializers-xml'
 require 'mongo_mapper/deprecator'
 require "mongo_mapper/railtie" if defined?(Rails)
+begin
+  require 'globalid'
+rescue LoadError
+end
 
 I18n.load_path << File.expand_path('../mongo_mapper/locale/en.yml', __FILE__)
 
@@ -70,6 +74,7 @@ module MongoMapper
     autoload :Userstamps,         'mongo_mapper/plugins/userstamps'
     autoload :Validations,        'mongo_mapper/plugins/validations'
     autoload :Touch,              'mongo_mapper/plugins/touch'
+    autoload :GlobalID,           'mongo_mapper/plugins/global_id'
 
     module Associations
       autoload :Base,                         'mongo_mapper/plugins/associations/base'

data/spec/config/alias.yml

@@ -0,0 +1,14 @@
+default: &default
+  host: 127.0.0.1:21017
+
+production:
+  <<: *default
+  database: production
+
+development:
+  <<: *default
+  database: development
+
+test:
+  <<: *default
+  database: test

data/spec/config/erb.yml

@@ -0,0 +1,10 @@
+production:
+  uri: <%= ENV["MONGODB_URI"] %>
+
+development:
+  host: 127.0.0.1:21017
+  database: development
+
+test:
+  host: 127.0.0.1:21017
+  database: test

data/spec/config/simple.yml

@@ -0,0 +1,11 @@
+production:
+  host: 127.0.0.1:21017
+  database: production
+
+development:
+  host: 127.0.0.1:21017
+  database: development
+
+test:
+  host: 127.0.0.1:21017
+  database: test