mongo_mapper 0.14.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b6880875b0db1bcf8f52f472551b859be5d399a9
-  data.tar.gz: ee4023cda04c706b6c56aa7358040b1a3d0c07e8
+SHA256:
+  metadata.gz: 143438e47efd4cc910b443067a35aff261a7c32baa12bbe8836b0505edb6c8ad
+  data.tar.gz: 0d8d33172da4805fa47544585d2ea5369a82e9154be19dcd9be2789b5c2747cb
 SHA512:
-  metadata.gz: acae6e9a273dd77a8c41f06138b910c23c197d0c3e790be33042fc9198fb02398a30bb73360655ca4bc8b1256b140e40ee568530fa75f56caa11f79b36f22ef8
-  data.tar.gz: dbb174abd832dddcc86e720a296198696401abc28da84e1a96737785c5d68b8197b7b8ce87b726340ba2e3858ae6f59649c6b270b663865a5fe2628871ee1fe1
+  metadata.gz: 50b970107ed41cc982e24fe9d171fed471847c593db3c5239b7e60fa88fb67ef799473eb1a088d2eb92d6d2cda49d8ec391b61a24e92bb5b9a9e7eea399ed61b
+  data.tar.gz: 1674cc8cdc27d2f3bc7460a8f32017903bde7263feeae62bf3074386d5fa0b080b3fc52c4407c200a7b4df8fb083fd917e6b5611b19f8538ec10033c789667ab

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/mongomapper/mongomapper/badge.png" alt="Coverage Status" />}[https://coveralls.io/r/mongomapper/mongomapper]
+# MongoMapper
 
 A Ruby Object Mapper for Mongo.
 
-== Install
+[<img src="https://badge.fury.io/rb/mongo_mapper.png" alt="RubyGems">](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/mongomapper/mongomapper/badge.png" 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,24 @@ 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
 
-== License & Copyright
+## Copyright
+
+Copyright (c) 2009-2020 MongoMapper. See LICENSE for details.
+
+## Contributors
+
+MongoMapper/Plucky is:
+
+* John Nunemaker
+* Chris Heald
+* Scott Taylor
+
+With contributions from:
 
-See LICENSE for details.
+* Frederick Cheung

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__)

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

@@ -3,58 +3,50 @@ module MongoMapper
   module Plugins
     module Dirty
       extend ActiveSupport::Concern
-
       include ::ActiveModel::Dirty
 
-      def initialize(*)
-        # never register initial id assignment as a change
-        # Chaining super into tap breaks implicit block passing in Ruby 1.8
-        doc = super
-        doc.tap { changed_attributes.delete('_id') }
-      end
-
-      def save(*)
-        clear_changes { super }
-      end
-
-      def reload(*)
-        doc = super
-        doc.tap { clear_changes }
-      end
-
-      def clear_changes
-        previous = changes
-        (block_given? ? yield : true).tap do |result|
-          unless result == false #failed validation; nil is OK.
-            @previously_changed = previous
-            changed_attributes.clear
+      module ClassMethods
+        def create_accessors_for(key)
+          super.tap do
+            define_attribute_methods([key.name])
           end
         end
       end
 
-    protected
+      def create_or_update(*)
+        super.tap do
+          changes_applied
+        end
+      end
 
-      # We don't call super here to avoid invoking #attributes, which builds a whole new hash per call.
-      def attribute_method?(attr_name)
-        keys.key?(attr_name) || !embedded_associations.detect {|a| a.name == attr_name }.nil?
+      def reload!
+        super.tap do
+          clear_changes_information
+        end
       end
 
     private
 
-      def write_key(key, value)
-        key = unalias_key(key)
-        if !keys.key?(key)
+      def write_key(key_name, value)
+        key_name = unalias_key(key_name)
+
+        if !keys.key?(key_name)
           super
         else
-          attribute_will_change!(key) unless attribute_changed?(key)
-          super.tap do
-            changed_attributes.delete(key) unless attribute_value_changed?(key)
+          # find the MongoMapper::Plugins::Keys::Key
+          _, key = keys.detect { |n, v| n == key_name }
+
+          # typecast to the new value
+          old_value = read_key(key_name)
+          new_value = key.type.to_mongo(value)
+
+          # only mark changed if really changed value (after typecasting)
+          unless old_value == new_value
+            attribute_will_change!(key_name)
           end
-        end
-      end
 
-      def attribute_value_changed?(key_name)
-        changed_attributes[key_name] != read_key(key_name)
+          super
+        end
       end
     end
   end

data/lib/mongo_mapper/plugins/document.rb

@@ -19,7 +19,7 @@ module MongoMapper
       end
 
       def reload
-        if doc = collection.find_one(:_id => id)
+        if doc = collection.find({:_id => id},{limit: -1}).first
           self.class.associations.each_value do |association|
             get_proxy(association).reset
           end

data/lib/mongo_mapper/plugins/dynamic_querying/dynamic_finder.rb

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

data/lib/mongo_mapper/plugins/embedded_callbacks.rb

@@ -44,6 +44,7 @@ module MongoMapper
           definition.each do |prefix, suffixes|
             suffixes.each do |suffix|
               callback = "%s_%s" % [prefix, suffix]
+
               class_eval <<-CALLBACK, __FILE__, __LINE__ + 1
                 class << self
                   alias_method :__original_#{callback}, :#{callback}

data/lib/mongo_mapper/plugins/embedded_document.rb

@@ -41,7 +41,7 @@ module MongoMapper
 
       def persist(options={})
         @_new = false
-        clear_changes if respond_to?(:clear_changes)
+        changes_applied if respond_to?(:changes_applied)
         save_to_collection(options)
       end
 

data/lib/mongo_mapper/plugins/indexes.rb

@@ -6,19 +6,20 @@ module MongoMapper
 
       module ClassMethods
         def ensure_index(spec, options = {})
-          collection.ensure_index dealias_options(spec), options
+          #TODO: should we emulate the mongo 1.x behaviour of caching attempts to create indexes?
+          collection.indexes.create_one dealias_options(spec), options
         end
 
         def create_index(spec, options = {})
-          collection.create_index dealias_options(spec), options
+          collection.indexes.create_one dealias_options(spec), options
         end
 
         def drop_index(name)
-          collection.drop_index name
+          collection.indexes.drop_one name
         end
 
         def drop_indexes
-          collection.drop_indexes
+          collection.indexes.drop_all
         end
 
       private
@@ -26,11 +27,17 @@ module MongoMapper
         def dealias_options(options)
           case options
           when Symbol, String
-             abbr(options)
+            {abbr(options) => 1}
           when Hash
             dealias_keys(options)
           when Array
-            options.map {|o| dealias_options(o) }
+            if options.first.is_a?(Hash)
+              options.map {|o| dealias_options(o) }
+            elsif options.first.is_a?(Array) # [[:foo, 1], [:bar, 1]]
+              options.inject({}) {|acc, tuple| acc.merge(dealias_options(tuple))}
+            else
+              dealias_keys(Hash[*options])
+            end
           else
             options
           end