mongoid 1.9.5 → 2.0.0.alpha

data/lib/mongoid/associations/proxy.rb

@@ -1,23 +1,30 @@
 # encoding: utf-8
 module Mongoid #:nodoc
   module Associations #:nodoc
-    class Proxy #:nodoc
-      instance_methods.each do |method|
-        undef_method(method) unless method =~ /(^__|^nil\?$|^send$|^object_id$|^extend$)/
+    module Proxy #:nodoc
+      def self.included(base)
+        base.class_eval do
+          instance_methods.each do |method|
+            undef_method(method) unless method =~ /(^__|^nil\?$|^send$|^object_id$|^extend$)/
+          end
+          include InstanceMethods
+        end
       end
-      attr_reader \
-        :options,
-        :target
+      module InstanceMethods #:nodoc:
+        attr_reader \
+          :options,
+          :target
 
-      # Default behavior of method missing should be to delegate all calls
-      # to the target of the proxy. This can be overridden in special cases.
-      def method_missing(name, *args, &block)
-        @target.send(name, *args, &block)
-      end
+        # Default behavior of method missing should be to delegate all calls
+        # to the target of the proxy. This can be overridden in special cases.
+        def method_missing(name, *args, &block)
+          @target.send(name, *args, &block)
+        end
 
-      # If anonymous extensions are added this will take care of them.
-      def extends(options)
-        extend Module.new(&options.extension) if options.extension?
+        # If anonymous extensions are added this will take care of them.
+        def extends(options)
+          extend Module.new(&options.extension) if options.extension?
+        end
       end
     end
   end

data/lib/mongoid/attributes.rb

@@ -1,12 +1,7 @@
 # encoding: utf-8
 module Mongoid #:nodoc:
   module Attributes
-    def self.included(base)
-      base.class_eval do
-        include InstanceMethods
-        extend ClassMethods
-      end
-    end
+    extend ActiveSupport::Concern
     module InstanceMethods
       # Get the id associated with this object. This will pull the _id value out
       # of the attributes +Hash+.
@@ -46,7 +41,6 @@ module Mongoid #:nodoc:
             send("#{key}=", value)
           end
         end
-        setup_modifications
       end
 
       # Read a value from the +Document+ attributes. If the value does not exist
@@ -61,7 +55,7 @@ module Mongoid #:nodoc:
       # <tt>person.read_attribute(:title)</tt>
       def read_attribute(name)
         access = name.to_s
-        accessed(access, fields[access].get(@attributes[access]))
+        fields[access].get(@attributes[access])
       end
 
       # Remove a value from the +Document+ attributes. If the value does not exist
@@ -75,8 +69,7 @@ module Mongoid #:nodoc:
       #
       # <tt>person.remove_attribute(:title)</tt>
       def remove_attribute(name)
-        access = name.to_s
-        modify(access, @attributes.delete(access), nil)
+        @attributes.delete(name.to_s)
       end
 
       # Returns the object type. This corresponds to the name of the class that
@@ -108,8 +101,8 @@ module Mongoid #:nodoc:
       # there is any.
       def write_attribute(name, value)
         access = name.to_s
-        modify(access, @attributes[access], fields[access].set(value))
-        notify if !id.blank? && new_record?
+        @attributes[access] = fields[access].set(value)
+        notify unless id.blank?
       end
 
       # Writes the supplied attributes +Hash+ to the +Document+. This will only
@@ -128,23 +121,12 @@ module Mongoid #:nodoc:
       # there is any.
       def write_attributes(attrs = nil)
         process(attrs || {})
-        identified = !id.blank?
-        if new_record? && !identified
-          identify; notify
-        end
+        identify if id.blank?
+        notify
       end
-      alias :attributes= write_attributes
+      alias :attributes= :write_attributes
 
       protected
-      # apply default values to attributes - calling procs as required
-      def default_attributes
-        default_values = defaults
-        default_values.each_pair do |key, val|
-          default_values[key] = val.call if val.respond_to?(:call)
-        end
-        default_values || {}
-      end
-
       # Return true if dynamic field setting is enabled.
       def set_allowed?(key)
         Mongoid.allow_dynamic_fields && !respond_to?("#{key}=")
@@ -163,10 +145,8 @@ module Mongoid #:nodoc:
 
       # 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?
+        return true unless fields[key.to_s]
+        fields[key.to_s].accessible?
       end
     end
 
@@ -178,8 +158,8 @@ module Mongoid #:nodoc:
       #
       #   class Person
       #     include Mongoid::Document
-      #     embeds_one :name
-      #     embeds_many :addresses
+      #     embed_one :name
+      #     embed_many :addresses
       #
       #     accepts_nested_attributes_for :name, :addresses
       #   end
@@ -191,7 +171,7 @@ module Mongoid #:nodoc:
             reject(attrs, options)
             association = send(name)
             if association
-              observe(association, true)
+              update(association, true)
               association.nested_build(attrs)
             else
               send("build_#{name}", attrs)

data/lib/mongoid/callbacks.rb

@@ -1,23 +1,18 @@
 # encoding: utf-8
 module Mongoid #:nodoc:
   module Callbacks
-    def self.included(base)
-      base.class_eval do
-        include ActiveSupport::Callbacks
+    extend ActiveSupport::Concern
+    included do
+      extend ActiveModel::Callbacks
 
-        # Define all the callbacks that are accepted by the document.
-        define_callbacks \
-          :before_create,
-          :after_create,
-          :before_destroy,
-          :after_destroy,
-          :before_save,
-          :after_save,
-          :before_update,
-          :after_update,
-          :before_validation,
-          :after_validation
-      end
+      # Define all the callbacks that are accepted by the document.
+      define_model_callbacks \
+        :create,
+        :destroy,
+        :save,
+        :update,
+        :validate,
+        :terminator => false
     end
   end
 end

data/lib/mongoid/collection.rb

@@ -1,12 +1,13 @@
 # encoding: utf-8
 require "mongoid/collections/operations"
 require "mongoid/collections/cyclic_iterator"
+require "mongoid/collections/mimic"
 require "mongoid/collections/master"
 require "mongoid/collections/slaves"
 
 module Mongoid #:nodoc
-  # The Mongoid wrapper to the Mongo Ruby driver's collection object.
   class Collection
+    include Collections::Mimic
     attr_reader :counter, :name
 
     # All write operations should delegate to the master connection. These
@@ -15,9 +16,7 @@ module Mongoid #:nodoc
     # Example:
     #
     # <tt>collection.save({ :name => "Al" })</tt>
-    Collections::Operations::PROXIED.each do |name|
-      define_method(name) { |*args| master.send(name, *args) }
-    end
+    proxy(:master, Collections::Operations::PROXIED)
 
     # Determines where to send the next read query. If the slaves are not
     # defined then send to master. If the read counter is under the configured

data/lib/mongoid/collections/master.rb

@@ -2,6 +2,7 @@
 module Mongoid #:nodoc:
   module Collections #:nodoc:
     class Master
+      include Mimic
 
       attr_reader :collection
 
@@ -11,9 +12,7 @@ module Mongoid #:nodoc:
       # Example:
       #
       # <tt>collection.save({ :name => "Al" })</tt>
-      Operations::ALL.each do |name|
-        define_method(name) { |*args| collection.send(name, *args) }
-      end
+      proxy(:collection, Operations::ALL)
 
       # Create the new database writer. Will create a collection from the
       # master database.

data/lib/mongoid/collections/mimic.rb

@@ -0,0 +1,46 @@
+# encoding: utf-8
+module Mongoid #:nodoc:
+  module Collections #:nodoc:
+    module Mimic #:nodoc:
+      def self.included(base)
+        base.class_eval do
+          include InstanceMethods
+          extend ClassMethods
+        end
+      end
+
+      module InstanceMethods #:nodoc:
+        # Retry the supplied operation until the reconnect time has expired,
+        # defined in the mongoid Config module.
+        #
+        # Example:
+        #
+        # <tt>master.attempt(operation)</tt>
+        def attempt(operation, start)
+          begin
+            elapsed = (Time.now - start)
+            operation.call
+          rescue Mongo::ConnectionFailure => error
+            (elapsed < Mongoid.reconnect_time) ? retry : (raise error)
+          end
+        end
+      end
+
+      module ClassMethods #:nodoc:
+        # Proxy all the supplied operations to the internal collection or target.
+        #
+        # Example:
+        #
+        # <tt>proxy Operations::ALL, :collection</tt>
+        def proxy(target, operations)
+          operations.each do |name|
+            define_method(name) do |*args|
+              operation = lambda { send(target).send(name, *args) }
+              attempt(operation, Time.now)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/mongoid/collections/slaves.rb

@@ -2,6 +2,7 @@
 module Mongoid #:nodoc:
   module Collections #:nodoc:
     class Slaves
+      include Mimic
 
       attr_reader :iterator
 
@@ -11,9 +12,7 @@ module Mongoid #:nodoc:
       # Example:
       #
       # <tt>collection.save({ :name => "Al" })</tt>
-      Operations::READ.each do |name|
-        define_method(name) { |*args| collection.send(name, *args) }
-      end
+      proxy(:collection, Operations::READ)
 
       # Is the collection of slaves empty or not?
       #

data/lib/mongoid/commands.rb

@@ -0,0 +1,161 @@
+# encoding: utf-8
+require "mongoid/commands/create"
+require "mongoid/commands/deletion"
+require "mongoid/commands/delete"
+require "mongoid/commands/delete_all"
+require "mongoid/commands/destroy"
+require "mongoid/commands/destroy_all"
+require "mongoid/commands/save"
+
+module Mongoid #:nodoc:
+
+  # This module is included in the +Document+ to provide all the persistence
+  # methods required on the +Document+ object and class.
+  module Commands
+    extend ActiveSupport::Concern
+    module InstanceMethods
+
+      # Delete the +Document+ from the database. This method is an optimized
+      # delete that does not force any callbacks.
+      #
+      # Example:
+      #
+      # <tt>document.delete</tt>
+      #
+      # Returns: true unless an error occurs.
+      def delete
+        Delete.execute(self)
+      end
+
+      # Destroy the +Document+. This will delete the document from the database
+      # and run the before and after destroy callbacks.
+      #
+      # Example:
+      #
+      # <tt>document.destroy</tt>
+      #
+      # Returns: true unless an error occurs.
+      def destroy
+        Destroy.execute(self)
+      end
+
+      # Save the +Document+. If the document is new, then the before and after
+      # create callbacks will get executed as well as the save callbacks.
+      # Otherwise only the save callbacks will run.
+      #
+      # Options:
+      #
+      # validate: Run validations or not. Defaults to true.
+      #
+      # Example:
+      #
+      # <tt>document.save # save with validations</tt>
+      # <tt>document.save(false) # save without validations</tt>
+      #
+      # Returns: true if validation passes, false if not.
+      def save(validate = true)
+        save = lambda { Save.execute(self, validate) }
+        new_record? ? run_callbacks(:create, &save) : save.call
+      end
+
+      # Save the +Document+, dangerously. Before and after save callbacks will
+      # get run. If validation fails an error will get raised.
+      #
+      # Example:
+      #
+      # <tt>document.save!</tt>
+      #
+      # Returns: true if validation passes
+      def save!
+        save(true) || (raise Errors::Validations.new(self.errors))
+      end
+
+      # Update the document attributes and persist the document to the
+      # database. Will delegate to save with all callbacks.
+      #
+      # Example:
+      #
+      # <tt>document.update_attributes(:title => "Test")</tt>
+      def update_attributes(attrs = {})
+        set_attributes(attrs); save
+      end
+
+      # Update the document attributes and persist the document to the
+      # database. Will delegate to save!
+      #
+      # Example:
+      #
+      # <tt>document.update_attributes!(:title => "Test")</tt>
+      def update_attributes!(attrs = {})
+        set_attributes(attrs); save!
+      end
+
+      protected
+      def set_attributes(attrs = {})
+        run_callbacks(:update) { write_attributes(attrs) }
+      end
+
+    end
+
+    module ClassMethods
+
+      # Create a new +Document+. This will instantiate a new document and save
+      # 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 = {})
+        document = new(attributes)
+        Create.execute(document)
+        document
+      end
+
+      # Create a new +Document+. This will instantiate a new document and save
+      # it in a single call. Will always return the document whether save
+      # passed or not. Will raise an error if validation fails.
+      #
+      # Example:
+      #
+      # <tt>Person.create!(:title => "Mr")</tt>
+      #
+      # Returns: the +Document+.
+      def create!(attributes = {})
+        document = Create.execute(new(attributes), true)
+        raise Errors::Validations.new(document.errors) unless document.errors.empty?
+        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 = {})
+        DeleteAll.execute(self, conditions)
+      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 = {})
+        DestroyAll.execute(self, conditions)
+      end
+    end
+  end
+end