mongo_mapper 0.14.0 → 0.15.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b6880875b0db1bcf8f52f472551b859be5d399a9
-  data.tar.gz: ee4023cda04c706b6c56aa7358040b1a3d0c07e8
+SHA256:
+  metadata.gz: 290286ec91fda33bce766c8cacff110abd4027b200fa5279c2ca8afdf68d3ad3
+  data.tar.gz: b38548fb44300f730c70e0e43abe48a7a9785f884d8b28d3d7447afc78a77ec5
 SHA512:
-  metadata.gz: acae6e9a273dd77a8c41f06138b910c23c197d0c3e790be33042fc9198fb02398a30bb73360655ca4bc8b1256b140e40ee568530fa75f56caa11f79b36f22ef8
-  data.tar.gz: dbb174abd832dddcc86e720a296198696401abc28da84e1a96737785c5d68b8197b7b8ce87b726340ba2e3858ae6f59649c6b270b663865a5fe2628871ee1fe1
+  metadata.gz: eef0f965e3d2b23cafcbfe6d3c39581ef4556e2b606a1668e3c26a2817bd4a75a94635c5102795171f4deeef6a0b52c74ff3bcac6f81c83a69e69d746f369a0b
+  data.tar.gz: '058f0007e68c8e8d3bbe5ea9236615ba252a44b12c5e91042390a8f920a4127cbe2950e8748f088daab02e8a7b8c6eb0a10b226c378cf4330951b1f8e94db898'

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 John Nunemaker
+Copyright (c) 2009-2020 MongoMapper: John Nunemaker, Chris Heald, Scott Taylor
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -0,0 +1,72 @@
+# MongoMapper
+
+A Ruby Object Mapper for Mongo.
+
+[<img src="https://badge.fury.io/rb/mongo_mapper.svg" alt="RubyGems">](https://rubygems.org/gems/mongo_mapper)
+
+[<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) -->
+
+## Install
+
+    $ gem install mongo_mapper
+
+## Documentation
+
+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 - 3.0.1
+* JRuby (Versions with 1.9 compatibility)
+
+Additionally, MongoMapper is tested against:
+
+* 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
+
+    $ git clone https://github.com/mongomapper/mongomapper && cd mongomapper
+    $ bundle install
+    $ bundle exec rake
+
+* Fork the project.
+* Make your feature addition or bug fix. All specs should pass.
+* 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.
+
+## Problems or Questions?
+
+Hit up the Google group: http://groups.google.com/group/mongomapper
+
+## Copyright
+
+Copyright (c) 2009-2021 MongoMapper. See LICENSE for details.
+
+## Contributors
+
+MongoMapper/Plucky is:
+
+* John Nunemaker
+* Chris Heald
+* Scott Taylor
+
+But all open source projects are a team effort and could not happen without
+everyone who has contributed.  See `CONTRIBUTORS` for the full list.  Thank you!

data/examples/keys.rb

@@ -16,7 +16,7 @@ class User
   key :links,       Hash
   timestamps!
 end
-User.collection.remove # empties collection
+User.collection.drop # empties collection
 
 john = User.create({
   :first_name => 'John',

data/examples/modifiers/set.rb

@@ -10,7 +10,7 @@ class User
   key :name, String
   key :tags, Array
 end
-User.collection.remove # empties collection
+User.collection.drop # empties collection
 
 john = User.create(:name => 'John',  :tags => %w[ruby mongo], :age => 28)
 bill = User.create(:name => 'Bill',  :tags => %w[ruby mongo], :age => 30)

data/examples/querying.rb

@@ -10,7 +10,7 @@ class User
   key :name, String
   key :tags, Array
 end
-User.collection.remove # empties collection
+User.collection.drop # empties collection
 
 User.create(:name => 'John',  :tags => %w[ruby mongo], :age => 28)
 User.create(:name => 'Bill',  :tags => %w[ruby mongo], :age => 30)

data/examples/safe.rb

@@ -22,7 +22,7 @@ puts
 begin
   user = User.new(:email => 'nunemaker@gmail.com')
   user.save(:safe => true)
-rescue Mongo::OperationFailure => e
+rescue Mongo::Error::OperationFailure => e
   puts 'Mongo Operation failure raised because duplicate email was entered'
   puts e.inspect
   puts
@@ -37,7 +37,7 @@ User.safe
 
 begin
   User.create(:email => 'nunemaker@gmail.com')
-rescue Mongo::OperationFailure => e
+rescue Mongo::Error::OperationFailure => e
   puts 'Mongo Operation failure raised because duplicate email was entered'
   puts e.inspect
 end

data/examples/scopes.rb

@@ -28,7 +28,7 @@ class User
   key :name, String
   key :tags, Array
 end
-User.collection.remove # empties collection
+User.collection.drop # empties collection
 
 User.create(:name => 'John',  :tags => %w[ruby mongo], :age => 28)
 User.create(:name => 'Bill',  :tags => %w[ruby mongo], :age => 30)

data/lib/mongo_mapper.rb

@@ -3,6 +3,7 @@ require 'plucky'
 require 'active_support'
 require 'active_support/core_ext'
 require 'active_model'
+require 'activemodel-serializers-xml'
 require "mongo_mapper/railtie" if defined?(Rails)
 
 I18n.load_path << File.expand_path('../mongo_mapper/locale/en.yml', __FILE__)
@@ -61,6 +62,7 @@ module MongoMapper
     autoload :Scopes,             'mongo_mapper/plugins/scopes'
     autoload :Serialization,      'mongo_mapper/plugins/serialization'
     autoload :Stats,              'mongo_mapper/plugins/stats'
+    autoload :StrongParameters,   'mongo_mapper/plugins/strong_parameters'
     autoload :Timestamps,         'mongo_mapper/plugins/timestamps'
     autoload :Userstamps,         'mongo_mapper/plugins/userstamps'
     autoload :Validations,        'mongo_mapper/plugins/validations'
@@ -68,24 +70,27 @@ module MongoMapper
 
     module Associations
       autoload :Base,                         'mongo_mapper/plugins/associations/base'
-      autoload :Collection,                   'mongo_mapper/plugins/associations/collection'
-      autoload :EmbeddedCollection,           'mongo_mapper/plugins/associations/embedded_collection'
       autoload :ManyAssociation,              'mongo_mapper/plugins/associations/many_association'
       autoload :SingleAssociation,            'mongo_mapper/plugins/associations/single_association'
       autoload :BelongsToAssociation,         'mongo_mapper/plugins/associations/belongs_to_association'
       autoload :OneAssociation,               'mongo_mapper/plugins/associations/one_association'
-      autoload :ManyDocumentsProxy,           'mongo_mapper/plugins/associations/many_documents_proxy'
-      autoload :BelongsToProxy,               'mongo_mapper/plugins/associations/belongs_to_proxy'
-      autoload :BelongsToPolymorphicProxy,    'mongo_mapper/plugins/associations/belongs_to_polymorphic_proxy'
-      autoload :ManyPolymorphicProxy,         'mongo_mapper/plugins/associations/many_polymorphic_proxy'
-      autoload :ManyEmbeddedProxy,            'mongo_mapper/plugins/associations/many_embedded_proxy'
-      autoload :ManyEmbeddedPolymorphicProxy, 'mongo_mapper/plugins/associations/many_embedded_polymorphic_proxy'
-      autoload :ManyDocumentsAsProxy,         'mongo_mapper/plugins/associations/many_documents_as_proxy'
-      autoload :OneProxy,                     'mongo_mapper/plugins/associations/one_proxy'
-      autoload :OneAsProxy,                   'mongo_mapper/plugins/associations/one_as_proxy'
-      autoload :OneEmbeddedProxy,             'mongo_mapper/plugins/associations/one_embedded_proxy'
-      autoload :OneEmbeddedPolymorphicProxy,  'mongo_mapper/plugins/associations/one_embedded_polymorphic_proxy'
-      autoload :InArrayProxy,                 'mongo_mapper/plugins/associations/in_array_proxy'
+
+      autoload :Proxy,                        'mongo_mapper/plugins/associations/proxy/proxy'
+      autoload :Collection,                   'mongo_mapper/plugins/associations/proxy/collection'
+      autoload :EmbeddedCollection,           'mongo_mapper/plugins/associations/proxy/embedded_collection'
+      autoload :ManyDocumentsProxy,           'mongo_mapper/plugins/associations/proxy/many_documents_proxy'
+      autoload :BelongsToProxy,               'mongo_mapper/plugins/associations/proxy/belongs_to_proxy'
+      autoload :BelongsToPolymorphicProxy,    'mongo_mapper/plugins/associations/proxy/belongs_to_polymorphic_proxy'
+      autoload :ManyPolymorphicProxy,         'mongo_mapper/plugins/associations/proxy/many_polymorphic_proxy'
+      autoload :ManyEmbeddedProxy,            'mongo_mapper/plugins/associations/proxy/many_embedded_proxy'
+      autoload :ManyEmbeddedPolymorphicProxy, 'mongo_mapper/plugins/associations/proxy/many_embedded_polymorphic_proxy'
+      autoload :ManyDocumentsAsProxy,         'mongo_mapper/plugins/associations/proxy/many_documents_as_proxy'
+      autoload :OneProxy,                     'mongo_mapper/plugins/associations/proxy/one_proxy'
+      autoload :OneAsProxy,                   'mongo_mapper/plugins/associations/proxy/one_as_proxy'
+      autoload :OneEmbeddedProxy,             'mongo_mapper/plugins/associations/proxy/one_embedded_proxy'
+      autoload :OneEmbeddedPolymorphicProxy,  'mongo_mapper/plugins/associations/proxy/one_embedded_polymorphic_proxy'
+      autoload :InArrayProxy,                 'mongo_mapper/plugins/associations/proxy/in_array_proxy'
+      autoload :InForeignArrayProxy,          'mongo_mapper/plugins/associations/proxy/in_foreign_array_proxy'
     end
   end
 
@@ -96,7 +101,4 @@ Dir[File.join(File.dirname(__FILE__), 'mongo_mapper', 'extensions', '*.rb')].eac
   require extension
 end
 
-# FIXME: autoload with proxy is failing, need to investigate
-require 'mongo_mapper/plugins/associations/proxy'
-
 ActiveSupport.run_load_hooks(:mongo_mapper, MongoMapper)

data/lib/mongo_mapper/connection.rb

@@ -4,13 +4,12 @@ require 'uri'
 module MongoMapper
   module Connection
     @@connection    = nil
-    @@database      = nil
-    @@database_name = nil
     @@config        = nil
+    @@database      = nil
 
     # @api public
     def connection
-      @@connection ||= Mongo::MongoClient.new
+      @@connection ||= Mongo::Client.new ['127.0.0.1:27017']
     end
 
     def connection?
@@ -29,15 +28,12 @@ module MongoMapper
 
     # @api public
     def database=(name)
-      @@database = nil
-      @@database_name = name
+      @@database = connection.use(name).database
     end
 
     # @api public
     def database
-      return nil if @@database_name.blank?
-
-      @@database ||= MongoMapper.connection.db(@@database_name)
+      @@database ||= connection.database
     end
 
     def config=(hash)
@@ -51,46 +47,28 @@ module MongoMapper
 
     # @api private
     def config_for_environment(environment)
-      env = config[environment.to_s] || {}
-      return env if env['uri'].blank?
-
-      uri = URI.parse(env['uri'])
-      raise InvalidScheme.new('must be mongodb') unless uri.scheme == 'mongodb'
-      {
-        'host'     => uri.host,
-        'port'     => uri.port,
-        'database' => uri.path.gsub(/^\//, ''),
-        'username' => uri.user,
-        'password' => uri.password,
-      }
+      config[environment.to_s]
     end
 
     def connect(environment, options={})
       raise 'Set config before connecting. MongoMapper.config = {...}' if config.blank?
-      env = config_for_environment(environment)
+      env = config_for_environment(environment).dup
+      addresses_or_uri = env.delete('hosts') ||
+                         env.delete('uri') ||
+                         [env.delete('host')].compact
 
       if env['options'].is_a?(Hash)
-        options = env['options'].symbolize_keys.merge(options)
-      end
-      options[:read] = options[:read].to_sym if options[:read].is_a? String
-
-      if env.key?('ssl')
-        options[:ssl] = env['ssl']
+        options = env.delete('options').symbolize_keys.merge(options)
       end
+      #database etc are all options to Mongo::Client.new now
+      options = env.symbolize_keys.merge(options)
 
-      MongoMapper.connection = if env.key?('hosts')
-        klass = (env.key?("mongos") || env.key?("sharded")) ? Mongo::MongoShardedClient : Mongo::MongoReplicaSetClient
-        if env['hosts'].first.is_a?(String)
-          klass.new( env['hosts'], options )
-        else
-          klass.new( *env['hosts'].push(options) )
-        end
-      else
-        Mongo::MongoClient.new(env['host'], env['port'], options)
+      if options[:port]
+        raise "port should be specified as part of the host or uri"
       end
 
-      MongoMapper.database = env['database']
-      MongoMapper.database.authenticate(env['username'], env['password']) if env['username'] && env['password']
+      options[:read] = options[:read].to_sym if options[:read].is_a? String
+      MongoMapper.connection = Mongo::Client.new(addresses_or_uri, options)
     end
 
     def setup(config, environment, options={})

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

@@ -18,7 +18,7 @@ class ObjectId
 end
 
 class BSON::ObjectId
-  alias_method :original_to_json, :to_json
+  alias_method :original_as_json, :as_json
 
   def as_json(options=nil)
     to_s
@@ -29,4 +29,8 @@ class BSON::ObjectId
   end
 
   alias to_str to_s
-end
+
+  def original_to_json(*args)
+    original_as_json.to_json(*args)
+  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/accessible.rb

@@ -59,4 +59,4 @@ module MongoMapper
       end
     end
   end
-end
+end

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

@@ -6,7 +6,7 @@ module MongoMapper
         attr_reader :name, :options, :query_options
 
         # Options that should not be considered MongoDB query options/criteria
-        AssociationOptions = [:as, :class, :class_name, :dependent, :extend, :foreign_key, :in, :polymorphic, :autosave, :touch, :counter_cache]
+        AssociationOptions = [:as, :class, :class_name, :dependent, :extend, :foreign_key, :in, :from, :polymorphic, :autosave, :touch, :counter_cache, :ordered]
 
         def initialize(name, options={}, &extension)
           @name, @options, @query_options, @original_options = name.to_sym, {}, {}, options
@@ -28,13 +28,17 @@ module MongoMapper
         end
 
         def as?
-          !!@options[:as]
+          !in_foreign_array? && !!@options[:as]
         end
 
         def in_array?
           !!@options[:in]
         end
 
+        def in_foreign_array?
+          !!@options[:from]
+        end
+
         def embeddable?
           klass.embeddable?
         end
@@ -47,6 +51,10 @@ module MongoMapper
           !!@options[:counter_cache]
         end
 
+        def ordered?
+          !!@options[:ordered]
+        end
+
         def type_key_name
           "_type"
         end

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

@@ -29,7 +29,7 @@ module MongoMapper
 
         def add_touch_callbacks
           name        = self.name
-          method_name = "belongs_to_touch_after_save_or_destroy_for_#{name}"
+          method_name = :"belongs_to_touch_after_save_or_destroy_for_#{name}"
           touch       = options.fetch(:touch)
 
           @model.send(:define_method, method_name) do