mongo_mapper 0.14.0.rc1 → 0.15.3

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZDZhYzcyYjE1YmNiYTY4NTVlOGFiZjRlNjk1MTVjOWRkZWViODE3YQ==
-  data.tar.gz: !binary |-
-    YjUxMmRlMTUyOTM5ZjgwMTBlM2JlMzFjNWIxNTVjYWY4NDU3NTYxMA==
+SHA256:
+  metadata.gz: 5d5192b00f4bce2f16b7ac329a9bdb059c888ebea3c62ba91e9017a42a43371c
+  data.tar.gz: 9e3f0dca756cb0e260266fa147800c07d02133dfad74376f3aaa169f56d67f36
 SHA512:
-  metadata.gz: !binary |-
-    N2ZhNWM1NmZlOTE3NDYwYjExZTZhODcxMTM1YzM3Yzg4NTY4ZjFlOTk4NDA1
-    NGJkNDc3YTdhZWRiY2JlOWZjNWZjNDZjYjkzMzZlMmNkY2MxNWNjZTE4M2Q3
-    OWYzYjBjNjcxNTVkODg4OTliODY5NTZjYWE1NzBjZGE1ZGU0NDA=
-  data.tar.gz: !binary |-
-    OWMyYjNmNTY5ZGNhOTM1MGNkNTg0MGFkNzkwMjg3Yjc5Y2M0MzM2ZjUwNTZm
-    YjU1MjAxODYzOTllYzM4NzBjZjNmYmI2NGUzYWFiODQwMjNmN2E4MDAxYWYz
-    MjQyNGQ4ZmU1OTcwMmRmOGZlMWQ4NDI1ZTJjYjU4ODViMjM4OWQ=
+  metadata.gz: 052506c11e7921c9412fdbbdaeedbc05a199700867502e87c73bb00d4bb649007ed4f5c8f3f57020f96084d26128aaf5ba9973504018a76a1ecf4cd93b014186
+  data.tar.gz: fb775b4103f3eaa22ae76c5e4875d6c3117e44db8c2e6cd39189800d0fcafb63a8d8368a91a195ea8380cf9ce0744431e41e303bec0c478d61c5606d4ca8bd14

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.rdoc → README.md}

@@ -1,39 +1,35 @@
-= MongoMapper
-
-{<img src="https://badge.fury.io/rb/mongo_mapper.png" alt="RubyGem" />}[https://rubygems.org/gems/mongo_mapper]
-{<img src="https://travis-ci.org/mongomapper/mongomapper.png?branch=master" alt="Build Status" />}[https://travis-ci.org/mongomapper/mongomapper]
-{<img src="https://coveralls.io/repos/jnunemaker/mongomapper/badge.png" alt="Coverage Status" />}[https://coveralls.io/r/jnunemaker/mongomapper]
+# MongoMapper
 
 A Ruby Object Mapper for Mongo.
 
-== Install
+[<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
+## Documentation
 
 http://mongomapper.com/documentation/
 
 http://rdoc.info/github/mongomapper/mongomapper
 
-== Compatibility
+## Compatibility
 
 MongoMapper is tested against:
 
-* MRI 1.8.7
-* MRI 1.9.3
-* MRI 2.0.0
-* MRI 2.1.1
+* MRI 2.4 - 2.7
 * JRuby (Versions with 1.9 compatibility)
 
 Additionally, MongoMapper is tested against:
 
-* Rails 3.0.x
-* Rails 3.1.x
-* Rails 3.2.x
-* Rails 4.0.x
+* Rails 5.0+ - 6.0
 
-== Contributing & Development
+## Contributing & Development
 
     $ git clone https://github.com/mongomapper/mongomapper && cd mongomapper
     $ bundle install
@@ -45,12 +41,21 @@ Additionally, MongoMapper is tested against:
 * 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.
 * Send a pull request. Bonus points for topic branches.
 
-== Problems or Questions?
+## Problems or Questions?
 
 Hit up the Google group: http://groups.google.com/group/mongomapper
 
-Hop on IRC: irc://chat.freenode.net/#mongomapper
+## Copyright
+
+Copyright (c) 2009-2020 MongoMapper. See LICENSE for details.
+
+## Contributors
+
+MongoMapper/Plucky is:
 
-== License & Copyright
+* John Nunemaker
+* Chris Heald
+* Scott Taylor
 
-See LICENSE for details.
+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'
@@ -86,6 +88,7 @@ module MongoMapper
       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 :InForeignArrayProxy,          'mongo_mapper/plugins/associations/in_foreign_array_proxy'
     end
   end
 

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/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
+
+  def original_to_json(*args)
+    original_as_json.to_json(*args)
+  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

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

@@ -47,6 +47,12 @@ module MongoMapper
           loaded
           @target
         end
+
+      private
+
+        def stale_target?
+          loaded? && proxy_owner[association.foreign_key] != @target&.id
+        end
       end
     end
   end

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

@@ -6,11 +6,11 @@ module MongoMapper
         include DynamicQuerying::ClassMethods
 
         def find(*args)
-          query.find(*scoped_ids(args))
+          order_results(query.find(*scoped_ids(args)))
         end
 
         def find!(*args)
-          query.find!(*scoped_ids(args))
+          order_results(query.find!(*scoped_ids(args)))
         end
 
         def paginate(options)
@@ -20,17 +20,29 @@ module MongoMapper
 
         def all(options={})
           return [] if ids.blank?
-          query(options).all
+          order_results(query(options).all)
         end
 
         def first(options={})
           return nil if ids.blank?
-          query(options).first
+
+          if ordered?
+            ids = find_ordered_ids(options)
+            find!(ids.first) if ids.any?
+          else
+            query(options).first
+          end
         end
 
         def last(options={})
           return nil if ids.blank?
-          query(options).last
+
+          if ordered?
+            ids = find_ordered_ids(options)
+            find!(ids.last) if ids.any?
+          else
+            query(options).last
+          end
         end
 
         def count(options={})
@@ -120,6 +132,13 @@ module MongoMapper
           valid.empty? ? nil : valid
         end
 
+        def find_ordered_ids(options={})
+          return ids if options.empty?
+
+          matched_ids = klass.collection.distinct(:_id, query(options).criteria.to_hash)
+          matched_ids.sort_by! { |matched_id| ids.index(matched_id) }
+        end
+
         def find_target
           return [] if ids.blank?
           all
@@ -128,7 +147,18 @@ module MongoMapper
         def ids
           proxy_owner[options[:in]]
         end
+
+        def order_results(objects)
+          return objects if !ordered?
+          return objects unless objects.respond_to?(:to_a) && objects.respond_to?(:sort_by)
+          objects.sort_by { |obj| ids.index(obj.id) }
+        end
+
+        def ordered?
+          association.ordered?
+        end
+
       end
     end
   end
-end
+end