mongoid 1.9.5 → 2.0.0.alpha

data/lib/mongoid/commands/create.rb

@@ -0,0 +1,19 @@
+# encoding: utf-8
+module Mongoid #:nodoc:
+  module Commands
+    class Create
+      # Performs a create of the supplied Document, with the necessary
+      # callbacks. It then delegates to the Save command.
+      #
+      # Options:
+      #
+      # doc: A new +Document+ that is going to be persisted.
+      #
+      # Returns: +Document+.
+      def self.execute(doc, validate = true)
+        doc.run_callbacks(:create) { Save.execute(doc, validate) }
+        doc
+      end
+    end
+  end
+end

data/lib/mongoid/commands/delete.rb

@@ -0,0 +1,16 @@
+# encoding: utf-8
+module Mongoid #:nodoc:
+  module Commands
+    class Delete
+      extend Deletion
+      # Performs a delete of the supplied +Document+ without any callbacks.
+      #
+      # Options:
+      #
+      # doc: A new +Document+ that is going to be deleted.
+      def self.execute(doc)
+        doc.destroyed = true if delete(doc)
+      end
+    end
+  end
+end

data/lib/mongoid/commands/delete_all.rb

@@ -0,0 +1,23 @@
+# encoding: utf-8
+module Mongoid #:nodoc:
+  module Commands
+    class DeleteAll
+      # Performs a delete of the all the +Documents+ that match the criteria
+      # supplied.
+      #
+      # Options:
+      #
+      # params: A set of conditions to find the +Documents+ by.
+      # klass: The class of the +Document+ to execute the find on.
+      #
+      # Example:
+      #
+      # <tt>DeleteAll.execute(Person, :conditions => { :field => "value" })</tt>
+      def self.execute(klass, params = {})
+        safe = Mongoid.persist_in_safe_mode
+        collection = klass.collection
+        collection.remove((params[:conditions] || {}).merge(:_type => klass.name), :safe => safe)
+      end
+    end
+  end
+end

data/lib/mongoid/commands/deletion.rb

@@ -0,0 +1,18 @@
+# encoding: utf-8
+module Mongoid #:nodoc
+  module Commands #:nodoc
+    module Deletion #:nodoc
+      # If the +Document+ has a parent, delete it from the parent's attributes,
+      # otherwise delete it from it's collection.
+      def delete(doc)
+        parent = doc._parent
+        if parent
+          parent.remove(doc)
+          parent.save
+        else
+          doc.collection.remove(:_id => doc.id)
+        end
+      end
+    end
+  end
+end

data/lib/mongoid/commands/destroy.rb

@@ -0,0 +1,17 @@
+# encoding: utf-8
+module Mongoid #:nodoc:
+  module Commands
+    class Destroy
+      extend Deletion
+      # Performs a destroy of the supplied +Document+, with the necessary
+      # callbacks. It then deletes the record from the collection.
+      #
+      # Options:
+      #
+      # doc: A new +Document+ that is going to be destroyed.
+      def self.execute(doc)
+        doc.run_callbacks(:destroy) { doc.destroyed = true if delete(doc) }
+      end
+    end
+  end
+end

data/lib/mongoid/commands/destroy_all.rb

@@ -0,0 +1,23 @@
+# encoding: utf-8
+module Mongoid #:nodoc:
+  module Commands
+    class DestroyAll
+      # Performs a destroy of the all the +Documents+ that match the criteria
+      # supplied. Will execute all the destroy callbacks for each +Document+.
+      #
+      # Options:
+      #
+      # params: A set of conditions to find the +Documents+ by.
+      # klass: The class of the +Document+ to execute the find on.
+      #
+      # Example:
+      #
+      # <tt>DestroyAll.execute(Person, :conditions => { :field => "value" })</tt>
+      def self.execute(klass, params)
+        conditions = params[:conditions] || {}
+        params[:conditions] = conditions.merge(:_type => klass.name)
+        klass.find(:all, params).each { |doc| Destroy.execute(doc) }; true
+      end
+    end
+  end
+end

data/lib/mongoid/commands/save.rb

@@ -0,0 +1,29 @@
+# encoding: utf-8
+module Mongoid #:nodoc:
+  module Commands
+    class Save
+      # Performs a save of the supplied +Document+, handling all associated
+      # callbacks and validation.
+      #
+      # Options:
+      #
+      # doc: A +Document+ that is going to be persisted.
+      #
+      # Returns: +true+ if validation passes, +false+ if not.
+      def self.execute(doc, validate = true)
+        return false if validate && !doc.valid?
+        doc.run_callbacks :save do
+          parent = doc._parent
+          doc.new_record = false
+          saved = if parent
+            Save.execute(parent, validate)
+          else
+            doc.collection.save(doc.raw_attributes, :safe => Mongoid.persist_in_safe_mode)
+          end
+          return false unless saved
+        end
+        return true
+      end
+    end
+  end
+end

data/lib/mongoid/components.rb

@@ -5,11 +5,13 @@ module Mongoid #:nodoc
     included do
       # All modules that a +Document+ is composed of are defined in this
       # module, to keep the document class from getting too cluttered.
+      include ActiveModel::Conversion
+      include ActiveModel::Naming
+      include ActiveModel::Serialization
       include Mongoid::Associations
       include Mongoid::Attributes
       include Mongoid::Callbacks
-      include Mongoid::Collections
-      include Mongoid::Dirty
+      include Mongoid::Commands
       include Mongoid::Extras
       include Mongoid::Fields
       include Mongoid::Indexes
@@ -17,9 +19,9 @@ module Mongoid #:nodoc
       include Mongoid::Memoization
       include Mongoid::Observable
       include Mongoid::Paths
-      include Mongoid::Persistence
       include Mongoid::State
-      include Validatable
+      include Mongoid::Validations
+      extend ActiveModel::Translation
       extend Mongoid::Finders
       extend Mongoid::NamedScope
     end

data/lib/mongoid/config.rb

@@ -1,6 +1,4 @@
 # encoding: utf-8
-require "uri"
-
 module Mongoid #:nodoc
   class Config #:nodoc
     include Singleton
@@ -10,44 +8,23 @@ module Mongoid #:nodoc
       :reconnect_time,
       :parameterize_keys,
       :persist_in_safe_mode,
+      :persist_types,
       :raise_not_found_error,
       :use_object_ids
 
     # Defaults the configuration options to true.
     def initialize
-      reset
-    end
-
-    # Sets whether the times returned from the database are in UTC or local time.
-    # If you omit this setting, then times will be returned in
-    # the local time zone.
-    #
-    # Example:
-    #
-    # <tt>Config.use_utc = true</tt>
-    #
-    # Returns:
-    #
-    # A boolean
-    def use_utc=(value)
-      @use_utc = value || false
+      @allow_dynamic_fields = true
+      @parameterize_keys = true
+      @persist_in_safe_mode = true
+      @persist_types = true
+      @raise_not_found_error = true
+      @reconnect_time = 3
+      @use_object_ids = false
     end
 
-    # Returns whether times are return from the database in UTC. If
-    # this setting is false, then times will be returned in the local time zone.
-    #
-    # Example:
-    #
-    # <tt>Config.use_utc</tt>
-    #
-    # Returns:
-    #
-    # A boolean
-    attr_reader :use_utc
-    alias_method :use_utc?, :use_utc
-
-    # Sets the Mongo::DB master database to be used. If the object trying to be
-    # set is not a valid +Mongo::DB+, then an error will be raised.
+    # Sets the Mongo::DB master database to be used. If the object trying to me
+    # set is not a valid +Mongo::DB+, then an error will be raise.
     #
     # Example:
     #
@@ -57,7 +34,7 @@ module Mongoid #:nodoc
     #
     # The Master DB instance.
     def master=(db)
-      check_database!(db)
+      raise Errors::InvalidDatabase.new(db) unless db.kind_of?(Mongo::DB)
       @master = db
     end
 
@@ -78,8 +55,8 @@ module Mongoid #:nodoc
     alias :database :master
     alias :database= :master=
 
-    # Sets the Mongo::DB slave databases to be used. If the objects provided
-    # are not valid +Mongo::DBs+ an error will be raised.
+    # Sets the Mongo::DB slave databases to be used. If the objects trying to me
+    # set are not valid +Mongo::DBs+, then an error will be raise.
     #
     # Example:
     #
@@ -87,12 +64,9 @@ module Mongoid #:nodoc
     #
     # Returns:
     #
-    # The slave DB instances.
+    # The slaves DB instances.
     def slaves=(dbs)
-      return unless dbs
-      dbs.each do |db|
-        check_database!(db)
-      end
+      dbs.each { |db| raise Errors::InvalidDatabase.new(db) unless db.kind_of?(Mongo::DB) }
       @slaves = dbs
     end
 
@@ -108,98 +82,5 @@ module Mongoid #:nodoc
     def slaves
       @slaves
     end
-
-    # Confiure mongoid from a hash that was usually parsed out of yml.
-    #
-    # Example:
-    #
-    # <tt>Mongoid::Config.instance.from_hash({})</tt>
-    def from_hash(settings)
-      _master(settings)
-      _slaves(settings)
-      settings.except("database").each_pair do |name, value|
-        send("#{name}=", value) if respond_to?(name)
-      end
-    end
-
-    # Reset the configuration options to the defaults.
-    #
-    # Example:
-    #
-    # <tt>config.reset</tt>
-    def reset
-      @allow_dynamic_fields = true
-      @parameterize_keys = true
-      @persist_in_safe_mode = true
-      @raise_not_found_error = true
-      @reconnect_time = 3
-      @use_object_ids = false
-      @time_zone = nil
-    end
-
-    protected
-
-    # Check if the database is valid and the correct version.
-    #
-    # Example:
-    #
-    # <tt>config.check_database!</tt>
-    def check_database!(database)
-      raise Errors::InvalidDatabase.new(database) unless database.kind_of?(Mongo::DB)
-      version = database.connection.server_version
-      raise Errors::UnsupportedVersion.new(version) if version < Mongoid::MONGODB_VERSION
-    end
-
-    # Get a Rails logger or stdout logger.
-    #
-    # Example:
-    #
-    # <tt>config.logger</tt>
-    def logger
-      defined?(Rails) ? Rails.logger : Logger.new($stdout)
-    end
-
-    # Get a master database from settings.
-    #
-    # Example:
-    #
-    # <tt>config._master({}, "test")</tt>
-    def _master(settings)
-      self.master = database_from_hash(settings)
-    end
-
-    # Get a bunch-o-slaves from settings and names.
-    #
-    # Example:
-    #
-    # <tt>config._slaves({}, "test")</tt>
-    def _slaves(settings)
-      self.slaves = settings["slaves"].to_a.map do |slave|
-        database_from_hash({"database" => master.name}.merge(slave), :slave_ok => true)
-      end
-    end
-
-    def database_from_hash(settings, connection_options={})
-      mongo_uri = settings["uri"].present? ? URI.parse(settings["uri"]) : OpenStruct.new
-
-      name = settings["database"] || mongo_uri.path.to_s.sub("/", "")
-      host = settings["host"] || mongo_uri.host || "localhost"
-      port = settings["port"] || mongo_uri.port || 27017
-      pool_size = settings["pool_size"] || 1
-      username = settings["username"] || mongo_uri.user
-      password = settings["password"] || mongo_uri.password
-
-      local_options = {
-        :logger => logger,
-        :pool_size => pool_size
-      }.merge(connection_options)
-
-      Mongo::Connection.new(host, port, local_options).tap do |connection|
-        if username || password
-          connection.add_auth(name, username, password)
-          connection.apply_saved_authentication
-        end
-      end.db(name)
-    end
   end
 end

data/lib/mongoid/contexts.rb

@@ -15,7 +15,7 @@ module Mongoid
     #
     # <tt>Contexts.context_for(criteria)</tt>
     def self.context_for(criteria)
-      if criteria.klass.embedded?
+      if criteria.klass.embedded
         return Contexts::Enumerable.new(criteria)
       end
       Contexts::Mongo.new(criteria)

data/lib/mongoid/contexts/enumerable.rb

@@ -6,7 +6,7 @@ module Mongoid #:nodoc:
       attr_reader :criteria
 
       delegate :blank?, :empty?, :first, :last, :to => :execute
-      delegate :klass, :documents, :options, :selector, :to => :criteria
+      delegate :documents, :options, :selector, :to => :criteria
 
       # Return aggregation counts of the grouped documents. This will count by
       # the first field provided in the fields array.

data/lib/mongoid/contexts/mongo.rb

@@ -133,7 +133,7 @@ module Mongoid #:nodoc:
       # <tt>Mongoid::Contexts::Mongo.new(criteria)</tt>
       def initialize(criteria)
         @criteria = criteria
-        if klass.hereditary
+        if klass.hereditary && Mongoid.persist_types
           criteria.in(:_type => criteria.klass._types)
         end
         criteria.enslave if klass.enslaved?

data/lib/mongoid/contexts/paging.rb

@@ -6,20 +6,12 @@ module Mongoid #:nodoc:
       #
       # Example:
       #
-      # <tt>context.paginate(:page => 6, :per_page => 25)</tt>
+      # <tt>context.paginate</tt>
       #
       # Returns:
       #
       # A collection of documents paginated.
-      # All previous <tt>limit</tt> and <tt>skip</tt> call will be ignored.
-      def paginate(pager_options={})
-        if pager_options[:per_page]
-          options[:limit] = pager_options[:per_page].to_i
-          if pager_options[:page]
-            options[:skip]  = (pager_options[:page].to_i - 1) * pager_options[:per_page].to_i
-          end
-        end
-
+      def paginate
         @collection ||= execute(true)
         WillPaginate::Collection.create(page, per_page, count) do |pager|
           pager.replace(@collection.to_a)

data/lib/mongoid/criterion/inclusion.rb

@@ -64,23 +64,6 @@ module Mongoid #:nodoc:
       end
       alias :any_in :in
 
-      # Adds a criterion to the +Criteria+ that specifies values to do
-      # geospacial searches by. The field must be indexed with the "2d" option.
-      #
-      # Options:
-      #
-      # attributes: A +Hash+ where the keys are the field names and the values are
-      # +Arrays+ of [latitude, longitude] pairs.
-      #
-      # Example:
-      #
-      # <tt>criteria.near(:field1 => [30, -44])</tt>
-      #
-      # Returns: <tt>self</tt>
-      def near(attributes = {})
-        update_selector(attributes, "$near")
-      end
-
       # Adds a criterion to the +Criteria+ that specifies values that must
       # be matched in order to return results. This is similar to a SQL "WHERE"
       # clause. This is the actual selector that will be provided to MongoDB,