mongoid 2.0.0.beta.10 → 2.0.0.beta.11

data/lib/mongoid.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-# Copyright (c) 2009 Durran Jordan
+# Copyright (c) 2009, 2010 Durran Jordan
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -63,12 +63,14 @@ require "mongoid/hierarchy"
 require "mongoid/identity"
 require "mongoid/indexes"
 require "mongoid/javascript"
+require "mongoid/keys"
 require "mongoid/logger"
 require "mongoid/matchers"
 require "mongoid/memoization"
 require "mongoid/named_scope"
 require "mongoid/paths"
 require "mongoid/persistence"
+require "mongoid/safety"
 require "mongoid/scope"
 require "mongoid/state"
 require "mongoid/timestamps"

data/lib/mongoid/associations.rb

@@ -99,7 +99,9 @@ module Mongoid # :nodoc:
       #   end
       def embedded_in(name, options = {}, &block)
         unless options.has_key?(:inverse_of)
-          raise Errors::InvalidOptions.new("Options for embedded_in association must include :inverse_of")
+          raise Errors::InvalidOptions.new(
+            "Options for embedded_in association must include :inverse_of"
+          )
         end
         self.embedded = true
         associate(Associations::EmbeddedIn, optionize(name, options, nil, &block))
@@ -176,8 +178,8 @@ module Mongoid # :nodoc:
       def referenced_in(name, options = {}, &block)
         opts = optionize(name, options, constraint(name, options, :in), &block)
         associate(Associations::ReferencedIn, opts)
-        field(opts.foreign_key, :type => Mongoid.use_object_ids ? BSON::ObjectID : String)
-        index(opts.foreign_key) unless embedded?
+        field(opts.foreign_key, :type => using_object_ids? ? BSON::ObjectID : String)
+        index(opts.foreign_key, :background => true) if !embedded? && opts.index
         set_callback(:save, :before) { |document| document.update_foreign_keys }
       end
 
@@ -268,7 +270,11 @@ module Mongoid # :nodoc:
         define_method("build_#{name}") do |*params|
           attrs = params[0]
           attr_options = params[1] || {}
-          reset(name) { type.new(self, (attrs || {}).stringify_keys, options) } unless type == Associations::EmbedsOne && attr_options[:update_only]
+          reset(name) do
+            unless type == Associations::EmbedsOne && attr_options[:update_only]
+              type.new(self, (attrs || {}).stringify_keys, options)
+            end
+          end
         end
       end
 
@@ -279,7 +285,9 @@ module Mongoid # :nodoc:
         define_method("create_#{name}") do |*params|
           attrs = params[0]
           attr_options = params[1] || {}
-          send("build_#{name}", attrs, attr_options).tap(&:save) unless type == Associations::EmbedsOne && attr_options[:update_only]
+          unless type == Associations::EmbedsOne && attr_options[:update_only]
+            send("build_#{name}", attrs, attr_options).tap(&:save)
+          end
         end
       end
 
@@ -292,8 +300,10 @@ module Mongoid # :nodoc:
 
       def reference_many(name, options, &block)
         if (options[:stored_as] == :array)
+          foreign_key = "#{name.to_s.singularize}_ids"
           opts = optionize(name, options, constraint(name, options, :many_as_array), &block)
-          field "#{name.to_s.singularize}_ids", :type => Array, :default => []
+          field(foreign_key, :type => Array, :default => [])
+          index(foreign_key, :background => true) if opts.index
           associate(Associations::ReferencesManyAsArray, opts)
         else
           opts = optionize(name, options, constraint(name, options, :many), &block)

data/lib/mongoid/associations/options.rb

@@ -26,6 +26,11 @@ module Mongoid #:nodoc:
         key.to_s
       end
 
+      # Returns whether the foreign key column is indexed.
+      def index
+        self[:index] || false
+      end
+
       # Returns the name of the inverse_of association
       def inverse_of
         self[:inverse_of]

data/lib/mongoid/components.rb

@@ -19,10 +19,12 @@ module Mongoid #:nodoc
       include Mongoid::Fields
       include Mongoid::Hierarchy
       include Mongoid::Indexes
+      include Mongoid::Keys
       include Mongoid::Matchers
       include Mongoid::Memoization
       include Mongoid::Paths
       include Mongoid::Persistence
+      include Mongoid::Safety
       include Mongoid::State
       include Mongoid::Validations
       include Mongoid::Callbacks

data/lib/mongoid/config.rb

@@ -12,7 +12,6 @@ module Mongoid #:nodoc
       :persist_in_safe_mode,
       :raise_not_found_error,
       :autocreate_indexes,
-      :use_object_ids,
       :skip_version_check
 
     # Initializes the configuration with default settings.
@@ -195,51 +194,14 @@ module Mongoid #:nodoc
     def reset
       @allow_dynamic_fields = true
       @parameterize_keys = true
-      @persist_in_safe_mode = true
+      @persist_in_safe_mode = false
       @raise_not_found_error = true
       @reconnect_time = 3
       @autocreate_indexes = false
-      @use_object_ids = false
       @skip_version_check = false
       @time_zone = nil
     end
 
-    ##
-    # If Mongoid.use_object_ids = true
-    #   Convert args to BSON::ObjectID
-    #   If this args is an array, convert all args inside
-    # Else
-    #   return args
-    #
-    # Options:
-    #
-    #  args : A +String+ or an +Array+ convert to +BSON::ObjectID+
-    #  cast :  A +Boolean+ define if we can or not cast to BSON::ObjectID. If false, we use the default type of args
-    #
-    # Example:
-    #
-    # <tt>Mongoid.convert_to_object_id("4ab2bc4b8ad548971900005c", true)</tt>
-    # <tt>Mongoid.convert_to_object_id(["4ab2bc4b8ad548971900005c", "4ab2bc4b8ad548971900005d"])</tt>
-    #
-    # Returns:
-    #
-    # If Mongoid.use_object_ids = true
-    #   An +Array+ of +BSON::ObjectID+ of each element if params is an +Array+
-    #   A +BSON::ObjectID+ from params if params is +String+
-    # Else
-    #   <tt>args</tt>
-    #
-    def convert_to_object_id(args, cast=true)
-      return args if !use_object_ids || args.is_a?(BSON::ObjectID) || !cast
-      if args.is_a?(String)
-        BSON::ObjectID(args)
-      else
-        args.map{ |a|
-          a.is_a?(BSON::ObjectID) ? a : BSON::ObjectID(a)
-        }
-      end
-    end
-
     protected
 
     # Check if the database is valid and the correct version.

data/lib/mongoid/criterion/optional.rb

@@ -38,6 +38,38 @@ module Mongoid #:nodoc:
         @options[:cache] == true
       end
 
+      # If the document is using BSON::ObjectIDs the convert the argument to
+      # either an object id or an array of them if the supplied argument is an
+      # Array. Otherwise just return.
+      #
+      # Options:
+      #  args: A +String+ or an +Array+ convert to +BSON::ObjectID+
+      #  cast: A +Boolean+ define if we can or not cast to BSON::ObjectID.
+      #        If false, we use the default type of args
+      #
+      # Example:
+      #
+      # <tt>Mongoid.cast_ids!("4ab2bc4b8ad548971900005c", true)</tt>
+      # <tt>Mongoid.cast_ids!(["4ab2bc4b8ad548971900005c"])</tt>
+      #
+      # Returns:
+      #
+      # If using object ids:
+      #   An +Array+ of +BSON::ObjectID+ of each element if params is an +Array+
+      #   A +BSON::ObjectID+ from params if params is +String+
+      # Otherwise:
+      #   <tt>args</tt>
+      def cast_ids!(args, cast = true)
+        return args if !using_object_ids? || args.is_a?(BSON::ObjectID) || !cast
+        if args.is_a?(String)
+          BSON::ObjectID(args)
+        else
+          args.map{ |a|
+            a.is_a?(BSON::ObjectID) ? a : BSON::ObjectID(a)
+          }
+        end
+      end
+
       # Adds fields to be sorted in descending order. Will add them in the order
       # they were passed into the method.
       #
@@ -102,9 +134,9 @@ module Mongoid #:nodoc:
       def id(*ids)
         ids.flatten!
         if ids.size > 1
-          self.in(:_id => Mongoid.convert_to_object_id(ids, self.klass.primary_key.nil?))
+          self.in(:_id => cast_ids!(ids, self.klass.primary_key.nil?))
         else
-          @selector[:_id] = Mongoid.convert_to_object_id(ids.first, self.klass.primary_key.nil?)
+          @selector[:_id] = cast_ids!(ids.first, self.klass.primary_key.nil?)
         end
         self
       end
@@ -174,7 +206,8 @@ module Mongoid #:nodoc:
         @options[:skip] = value; self
       end
 
-      # Adds a criterion to the +Criteria+ that specifies a type or an Array of type that must be matched.
+      # Adds a criterion to the +Criteria+ that specifies a type or an Array of
+      # type that must be matched.
       #
       # Options:
       #

data/lib/mongoid/document.rb

@@ -5,13 +5,9 @@ module Mongoid #:nodoc:
     included do
       include Mongoid::Components
 
-      cattr_accessor :primary_key
-
       attr_accessor :association_name
       attr_reader :new_record
 
-      delegate :primary_key, :to => "self.class"
-
       unless self.instance_of?(Class) and self.name == ""
         (@@descendants ||= {})[self] = :seen
       end
@@ -46,22 +42,6 @@ module Mongoid #:nodoc:
         end
       end
 
-      # Defines the field that will be used for the id of this +Document+. This
-      # set the id of this +Document+ before save to a parameterized version of
-      # the field that was supplied. This is good for use for readable URLS in
-      # web applications.
-      #
-      # Example:
-      #
-      #   class Person
-      #     include Mongoid::Document
-      #     key :first_name, :last_name
-      #   end
-      def key(*fields)
-        self.primary_key = fields
-        set_callback :save, :before, :identify
-      end
-
       # Returns the classes that have included Mongoid::Document
       def self.descendents
         (@@descendants ||= {}).keys
@@ -88,8 +68,13 @@ module Mongoid #:nodoc:
       self == (comparison_object)
     end
 
-    # Delegates to id in order to allow two records of the same type and id to work with something like:
-    #   [ Person.find(1), Person.find(2), Person.find(3) ] & [ Person.find(1), Person.find(4) ] # => [ Person.find(1) ]
+    # Delegates to id in order to allow two records of the same type and id to
+    # work with something like:
+    #   [ Person.find(1),
+    #     Person.find(2),
+    #     Person.find(3) ] &
+    #   [ Person.find(1),
+    #     Person.find(4) ] # => [ Person.find(1) ]
     def hash
       id.hash
     end

data/lib/mongoid/identity.rb

@@ -25,7 +25,7 @@ module Mongoid #:nodoc:
     # Return the proper id for the document.
     def generate_id
       id = BSON::ObjectID.new
-      Mongoid.use_object_ids ? id : id.to_s
+      @document.using_object_ids? ? id : id.to_s
     end
 
     # Set the id for the document.

data/lib/mongoid/keys.rb

@@ -0,0 +1,77 @@
+# encoding: utf-8
+module Mongoid #:nodoc:
+  module Keys
+    extend ActiveSupport::Concern
+    included do
+      cattr_accessor :primary_key, :_identity
+      self._identity = { :type => BSON::ObjectID }
+
+      delegate \
+        :_id_type,
+        :primary_key,
+        :using_object_ids?, :to => "self.class"
+    end
+
+    module ClassMethods #:nodoc:
+
+      # Convenience method for returning the type of the id for this class.
+      #
+      # Example:
+      #
+      # <tt>Person._id_type</tt>
+      #
+      # Returns:
+      #
+      # The type of the id.
+      def _id_type
+        _identity[:type]
+      end
+
+      # Used for telling Mongoid on a per model basis whether to override the
+      # default +BSON::ObjectID+ and use a different type. This will be
+      # expanded in the future for requiring a PkFactory if the type is not a
+      # +BSON::ObjectID+ or +String+.
+      #
+      # Example:
+      #
+      #   class Person
+      #     include Mongoid::Document
+      #     identity :type => String
+      #   end
+      def identity(options = {})
+        self._identity = options
+      end
+
+      # Defines the field that will be used for the id of this +Document+. This
+      # set the id of this +Document+ before save to a parameterized version of
+      # the field that was supplied. This is good for use for readable URLS in
+      # web applications.
+      #
+      # Example:
+      #
+      #   class Person
+      #     include Mongoid::Document
+      #     key :first_name, :last_name
+      #   end
+      def key(*fields)
+        self.primary_key = fields
+        identity(:type => String)
+        set_callback :save, :before, :identify
+      end
+
+      # Convenience method for determining if we are using +BSON::ObjectIDs+ as
+      # our id.
+      #
+      # Example:
+      #
+      # <tt>person.using_object_ids?</tt>
+      #
+      # Returns:
+      #
+      # true if we are using BSON::ObjectIDs
+      def using_object_ids?
+        _id_type == BSON::ObjectID
+      end
+    end
+  end
+end

data/lib/mongoid/persistence.rb

@@ -19,15 +19,14 @@ module Mongoid #:nodoc:
   # <tt>document.upsert</tt>
   module Persistence
     extend ActiveSupport::Concern
+
     # Remove the +Document+ from the datbase with callbacks.
     #
     # Example:
     #
     # <tt>document.destroy</tt>
-    #
-    # TODO: Will get rid of other #destroy once new persistence complete.
-    def destroy
-      run_callbacks(:destroy) { self.destroyed = true if _remove }
+    def destroy(options = {})
+      run_callbacks(:destroy) { self.destroyed = true if _remove(options) }
     end
 
     # Insert a new +Document+ into the database. Will return the document
@@ -36,8 +35,8 @@ module Mongoid #:nodoc:
     # Example:
     #
     # <tt>document.insert</tt>
-    def insert(validate = true)
-      Insert.new(self, validate).persist
+    def insert(options = {})
+      Insert.new(self, options).persist
     end
 
     # Remove the +Document+ from the datbase.
@@ -47,8 +46,8 @@ module Mongoid #:nodoc:
     # <tt>document._remove</tt>
     #
     # TODO: Will get rid of other #remove once observable pattern killed.
-    def _remove
-      Remove.new(self).persist
+    def _remove(options = {})
+      Remove.new(self, options).persist
     end
 
     alias :delete :_remove
@@ -64,7 +63,7 @@ module Mongoid #:nodoc:
     # Returns:
     #
     # +true+ if validation passed, will raise error otherwise.
-    def save!
+    def save!(options = {})
       self.class.fail_validate!(self) unless upsert; true
     end
 
@@ -73,8 +72,8 @@ module Mongoid #:nodoc:
     # Example:
     #
     # <tt>document.update</tt>
-    def update(validate = true)
-      Update.new(self, validate).persist
+    def update(options = {})
+      Update.new(self, options).persist
     end
 
     # Update the +Document+ attributes in the datbase.
@@ -116,12 +115,11 @@ module Mongoid #:nodoc:
     # Returns:
     #
     # A +Boolean+ for updates.
-    def upsert(validate = true)
-      validate = parse_validate(validate)
+    def upsert(options = {})
       if new_record?
-        insert(validate).persisted?
+        insert(options).persisted?
       else
-        update(validate)
+        update(options)
       end
     end
 
@@ -133,15 +131,6 @@ module Mongoid #:nodoc:
     # <tt>document.save</tt>
     alias :save :upsert
 
-    protected
-    # Alternative validation params.
-    def parse_validate(validate)
-      if validate.is_a?(Hash) && validate.has_key?(:validate)
-        validate = validate[:validate]
-      end
-      validate
-    end
-
     module ClassMethods #:nodoc:
 
       # Create a new +Document+. This will instantiate a new document and
@@ -186,7 +175,7 @@ module Mongoid #:nodoc:
       def delete_all(conditions = {})
         RemoveAll.new(
           self,
-          false,
+          { :validate => false },
           conditions[:conditions] || {}
         ).persist
       end

data/lib/mongoid/persistence/command.rb

@@ -17,13 +17,13 @@ module Mongoid #:nodoc:
       # Options:
       #
       # document_or_class: The +Document+ or +Class+ to get the collection.
-      # validate: Is the document to be validated.
+      # options: Options like validation or safe mode.
       # selector: Optional selector to use in query.
       #
       # Example:
       #
-      # <tt>DeleteAll.new(Person, false, {})</tt>
-      def initialize(document_or_class, validate = true, selector = {})
+      # <tt>DeleteAll.new(Person, { :validate => true }, {})</tt>
+      def initialize(document_or_class, options = {}, selector = {})
         if document_or_class.is_a?(Mongoid::Document)
           @document = document_or_class
           @collection = @document.embedded? ? @document._root.collection : @document.collection
@@ -31,8 +31,20 @@ module Mongoid #:nodoc:
           @klass = document_or_class
           @collection = @klass.collection
         end
-        @selector, @validate = selector, validate
-        @options = { :safe => Mongoid.persist_in_safe_mode }
+        validate = options[:validate]
+        @selector = selector
+        @validate = (validate.nil? ? true : validate)
+        @options = { :safe => safe_mode?(options) }
+      end
+
+      protected
+      # Determine based on configuration if we are persisting in safe mode or
+      # not.
+      #
+      # The query option will always override the global configuration.
+      def safe_mode?(options)
+        safe = options[:safe]
+        safe.nil? ? Mongoid.persist_in_safe_mode : safe
       end
     end
   end

data/lib/mongoid/persistence/insert.rb

@@ -38,7 +38,10 @@ module Mongoid #:nodoc:
       # Insert the document into the database.
       def insert
         if @document.embedded?
-          Persistence::InsertEmbedded.new(@document, @validate).persist
+          Persistence::InsertEmbedded.new(
+            @document,
+            @options.merge(:validate => @validate)
+          ).persist
         else
           @collection.insert(@document.raw_attributes, @options)
         end

data/lib/mongoid/persistence/remove.rb

@@ -29,7 +29,10 @@ module Mongoid #:nodoc:
       # Remove the document from the database.
       def remove
         if @document.embedded?
-          Persistence::RemoveEmbedded.new(@document, @validate).persist
+          Persistence::RemoveEmbedded.new(
+            @document,
+            @options.merge(:validate => @validate)
+          ).persist
         else
           @collection.remove({ :_id => @document.id }, @options)
         end

data/lib/mongoid/persistence/update.rb

@@ -61,9 +61,12 @@ module Mongoid #:nodoc:
         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
+          @collection.update(
+            @document._selector,
+            { "$pushAll" => other_pushes },
+            @options.merge(:multi => false)
+          ) if other_pushes
         end; true
       end
     end

data/lib/mongoid/safety.rb

@@ -0,0 +1,168 @@
+# encoding: utf-8
+module Mongoid #:nodoc:
+
+  # The +Safety+ module is used to provide a DSL to execute database operations
+  # in safe mode on a per query basis, either from the +Document+ class level
+  # or instance level.
+  module Safety
+    extend ActiveSupport::Concern
+
+    # Execute the following class-level persistence operation in safe mode.
+    #
+    # Example:
+    #
+    # <tt>person.safely.upsert</tt>
+    # <tt>person.safely.destroy</tt>
+    #
+    # Returns:
+    #
+    # A +Proxy+ to the +Document+.
+    def safely
+      Proxy.new(self)
+    end
+
+    module ClassMethods #:nodoc:
+
+      # Execute the following class-level persistence operation in safe mode.
+      #
+      # Example:
+      #
+      # <tt>Person.safely.create(:name => "John")</tt>
+      # <tt>Person.safely.delete_all</tt>
+      #
+      # Returns:
+      #
+      # A +Proxy+ to the +Document+ class.
+      def safely
+        Proxy.new(self)
+      end
+    end
+
+    # When this class proxies a document or class, the next persistence
+    # operation executed on it will query in safe mode.
+    #
+    # Operations that took a hash of attributes had to be somewhat duplicated
+    # here since we do not want to allow a :safe attribute to be included in
+    # the args. This is because safe could be a common attribute name and we
+    # don't want the collision between the attribute and determining whether or
+    # not safe mode is allowed.
+    class Proxy
+
+      attr_reader :target
+
+      # Create the new +Proxy+.
+      #
+      # Options:
+      #
+      # target: Either the class or the instance.
+      def initialize(target)
+        @target = target
+      end
+
+      # We will use method missing to proxy calls to the target.
+      #
+      # Example:
+      #
+      # <tt>person.safely.save</tt>
+      def method_missing(*args)
+        name = args[0]
+        attributes = args[1] || {}
+        @target.send(name, attributes.merge(:safe => true))
+      end
+
+      # Update the +Document+ attributes in the datbase.
+      #
+      # Example:
+      #
+      # <tt>document.update_attributes(:title => "Sir")</tt>
+      #
+      # Returns:
+      #
+      # +true+ if validation passed, +false+ if not.
+      def update_attributes(attributes = {})
+        @target.write_attributes(attributes)
+        @target.update(:safe => true)
+      end
+
+      # Update the +Document+ attributes in the datbase.
+      #
+      # Example:
+      #
+      # <tt>document.update_attributes(:title => "Sir")</tt>
+      #
+      # Returns:
+      #
+      # +true+ if validation passed, raises an error if not
+      def update_attributes!(attributes = {})
+        @target.write_attributes(attributes)
+        result = update(:safe => true)
+        @target.class.fail_validate!(self) unless result
+        result
+      end
+
+      # Create a new +Document+. This will instantiate a new document and
+      # insert it in a single call. Will always return the document
+      # whether save passed or not.
+      #
+      # Example:
+      #
+      # <tt>Person.create(:title => "Mr")</tt>
+      #
+      # Returns: the +Document+.
+      def create(attributes = {})
+        @target.new(attributes).tap { |doc| doc.insert(:safe => true) }
+      end
+
+      # Create a new +Document+. This will instantiate a new document and
+      # insert it in a single call. Will always return the document
+      # whether save passed or not, and if validation fails an error will be
+      # raise.
+      #
+      # Example:
+      #
+      # <tt>Person.create!(:title => "Mr")</tt>
+      #
+      # Returns: the +Document+.
+      def create!(attributes = {})
+        document = @target.new(attributes)
+        fail_validate!(document) if document.insert(:safe => true).errors.any?
+        document
+      end
+
+      # Delete all documents given the supplied conditions. If no conditions
+      # are passed, the entire collection will be dropped for performance
+      # benefits. Does not fire any callbacks.
+      #
+      # Example:
+      #
+      # <tt>Person.delete_all(:conditions => { :title => "Sir" })</tt>
+      # <tt>Person.delete_all</tt>
+      #
+      # Returns: true or raises an error.
+      def delete_all(conditions = {})
+        Mongoid::Persistence::RemoveAll.new(
+          @target,
+          { :validate => false, :safe => true },
+          conditions[:conditions] || {}
+        ).persist
+      end
+
+      # Delete all documents given the supplied conditions. If no conditions
+      # are passed, the entire collection will be dropped for performance
+      # benefits. Fires the destroy callbacks if conditions were passed.
+      #
+      # Example:
+      #
+      # <tt>Person.destroy_all(:conditions => { :title => "Sir" })</tt>
+      # <tt>Person.destroy_all</tt>
+      #
+      # Returns: true or raises an error.
+      def destroy_all(conditions = {})
+        documents = @target.all(conditions)
+        count = documents.count
+        documents.each { |doc| doc.destroy(:safe => true) }
+        count
+      end
+    end
+  end
+end

data/lib/mongoid/version.rb

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

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: mongoid
 version: !ruby/object:Gem::Version 
-  hash: 62196471
+  hash: 62196469
   prerelease: true
   segments: 
   - 2
   - 0
   - 0
   - beta
-  - 10
-  version: 2.0.0.beta.10
+  - 11
+  version: 2.0.0.beta.11
 platform: ruby
 authors: 
 - Durran Jordan
@@ -253,6 +253,7 @@ files:
 - lib/mongoid/indexes.rb
 - lib/mongoid/javascript/functions.yml
 - lib/mongoid/javascript.rb
+- lib/mongoid/keys.rb
 - lib/mongoid/logger.rb
 - lib/mongoid/matchers/all.rb
 - lib/mongoid/matchers/default.rb
@@ -280,6 +281,7 @@ files:
 - lib/mongoid/persistence.rb
 - lib/mongoid/railtie.rb
 - lib/mongoid/railties/database.rake
+- lib/mongoid/safety.rb
 - lib/mongoid/scope.rb
 - lib/mongoid/state.rb
 - lib/mongoid/timestamps.rb
@@ -301,7 +303,7 @@ has_rdoc: true
 homepage: http://mongoid.org
 licenses: []
 
-post_install_message: 
+post_install_message: "   _________________________________\n  |:::::::::::::::::::::::::::::::::| \"I find your lack of faith disturbing.\"\n  |:::::::::::::;;::::::::::::::::::|\n  |:::::::::::'~||~~~``:::::::::::::| Mongoid 2 introduces\n  |::::::::'   .':     o`:::::::::::| a different way of defining how\n  |:::::::' oo | |o  o    ::::::::::| ids are stored on documents, as\n  |::::::: 8  .'.'    8 o  :::::::::| well as how foreign key fields\n  |::::::: 8  | |     8    :::::::::| and indexes are stored.\n  |::::::: _._| |_,...8    :::::::::|\n  |::::::'~--.   .--. `.   `::::::::| If you were using String\n  |:::::'     =8     ~  \\ o ::::::::| representations of BSON::ObjectIDs\n  |::::'       8._ 88.   \\ o::::::::| as your document ids, all of your\n  |:::'   __. ,.ooo~~.    \\ o`::::::| documents will now need to tell\n  |:::   . -. 88`78o/:     \\  `:::::| Mongoid to use Strings like so:\n  |::'     /. o o \\ ::      \\88`::::|\n  |:;     o|| 8 8 |d.        `8 `:::| class User\n  |:.       - ^ ^ -'           `-`::|   include Mongoid::Document\n  |::.                          .:::|   identity :type => String\n  |:::::.....           ::'     ``::| end\n  |::::::::-'`-        88          `|\n  |:::::-'.          -       ::     | All ids will default to\n  |:-~. . .                   :     | BSON:ObjectIDs from now on, and\n  | .. .   ..:   o:8      88o       | Config#use_object_ids has been\n  |. .     :::   8:P     d888. . .  | removed.\n  |.   .   :88   88      888'  . .  |\n  |   o8  d88P . 88   ' d88P   ..   | Foreign key fields for relational\n  |  88P  888   d8P   ' 888         | associations no longer index by\n  |   8  d88P.'d:8  .- dP~ o8       | default - you will need to pass\n  |      888   888    d~ o888    LS | :index => true to the association\n  |_________________________________| definition to have the field indexed\n\n  or create the index manually, which is the preferred method. Note that\n  if you were using String ids and now want to use object ids instead you\n  will have to migrate your database manually - Mongoid cannot perform\n  this for you automatically. If you were using custom composite keys,\n  these will need to be defined as Strings since they cannot be converted.\n\n  Please see the following gist for assistance in migrating the database\n  via the Ruby driver (thanks to Kyle Banker):\n\n  http://gist.github.com/489098\n\n"
 rdoc_options: []
 
 require_paths: