mongoid 2.0.0.alpha → 2.0.0.beta.5

data/lib/mongoid/identity.rb

@@ -15,19 +15,19 @@ module Mongoid #:nodoc:
       protected
       # Return the proper id for the document.
       def generate_id
-        id = Mongo::ObjectID.new
+        id = BSON::ObjectID.new
         Mongoid.use_object_ids ? id : id.to_s
       end
 
       # Set the id for the document.
       def identify(doc)
         doc.id = compose(doc).join(" ").identify if doc.primary_key
-        doc.id = generate_id unless doc.id
+        doc.id = generate_id if doc.id.blank?
       end
 
       # Set the _type field on the document.
       def type(doc)
-        doc._type = doc.class.name if Mongoid.persist_types
+        doc._type = doc.class.name if doc.hereditary?
       end
 
       # Generates the composite key for a document.

data/lib/mongoid/indexes.rb

@@ -11,8 +11,8 @@ module Mongoid #:nodoc
       # Add the default indexes to the root document if they do not already
       # exist. Currently this is only _type.
       def add_indexes
-        unless indexed
-          self._collection.create_index(:_type, false)
+        if hereditary && !indexed
+          self._collection.create_index(:_type, :unique => false, :background => true)
           self.indexed = true
         end
       end
@@ -20,7 +20,7 @@ module Mongoid #:nodoc
       # 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[:unique])
+        collection.create_index(name, options)
       end
     end
   end

data/lib/mongoid/matchers.rb

@@ -18,8 +18,7 @@ module Mongoid #:nodoc:
     def matches?(selector)
       selector.each_pair do |key, value|
         return false unless matcher(key, value).matches?(value)
-      end
-      true
+      end; true
     end
 
     protected

data/lib/mongoid/memoization.rb

@@ -2,14 +2,20 @@ module Mongoid #:nodoc
   module Memoization
 
     # Handles cases when accessing an association that should be memoized in
-    # the Mongoid specific manner.
+    # the Mongoid specific manner. Does not memoize nil values though
     def memoized(name, &block)
       var = "@#{name}"
       if instance_variable_defined?(var)
         return instance_variable_get(var)
       end
       value = yield
-      instance_variable_set(var, value)
+      instance_variable_set(var, value) if value
+    end
+
+    # Removes an memozied association if it exists
+    def unmemoize(name)
+      var = "@#{name}"
+      remove_instance_variable(var) if instance_variable_defined?(var)
     end
 
     # Mongoid specific behavior is to remove the memoized object when setting

data/lib/mongoid/named_scope.rb

@@ -27,16 +27,11 @@ module Mongoid #:nodoc:
         end
       EOT
     end
-    
-    alias :scope :named_scope 
-
     alias :scope :named_scope
 
     # Return the scopes or default to an empty +Hash+.
     def scopes
       read_inheritable_attribute(:scopes) || write_inheritable_attribute(:scopes, {})
     end
-
   end
 end
-

data/lib/mongoid/observable.rb

@@ -24,7 +24,7 @@ module Mongoid #:nodoc:
     #
     # <tt>document.notify_observers(self)</tt>
     def notify_observers(*args)
-      @observers.dup.each { |observer| observer.update(*args) } if @observers
+      @observers.dup.each { |observer| observer.observe(*args) } if @observers
     end
   end
 end

data/lib/mongoid/paths.rb

@@ -3,29 +3,49 @@ module Mongoid #:nodoc:
   module Paths #:nodoc:
     extend ActiveSupport::Concern
     included do
-      cattr_accessor :_path, :_position
-      delegate :_path, :_position, :to => "self.class"
+      cattr_accessor :__path
+      attr_accessor :_index
     end
     module InstanceMethods
+      # Get the insertion modifier for the document. Will be nil on root
+      # documents, $set on embeds_one, $push on embeds_many.
+      #
+      # Example:
+      #
+      # <tt>name.inserter</tt>
+      def _inserter
+        embedded? ? (embedded_many? ? "$push" : "$set") : nil
+      end
+
       # Return the path to this +Document+ in JSON notation, used for atomic
       # updates via $set in MongoDB.
       #
       # Example:
       #
       # <tt>address.path # returns "addresses"</tt>
-      def path
-        self._path ||= climb("") do |document, value|
-          value = "#{document.association_name}#{"." + value unless value.blank?}"
-        end
+      def _path
+        _position.sub!(/\.\d+$/, '') || _position
       end
+      alias :_pull :_path
 
       # Returns the positional operator of this document for modification.
       #
       # Example:
       #
       # <tt>address.position</tt>
-      def position
-        self._position ||= (path.blank? ? "" : "#{path}.$")
+      def _position
+        locator = _index ? (new_record? ? "" : ".#{_index}") : ""
+        embedded? ? "#{_parent._position}#{"." unless _parent._position.blank?}#{@association_name}#{locator}" : ""
+      end
+
+      # Get the removal modifier for the document. Will be nil on root
+      # documents, $unset on embeds_one, $set on embeds_many.
+      #
+      # Example:
+      #
+      # <tt>name.remover</tt>
+      def _remover
+        embedded? ? (_index ? "$pull" : "$unset") : nil
       end
 
       # Return the selector for this document to be matched exactly for use
@@ -34,20 +54,8 @@ module Mongoid #:nodoc:
       # Example:
       #
       # <tt>address.selector</tt>
-      def selector
-        @selector ||= climb({ "_id" => _root.id }) do |document, value|
-          value["#{document.path}._id"] = document.id; value
-        end
-      end
-
-      protected
-      def climb(value, &block)
-        document = self;
-        while (document._parent) do
-          value = yield document, value
-          document = document._parent
-        end
-        value
+      def _selector
+        embedded? ? _parent._selector.merge("#{_path}._id" => id) : { "_id" => id }
       end
     end
   end

data/lib/mongoid/persistence.rb

@@ -0,0 +1,218 @@
+# encoding: utf-8
+require "mongoid/persistence/command"
+require "mongoid/persistence/insert"
+require "mongoid/persistence/insert_embedded"
+require "mongoid/persistence/remove"
+require "mongoid/persistence/remove_all"
+require "mongoid/persistence/remove_embedded"
+require "mongoid/persistence/update"
+
+module Mongoid #:nodoc:
+  # The persistence module is a mixin to provide database accessor methods for
+  # the document. These correspond to the appropriate accessors on a
+  # +Mongo::Collection+ and retain the same DSL.
+  #
+  # Examples:
+  #
+  # <tt>document.insert</tt>
+  # <tt>document.update</tt>
+  # <tt>document.upsert</tt>
+  module Persistence
+    extend ActiveSupport::Concern
+    module InstanceMethods #:nodoc:
+      # 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 }
+      end
+
+      # Insert a new +Document+ into the database. Will return the document
+      # itself whether or not the save was successful.
+      #
+      # Example:
+      #
+      # <tt>document.insert</tt>
+      def insert(validate = true)
+        Insert.new(self, validate).persist
+      end
+
+      # Remove the +Document+ from the datbase.
+      #
+      # Example:
+      #
+      # <tt>document._remove</tt>
+      #
+      # TODO: Will get rid of other #remove once observable pattern killed.
+      def _remove
+        Remove.new(self).persist
+      end
+
+      alias :delete :_remove
+
+      # Save the document - will perform an insert if the document is new, and
+      # update if not. If a validation error occurs a
+      # Mongoid::Errors::Validations error will get raised.
+      #
+      # Example:
+      #
+      # <tt>document.save!</tt>
+      #
+      # Returns:
+      #
+      # +true+ if validation passed, will raise error otherwise.
+      def save!
+        self.class.fail_validate!(self) unless upsert; true
+      end
+
+      # Update the +Document+ in the datbase.
+      #
+      # Example:
+      #
+      # <tt>document.update</tt>
+      def update(validate = true)
+        Update.new(self, validate).persist
+      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 = {})
+        write_attributes(attributes); update
+      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 = {})
+        write_attributes(attributes)
+        result = update
+        self.class.fail_validate!(self) unless result
+        result
+      end
+
+      # Upsert the document - will perform an insert if the document is new, and
+      # update if not.
+      #
+      # Example:
+      #
+      # <tt>document.upsert</tt>
+      #
+      # Returns:
+      #
+      # A +Boolean+ for updates.
+      def upsert(validate = true)
+        validate = parse_validate(validate)
+        if new_record?
+          insert(validate).persisted?
+        else
+          update(validate)
+        end
+      end
+
+      # Save is aliased so that users familiar with active record can have some
+      # semblance of a familiar API.
+      #
+      # Example:
+      #
+      # <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
+    end
+
+    module ClassMethods #:nodoc:
+
+      # 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 = {})
+        new(attributes).tap(&:insert)
+      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 = new(attributes)
+        fail_validate!(document) if document.insert.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 = {})
+        RemoveAll.new(
+          self,
+          false,
+          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 = all(conditions)
+        count = documents.count
+        documents.each { |doc| doc.destroy }; count
+      end
+
+      # Raise an error if validation failed.
+      def fail_validate!(document)
+        raise Errors::Validations.new(document.errors)
+      end
+    end
+  end
+end

data/lib/mongoid/persistence/command.rb

@@ -0,0 +1,39 @@
+# encoding: utf-8
+module Mongoid #:nodoc:
+  module Persistence #:nodoc:
+    # Persistence commands extend from this class to get basic functionality on
+    # initialization.
+    class Command
+      attr_reader \
+        :collection,
+        :document,
+        :klass,
+        :options,
+        :selector,
+        :validate
+
+      # Initialize the persistence +Command+.
+      #
+      # Options:
+      #
+      # document_or_class: The +Document+ or +Class+ to get the collection.
+      # validate: Is the document to be validated.
+      # selector: Optional selector to use in query.
+      #
+      # Example:
+      #
+      # <tt>DeleteAll.new(Person, false, {})</tt>
+      def initialize(document_or_class, validate = true, selector = {})
+        if document_or_class.is_a?(Mongoid::Document)
+          @document = document_or_class
+          @collection = @document.embedded? ? @document._root.collection : @document.collection
+        else
+          @klass = document_or_class
+          @collection = @klass.collection
+        end
+        @selector, @validate = selector, validate
+        @options = { :safe => Mongoid.persist_in_safe_mode }
+      end
+    end
+  end
+end

data/lib/mongoid/persistence/insert.rb

@@ -0,0 +1,47 @@
+# encoding: utf-8
+module Mongoid #:nodoc:
+  module Persistence #:nodoc:
+    # Insert is a persistence command responsible for taking a document that
+    # has not been saved to the database and saving it.
+    #
+    # The underlying query resembles the following MongoDB query:
+    #
+    #   collection.insert(
+    #     { "_id" : 1, "field" : "value" },
+    #     false
+    #   );
+    class Insert < Command
+      # Insert the new document in the database. This delegates to the standard
+      # MongoDB collection's insert command.
+      #
+      # Example:
+      #
+      # <tt>Insert.persist</tt>
+      #
+      # Returns:
+      #
+      # The +Document+, whether the insert succeeded or not.
+      def persist
+        return @document if @validate && !@document.valid?
+        @document.run_callbacks(:create) do
+          @document.run_callbacks(:save) do
+            if insert
+              @document.new_record = false
+              @document.move_changes
+            end
+          end
+        end; @document
+      end
+
+      protected
+      # Insert the document into the database.
+      def insert
+        if @document.embedded?
+          Persistence::InsertEmbedded.new(@document, @validate).persist
+        else
+          @collection.insert(@document.raw_attributes, @options)
+        end
+      end
+    end
+  end
+end