mongo_mapper 0.13.0 → 0.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: cd7ff4dfcd2b6bce162c7b55ba45e8c00e38a461
-  data.tar.gz: 673686bd40a1c139e2045b5397802239cd5d894c
+SHA256:
+  metadata.gz: 77d669d6c4286995fb2afbed7cf23475c6dc496cb3faf97a57f3b8f115e263b3
+  data.tar.gz: d11040bb05eeb6cb57465c4585c0667b16d750b16d7fd5fedca5e03734b769ac
 SHA512:
-  metadata.gz: 36943d83bc3ddff1cd8c82d8bddfdde2fa3dfae12800f4c93260480185925e1f34e5a8622b7682b176a318579ee723339286a5c5b99678e9731301e475fb183b
-  data.tar.gz: 039605ede2145f91ef107e39dc91d43db57906be355737198fe0a1cff97a2eeb821a9a9460fa977f1a2cc520cdf07c1177994db5ad623e298203e50e6f5838a4
+  metadata.gz: 56a665e63c65da52238cc18348333a2a9c6b6d1c5acf564308f60f8fcec8a1be759c5b7546a0259092a7f6acc9170659d55c462ac59fffe6520f3339a650df15
+  data.tar.gz: 8dceac60d1ef1159585453450d2960e4d9d50e472ec7728f3b703da8e40e80af625b01bb6c4022327e16631960faa698da93c7d37c563cd1c839eb3ebfc28ddb

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,61 @@
+# 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://travis-ci.org/mongomapper/mongomapper.svg?branch=master" alt="Build Status" />](https://travis-ci.org/mongomapper/mongomapper)
+
+[<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
+
+## Compatibility
+
+MongoMapper is tested against:
+
+* MRI 2.4 - 2.7
+* JRuby (Versions with 1.9 compatibility)
+
+Additionally, MongoMapper is tested against:
+
+* Rails 5.0+ - 6.0
+
+## 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 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.
+* 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-2020 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

@@ -1,7 +1,9 @@
 # encoding: UTF-8
 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__)
@@ -35,6 +37,7 @@ module MongoMapper
     autoload :Callbacks,          'mongo_mapper/plugins/callbacks'
     autoload :Caching,            'mongo_mapper/plugins/caching'
     autoload :Clone,              'mongo_mapper/plugins/clone'
+    autoload :CounterCache,       'mongo_mapper/plugins/counter_cache'
     autoload :Dirty,              'mongo_mapper/plugins/dirty'
     autoload :Document,           'mongo_mapper/plugins/document'
     autoload :DynamicQuerying,    'mongo_mapper/plugins/dynamic_querying'
@@ -49,6 +52,7 @@ module MongoMapper
     autoload :Logger,             'mongo_mapper/plugins/logger'
     autoload :Modifiers,          'mongo_mapper/plugins/modifiers'
     autoload :Pagination,         'mongo_mapper/plugins/pagination'
+    autoload :PartialUpdates,     'mongo_mapper/plugins/partial_updates'
     autoload :Persistence,        'mongo_mapper/plugins/persistence'
     autoload :Protected,          'mongo_mapper/plugins/protected'
     autoload :Querying,           'mongo_mapper/plugins/querying'
@@ -57,6 +61,8 @@ module MongoMapper
     autoload :Sci,                'mongo_mapper/plugins/sci'
     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'
@@ -82,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,45 +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['hosts']
-        if env['hosts'].first.is_a?(String)
-          Mongo::MongoReplicaSetClient.new( env['hosts'], options )
-        else
-          Mongo::MongoReplicaSetClient.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/document.rb

@@ -16,6 +16,7 @@ module MongoMapper
     include Plugins::Inspect
     include Plugins::Indexes
     include Plugins::Keys
+    include Plugins::Keys::Static
     include Plugins::Dirty # for now dirty needs to be after keys
     include Plugins::Logger
     include Plugins::Modifiers
@@ -28,13 +29,16 @@ module MongoMapper
     include Plugins::Sci
     include Plugins::Scopes
     include Plugins::Serialization
+    include Plugins::Stats
     include Plugins::Timestamps
     include Plugins::Userstamps
     include Plugins::Touch
     include Plugins::Validations
     include Plugins::EmbeddedCallbacks
     include Plugins::Callbacks # for now callbacks needs to be after validations
+    include Plugins::PartialUpdates
     include Plugins::IdentityMap
+    include Plugins::CounterCache
 
     included do
       extend Plugins

data/lib/mongo_mapper/extensions/array.rb

@@ -2,18 +2,26 @@
 module MongoMapper
   module Extensions
     module Array
-      def to_mongo(value)
-        value = value.respond_to?(:lines) ? value.lines : value
-        value.to_a
+      extend ActiveSupport::Concern
+
+      module ClassMethods
+        def to_mongo(value)
+          value = value.respond_to?(:lines) ? value.lines : value
+          value.to_a
+        end
+
+        def from_mongo(value)
+          value || []
+        end
       end
 
-      def from_mongo(value)
-        value || []
+      def _mongo_mapper_deep_copy_
+        map { |value| value._mongo_mapper_deep_copy_ }
       end
     end
   end
 end
 
 class Array
-  extend MongoMapper::Extensions::Array
+  include MongoMapper::Extensions::Array
 end

data/lib/mongo_mapper/extensions/hash.rb

@@ -2,13 +2,25 @@
 module MongoMapper
   module Extensions
     module Hash
-      def from_mongo(value)
-        HashWithIndifferentAccess.new(value || {})
+      extend ActiveSupport::Concern
+
+      module ClassMethods
+        def from_mongo(value)
+          HashWithIndifferentAccess.new(value || {})
+        end
+      end
+
+      def _mongo_mapper_deep_copy_
+        self.class.new.tap do |new_hash|
+          each do |key, value|
+            new_hash[key._mongo_mapper_deep_copy_] = value._mongo_mapper_deep_copy_
+          end
+        end
       end
     end
   end
 end
 
 class Hash
-  extend MongoMapper::Extensions::Hash
+  include MongoMapper::Extensions::Hash
 end

data/lib/mongo_mapper/extensions/object.rb

@@ -17,6 +17,10 @@ module MongoMapper
       def to_mongo
         self.class.to_mongo(self)
       end
+
+      def _mongo_mapper_deep_copy_
+        self
+      end
     end
   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
+
+  def original_to_json(*args)
+    original_as_json.to_json(*args)
+  end
 end

data/lib/mongo_mapper/extensions/string.rb

@@ -2,17 +2,25 @@
 module MongoMapper
   module Extensions
     module String
-      def to_mongo(value)
-        value && value.to_s
+      extend ActiveSupport::Concern
+
+      module ClassMethods
+        def to_mongo(value)
+          value && value.to_s
+        end
+
+        def from_mongo(value)
+          value && value.to_s
+        end
       end
 
-      def from_mongo(value)
-        value && value.to_s
+      def _mongo_mapper_deep_copy_
+        self.dup
       end
     end
   end
 end
 
 class String
-  extend MongoMapper::Extensions::String
+  include MongoMapper::Extensions::String
 end

data/lib/mongo_mapper/extensions/symbol.rb

@@ -0,0 +1,18 @@
+# encoding: UTF-8
+module MongoMapper
+  module Extensions
+    module Symbol
+      def to_mongo(value)
+        value && value.to_s.to_sym
+      end
+
+      def from_mongo(value)
+        value && value.to_s.to_sym
+      end
+    end
+  end
+end
+
+class Symbol
+  extend MongoMapper::Extensions::Symbol
+end

data/lib/mongo_mapper/plugins/accessible.rb

@@ -42,11 +42,21 @@ module MongoMapper
         self.class.accessible_attributes?
       end
 
-      protected
-        def filter_inaccessible_attrs(attrs)
-          return attrs if !accessible_attributes? || attrs.blank?
-          attrs.dup.delete_if { |key, val| !accessible_attributes.include?(key.to_sym) }
+    protected
+
+      def filter_inaccessible_attrs(attrs)
+        return attrs if !accessible_attributes? || attrs.blank?
+        attrs.dup.delete_if { |key, val| attribute_inaccessible?(key.to_sym) }
+      end
+
+      def attribute_inaccessible?(attribute)
+        unless accessible_attributes.include?(attribute)
+          message = "Can't mass-assign protected attribute: #{attribute}"
+          MongoMapper.logger ? MongoMapper.logger.warn(message) : puts(message)
+
+          return true
         end
+      end
     end
   end
-end
+end