mongoid 4.0.0.alpha2 → 4.0.0.beta1

data/lib/mongoid/tasks/database.rake

@@ -0,0 +1,31 @@
+namespace :db do
+  namespace :mongoid do
+    task :load_models do
+    end
+
+    desc "Create the indexes defined on your mongoid models"
+    task :create_indexes => [:environment, :load_models] do
+      ::Mongoid::Tasks::Database.create_indexes
+    end
+
+    desc "Remove indexes that exist in the database but aren't specified on the models"
+    task :remove_undefined_indexes => [:environment, :load_models] do
+      ::Mongoid::Tasks::Database.remove_undefined_indexes
+    end
+
+    desc "Remove the indexes defined on your mongoid models without questions!"
+    task :remove_indexes => [:environment, :load_models] do
+      ::Mongoid::Tasks::Database.remove_indexes
+    end
+
+    desc "Drops the default session"
+    task :drop => :environment do
+      ::Mongoid::Sessions.default.drop
+    end
+
+    desc "Drop all collections except the system collections"
+    task :purge => :environment do
+      ::Mongoid.purge!
+    end
+  end
+end

data/lib/mongoid/tasks/database.rb

@@ -0,0 +1,107 @@
+# encoding: utf-8
+module Mongoid
+  module Tasks
+    module Database
+      extend self
+
+      # Create indexes for each model given the provided globs and the class is
+      # not embedded.
+      #
+      # @example Create all the indexes.
+      #   Mongoid::Tasks::Database.create_indexes
+      #
+      # @return [ Array<Class> ] The indexed models.
+      #
+      # @since 2.1.0
+      def create_indexes(models = ::Mongoid.models)
+        models.each do |model|
+          next if model.index_specifications.empty?
+          unless model.embedded?
+            model.create_indexes
+            logger.info("MONGOID: Created indexes on #{model}:")
+            model.index_specifications.each do |spec|
+              logger.info("MONGOID: Index: #{spec.key}, Options: #{spec.options}")
+            end
+            model
+          else
+            logger.info("MONGOID: Index ignored on: #{model}, please define in the root model.")
+            nil
+          end
+        end.compact
+      end
+
+      # Return the list of indexes by model that exist in the database but aren't
+      # specified on the models.
+      #
+      # @example Return the list of unused indexes.
+      #   Mongoid::Tasks::Database.undefined_indexes
+      #
+      # @return Hash{Class => Array(Hash)} The list of undefined indexes by model.
+      def undefined_indexes(models = ::Mongoid.models)
+        undefined_by_model = {}
+
+        models.each do |model|
+          unless model.embedded?
+            model.collection.indexes.each do |index|
+              # ignore default index
+              unless index['name'] == '_id_'
+                key = index['key'].symbolize_keys
+                spec = model.index_specification(key)
+                unless spec
+                  # index not specified
+                  undefined_by_model[model] ||= []
+                  undefined_by_model[model] << index
+                end
+              end
+            end
+          end
+        end
+
+        undefined_by_model
+      end
+
+      # Remove indexes that exist in the database but aren't specified on the
+      # models.
+      #
+      # @example Remove undefined indexes.
+      #   Mongoid::Tasks::Database.remove_undefined_indexes
+      #
+      # @return [ Hash{Class => Array(Hash)}] The list of indexes that were removed by model.
+      #
+      # @since 4.0.0
+      def remove_undefined_indexes(models = ::Mongoid.models)
+        undefined_indexes(models).each do |model, indexes|
+          indexes.each do |index|
+            key = index['key'].symbolize_keys
+            model.collection.indexes.drop(key)
+            logger.info("MONGOID: Removing index: #{index['name']} on #{model}.")
+          end
+        end
+      end
+
+      # Remove indexes for each model given the provided globs and the class is
+      # not embedded.
+      #
+      # @example Remove all the indexes.
+      #   Mongoid::Tasks::Database.remove_indexes
+      #
+      # @return [ Array<Class> ] The un-indexed models.
+      #
+      def remove_indexes(models = ::Mongoid.models)
+        models.each do |model|
+          next if model.embedded?
+          indexes = model.collection.indexes.map{ |doc| doc["name"] }
+          indexes.delete_one("_id_")
+          model.remove_indexes
+          logger.info("MONGOID: Removing indexes on: #{model} for: #{indexes.join(', ')}.")
+          model
+        end.compact
+      end
+
+      private
+      def logger
+        @logger ||= Logger.new($stdout)
+      end
+    end
+  end
+end

data/lib/mongoid/threaded.rb

@@ -150,53 +150,6 @@ module Mongoid
       validations_for(document.class).delete_one(document.id)
     end
 
-    # Get the field selection options from the current thread.
-    #
-    # @example Get the field selection options.
-    #   Threaded.selection
-    #
-    # @param [ Integer ] criteria_instance_id The criteria instance id.
-    #
-    # @return [ Hash ] The field selection.
-    #
-    # @since 2.4.4
-    def selection(criteria_instance_id)
-      selections = Thread.current["[mongoid][selections]"]
-      selections[criteria_instance_id] if selections
-    end
-
-    # Set the field selection on the current thread.
-    #
-    # @example Set the field selection.
-    #   Threaded.set_selection(Person, { field: 1 })
-    #
-    # @param [ Integer ] criteria_instance_id The criteria instance id.
-    # @param [ Hash ] value The current field selection.
-    #
-    # @return [ Hash ] The field selection.
-    #
-    # @since 2.4.4
-    def set_selection(criteria_instance_id, value)
-      Thread.current["[mongoid][selections]"] ||= {}
-      Thread.current["[mongoid][selections]"][criteria_instance_id] = value
-    end
-
-    # Delete the field selection on the current thread.
-    #
-    # @example Delete the field selection.
-    #   Threaded.delete_selection(Person)
-    #
-    # @param [ Integer ] criteria_instance_id The criteria instance id.
-    #
-    # @return [ Boolean ] Whether there was a field selection.
-    #
-    # @since 3.0.7
-    def delete_selection(criteria_instance_id)
-      selections = Thread.current["[mongoid][selections]"]
-      return false unless selections
-      !!selections.delete(criteria_instance_id)
-    end
-
     # Get the global session override.
     #
     # @example Get the global session override.

data/lib/mongoid/validatable/uniqueness.rb

@@ -26,20 +26,6 @@ module Mongoid
     class UniquenessValidator < ActiveModel::EachValidator
       include Queryable
 
-      attr_reader :klass
-
-      # Unfortunately, we have to tie Uniqueness validators to a class.
-      #
-      # @example Setup the validator.
-      # UniquenessValidator.new.setup(Person)
-      #
-      # @param [ Class ] klass The class getting validated.
-      #
-      # @since 1.0.0
-      def setup(klass)
-        @klass = klass
-      end
-
       # Validate the document for uniqueness violations.
       #
       # @example Validate the document.
@@ -241,7 +227,7 @@ module Mongoid
       def to_validate(document, attribute, value)
         metadata = document.relations[attribute.to_s]
         if metadata && metadata.stores_foreign_key?
-          [ metadata.foreign_key, value.id ]
+          [ metadata.foreign_key, value && value.id ]
         else
           [ attribute, value ]
         end
@@ -280,7 +266,9 @@ module Mongoid
       #
       # @since 2.4.10
       def validate_root(document, attribute, value)
-        criteria = create_criteria(klass || document.class, document, attribute, value)
+        klass = document.class
+        klass = klass.superclass while !klass.validators.include?(self)
+        criteria = create_criteria(klass, document, attribute, value)
         criteria = criteria.merge(options[:conditions].call) if options[:conditions]
 
         if criteria.with(persistence_options(criteria)).exists?

data/lib/mongoid/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Mongoid
-  VERSION = "4.0.0.alpha2"
+  VERSION = "4.0.0.beta1"
 end

data/lib/rails/generators/mongoid/config/templates/mongoid.yml

@@ -29,9 +29,6 @@ development:
         # retry_interval: 1
   # Configure Mongoid specific options. (optional)
   options:
-    # Enable the identity map, needed for eager loading. (default: false)
-    # identity_map_enabled: false
-
     # Includes the root model name in json serialization. (default: false)
     # include_root_in_json: false
 

data/lib/rails/mongoid.rb

@@ -3,100 +3,6 @@ module Rails
   module Mongoid
     extend self
 
-    # Create indexes for each model given the provided globs and the class is
-    # not embedded.
-    #
-    # @example Create all the indexes.
-    #   Rails::Mongoid.create_indexes
-    #
-    # @return [ Array<Class> ] The indexed models.
-    #
-    # @since 2.1.0
-    def create_indexes
-      ::Mongoid.models.each do |model|
-        next if model.index_specifications.empty?
-        unless model.embedded?
-          model.create_indexes
-          logger.info("MONGOID: Created indexes on #{model}:")
-          model.index_specifications.each do |spec|
-            logger.info("MONGOID: Index: #{spec.key}, Options: #{spec.options}")
-          end
-          model
-        else
-          logger.info("MONGOID: Index ignored on: #{model}, please define in the root model.")
-          nil
-        end
-      end.compact
-    end
-
-    # Return the list of indexes by model that exist in the database but aren't
-    # specified on the models.
-    #
-    # @example Return the list of unused indexes.
-    #   Rails::Mongoid.undefined_indexes
-    #
-    # @return Hash{Class => Array(Hash)} The list of undefined indexes by model.
-    def undefined_indexes
-      undefined_by_model = {}
-
-      ::Mongoid.models.each do |model|
-        unless model.embedded?
-          model.collection.indexes.each do |index|
-            # ignore default index
-            unless index['name'] == '_id_'
-              key = index['key'].symbolize_keys
-              spec = model.index_specification(key)
-              unless spec
-                # index not specified
-                undefined_by_model[model] ||= []
-                undefined_by_model[model] << index
-              end
-            end
-          end
-        end
-      end
-
-      undefined_by_model
-    end
-
-    # Remove indexes that exist in the database but aren't specified on the
-    # models.
-    #
-    # @example Remove undefined indexes.
-    #   Rails::Mongoid.remove_undefined_indexes
-    #
-    # @return [ Hash{Class => Array(Hash)}] The list of indexes that were removed by model.
-    #
-    # @since 4.0.0
-    def remove_undefined_indexes
-      undefined_indexes.each do |model, indexes|
-        indexes.each do |index|
-          key = index['key'].symbolize_keys
-          model.collection.indexes.drop(key)
-          logger.info("MONGOID: Removing index: #{index['name']} on #{model}.")
-        end
-      end
-    end
-
-    # Remove indexes for each model given the provided globs and the class is
-    # not embedded.
-    #
-    # @example Remove all the indexes.
-    #   Rails::Mongoid.remove_indexes
-    #
-    # @return [ Array<Class> ] The un-indexed models.
-    #
-    def remove_indexes
-      ::Mongoid.models.each do |model|
-        next if model.embedded?
-        indexes = model.collection.indexes.map{ |doc| doc["name"] }
-        indexes.delete_one("_id_")
-        model.remove_indexes
-        logger.info("MONGOID: Removing indexes on: #{model} for: #{indexes.join(', ')}.")
-        model
-      end.compact
-    end
-
     # Use the application configuration to get every model and require it, so
     # that indexing and inheritance work in both development and production
     # with the same results.
@@ -146,35 +52,5 @@ module Rails
         Logger.new($stdout).warn(e.message)
       end
     end
-
-    # Given the provided file name, determine the model and return the class.
-    #
-    # @example Determine the model from the file.
-    #   Rails::Mongoid.determine_model("app/models/person.rb")
-    #
-    # @param [ String ] file The filename.
-    #
-    # @return [ Class ] The model.
-    #
-    # @since 2.1.0
-    def determine_model(file, logger)
-      return nil unless file =~ /app\/models\/(.*).rb$/
-      return nil unless logger
-
-      model_path = $1.split('/')
-      begin
-        parts = model_path.map { |path| path.camelize }
-        name = parts.join("::")
-        klass = name.constantize
-      rescue NameError, LoadError
-        logger.info("MONGOID: Attempted to constantize #{name}, trying without namespacing.")
-        klass = parts.last.constantize rescue nil
-      end
-      klass if klass && klass.ancestors.include?(::Mongoid::Document)
-    end
-
-    def logger
-      @logger ||= Logger.new($stdout)
-    end
   end
 end

data/spec/app/models/edit.rb

@@ -0,0 +1,5 @@
+class Edit
+  include Mongoid::Document
+  include Mongoid::Timestamps::Updated
+  embedded_in :wiki_page, touch: true
+end

data/spec/app/models/even.rb

@@ -0,0 +1,7 @@
+class Even
+  include Mongoid::Document
+  field :name
+
+  belongs_to :parent, class_name: 'Odd', inverse_of: :evens
+  has_many :odds, inverse_of: :parent, autosave: true
+end

data/spec/app/models/line_item.rb

@@ -2,5 +2,5 @@ class LineItem
   include Mongoid::Document
   embedded_in :purchase
   belongs_to :product, polymorphic: true
-  validates :product, presence: true
+  validates :product, presence: true, uniqueness: { scope: :product }
 end

data/spec/app/models/note.rb

@@ -6,6 +6,8 @@ class Note
 
   after_save :update_saved
 
+  scope :permanent, ->{ where(saved: true) }
+
   def update_saved
     self.saved = true
   end

data/spec/app/models/odd.rb

@@ -0,0 +1,7 @@
+class Odd
+  include Mongoid::Document
+  field :name
+
+  belongs_to :parent, class_name: 'Even', inverse_of: :odds
+  has_many :evens, inverse_of: :parent
+end

data/spec/app/models/record.rb

@@ -43,4 +43,9 @@ class Record
   def access_band
     band.name
   end
+
+  def dont_call_me_twice
+  end
+
+  validate { dont_call_me_twice }
 end

data/spec/app/models/wiki_page.rb

@@ -6,8 +6,8 @@ class WikiPage
   field :transient_property, type: String
   field :author, type: String
   field :description, type: String, localize: true
-  max_versions 5
 
+  embeds_many :edits, validate: false
   has_many :comments, dependent: :destroy, validate: false
   has_many :child_pages, class_name: "WikiPage", dependent: :delete, inverse_of: :parent_pages
   belongs_to :parent_pages, class_name: "WikiPage", inverse_of: :child_pages