mongoid 2.0.1 → 2.0.2

data/lib/mongoid/contexts/mongo.rb

@@ -2,7 +2,6 @@
 module Mongoid #:nodoc:
   module Contexts #:nodoc:
     class Mongo
-      include Paging
       attr_accessor :criteria
 
       delegate :klass, :options, :field_list, :selector, :to => :criteria
@@ -122,14 +121,8 @@ module Mongoid #:nodoc:
       # Returns:
       #
       # An enumerable +Cursor+.
-      def execute(paginating = false)
-        cursor = klass.collection.find(selector, process_options)
-        if cursor
-          @count = cursor.count if paginating
-          cursor
-        else
-          []
-        end
+      def execute
+        klass.collection.find(selector, process_options) || []
       end
 
       # Groups the context. This will take the internally built selector and options
@@ -152,7 +145,7 @@ module Mongoid #:nodoc:
           :reduce => Javascript.group
         ).collect do |docs|
           docs["group"] = docs["group"].collect do |attrs|
-            Mongoid::Factory.build(klass, attrs)
+            Mongoid::Factory.from_db(klass, attrs)
           end
           docs
         end
@@ -203,7 +196,7 @@ module Mongoid #:nodoc:
         sorting = [[:_id, :asc]] unless sorting
         opts[:sort] = sorting.collect { |option| [ option[0], option[1].invert ] }
         attributes = klass.collection.find_one(selector, opts)
-        attributes ? Mongoid::Factory.build(klass, attributes) : nil
+        attributes ? Mongoid::Factory.from_db(klass, attributes) : nil
       end
 
       # Return the max value for a field.
@@ -253,7 +246,7 @@ module Mongoid #:nodoc:
       # The first document in the collection.
       def one
         attributes = klass.collection.find_one(selector, process_options)
-        attributes ? Mongoid::Factory.build(klass, attributes) : nil
+        attributes ? Mongoid::Factory.from_db(klass, attributes) : nil
       end
 
       alias :first :one

data/lib/mongoid/copyable.rb

@@ -37,8 +37,8 @@ module Mongoid #:nodoc:
         value = other.instance_variable_get(name)
         instance_variable_set(name, value ? value.dup : nil)
       end
-      @attributes.delete("_id")
-      @attributes.delete("versions")
+      attributes.delete("_id")
+      attributes.delete("versions")
       @new_record = true
       identify
     end

data/lib/mongoid/criteria.rb

@@ -7,6 +7,7 @@ require "mongoid/criterion/inclusion"
 require "mongoid/criterion/inspection"
 require "mongoid/criterion/optional"
 require "mongoid/criterion/selector"
+require "mongoid/criterion/unconvertable"
 
 module Mongoid #:nodoc:
 
@@ -61,9 +62,6 @@ module Mongoid #:nodoc:
       :max,
       :min,
       :one,
-      :page,
-      :paginate,
-      :per_page,
       :shift,
       :sum,
       :update,
@@ -202,12 +200,13 @@ module Mongoid #:nodoc:
     #
     # name: The name of the class method on the +Document+ to chain.
     # args: The arguments passed to the method.
+    # block: Optional block to pass
     #
     # Returns: <tt>Criteria</tt>
-    def method_missing(name, *args)
+    def method_missing(name, *args, &block)
       if @klass.respond_to?(name)
         @klass.send(:with_scope, self) do
-          @klass.send(name, *args)
+          @klass.send(name, *args, &block)
         end
       else
         return entries.send(name, *args)
@@ -308,24 +307,6 @@ module Mongoid #:nodoc:
       other.is_a?(Criteria) ? other.entries : other
     end
 
-    # Filters the unused options out of the options +Hash+. Currently this
-    # takes into account the "page" and "per_page" options that would be passed
-    # in if using will_paginate.
-    #
-    # Example:
-    #
-    # Given a criteria with a selector of { :page => 1, :per_page => 40 }
-    #
-    # <tt>criteria.filter_options</tt> # selector: { :skip => 0, :limit => 40 }
-    def filter_options
-      page_num = @options.delete(:page)
-      per_page_num = @options.delete(:per_page)
-      if (page_num || per_page_num)
-        @options[:limit] = limits = (per_page_num || 20).to_i
-        @options[:skip] = (page_num || 1).to_i * limits - limits
-      end
-    end
-
     # Clone or dup the current +Criteria+. This will return a new criteria with
     # the selector, options, klass, embedded options, etc intact.
     #

data/lib/mongoid/criterion/exclusion.rb

@@ -24,6 +24,21 @@ module Mongoid #:nodoc:
         update_selector(attributes, "$ne")
       end
 
+      # Used when wanting to set the fields options directly using a hash
+      # instead of going through only or without.
+      #
+      # @example Set the limited fields.
+      #   criteria.fields(:field => 1)
+      #
+      # @param [ Hash ] attributes The field options.
+      #
+      # @return [ Criteria ] A newly cloned copy.
+      #
+      # @since 2.0.2
+      def fields(attributes = nil)
+        clone.tap { |crit| crit.options[:fields] = attributes || {} }
+      end
+
       # Adds a criterion to the +Criteria+ that specifies values where none
       # should match in order to return results. This is similar to an SQL
       # "NOT IN" clause. The MongoDB conditional operator that will be

data/lib/mongoid/criterion/inclusion.rb

@@ -189,7 +189,7 @@ module Mongoid #:nodoc:
       def execute_or_raise(args, criteria)
         (args[0].is_a?(Array) ? criteria.entries : criteria.one).tap do |result|
           if Mongoid.raise_not_found_error && !args.flatten.blank?
-            raise Errors::DocumentNotFound.new(klass, args) if result.blank?
+            raise Errors::DocumentNotFound.new(klass, args) if result._vacant?
           end
         end
       end

data/lib/mongoid/criterion/optional.rb

@@ -86,7 +86,6 @@ module Mongoid #:nodoc:
       def extras(extras)
         clone.tap do |crit|
           crit.options.merge!(extras)
-          crit.filter_options
         end
       end
 

data/lib/mongoid/criterion/unconvertable.rb

@@ -0,0 +1,20 @@
+# encoding: utf-8
+module Mongoid #:nodoc:
+  module Criterion #:nodoc:
+
+    # Wrapper class for strings that should not be converted into
+    # BSON::ObjectIds.
+    class Unconvertable < String
+
+      # Initialize just like a normal string, and quack like it to.
+      #
+      # @example Create the new Unconvertable.
+      #   Unconvertable.new("testing")
+      #
+      # @param [ String ] value The string.
+      #
+      # @since 2.0.2
+      def initialize(value); super; end
+    end
+  end
+end

data/lib/mongoid/cursor.rb

@@ -46,7 +46,7 @@ module Mongoid #:nodoc
     # <tt>cursor.each { |doc| p doc.title }</tt>
     def each
       @cursor.each do |document|
-        yield Mongoid::Factory.build(@klass, document)
+        yield Mongoid::Factory.from_db(@klass, document)
       end
     end
 
@@ -71,7 +71,7 @@ module Mongoid #:nodoc
     #
     # <tt>cursor.next_document</tt>
     def next_document
-      Mongoid::Factory.build(@klass, @cursor.next_document)
+      Mongoid::Factory.from_db(@klass, @cursor.next_document)
     end
 
     # Returns an array of all the documents in the cursor.
@@ -80,7 +80,7 @@ module Mongoid #:nodoc
     #
     # <tt>cursor.to_a</tt>
     def to_a
-      @cursor.to_a.collect { |attrs| Mongoid::Factory.build(@klass, attrs) }
+      @cursor.to_a.collect { |attrs| Mongoid::Factory.from_db(@klass, attrs) }
     end
   end
 end

data/lib/mongoid/dirty.rb

@@ -46,7 +46,7 @@ module Mongoid #:nodoc:
     # The old field value.
     def attribute_was(name)
       change = modifications[name]
-      change ? change[0] : @attributes[name]
+      change ? change[0] : attributes[name]
     end
 
     # Gets the names of all the fields that have changed in the document.
@@ -157,7 +157,7 @@ module Mongoid #:nodoc:
     # The old field value.
     def reset_attribute!(name)
       value = attribute_was(name)
-      value ? @attributes[name] = value : @attributes.delete(name)
+      value ? attributes[name] = value : attributes.delete(name)
       modifications.delete(name)
     end
 
@@ -210,7 +210,7 @@ module Mongoid #:nodoc:
     def modifications
       reset_modifications unless @modifications && @accessed
       @accessed.each_pair do |field, value|
-        current = @attributes[field]
+        current = attributes[field]
         @modifications[field] = [ value, current ] if current != value
       end
       @accessed.clear
@@ -223,7 +223,7 @@ module Mongoid #:nodoc:
     #
     # <tt>person.modify("name", "Jack", "John")</tt>
     def modify(name, old_value, new_value)
-      @attributes[name] = new_value
+      attributes[name] = new_value
       if @modifications && (old_value != new_value)
         original = @modifications[name].first if @modifications[name]
         @modifications[name] = [ (original || old_value), new_value ]
@@ -243,10 +243,10 @@ module Mongoid #:nodoc:
       #   person.title_was # "Sir"
       #   person.reset_title!
       def add_dirty_methods(name)
-        define_method("#{name}_change") { attribute_change(name) } unless instance_methods.include?("#{name}_change")
-        define_method("#{name}_changed?") { attribute_changed?(name) } unless instance_methods.include?("#{name}_changed?")
-        define_method("#{name}_was") { attribute_was(name) } unless instance_methods.include?("#{name}_was")
-        define_method("reset_#{name}!") { reset_attribute!(name) } unless instance_methods.include?("reset_#{name}!")
+        define_method("#{name}_change") { attribute_change(name) } unless instance_methods.include?("#{name}_change") || instance_methods.include?(:"#{name}_change") 
+        define_method("#{name}_changed?") { attribute_changed?(name) } unless instance_methods.include?("#{name}_changed?") || instance_methods.include?(:"#{name}_changed?")
+        define_method("#{name}_was") { attribute_was(name) } unless instance_methods.include?("#{name}_was") || instance_methods.include?(:"#{name}_was")
+        define_method("reset_#{name}!") { reset_attribute!(name) } unless instance_methods.include?("reset_#{name}!") || instance_methods.include?(:"reset_#{name}!")
       end
     end
   end

data/lib/mongoid/document.rb

@@ -21,7 +21,7 @@ module Mongoid #:nodoc:
     #
     # @return [ Integer ] -1, 0, 1.
     def <=>(other)
-      raw_attributes["_id"].to_s <=> other.raw_attributes["_id"].to_s
+      attributes["_id"].to_s <=> other.attributes["_id"].to_s
     end
 
     # Performs equality checking on the document ids. For more robust
@@ -35,7 +35,7 @@ module Mongoid #:nodoc:
     # @return [ true, false ] True if the ids are equal, false if not.
     def ==(other)
       self.class == other.class &&
-        raw_attributes["_id"] == other.raw_attributes["_id"]
+        attributes["_id"] == other.attributes["_id"]
     end
 
     # Performs class equality checking.
@@ -71,7 +71,7 @@ module Mongoid #:nodoc:
     #
     # @since 2.0.0
     def freeze
-      raw_attributes.freeze
+      attributes.freeze
       self
     end
 
@@ -101,18 +101,6 @@ module Mongoid #:nodoc:
       raw_attributes["_id"].hash
     end
 
-    # Return the attributes hash with indifferent access. Used mostly for
-    # convenience - use +Document#raw_attributes+ where you dont care if the
-    # keys are all strings.
-    #
-    # @example Get the attributes.
-    #   person.attributes
-    #
-    # @return [ HashWithIndifferentAccess ] The attributes.
-    def attributes
-      raw_attributes.with_indifferent_access
-    end
-
     # Generate an id for this +Document+.
     #
     # @example Create the id.
@@ -146,16 +134,6 @@ module Mongoid #:nodoc:
       run_callbacks(:initialize) { self }
     end
 
-    # Return the attributes hash.
-    #
-    # @example Get the untouched attributes.
-    #   person.raw_attributes
-    #
-    # @return [ Hash ] This document's attributes.
-    def raw_attributes
-      @attributes
-    end
-
     # Reloads the +Document+ attributes from the database. If the document has
     # not been saved then an error will get raised if the configuration option
     # was set.
@@ -220,8 +198,8 @@ module Mongoid #:nodoc:
     #
     # @return [ Hash ] A hash of all attributes in the hierarchy.
     def as_document
-      attributes = raw_attributes
-      attributes.tap do |attrs|
+      attribs = attributes
+      attribs.tap do |attrs|
         relations.select { |name, meta| meta.embedded? }.each do |name, meta|
           relation = send(name, false, :continue => false)
           attrs[name] = relation.as_document unless relation.blank?
@@ -229,6 +207,29 @@ module Mongoid #:nodoc:
       end
     end
 
+    # Returns an instance of the specified class with the attributes
+    # and errors of the current document.
+    #
+    # @example Return a subclass document as a superclass instance.
+    #   manager.becomes(Person)
+    #
+    # @raise [ ArgumentError ] If the class doesn't include Mongoid::Document
+    #
+    # @param [ Class ] klass The class to become.
+    #
+    # @return [ Document ] An instance of the specified class.
+    def becomes(klass)
+      unless klass.include?(Mongoid::Document)
+        raise ArgumentError, 'A class which includes Mongoid::Document is expected'
+      end
+      became = klass.new
+      became.instance_variable_set('@attributes', @attributes)
+      became.instance_variable_set('@errors', @errors)
+      became.instance_variable_set('@new_record', new_record?)
+      became.instance_variable_set('@destroyed', destroyed?)
+      became
+    end
+
     module ClassMethods #:nodoc:
 
       # Performs class equality checking.
@@ -256,15 +257,11 @@ module Mongoid #:nodoc:
       # @return [ Document ] A new document.
       def instantiate(attrs = nil)
         attributes = attrs || {}
-        if attributes["_id"]
-          allocate.tap do |doc|
-            doc.instance_variable_set(:@attributes, attributes)
-            doc.send(:apply_default_attributes)
-            doc.setup_modifications
-            doc.run_callbacks(:initialize) { doc }
-          end
-        else
-          new(attrs)
+        allocate.tap do |doc|
+          doc.instance_variable_set(:@attributes, attributes)
+          doc.send(:apply_default_attributes)
+          doc.setup_modifications
+          doc.run_callbacks(:initialize) { doc }
         end
       end
 

data/lib/mongoid/extensions.rb

@@ -15,10 +15,12 @@ require "mongoid/extensions/hash/criteria_helpers"
 require "mongoid/extensions/hash/scoping"
 require "mongoid/extensions/integer/conversions"
 require "mongoid/extensions/nil/collectionization"
+require "mongoid/extensions/object/checks"
 require "mongoid/extensions/object/conversions"
 require "mongoid/extensions/object/reflections"
 require "mongoid/extensions/object/yoda"
 require "mongoid/extensions/proc/scoping"
+require "mongoid/extensions/range/conversions"
 require "mongoid/extensions/string/conversions"
 require "mongoid/extensions/string/inflections"
 require "mongoid/extensions/symbol/inflections"
@@ -80,6 +82,7 @@ class NilClass #:nodoc
 end
 
 class Object #:nodoc:
+  include Mongoid::Extensions::Object::Checks
   include Mongoid::Extensions::Object::Conversions
   include Mongoid::Extensions::Object::Reflections
   include Mongoid::Extensions::Object::Yoda
@@ -89,6 +92,10 @@ class Proc #:nodoc:
   include Mongoid::Extensions::Proc::Scoping
 end
 
+class Range
+  include Mongoid::Extensions::Range::Conversions
+end
+
 class String #:nodoc
   include Mongoid::Extensions::String::Inflections
   include Mongoid::Extensions::String::Conversions

data/lib/mongoid/extensions/object/checks.rb

@@ -0,0 +1,32 @@
+# encoding: utf-8
+module Mongoid #:nodoc:
+  module Extensions #:nodoc:
+    module Object #:nodoc:
+
+      # This module has object checks in it.
+      module Checks #:nodoc:
+
+        # Since Active Support's blank? check looks to see if the object
+        # responds to #empty? and will call it if it does, we need another way
+        # to check if the object is empty or nil in case the user has defined a
+        # field called "empty" on the document.
+        #
+        # @example Is the array vacant?
+        #   [].vacant?
+        #
+        # @example Is the hash vacant?
+        #   {}.vacant?
+        #
+        # @example Is the object vacant?
+        #   nil.vacant?
+        #
+        # @return [ true, false ] True if empty or nil, false if not.
+        #
+        # @since 2.0.2
+        def _vacant?
+          is_a?(::Enumerable) || is_a?(::String) ? empty? : !self
+        end
+      end
+    end
+  end
+end

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

@@ -8,7 +8,7 @@ module Mongoid #:nodoc:
 
         module ClassMethods
           def set(value)
-            value.respond_to?(:raw_attributes) ? value.raw_attributes : value
+            value.respond_to?(:attributes) ? value.attributes : value
           end
 
           def get(value)