mongoid 2.0.0.beta.9 → 2.0.0.beta.10

data/lib/mongoid/contexts/enumerable.rb

@@ -36,7 +36,7 @@ module Mongoid #:nodoc:
 
       # Gets the number of documents in the array. Delegates to size.
       def count
-        @count ||= documents.size
+        @count ||= filter.size
       end
 
       # Gets an array of distinct values for the supplied field across the
@@ -56,7 +56,7 @@ module Mongoid #:nodoc:
       #
       # An +Array+ of documents that matched the selector.
       def execute(paginating = false)
-        limit(documents.select { |document| document.matches?(selector) })
+        limit(filter) || []
       end
 
       # Groups the documents by the first field supplied in the field options.
@@ -66,7 +66,7 @@ module Mongoid #:nodoc:
       # A +Hash+ with field values as keys, arrays of documents as values.
       def group
         field = options[:fields].first
-        documents.group_by { |doc| doc.send(field) }
+        execute.group_by { |doc| doc.send(field) }
       end
 
       # Create the new enumerable context. This will need the selector and
@@ -121,13 +121,18 @@ module Mongoid #:nodoc:
       #
       # The numerical sum of all the document field values.
       def sum(field)
-        sum = documents.inject(nil) do |memo, doc|
+        sum = execute.inject(nil) do |memo, doc|
           value = doc.send(field)
           memo ? memo += value : value
         end
       end
 
       protected
+      # Filters the documents against the criteria's selector
+      def filter
+        documents.select { |document| document.matches?(selector) }
+      end
+
       # If the field exists, perform the comparison and set if true.
       def determine(field, operator)
         matching = documents.inject(nil) do |memo, doc|

data/lib/mongoid/contexts/mongo.rb

@@ -133,7 +133,7 @@ module Mongoid #:nodoc:
       # <tt>Mongoid::Contexts::Mongo.new(criteria)</tt>
       def initialize(criteria)
         @criteria = criteria
-        if klass.hereditary
+        if klass.hereditary && !criteria.selector.keys.include?(:_type)
           criteria.in(:_type => criteria.klass._types)
         end
         criteria.enslave if klass.enslaved?

data/lib/mongoid/criteria.rb

@@ -63,6 +63,12 @@ module Mongoid #:nodoc:
       end
     end
 
+    # Returns true if the supplied +Object+ is an instance of +Criteria+ or
+    # +Scope+.
+    def self.===(other)
+      super || Scope === other
+    end
+
     # Return or create the context in which this criteria should be executed.
     #
     # This will return an Enumerable context if the class is embedded,
@@ -148,7 +154,7 @@ module Mongoid #:nodoc:
     def method_missing(name, *args)
       if @klass.respond_to?(name)
         new_scope = @klass.send(name, *args)
-        new_scope.merge(self)
+        new_scope.merge(self) if Criteria === new_scope
         return new_scope
       else
         return entries.send(name, *args)

data/lib/mongoid/criterion/inclusion.rb

@@ -97,12 +97,19 @@ module Mongoid #:nodoc:
       #
       # Returns: <tt>self</tt>
       def where(selector = nil)
-        case selector
-        when String
-          @selector.update("$where" => selector)
-        else
-          @selector.update(selector ? selector.expand_complex_criteria : {})
+        selector = case selector
+          when String then {"$where" => selector}
+          else selector ? selector.expand_complex_criteria : {}
         end
+
+        selector.each_pair do |key, value|
+          if @selector.has_key?(key) && @selector[key].respond_to?(:merge!)
+            @selector[key].merge!(value)
+          else
+            @selector[key] = value
+          end
+        end
+
         self
       end
     end

data/lib/mongoid/criterion/optional.rb

@@ -91,15 +91,21 @@ module Mongoid #:nodoc:
       #
       # Options:
       #
-      # object_id: A +String+ representation of a <tt>BSON::ObjectID</tt>
+      # object_id: A single id or an array of ids in +String+ or <tt>BSON::ObjectID</tt> format
       #
       # Example:
       #
       # <tt>criteria.id("4ab2bc4b8ad548971900005c")</tt>
+      # <tt>criteria.id(["4ab2bc4b8ad548971900005c", "4c454e7ebf4b98032d000001"])</tt>
       #
       # Returns: <tt>self</tt>
-      def id(*args)
-        (args.flatten.size > 1) ? self.in(:_id => args.flatten) : (@selector[:_id] = args.first)
+      def id(*ids)
+        ids.flatten!
+        if ids.size > 1
+          self.in(:_id => Mongoid.convert_to_object_id(ids, self.klass.primary_key.nil?))
+        else
+          @selector[:_id] = Mongoid.convert_to_object_id(ids.first, self.klass.primary_key.nil?)
+        end
         self
       end
 
@@ -167,6 +173,23 @@ module Mongoid #:nodoc:
       def skip(value = 0)
         @options[:skip] = value; self
       end
+
+      # Adds a criterion to the +Criteria+ that specifies a type or an Array of type that must be matched.
+      #
+      # Options:
+      #
+      # types : An +Array+ of types of a +String+ representing the Type of you search
+      #
+      # Example:
+      #
+      # <tt>criteria.type('Browser')</tt>
+      # <tt>criteria.type(['Firefox', 'Browser'])</tt>
+      #
+      # Returns: <tt>self</tt>
+      def type(types)
+        types = [types] unless types.is_a?(Array)
+        self.in(:_type => types)
+      end
     end
   end
 end

data/lib/mongoid/cursor.rb

@@ -5,7 +5,6 @@ module Mongoid #:nodoc
     # Operations on the Mongo::Cursor object that will not get overriden by the
     # Mongoid::Cursor are defined here.
     OPERATIONS = [
-      :admin,
       :close,
       :closed?,
       :count,

data/lib/mongoid/deprecation.rb

@@ -14,9 +14,8 @@ module Mongoid #:nodoc:
     end
 
     protected
-    # Instantiate a new logger to stdout or a rails logger if available.
     def initialize
-      @logger = defined?(Rails) ? Rails.logger : Logger.new($stdout)
+      @logger = Mongoid::Logger.new
     end
   end
 end

data/lib/mongoid/document.rb

@@ -11,6 +11,10 @@ module Mongoid #:nodoc:
       attr_reader :new_record
 
       delegate :primary_key, :to => "self.class"
+
+      unless self.instance_of?(Class) and self.name == ""
+        (@@descendants ||= {})[self] = :seen
+      end
     end
 
     module ClassMethods #:nodoc:
@@ -58,12 +62,17 @@ module Mongoid #:nodoc:
         set_callback :save, :before, :identify
       end
 
+      # Returns the classes that have included Mongoid::Document
+      def self.descendents
+        (@@descendants ||= {}).keys
+      end
+
       # Returns all types to query for when using this class as the base.
       # *subclasses* is from activesupport. Note that a bug in *subclasses*
       # causes the first call to only return direct children, hence
       # the double call and unique.
       def _types
-        @_type ||= [subclasses + subclasses + [self.name]].flatten.uniq
+        @_type ||= [subclasses + subclasses + [self.name]].flatten.uniq.map(&:to_s)
       end
     end
 
@@ -169,10 +178,23 @@ module Mongoid #:nodoc:
     # memoized association and notify the parent of the change.
     def remove(child)
       name = child.association_name
-      reset(name) { @attributes.remove(name, child.raw_attributes) }
-      notify
+      if @building_nested
+        @attributes.remove(name, child.raw_attributes)
+      else
+        reset(name) do
+          @attributes.remove(name, child.raw_attributes)
+          @attributes[name]
+        end
+        notify
+      end
     end
 
+    # def remove_without_reset
+    #   name = child.association_name
+    #   @attributes.remove(name, child.raw_attributes)
+    #   notify
+    # end
+
     # Return an array with this +Document+ only in it.
     def to_a
       [ self ]

data/lib/mongoid/extensions.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 require "mongoid/extensions/time_conversions"
 require "mongoid/extensions/array/accessors"
-require "mongoid/extensions/array/aliasing"
 require "mongoid/extensions/array/assimilation"
 require "mongoid/extensions/array/conversions"
 require "mongoid/extensions/array/parentization"
@@ -25,6 +24,7 @@ require "mongoid/extensions/proc/scoping"
 require "mongoid/extensions/string/conversions"
 require "mongoid/extensions/string/inflections"
 require "mongoid/extensions/symbol/inflections"
+require "mongoid/extensions/symbol/conversions"
 require "mongoid/extensions/true_class/equality"
 require "mongoid/extensions/objectid/conversions"
 
@@ -101,6 +101,7 @@ end
 class Symbol #:nodoc
   remove_method :size if instance_methods.include? :size # temporal fix for ruby 1.9
   include Mongoid::Extensions::Symbol::Inflections
+  include Mongoid::Extensions::Symbol::Conversions
 end
 
 class Time #:nodoc

data/lib/mongoid/extensions/float/conversions.rb

@@ -8,7 +8,7 @@ module Mongoid #:nodoc:
           begin
             Float(value)
           rescue ArgumentError => e
-            puts(e.message); value
+            value
           end
         end
         def get(value)

data/lib/mongoid/extensions/integer/conversions.rb

@@ -8,7 +8,7 @@ module Mongoid #:nodoc:
           begin
             Integer(value)
           rescue ArgumentError => e
-            puts(e.message); value
+            value
           end
         end
         def get(value)

data/lib/mongoid/extensions/symbol/conversions.rb

@@ -0,0 +1,21 @@
+# encoding: utf-8
+module Mongoid #:nodoc:
+  module Extensions #:nodoc:
+    module Symbol#:nodoc:
+      # This module converts objects into mongoid related objects.
+      module Conversions #:nodoc:
+        extend ActiveSupport::Concern
+
+        module ClassMethods
+          def set(value)
+            (value.nil? or (value.respond_to?(:empty?) && value.empty?)) ? nil : value.to_sym
+          end
+
+          def get(value)
+            value
+          end
+        end
+      end
+    end
+  end
+end

data/lib/mongoid/finders.rb

@@ -4,8 +4,9 @@ module Mongoid #:nodoc:
 
     # Delegate to the criteria methods that are natural for creating a new
     # criteria.
-    [ :all_in, :any_in, :avg, :excludes, :limit, :max, :min,
-      :not_in, :only, :order_by, :skip, :sum, :where ].each do |name|
+    [ :all_in, :any_in, :asc, :ascending, :avg, :desc, :descending,
+      :excludes, :limit, :max, :min, :not_in, :only, :order_by,
+      :skip, :sum, :where, :near ].each do |name|
       define_method(name) do |*args|
         criteria.send(name, *args)
       end

data/lib/mongoid/indexes.rb

@@ -3,24 +3,35 @@ module Mongoid #:nodoc
   module Indexes #:nodoc
     extend ActiveSupport::Concern
     included do
-      cattr_accessor :indexed
-      self.indexed = false
+      cattr_accessor :index_options
+      self.index_options = {}
     end
 
     module ClassMethods #:nodoc
+
+      # Send the actual index creation comments to the MongoDB driver
+      def create_indexes
+        return unless index_options
+
+        index_options.each do |name, options|
+          self._collection.create_index(name, options)
+        end
+      end
+
       # Add the default indexes to the root document if they do not already
       # exist. Currently this is only _type.
       def add_indexes
-        if hereditary && !indexed
-          self._collection.create_index(:_type, :unique => false, :background => true)
-          self.indexed = true
+        if hereditary && !index_options[:_type]
+          self.index_options[:_type] = {:unique => false, :background => true}
         end
+        create_indexes if Mongoid.autocreate_indexes
       end
 
       # Adds an index on the field specified. Options can be :unique => true or
       # :unique => false. It will default to the latter.
       def index(name, options = { :unique => false })
-        collection.create_index(name, options)
+        self.index_options[name] = options
+        create_indexes if Mongoid.autocreate_indexes
       end
     end
   end

data/lib/mongoid/logger.rb

@@ -0,0 +1,19 @@
+module Mongoid
+  class Logger
+
+    delegate :info, :debug, :error, :fatal, :unknown, :to => :logger, :allow_nil => true
+
+    def warn(message)
+      logger.warn(message) if logger && logger.respond_to?(:warn)
+    end
+
+    def logger
+      Mongoid.logger
+    end
+
+    def inspect
+      "#<Mongoid::Logger:0x#{object_id.to_s(16)} @logger=#{logger.inspect}>"
+    end
+
+  end
+end

data/lib/mongoid/paranoia.rb

@@ -1,18 +1,5 @@
 # encoding: utf-8
 module Mongoid #:nodoc:
-  module Paranoid #:nodoc:
-    # Find deleted documents
-    #
-    # Examples:
-    #
-    #   <tt>Person.deleted</tt>  # all deleted employees
-    #   <tt>Company.first.employees.deleted</tt>  # works with a join
-    #   <tt>Person.deleted.find("4c188dea7b17235a2a000001").first</tt>  # retrieve by id a deleted person
-    def deleted
-      where(:deleted_at.exists => false)
-    end
-  end
-
   # Include this module to get soft deletion of root level documents.
   # This will add a deleted_at field to the +Document+, managed automatically.
   # Potentially incompatible with unique indices. (if collisions with deleted items)
@@ -27,7 +14,6 @@ module Mongoid #:nodoc:
     extend ActiveSupport::Concern
 
     included do
-      Mongoid::Criteria.send(:include, Mongoid::Paranoid)
       field :deleted_at, :type => Time
     end
 
@@ -101,6 +87,18 @@ module Mongoid #:nodoc:
       def criteria
         super.where(:deleted_at.exists => false)
       end
+      
+      # Find deleted documents
+      #
+      # Examples:
+      #
+      #   <tt>Person.deleted</tt>  # all deleted employees
+      #   <tt>Company.first.employees.deleted</tt>  # works with a join
+      #   <tt>Person.deleted.find("4c188dea7b17235a2a000001").first</tt>  # retrieve by id a deleted person
+      def deleted
+        where(:deleted_at.exists => true)
+      end
+      
     end
   end
 end

data/lib/mongoid/persistence/remove_embedded.rb

@@ -11,10 +11,6 @@ module Mongoid #:nodoc:
     #     false
     #   );
     class RemoveEmbedded < Command
-      # Insert the new document in the database. If the document's parent is a
-      # new record, we will call save on the parent, otherwise we will $push
-      # the document onto the parent.
-      #
       # Remove the document from the database. If the parent is a new record,
       # it will get removed in Ruby only. If the parent is not a new record
       # then either an $unset or $set will occur, depending if it's an

data/lib/mongoid/persistence/update.rb

@@ -60,7 +60,10 @@ module Mongoid #:nodoc:
       def update
         updates = @document._updates
         unless updates.empty?
+          other_pushes = updates.delete(:other)
+
           @collection.update(@document._selector, updates, @options.merge(:multi => false))
+          @collection.update(@document._selector, { "$pushAll" => other_pushes }, @options.merge(:multi => false)) if other_pushes
         end; true
       end
     end

data/lib/mongoid/railtie.rb

@@ -1,17 +1,28 @@
+require "singleton"
 require "rails"
+require "mongoid/config"
 module Rails #:nodoc:
   module Mongoid #:nodoc:
     class Railtie < Rails::Railtie #:nodoc:
 
-      # do we want a custom log subscriber for mongoid?
-      # log_subscriber :mongoid, ::Mongoid::Railties::LogSubscriber.new
-
       config.generators.orm :mongoid, :migration => false
 
       rake_tasks do
         load "mongoid/railties/database.rake"
       end
 
+      # Exposes Mongoid's configuration to the Rails application configuration.
+      #
+      # Example:
+      #
+      #   module MyApplication
+      #     class Application < Rails::Application
+      #       config.mongoid.logger = Logger.new($stdout, :warn)
+      #       config.mongoid.reconnect_time = 10
+      #     end
+      #   end
+      config.mongoid = ::Mongoid::Config.instance
+
       # Initialize Mongoid. This will look for a mongoid.yml in the config
       # directory and configure mongoid appropriately.
       #
@@ -51,6 +62,28 @@ module Rails #:nodoc:
           end
         end
       end
+
+      initializer "reconnect to master if application is preloaded" do
+        config.after_initialize do
+          # Unicorn clears the START_CTX when a worker is forked, so if we have
+          # data in START_CTX then we know we're being preloaded. Unicorn does
+          # not provide application-level hooks for executing code after the
+          # process has forked, so we reconnect lazily.
+          if defined?(Unicorn) && !Unicorn::HttpServer::START_CTX.empty?
+            ::Mongoid.reconnect!(false)
+          end
+
+          # Passenger provides the :starting_worker_process event for executing
+          # code after it has forked, so we use that and reconnect immediately.
+          if defined?(PhusionPassenger)
+            PhusionPassenger.on_event(:starting_worker_process) do |forked|
+              if forked
+                ::Mongoid.reconnect!
+              end
+            end
+          end
+        end
+      end
     end
   end
-end
+end