mongoid 2.0.0.beta.7 → 2.0.0.beta.8

data/lib/mongoid.rb

@@ -19,13 +19,6 @@
 # LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-require "rubygems"
-
-gem "activemodel", "~>3.0.0.beta"
-gem "tzinfo", "~>0.3.22"
-gem "will_paginate", "~>3.0.pre"
-gem "mongo", "~>1.0.1"
-gem "bson", "~>1.0.1"
 
 require "delegate"
 require "singleton"
@@ -47,7 +40,7 @@ require "active_model/validator"
 require "active_model/validations"
 require "will_paginate/collection"
 require "mongo"
-require "mongoid/observable"
+require "mongoid/extensions"
 require "mongoid/associations"
 require "mongoid/atomicity"
 require "mongoid/attributes"
@@ -60,7 +53,6 @@ require "mongoid/criteria"
 require "mongoid/cursor"
 require "mongoid/deprecation"
 require "mongoid/dirty"
-require "mongoid/extensions"
 require "mongoid/extras"
 require "mongoid/errors"
 require "mongoid/factory"
@@ -82,6 +74,7 @@ require "mongoid/timestamps"
 require "mongoid/validations"
 require "mongoid/versioning"
 require "mongoid/components"
+require "mongoid/paranoia"
 require "mongoid/document"
 
 # add railtie

data/lib/mongoid/associations/embedded_in.rb

@@ -55,8 +55,10 @@ module Mongoid #:nodoc:
         #
         # A new +EmbeddedIn+ association proxy.
         def update(target, child, options)
-          child.parentize(target, determine_name(target, options))
+          inverse = determine_name(target, options)
+          child.parentize(target, inverse)
           child.notify
+          target.unmemoize(inverse)
           instantiate(child, options)
         end
 

data/lib/mongoid/associations/embeds_many.rb

@@ -41,11 +41,24 @@ module Mongoid #:nodoc:
       def clear
         unless @target.empty?
           document = @target.first
-          document.notify_observers(document, true)
+          document._parent.update_child(document, true) if (document._parent)
           @target.clear
         end
       end
 
+      # Returns a count of the number of documents in the association that have
+      # actually been persisted to the database.
+      #
+      # Use #size if you want the total number of documents.
+      #
+      # Returns:
+      #
+      # The total number of persisted embedded docs, as flagged by the
+      # #persisted? method.
+      def count
+        @target.select(&:persisted?).size
+      end
+
       # Creates a new Document and adds it to the association collection. The
       # document created will be of the same class as the others in the
       # association, and the attributes will be passed into the constructor and
@@ -69,8 +82,7 @@ module Mongoid #:nodoc:
       # The newly created Document.
       def create!(attrs = {}, type = nil)
         document = create(attrs, type)
-        errors = document.errors
-        raise Errors::Validations.new(errors) unless errors.empty?
+        raise Errors::Validations.new(document) unless document.errors.empty?
         document
       end
 
@@ -174,7 +186,7 @@ module Mongoid #:nodoc:
           else
             build(attrs)
           end
-        end
+        end; self
       end
 
       # Paginate the association. Will create a new criteria, set the documents

data/lib/mongoid/associations/embeds_one.rb

@@ -43,7 +43,11 @@ module Mongoid #:nodoc:
       #
       # A new target document.
       def nested_build(attributes, options = nil)
-        build(attributes) unless @target.blank? && options[:update_only]
+        unless @target.blank? && options[:update_only]
+          (attributes || {}).each do |key, value|
+            @target.write_attribute(key, value)
+          end
+        end; @target
       end
 
       class << self

data/lib/mongoid/attributes.rb

@@ -2,6 +2,10 @@
 module Mongoid #:nodoc:
   module Attributes
     extend ActiveSupport::Concern
+    included do
+      class_inheritable_accessor :_protected_fields
+      self._protected_fields = []
+    end
 
     # Get the id associated with this object. This will pull the _id value out
     # of the attributes +Hash+.
@@ -38,7 +42,15 @@ module Mongoid #:nodoc:
         if set_allowed?(key)
           write_attribute(key, value)
         elsif write_allowed?(key)
-          send("#{key}=", value)
+          if associations.include?(key.to_s) and associations[key.to_s].embedded? and value.is_a?(Hash)
+            if association = send(key)
+              association.nested_build(value)
+            else
+              send("build_#{key}", value)
+            end
+          else
+            send("#{key}=", value)
+          end
         end
       end
       setup_modifications
@@ -76,6 +88,16 @@ module Mongoid #:nodoc:
       modify(access, @attributes.delete(name.to_s), nil)
     end
 
+    # Returns true when attribute is present.
+    #
+    # Options:
+    #
+    # name: The name of the attribute to request presence on.
+    def attribute_present?(name)
+      value = read_attribute(name)
+      !value.blank?
+    end
+
     # Returns the object type. This corresponds to the name of the class that
     # this +Document+ is, which is used in determining the class to
     # instantiate in various cases.
@@ -161,15 +183,15 @@ module Mongoid #:nodoc:
 
     # Used when supplying a :limit as an option to accepts_nested_attributes_for
     def limit(attributes, name, options)
-      raise Mongoid::Errors::TooManyNestedAttributeRecords.new(name, options[:limit]) if options[:limit] && attributes.size > options[:limit]
+      if options[:limit] && attributes.size > options[:limit]
+        raise Mongoid::Errors::TooManyNestedAttributeRecords.new(name, options[:limit])
+      end
     end
 
     # Return true if writing to the given field is allowed
     def write_allowed?(key)
       name = key.to_s
-      existing = fields[name]
-      return true unless existing
-      existing.accessible?
+      !self._protected_fields.include?(name)
     end
 
     module ClassMethods
@@ -202,6 +224,19 @@ module Mongoid #:nodoc:
           end
         end
       end
+
+      # Defines fields that cannot be set via mass assignment.
+      #
+      # Example:
+      #
+      #   class Person
+      #     include Mongoid::Document
+      #     field :security_code
+      #     attr_protected :security_code
+      #   end
+      def attr_protected(*names)
+        _protected_fields.concat(names.flatten.map(&:to_s))
+      end
     end
   end
 end

data/lib/mongoid/components.rb

@@ -21,7 +21,6 @@ module Mongoid #:nodoc
       include Mongoid::Indexes
       include Mongoid::Matchers
       include Mongoid::Memoization
-      include Mongoid::Observable
       include Mongoid::Paths
       include Mongoid::Persistence
       include Mongoid::State

data/lib/mongoid/criteria.rb

@@ -160,7 +160,10 @@ module Mongoid #:nodoc:
     # Returns the selector and options as a +Hash+ that would be passed to a
     # scope for use with named scopes.
     def scoped
-      { :where => @selector }.merge(@options)
+      scope_options = @options.dup
+      sorting = scope_options.delete(:sort)
+      scope_options[:order_by] = sorting if sorting
+      { :where => @selector }.merge(scope_options)
     end
 
     # Translate the supplied arguments into a +Criteria+ object.

data/lib/mongoid/criterion/optional.rb

@@ -2,6 +2,21 @@
 module Mongoid #:nodoc:
   module Criterion #:nodoc:
     module Optional
+
+      # Adds fields to be sorted in ascending order. Will add them in the order
+      # they were passed into the method.
+      #
+      # Example:
+      #
+      # <tt>criteria.ascending(:title, :dob)</tt>
+      def ascending(*fields)
+        @options[:sort] = [] unless @options[:sort] || fields.first.nil?
+        fields.flatten.each { |field| @options[:sort] << [ field, :asc ] }
+        self
+      end
+
+      alias :asc :ascending
+
       # Tells the criteria that the cursor that gets returned needs to be
       # cached. This is so multiple iterations don't hit the database multiple
       # times, however this is not advisable when working with large data sets
@@ -23,6 +38,20 @@ module Mongoid #:nodoc:
         @options[:cache] == true
       end
 
+      # Adds fields to be sorted in descending order. Will add them in the order
+      # they were passed into the method.
+      #
+      # Example:
+      #
+      # <tt>criteria.descending(:title, :dob)</tt>
+      def descending(*fields)
+        @options[:sort] = [] unless @options[:sort] || fields.first.nil?
+        fields.flatten.each { |field| @options[:sort] << [ field, :desc ] }
+        self
+      end
+
+      alias :desc :descending
+
       # Flags the criteria to execute against a read-only slave in the pool
       # instead of master.
       #
@@ -110,8 +139,15 @@ module Mongoid #:nodoc:
       # <tt>criteria.order_by([[:field1, :asc], [:field2, :desc]])</tt>
       #
       # Returns: <tt>self</tt>
-      def order_by(params = [])
-        @options[:sort] = params; self
+      def order_by(*args)
+        @options[:sort] = [] unless @options[:sort] || args.first.nil?
+        arguments = args.first
+        case arguments
+        when Hash then arguments.each { |field, direction| @options[:sort] << [ field, direction ] }
+        when Array then @options[:sort].concat(arguments)
+        when Complex
+          args.flatten.each { |complex| @options[:sort] << [ complex.key, complex.operator.to_sym ] }
+        end; self
       end
 
       # Adds a criterion to the +Criteria+ that specifies how many results to skip

data/lib/mongoid/document.rb

@@ -141,13 +141,13 @@ module Mongoid #:nodoc:
       "#<#{self.class.name} _id: #{id}, #{attrs * ', '}>"
     end
 
-    # Notify observers of an update.
+    # Notify parent of an update.
     #
     # Example:
     #
     # <tt>person.notify</tt>
     def notify
-      notify_observers(self)
+      _parent.update_child(self) if _parent
     end
 
     # Return the attributes hash.
@@ -178,7 +178,7 @@ module Mongoid #:nodoc:
       [ self ]
     end
 
-    # Observe a notify call from a child +Document+. This will either update
+    # Recieve a notify call from a child +Document+. This will either update
     # existing attributes on the +Document+ or clear them out for the child if
     # the clear boolean is provided.
     #
@@ -186,18 +186,15 @@ module Mongoid #:nodoc:
     #
     # child: The child +Document+ that sent the notification.
     # clear: Will clear out the child's attributes if set to true.
-    #
-    # This will also cause the observing +Document+ to notify it's parent if
-    # there is any.
-    def observe(child, clear = false)
+    def update_child(child, clear = false)
       name = child.association_name
       attrs = child.instance_variable_get(:@attributes)
       if clear
         @attributes.delete(name)
       else
+        # check good for array only
         @attributes.insert(name, attrs) unless @attributes[name] && @attributes[name].include?(attrs)
       end
-      notify
     end
   end
 end

data/lib/mongoid/errors.rb

@@ -2,6 +2,9 @@
 module Mongoid #:nodoc
   module Errors #:nodoc
 
+    # Default parent Mongoid error for all custom errors
+    class MongoidError < StandardError; end
+
     # Raised when querying the database for a document by a specific id which
     # does not exist. If multiple ids were passed then it will display all of
     # those.
@@ -9,12 +12,12 @@ module Mongoid #:nodoc
     # Example:
     #
     # <tt>DocumentNotFound.new(Person, ["1", "2"])</tt>
-    class DocumentNotFound < RuntimeError
+    class DocumentNotFound < MongoidError
+      attr_reader :klass, :indentifiers
       def initialize(klass, ids)
-        @klass, @identifier = klass, ids.is_a?(Array) ? ids.join(", ") : ids
-      end
-      def message
-        "Document not found for class #{@klass} and id(s) #{@identifier}"
+        @klass = klass
+        @identifiers = ids.is_a?(Array) ? ids.join(", ") : ids
+        super("Document not found for class #{@klass} with id(s) #{@identifiers}")
       end
     end
 
@@ -23,7 +26,7 @@ module Mongoid #:nodoc
     # Example:
     #
     # <tt>InvalidOptions.new</tt>
-    class InvalidOptions < RuntimeError; end
+    class InvalidOptions < MongoidError; end
 
     # Raised when the database connection has not been set up properly, either
     # by attempting to set an object on the db that is not a +Mongo::DB+, or
@@ -32,12 +35,24 @@ module Mongoid #:nodoc
     # Example:
     #
     # <tt>InvalidDatabase.new("Not a DB")</tt>
-    class InvalidDatabase < RuntimeError
+    class InvalidDatabase < MongoidError
+      attr_reader :database
       def initialize(database)
         @database = database
+        super("Database should be a Mongo::DB, not #{@database.class.name}")
       end
-      def message
-        "Database should be a Mongo::DB, not #{@database.class.name}"
+    end
+
+    # Raised when trying to get or set a value for a defined field, where the
+    # type of the object does not match the defined field type.
+    #
+    # Example:
+    #
+    # <tt>InvalidType.new(Array, "Not an Array")</tt>
+    class InvalidType < MongoidError
+      def initialize(klass, value)
+        super("Field was defined as a(n) #{klass.name}, but received a #{value.class.name} " +
+              "with the value #{value.inspect}.")
       end
     end
 
@@ -46,12 +61,9 @@ module Mongoid #:nodoc
     # Example:
     #
     # <tt>UnsupportedVersion.new(Mongo::ServerVersion.new("1.3.1"))</tt>
-    class UnsupportedVersion < RuntimeError
+    class UnsupportedVersion < MongoidError
       def initialize(version)
-        @version = version
-      end
-      def message
-        "MongoDB #{@version} not supported, please upgrade to #{Mongoid::MONGODB_VERSION}"
+        super("MongoDB #{version} not supported, please upgrade to #{Mongoid::MONGODB_VERSION}")
       end
     end
 
@@ -61,12 +73,11 @@ module Mongoid #:nodoc
     # Example:
     #
     # <tt>Validations.new(person.errors)</tt>
-    class Validations < RuntimeError
-      def initialize(errors)
-        @errors = errors
-      end
-      def message
-        "Validation Failed: " + @errors.full_messages.join(", ")
+    class Validations < MongoidError
+      attr_reader :document
+      def initialize(document)
+        @document = document
+        super("Validation Failed: #{@document.errors.full_messages.join(", ")}")
       end
     end
 
@@ -76,14 +87,13 @@ module Mongoid #:nodoc
     # Example:
     #
     # <tt>InvalidCollection.new(Address)</tt>
-    class InvalidCollection < RuntimeError
+    class InvalidCollection < MongoidError
+      attr_reader :klass
       def initialize(klass)
         @klass = klass
-      end
-      def message
-        "Access to the collection for #{@klass.name} is not allowed " +
-          "since it is an embedded document, please access a collection from " +
-          "the root document"
+        super("Access to the collection for #{@klass.name} is not allowed " +
+              "since it is an embedded document, please access a collection from " +
+              "the root document")
       end
     end
 
@@ -93,15 +103,14 @@ module Mongoid #:nodoc
     # Example:
     #
     # <tt>InvalidField.new('collection')</tt>
-    class InvalidField < RuntimeError
+    class InvalidField < MongoidError
+      attr_reader :name
       def initialize(name)
         @name = name
-      end
-      def message
-        "Defining a field named '#{@name}' is not allowed. " +
-          "Do not define fields that conflict with Mongoid internal attributes " +
-          "or method names. Use Document#instance_methods to see what " +
-          "names this includes."
+        super("Defining a field named '#{@name}' is not allowed. " +
+              "Do not define fields that conflict with Mongoid internal attributes " +
+              "or method names. Use Document#instance_methods to see what " +
+              "names this includes.")
       end
     end
 
@@ -111,13 +120,11 @@ module Mongoid #:nodoc
     # Example:
     #
     #<tt>TooManyNestedAttributeRecords.new('association', limit)
-    class TooManyNestedAttributeRecords < RuntimeError
+    class TooManyNestedAttributeRecords < MongoidError
+      attr_reader :association, :limit
       def initialize(association, limit)
-        @association = association.to_s.humanize.capitalize
-        @limit = limit
-      end
-      def message
-        "Accept Nested Attributes for #{@association} is limited to #{@limit} records"
+        @association, @limit = association.to_s.humanize.capitalize, limit
+        super("Accept Nested Attributes for #{@association} is limited to #{@limit} records")
       end
     end
   end

data/lib/mongoid/extensions.rb

@@ -11,6 +11,7 @@ require "mongoid/extensions/binary/conversions"
 require "mongoid/extensions/boolean/conversions"
 require "mongoid/extensions/date/conversions"
 require "mongoid/extensions/datetime/conversions"
+require "mongoid/extensions/false_class/equality"
 require "mongoid/extensions/float/conversions"
 require "mongoid/extensions/hash/accessors"
 require "mongoid/extensions/hash/assimilation"
@@ -24,6 +25,7 @@ require "mongoid/extensions/proc/scoping"
 require "mongoid/extensions/string/conversions"
 require "mongoid/extensions/string/inflections"
 require "mongoid/extensions/symbol/inflections"
+require "mongoid/extensions/true_class/equality"
 require "mongoid/extensions/objectid/conversions"
 
 class Array #:nodoc
@@ -46,7 +48,7 @@ class Binary #:nodoc
 end
 
 class Boolean #:nodoc
-  extend Mongoid::Extensions::Boolean::Conversions
+  include Mongoid::Extensions::Boolean::Conversions
 end
 
 class DateTime #:nodoc
@@ -59,6 +61,10 @@ class Date #:nodoc
   extend Mongoid::Extensions::Date::Conversions
 end
 
+class FalseClass #:nodoc
+  include Mongoid::Extensions::FalseClass::Equality
+end
+
 class Float #:nodoc
   extend Mongoid::Extensions::Float::Conversions
 end
@@ -101,6 +107,10 @@ class Time #:nodoc
   extend Mongoid::Extensions::TimeConversions
 end
 
+class TrueClass #:nodoc
+  include Mongoid::Extensions::TrueClass::Equality
+end
+
 class BSON::ObjectID #:nodoc
   extend Mongoid::Extensions::ObjectID::Conversions
 end

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

@@ -6,18 +6,14 @@ module Mongoid #:nodoc:
       module Conversions #:nodoc:
         extend ActiveSupport::Concern
 
-        # Converts this array into an array of hashes.
-        def mongoidize
-          collect { |obj| obj.attributes }
-        end
-
         module ClassMethods #:nodoc:
-          def get(value)
-            value
-          end
-          def set(value)
+          def raise_or_return(value)
+            raise Mongoid::Errors::InvalidType.new(::Array, value) unless value.is_a?(::Array)
             value
           end
+
+          alias :get :raise_or_return
+          alias :set :raise_or_return
         end
       end
     end

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

@@ -3,18 +3,23 @@ module Mongoid #:nodoc:
   module Extensions #:nodoc:
     module Boolean #:nodoc:
       module Conversions #:nodoc:
+        extend ActiveSupport::Concern
 
         BOOLEAN_MAP = {
           true => true, "true" => true, "TRUE" => true, "1" => true, 1 => true, 1.0 => true,
           false => false, "false" => false, "FALSE" => false, "0" => false, 0 => false, 0.0 => false
         }
 
-        def set(value)
-          value = BOOLEAN_MAP[value]
-          value.nil? ? nil : value
-        end
-        def get(value)
-          value
+        module ClassMethods #:nodoc
+
+          def set(value)
+            value = BOOLEAN_MAP[value]
+            value.nil? ? nil : value
+          end
+
+          def get(value)
+            value
+          end
         end
       end
     end

data/lib/mongoid/extensions/false_class/equality.rb

@@ -0,0 +1,13 @@
+# encoding: utf-8
+module Mongoid #:nodoc:
+  module Extensions #:nodoc:
+    module FalseClass #:nodoc:
+      module Equality #:nodoc:
+        def is_a?(other)
+          return true if other.name == "Boolean"
+          super(other)
+        end
+      end
+    end
+  end
+end

data/lib/mongoid/extensions/hash/accessors.rb

@@ -21,7 +21,11 @@ module Mongoid #:nodoc:
         def insert(key, attrs)
           elements = self[key]
           if elements
-            elements.merge!(attrs)
+            if elements.kind_of?(::Array)
+              elements.merge!(attrs)
+            else
+              self[key] = attrs.reverse_merge!(elements)
+            end
           else
             self[key] = key.singular? ? attrs : [attrs]
           end

data/lib/mongoid/extensions/hash/assimilation.rb

@@ -27,11 +27,12 @@ module Mongoid #:nodoc:
         protected
 
         def init(parent, child, options)
-          child._parent = parent
+          child.parentize(parent, options.name)
           child.write_attributes(self)
           child.identify
           child.reset_modifications
-          child.assimilate(parent, options)
+          child.notify
+          child
         end
       end
     end

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

@@ -23,8 +23,9 @@ module Mongoid #:nodoc:
           to_s.plural?
         end
 
-        [ "gt", "lt", "gte", "lte", "ne", "near", "in", "nin", "mod", "all",
-          "size", "exists", "within", ["matches","elemMatch"] ].each do |oper|
+        [ "asc", "ascending", "desc", "descending", "gt", "lt", "gte",
+          "lte", "ne", "near", "in", "nin", "mod", "all", "size", "exists",
+          "within", ["matches","elemMatch"] ].each do |oper|
           m, oper = oper
           oper = m unless oper
           class_eval <<-OPERATORS

data/lib/mongoid/extensions/true_class/equality.rb

@@ -0,0 +1,13 @@
+# encoding: utf-8
+module Mongoid #:nodoc:
+  module Extensions #:nodoc:
+    module TrueClass #:nodoc:
+      module Equality #:nodoc:
+        def is_a?(other)
+          return true if other.name == "Boolean"
+          super(other)
+        end
+      end
+    end
+  end
+end

data/lib/mongoid/field.rb

@@ -43,12 +43,12 @@ module Mongoid #:nodoc:
     # <tt>Field.new(:score, :default => 0)</tt>
     def initialize(name, options = {})
       check_name!(name)
+      @type = options[:type] || String
       @name, @default = name, options[:default]
       @copyable = (@default.is_a?(Array) || @default.is_a?(Hash))
-      @type = options[:type] || String
       @accessible = options.has_key?(:accessible) ? options[:accessible] : true
-
       @options = options
+      check_default!
     end
 
     # Used for setting an object in the attributes hash. If nil is provided the
@@ -70,7 +70,14 @@ module Mongoid #:nodoc:
 
     # Check if the name is valid.
     def check_name!(name)
-      raise Errors::InvalidField.new(name) if Mongoid.destructive_fields.include?(name.to_s)
+      raise Mongoid::Errors::InvalidField.new(name) if Mongoid.destructive_fields.include?(name.to_s)
+    end
+
+    def check_default!
+      return if @default.is_a?(Proc)
+      if !@default.nil? && !@default.is_a?(@type)
+        raise Mongoid::Errors::InvalidType.new(@type, @default)
+      end
     end
   end
 end

data/lib/mongoid/fields.rb

@@ -27,6 +27,7 @@ module Mongoid #:nodoc
       def field(name, options = {})
         access = name.to_s
         set_field(access, options)
+        attr_protected name if options[:accessible] == false
       end
 
       # Returns the default values for the fields on the document

data/lib/mongoid/finders.rb

@@ -25,7 +25,7 @@ module Mongoid #:nodoc:
     # Returns a count of matching records in the database based on the
     # provided arguments.
     #
-    # <tt>Person.count(:first, :conditions => { :attribute => "value" })</tt>
+    # <tt>Person.count(:conditions => { :attribute => "value" })</tt>
     def count(*args)
       Criteria.translate(self, *args).count
     end
@@ -33,7 +33,7 @@ module Mongoid #:nodoc:
     # Returns true if there are on document in database based on the
     # provided arguments.
     #
-    # <tt>Person.exists?(:first, :conditions => { :attribute => "value" })</tt>
+    # <tt>Person.exists?(:conditions => { :attribute => "value" })</tt>
     def exists?(*args)
       Criteria.translate(self, *args).limit(1).count == 1
     end

data/lib/mongoid/hierarchy.rb

@@ -47,8 +47,7 @@ module Mongoid #:nodoc
       end
 
       # Sets up a child/parent association. This is used for newly created
-      # objects so they can be properly added to the graph and have the parent
-      # observers set up properly.
+      # objects so they can be properly added to the graph.
       #
       # Options:
       #
@@ -61,7 +60,6 @@ module Mongoid #:nodoc
       def parentize(object, association_name)
         self._parent = object
         self.association_name = association_name.to_s
-        add_observer(object)
       end
 
       # Return the root +Document+ in the object graph. If the current +Document+

data/lib/mongoid/paranoia.rb

@@ -0,0 +1,106 @@
+# 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)
+  #
+  # To use:
+  #
+  #   class Person
+  #     include Mongoid::Document
+  #     include Mongoid::Paranoia
+  #   end
+  module Paranoia
+    extend ActiveSupport::Concern
+
+    included do
+      Mongoid::Criteria.send(:include, Mongoid::Paranoid)
+      field :deleted_at, :type => Time
+    end
+
+    # Delete the paranoid +Document+ from the database completely. This will
+    # run the destroy callbacks.
+    #
+    # Example:
+    #
+    # <tt>document.destroy!</tt>
+    def destroy!
+      run_callbacks(:destroy) { delete! }
+    end
+
+    # Delete the paranoid +Document+ from the database completely.
+    #
+    # Example:
+    #
+    # <tt>document.delete!</tt>
+    def delete!
+      @destroyed = true
+      Mongoid::Persistence::Remove.new(self).persist
+    end
+
+    # Delete the +Document+, will set the deleted_at timestamp and not actually
+    # delete it.
+    #
+    # Example:
+    #
+    # <tt>document._remove</tt>
+    #
+    # Returns:
+    #
+    # true
+    def _remove
+      now = Time.now
+      collection.update({ :_id => self.id }, { '$set' => { :deleted_at => Time.now } })
+      @attributes["deleted_at"] = now
+      true
+    end
+
+    alias :delete :_remove
+
+    # Determines if this document is destroyed.
+    #
+    # Returns:
+    #
+    # true if the +Document+ was destroyed.
+    def destroyed?
+      @destroyed || !!deleted_at
+    end
+
+    # Restores a previously soft-deleted document. Handles this by removing the
+    # deleted_at flag.
+    #
+    # Example:
+    #
+    # <tt>document.restore</tt>
+    def restore
+      collection.update({ :_id => self.id }, { '$unset' => { :deleted_at => true } })
+      @attributes.delete("deleted_at")
+    end
+
+    module ClassMethods #:nodoc:
+
+      # Override the default +Criteria+ accessor to only get existing
+      # documents.
+      #
+      # Returns:
+      #
+      # A +Criteria+ for deleted_at not existing.
+      def criteria
+        super.where(:deleted_at.exists => false)
+      end
+    end
+  end
+end

data/lib/mongoid/persistence.rb

@@ -209,7 +209,7 @@ module Mongoid #:nodoc:
 
       # Raise an error if validation failed.
       def fail_validate!(document)
-        raise Errors::Validations.new(document.errors)
+        raise Errors::Validations.new(document)
       end
     end
   end

data/lib/mongoid/persistence/insert.rb

@@ -27,6 +27,7 @@ module Mongoid #:nodoc:
           @document.run_callbacks(:save) do
             if insert
               @document.new_record = false
+              @document._children.each { |child| child.new_record = false }
               @document.move_changes
             end
           end

data/lib/mongoid/persistence/insert_embedded.rb

@@ -33,10 +33,11 @@ module Mongoid #:nodoc:
             else
               update = { @document._inserter => { @document._position => @document.raw_attributes } }
               @collection.update(parent._selector, update, @options.merge(:multi => false))
+              @document.new_record = false
             end
           end
         end
-        @document.new_record = false; @document
+        @document
       end
     end
   end

data/lib/mongoid/timestamps.rb

@@ -7,6 +7,9 @@ module Mongoid #:nodoc:
       field :updated_at, :type => Time
       set_callback :create, :before, :set_created_at
       set_callback :save, :before, :set_updated_at
+
+      class_inheritable_accessor :record_timestamps, :instance_writer => false
+      self.record_timestamps = true
     end
 
     # Update the created_at field on the Document to the current time. This is

data/lib/mongoid/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Mongoid #:nodoc
-  VERSION = "2.0.0.beta.7"
+  VERSION = "2.0.0.beta.8"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: mongoid
 version: !ruby/object:Gem::Version 
-  hash: 62196461
+  hash: 62196467
   prerelease: true
   segments: 
   - 2
   - 0
   - 0
   - beta
-  - 7
-  version: 2.0.0.beta.7
+  - 8
+  version: 2.0.0.beta.8
 platform: ruby
 authors: 
 - Durran Jordan
@@ -77,12 +77,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 21
+        hash: 17
         segments: 
         - 1
         - 0
-        - 1
-        version: 1.0.1
+        - 3
+        version: 1.0.3
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -93,12 +93,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 21
+        hash: 17
         segments: 
         - 1
         - 0
-        - 1
-        version: 1.0.1
+        - 3
+        version: 1.0.3
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -193,6 +193,7 @@ files:
 - lib/mongoid/extensions/boolean/conversions.rb
 - lib/mongoid/extensions/date/conversions.rb
 - lib/mongoid/extensions/datetime/conversions.rb
+- lib/mongoid/extensions/false_class/equality.rb
 - lib/mongoid/extensions/float/conversions.rb
 - lib/mongoid/extensions/hash/accessors.rb
 - lib/mongoid/extensions/hash/assimilation.rb
@@ -209,6 +210,7 @@ files:
 - lib/mongoid/extensions/string/inflections.rb
 - lib/mongoid/extensions/symbol/inflections.rb
 - lib/mongoid/extensions/time_conversions.rb
+- lib/mongoid/extensions/true_class/equality.rb
 - lib/mongoid/extensions.rb
 - lib/mongoid/extras.rb
 - lib/mongoid/factory.rb
@@ -234,7 +236,7 @@ files:
 - lib/mongoid/matchers.rb
 - lib/mongoid/memoization.rb
 - lib/mongoid/named_scope.rb
-- lib/mongoid/observable.rb
+- lib/mongoid/paranoia.rb
 - lib/mongoid/paths.rb
 - lib/mongoid/persistence/command.rb
 - lib/mongoid/persistence/insert.rb

data/lib/mongoid/observable.rb

@@ -1,30 +0,0 @@
-# encoding: utf-8
-module Mongoid #:nodoc:
-  module Observable #:nodoc:
-    extend ActiveSupport::Concern
-    included do
-      attr_reader :observers
-    end
-
-    # Add an observer to this object. This mimics the standard Ruby observable
-    # library.
-    #
-    # Example:
-    #
-    # <tt>address.add_observer(person)</tt>
-    def add_observer(object)
-      @observers ||= []
-      @observers.push(object)
-    end
-
-    # Notify all the objects observing this object of an update. All observers
-    # need to respond to the update method in order to handle this.
-    #
-    # Example:
-    #
-    # <tt>document.notify_observers(self)</tt>
-    def notify_observers(*args)
-      @observers.dup.each { |observer| observer.observe(*args) } if @observers
-    end
-  end
-end