mongoid 2.0.1 → 2.0.2

data/Rakefile

@@ -24,19 +24,19 @@ task :release => :build do
   system "gem push mongoid-#{Mongoid::VERSION}.gem"
 end
 
-Rspec::Core::RakeTask.new(:spec) do |spec|
+RSpec::Core::RakeTask.new(:spec) do |spec|
   spec.pattern = "spec/**/*_spec.rb"
 end
 
-Rspec::Core::RakeTask.new("spec:unit") do |spec|
+RSpec::Core::RakeTask.new("spec:unit") do |spec|
   spec.pattern = "spec/unit/**/*_spec.rb"
 end
 
-Rspec::Core::RakeTask.new("spec:functional") do |spec|
+RSpec::Core::RakeTask.new("spec:functional") do |spec|
   spec.pattern = "spec/functional/**/*_spec.rb"
 end
 
-Rspec::Core::RakeTask.new('spec:progress') do |spec|
+RSpec::Core::RakeTask.new('spec:progress') do |spec|
   spec.rspec_opts = %w(--format progress)
   spec.pattern = "spec/**/*_spec.rb"
 end

data/lib/config/locales/{pt-br.yml → pt-BR.yml}

@@ -1,4 +1,4 @@
-pt-br:
+pt-BR:
   mongoid:
     errors:
       messages:
@@ -12,7 +12,7 @@ pt-br:
           O campo foi definido como %{klass}, mas recebeu uma instância de %{other} com
           o valor %{value}.
         unsupported_version:
-          MongoDB %{version} não é suportada, por favor atualize para a 
+          MongoDB %{version} não é suportada, por favor atualize para a
           versão %{mongo_version}.
         validations:
           A validação falhou - %{errors}.
@@ -22,7 +22,7 @@ pt-br:
           do documento raiz.
         invalid_field:
           Não é permitido definir um campo com o nome %{name}. Não defina
-          campos que entrem em conflito com os nomes dos atributos internos e métodos 
+          campos que entrem em conflito com os nomes dos atributos internos e métodos
           do Mongoid. Use Document#instance_methods para consultar esses nomes.
         too_many_nested_attribute_records:
           A aceitação de atributos encadeados para %{association} encontra-se limitada
@@ -36,5 +36,5 @@ pt-br:
           A definição de inverse_of nesta associação não é permitida. Apenas
           use esta opção em embedded_in ou references_many as array.
         unsaved_document:
-          You cannot call create or create! through a relational association
-          relation (%{document}) who's parent (%{base}) is not already saved.
+          Você não pode chamar os métodos create ou create! de uma associação
+          relacional (%{document}) cujo pai (%{base}) ainda não foi salvo.

data/lib/config/locales/ru.yml

@@ -7,7 +7,7 @@ ru:
         document_not_found:
           Документ класса %{klass} с id %{identifiers} не найден.
         invalid_database:
-          База данных должная быть Mongo::DB, а не %{name}.
+          База данных должна быть Mongo::DB, а не %{name}.
         invalid_type:
           Поле уже было определено в классе %{klass}, но получено как %{other}
           со значением %{value}.

data/lib/config/locales/zh-CN.yml

@@ -2,6 +2,8 @@ zh-CN:
   mongoid:
     errors:
       messages:
+        blank:
+          不能为空
         taken:
           已占用
         document_not_found:

data/lib/mongoid.rb

@@ -37,7 +37,6 @@ require "active_model/serialization"
 require "active_model/translation"
 require "active_model/validator"
 require "active_model/validations"
-require "will_paginate/collection"
 require "mongo"
 require "mongoid/errors"
 require "mongoid/extensions"

data/lib/mongoid/attributes.rb

@@ -8,6 +8,9 @@ module Mongoid #:nodoc:
   module Attributes
     include Processing
 
+    attr_reader :attributes
+    alias :raw_attributes :attributes
+
     # Determine if an attribute is present.
     #
     # @example Is the attribute present?
@@ -38,7 +41,7 @@ module Mongoid #:nodoc:
     # @since 1.0.0
     def read_attribute(name)
       access = name.to_s
-      value = @attributes[access]
+      value = attributes[access]
       accessed(access, value)
     end
     alias :[] :read_attribute
@@ -54,7 +57,7 @@ module Mongoid #:nodoc:
     # @since 1.0.0
     def remove_attribute(name)
       access = name.to_s
-      modify(access, @attributes.delete(access), nil)
+      modify(access, attributes.delete(access), nil)
     end
 
     # Override respond_to? so it responds properly for dynamic attributes.
@@ -69,8 +72,8 @@ module Mongoid #:nodoc:
     # @since 1.0.0
     def respond_to?(*args)
       (Mongoid.allow_dynamic_fields &&
-        @attributes &&
-        @attributes.has_key?(args.first.to_s)
+        attributes &&
+        attributes.has_key?(args.first.to_s)
       ) || super
     end
 
@@ -90,7 +93,7 @@ module Mongoid #:nodoc:
     # @since 1.0.0
     def write_attribute(name, value)
       access = name.to_s
-      modify(access, @attributes[access], typed_value_for(access, value))
+      modify(access, attributes[access], typed_value_for(access, value))
     end
     alias :[]= :write_attribute
 
@@ -156,7 +159,7 @@ module Mongoid #:nodoc:
     # @param [ Array ] *args The arguments to the method.
     def method_missing(name, *args)
       attr = name.to_s
-      return super unless @attributes.has_key?(attr.reader)
+      return super unless attributes.has_key?(attr.reader)
       if attr.writer?
         write_attribute(attr.reader, (args.size > 1) ? args : args.first)
       else

data/lib/mongoid/collection.rb

@@ -83,6 +83,27 @@ module Mongoid #:nodoc
       @klass, @name = klass, name
     end
 
+    # Inserts one or more documents in the collection.
+    #
+    # @example Insert documents.
+    #   collection.insert(
+    #     { "field" => "value" },
+    #     :safe => true
+    #   )
+    #
+    # @param [ Hash, Array<Hash> ] documents A single document or multiples.
+    # @param [ Hash ] options The options.
+    #
+    # @since 2.0.2, batch-relational-insert
+    def insert(documents, options = {})
+      inserter = Thread.current[:mongoid_batch_insert]
+      if inserter
+        inserter.consume(documents, options)
+      else
+        master.insert(documents, options)
+      end
+    end
+
     # Perform a map/reduce on the documents.
     #
     # @example Perform the map/reduce.

data/lib/mongoid/config.rb

@@ -111,7 +111,7 @@ module Mongoid #:nodoc
       options.except("database", "slaves", "databases").each_pair do |name, value|
         send("#{name}=", value) if respond_to?("#{name}=")
       end
-      configure_databases(options)
+      @master, @slaves = configure_databases(options)
       configure_extras(options["databases"])
     end
 
@@ -132,14 +132,25 @@ module Mongoid #:nodoc
       end
     end
 
+    # Returns the default logger, which is either a Rails logger of stdout logger
+    #
+    # @example Get the default logger
+    #   config.default_logger
+    #
+    # @return [ Logger ] The default Logger instance.
+    def default_logger
+      defined?(Rails) ? Rails.logger : ::Logger.new($stdout)
+    end
+
     # Returns the logger, or defaults to Rails logger or stdout logger.
     #
     # @example Get the logger.
     #   config.logger
     #
-    # @return [ Logger ] The desired logger.
+    # @return [ Logger ] The configured logger or a default Logger instance.
     def logger
-      @logger ||= defined?(Rails) ? Rails.logger : ::Logger.new($stdout)
+      @logger = default_logger unless defined?(@logger)
+      @logger
     end
 
     # Sets the logger for Mongoid to use.
@@ -152,6 +163,18 @@ module Mongoid #:nodoc
       @logger = logger
     end
 
+    # Purge all data in all collections, including indexes.
+    #
+    # @example Purge all data.
+    #   Mongoid::Config.purge!
+    #
+    # @since 2.0.2
+    def purge!
+      master.collections.map do |collection|
+        collection.drop if collection.name !~ /system/
+      end
+    end
+
     # Sets whether the times returned from the database use the ruby or
     # the ActiveSupport time zone.
     # If you omit this setting, then times will use the ruby time zone.
@@ -209,7 +232,7 @@ module Mongoid #:nodoc
     # @return [ Mongo::DB ] The master database.
     def master
       unless @master
-        configure_databases(@settings) unless @settings.blank?
+        @master, @slaves = configure_databases(@settings) unless @settings.blank?
         raise Errors::InvalidDatabase.new(nil) unless @master
       end
       if @reconnect
@@ -272,7 +295,7 @@ module Mongoid #:nodoc
     # @return [ Array<Mongo::DB>, nil ] The slave databases.
     def slaves
       unless @slaves
-        configure_databases(@settings) if @settings && @settings[:database]
+        @master, @slaves = configure_databases(@settings) if @settings && @settings[:database]
       end
       @slaves
     end
@@ -314,9 +337,9 @@ module Mongoid #:nodoc
     # @since 2.0.0.rc.1
     def configure_databases(options)
       if options.has_key?('hosts')
-        @master, @slaves = ReplsetDatabase.new(options).configure
+        ReplsetDatabase.new(options).configure
       else
-        @master, @slaves = Database.new(options).configure
+        Database.new(options).configure
       end
     end
 
@@ -331,7 +354,7 @@ module Mongoid #:nodoc
     def configure_extras(extras)
       @databases = (extras || []).inject({}) do |dbs, (name, options)|
         dbs.tap do |extra|
-        dbs[name], dbs["#{name}_slaves"] = Database.new(options).configure
+        dbs[name], dbs["#{name}_slaves"] = configure_databases(options)
         end
       end
     end

data/lib/mongoid/config/replset_database.rb

@@ -17,8 +17,38 @@ module Mongoid #:nodoc:
         #yes, construction is weird but the driver wants "A list of host-port pairs ending with a hash containing any options"
         #mongo likes symbols
         options = self.inject({}) { |memo, (k, v)| memo[k.to_sym] = v; memo}
-        connection = Mongo::ReplSetConnection.new(*(self['hosts'] << options))
-        [ connection.db(self['database']), nil ]
+        connection = Mongo::ReplSetConnection.new(*(hosts << options))
+
+        if authenticating?
+          connection.add_auth(database, username, password)
+          connection.apply_saved_authentication
+        end
+
+        [ connection.db(database), nil ]
+      end
+
+      # Do we need to authenticate against the database?
+      #
+      # @example Are we authenticating?
+      #   db.authenticating?
+      #
+      # @return [ true, false ] True if auth is needed, false if not.
+      #
+      # @since 2.0.2
+      def authenticating?
+        username || password
+      end
+
+      # Convenience for accessing the hash via dot notation.
+      #
+      # @example Access a value in alternate syntax.
+      #   db.host
+      #
+      # @return [ Object ] The value in the hash.
+      #
+      # @since 2.0.2
+      def method_missing(name, *args, &block)
+        self[name.to_s]
       end
 
       # Create the new db configuration class.

data/lib/mongoid/contexts.rb

@@ -1,5 +1,4 @@
 # encoding: utf-8
-require "mongoid/contexts/paging"
 require "mongoid/contexts/enumerable"
 require "mongoid/contexts/mongo"
 

data/lib/mongoid/contexts/enumerable.rb

@@ -4,7 +4,6 @@ require 'mongoid/contexts/enumerable/sort'
 module Mongoid #:nodoc:
   module Contexts #:nodoc:
     class Enumerable
-      include Paging
       include Relations::Embedded::Atomic
 
       attr_accessor :collection, :criteria
@@ -15,30 +14,33 @@ module Mongoid #:nodoc:
       # Return aggregation counts of the grouped documents. This will count by
       # the first field provided in the fields array.
       #
-      # Returns:
+      # @example Aggregate on a field.
+      #   person.addresses.only(:street).aggregate
       #
-      # A +Hash+ with field values as keys, count as values
+      # @return [ Hash ] Field values as keys, count as values
       def aggregate
-        counts = {}
-        group.each_pair { |key, value| counts[key] = value.size }
-        counts
+        {}.tap do |counts|
+          group.each_pair { |key, value| counts[key] = value.size }
+        end
       end
 
       # Get the average value for the supplied field.
       #
-      # Example:
-      #
-      # <tt>context.avg(:age)</tt>
-      #
-      # Returns:
+      # @example Get the average.
+      #   context.avg(:age)
       #
-      # A numeric value that is the average.
+      # @return [ Numeric ] A numeric value that is the average.
       def avg(field)
         total = sum(field)
         total ? (total.to_f / count) : nil
       end
 
       # Gets the number of documents in the array. Delegates to size.
+      #
+      # @example Get the count.
+      #   context.count
+      #
+      # @return [ Integer ] The count of documents.
       def count
         @count ||= filter.size
       end
@@ -78,9 +80,10 @@ module Mongoid #:nodoc:
       # Gets an array of distinct values for the supplied field across the
       # entire array or the susbset given the criteria.
       #
-      # Example:
+      # @example Get the list of distinct values.
+      #   context.distinct(:title)
       #
-      # <tt>context.distinct(:title)</tt>
+      # @return [ Array<String> ] The distinct values.
       def distinct(field)
         execute.collect { |doc| doc.send(field) }.uniq
       end
@@ -88,18 +91,20 @@ module Mongoid #:nodoc:
       # Enumerable implementation of execute. Returns matching documents for
       # the selector, and adds options if supplied.
       #
-      # Returns:
+      # @example Execute the context.
+      #   context.execute
       #
-      # An +Array+ of documents that matched the selector.
-      def execute(paginating = false)
+      # @return [ Array<Document> ] Documents that matched the selector.
+      def execute
         limit(sort(filter)) || []
       end
 
       # Groups the documents by the first field supplied in the field options.
       #
-      # Returns:
+      # @example Group the context.
+      #   context.group
       #
-      # A +Hash+ with field values as keys, arrays of documents as values.
+      # @return [ Hash ] Field values as keys, arrays of documents as values.
       def group
         field = field_list.first
         execute.group_by { |doc| doc.send(field) }
@@ -109,9 +114,10 @@ module Mongoid #:nodoc:
       # options from a +Criteria+ and a documents array that is the underlying
       # array of embedded documents from a has many association.
       #
-      # Example:
+      # @example Create a new context.
+      #   Mongoid::Contexts::Enumerable.new(criteria)
       #
-      # <tt>Mongoid::Contexts::Enumerable.new(criteria)</tt>
+      # @param [ Criteria ] criteria The criteria for the context.
       def initialize(criteria)
         @criteria = criteria
       end
@@ -119,44 +125,47 @@ module Mongoid #:nodoc:
       # Iterate over each +Document+ in the results. This can take an optional
       # block to pass to each argument in the results.
       #
-      # Example:
-      #
-      # <tt>context.iterate { |doc| p doc }</tt>
+      # @example Iterate over the documents.
+      #   context.iterate { |doc| p doc }
       def iterate(&block)
         execute.each(&block)
       end
 
       # Get the largest value for the field in all the documents.
       #
-      # Returns:
+      # @example Get the max value.
+      #   context.max(:age)
       #
-      # The numerical largest value.
+      # @return [ Numeric ] The numerical largest value.
       def max(field)
         determine(field, :>=)
       end
 
       # Get the smallest value for the field in all the documents.
       #
-      # Returns:
+      # @example Get the minimum value.
+      #   context.min(:age)
       #
-      # The numerical smallest value.
+      # @return [ Numeric ] The numerical smallest value.
       def min(field)
         determine(field, :<=)
       end
 
       # Get one document.
       #
-      # Returns:
+      # @example Get one document.
+      #   context.one
       #
-      # The first document in the +Array+
+      # @return [ Document ] The first document in the array.
       alias :one :first
 
       # Get one document and tell the criteria to skip this record on
       # successive calls.
       #
-      # Returns:
+      # @example Shift the documents.
+      #   context.shift
       #
-      # The first document in the +Array+
+      # @return [ Document ] The first document in the array.
       def shift
         first.tap do |document|
           self.criteria = criteria.skip((options[:skip] || 0) + 1)
@@ -165,12 +174,13 @@ module Mongoid #:nodoc:
 
       # Get the sum of the field values for all the documents.
       #
-      # Returns:
+      # @example Get the sum of the field.
+      #   context.sum(:cost)
       #
-      # The numerical sum of all the document field values.
+      # @return [ Numeric ] The numerical sum of all the document field values.
       def sum(field)
         sum = execute.inject(nil) do |memo, doc|
-          value = doc.send(field)
+          value = doc.send(field) || 0
           memo ? memo += value : value
         end
       end
@@ -193,20 +203,36 @@ module Mongoid #:nodoc:
       alias :update :update_all
 
       protected
+
       # Filters the documents against the criteria's selector
+      #
+      # @example Filter the documents.
+      #   context.filter
+      #
+      # @return [ Array ] The documents filtered.
       def filter
         documents.select { |document| document.matches?(selector) }
       end
 
       # If the field exists, perform the comparison and set if true.
+      #
+      # @example Compare.
+      #   context.determine
+      #
+      # @return [ Array<Document> ] The matching documents.
       def determine(field, operator)
         matching = documents.inject(nil) do |memo, doc|
-          value = doc.send(field)
+          value = doc.send(field) || 0
           (memo && memo.send(operator, value)) ? memo : value
         end
       end
 
       # Limits the result set if skip and limit options.
+      #
+      # @example Limit the results.
+      #   context.limit(documents)
+      #
+      # @return [ Array<Document> ] The limited documents.
       def limit(documents)
         skip, limit = options[:skip], options[:limit]
         if skip && limit
@@ -219,12 +245,23 @@ module Mongoid #:nodoc:
         documents
       end
 
+      # Set the collection to the collection of the root document.
+      #
+      # @example Set the collection.
+      #   context.set_collection
+      #
+      # @return [ Collection ] The root collection.
       def set_collection
         root = documents.first._root
         @collection = root.collection if root && !root.embedded?
       end
 
       # Sorts the result set if sort options have been set.
+      #
+      # @example Sort the documents.
+      #   context.sort(documents)
+      #
+      # @return [ Array<Document> ] The sorted documents.
       def sort(documents)
         return documents if options[:sort].blank?
         documents.sort_by do |document|