mongoid 2.0.0.beta.5 → 2.0.0.beta.7

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

@@ -0,0 +1,20 @@
+# encoding: utf-8
+module Mongoid #:nodoc:
+  module Extensions #:nodoc:
+    module Set #:nodoc:
+      # This module converts set into mongoid related objects.
+      module Conversions #:nodoc:
+        extend ActiveSupport::Concern
+
+        module ClassMethods #:nodoc:
+          def get(value)
+            ::Set.new(value)
+          end
+          def set(value)
+            value
+          end
+        end
+      end
+    end
+  end
+end

data/lib/mongoid/field.rb

@@ -12,6 +12,15 @@ module Mongoid #:nodoc:
       !!@accessible
     end
 
+    # Get the declared options for this field
+    #
+    # Returns:
+    #
+    # a hash of options 
+    def options
+      @options
+    end
+
     # Get the default value for the field.
     #
     # Returns:
@@ -38,6 +47,8 @@ module Mongoid #:nodoc:
       @copyable = (@default.is_a?(Array) || @default.is_a?(Hash))
       @type = options[:type] || String
       @accessible = options.has_key?(:accessible) ? options[:accessible] : true
+
+      @options = options
     end
 
     # Used for setting an object in the attributes hash. If nil is provided the

data/lib/mongoid/finders.rb

@@ -30,6 +30,14 @@ module Mongoid #:nodoc:
       Criteria.translate(self, *args).count
     end
 
+    # Returns true if there are on document in database based on the
+    # provided arguments.
+    #
+    # <tt>Person.exists?(:first, :conditions => { :attribute => "value" })</tt>
+    def exists?(*args)
+      Criteria.translate(self, *args).limit(1).count == 1
+    end
+
     # Helper to initialize a new +Criteria+ object for this class.
     #
     # Example:

data/lib/mongoid/hierarchy.rb

@@ -0,0 +1,76 @@
+# encoding: utf-8
+module Mongoid #:nodoc
+  module Hierarchy #:nodoc
+    extend ActiveSupport::Concern
+    included do
+      cattr_accessor :hereditary
+      self.hereditary = false
+
+      attr_accessor :_parent
+    end
+
+    module InstanceMethods #:nodoc:
+
+      # Get all child +Documents+ to this +Document+, going n levels deep if
+      # necessary. This is used when calling update persistence operations from
+      # the root document, where changes in the entire tree need to be
+      # determined. Note that persistence from the embedded documents will
+      # always be preferred, since they are optimized calls... This operation
+      # can get expensive in domains with large hierarchies.
+      #
+      # Example:
+      #
+      # <tt>person._children</tt>
+      #
+      # Returns:
+      #
+      # All child +Documents+ to this +Document+ in the entire hierarchy.
+      def _children
+        associations.inject([]) do |children, (name, metadata)|
+          if metadata.embedded? && name != "versions"
+            child = send(name)
+            child.to_a.each do |doc|
+              children.push(doc).concat(doc._children)
+            end unless child.blank?
+          end
+          children
+        end
+      end
+
+      # Is inheritance in play here?
+      #
+      # Returns:
+      #
+      # <tt>true</tt> if inheritance used, <tt>false</tt> if not.
+      def hereditary?
+        !!self.hereditary
+      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.
+      #
+      # Options:
+      #
+      # abject: The parent object that needs to be set for the child.
+      # association_name: The name of the association for the child.
+      #
+      # Example:
+      #
+      # <tt>address.parentize(person, :addresses)</tt>
+      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+
+      # is the root object in the graph it will return self.
+      def _root
+        object = self
+        while (object._parent) do object = object._parent; end
+        object || self
+      end
+    end
+  end
+end

data/lib/mongoid/identity.rb

@@ -1,39 +1,47 @@
 # encoding: utf-8
 module Mongoid #:nodoc:
   class Identity #:nodoc:
-    class << self
-      # Create the identity for the +Document+.
-      #
-      # The id will be set in either in the form of a Mongo
-      # +ObjectID+ or a composite key set up by defining a key on the document.
-      #
-      # The _type will be set to the document's class name.
-      def create(doc)
-        identify(doc); type(doc); doc
-      end
+    # Create the identity for the +Document+.
+    #
+    # The id will be set in either in the form of a Mongo
+    # +ObjectID+ or a composite key set up by defining a key on the document.
+    #
+    # The _type will be set to the document's class name.
+    def create
+      identify!; type!
+    end
+
+    # Create the new identity generator - this will be expanded in the future
+    # to support pk generators.
+    #
+    # Options:
+    #
+    # document: The document to generate an id for.
+    def initialize(document)
+      @document = document
+    end
 
-      protected
-      # Return the proper id for the document.
-      def generate_id
-        id = BSON::ObjectID.new
-        Mongoid.use_object_ids ? id : id.to_s
-      end
+    protected
+    # Return the proper id for the document.
+    def generate_id
+      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 if doc.id.blank?
-      end
+    # Set the id for the document.
+    def identify!
+      @document.id = compose.join(" ").identify if @document.primary_key
+      @document.id = generate_id if @document.id.blank?
+    end
 
-      # Set the _type field on the document.
-      def type(doc)
-        doc._type = doc.class.name if doc.hereditary?
-      end
+    # Set the _type field on the @document.ment.
+    def type!
+      @document._type = @document.class.name if @document.hereditary?
+    end
 
-      # Generates the composite key for a document.
-      def compose(doc)
-        doc.primary_key.collect { |key| doc.attributes[key] }.reject { |val| val.nil? }
-      end
+    # Generates the composite key for a @document.ment.
+    def compose
+      @document.primary_key.collect { |key| @document.attributes[key] }.reject { |val| val.nil? }
     end
   end
 end

data/lib/mongoid/paths.rb

@@ -6,57 +6,56 @@ module Mongoid #:nodoc:
       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
-        _position.sub!(/\.\d+$/, '') || _position
-      end
-      alias :_pull :_path
+    # 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
 
-      # Returns the positional operator of this document for modification.
-      #
-      # Example:
-      #
-      # <tt>address.position</tt>
-      def _position
-        locator = _index ? (new_record? ? "" : ".#{_index}") : ""
-        embedded? ? "#{_parent._position}#{"." unless _parent._position.blank?}#{@association_name}#{locator}" : ""
-      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
+      _position.sub!(/\.\d+$/, '') || _position
+    end
+    alias :_pull :_path
 
-      # 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
+    # Returns the positional operator of this document for modification.
+    #
+    # Example:
+    #
+    # <tt>address.position</tt>
+    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
-      # with MongoDB's $ operator.
-      #
-      # Example:
-      #
-      # <tt>address.selector</tt>
-      def _selector
-        embedded? ? _parent._selector.merge("#{_path}._id" => id) : { "_id" => id }
-      end
+    # Return the selector for this document to be matched exactly for use
+    # with MongoDB's $ operator.
+    #
+    # Example:
+    #
+    # <tt>address.selector</tt>
+    def _selector
+      embedded? ? _parent._selector.merge("#{_path}._id" => id) : { "_id" => id }
     end
   end
 end

data/lib/mongoid/persistence.rb

@@ -19,129 +19,127 @@ module Mongoid #:nodoc:
   # <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 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
 
-      # 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
+    # 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
 
-      alias :delete :_remove
+    # 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
 
-      # 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
+    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+ 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, +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
+    # 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
+    # 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
+    # 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
 
     module ClassMethods #:nodoc: