mongoid 3.1.7 → 4.0.0.alpha1

data/lib/mongoid/{validations.rb → validatable.rb}

@@ -1,18 +1,18 @@
 # encoding: utf-8
-require "mongoid/validations/macros"
-require "mongoid/validations/localizable"
-require "mongoid/validations/associated"
-require "mongoid/validations/format"
-require "mongoid/validations/length"
-require "mongoid/validations/queryable"
-require "mongoid/validations/presence"
-require "mongoid/validations/uniqueness"
+require "mongoid/validatable/macros"
+require "mongoid/validatable/localizable"
+require "mongoid/validatable/associated"
+require "mongoid/validatable/format"
+require "mongoid/validatable/length"
+require "mongoid/validatable/queryable"
+require "mongoid/validatable/presence"
+require "mongoid/validatable/uniqueness"
 
 module Mongoid
 
   # This module provides additional validations that ActiveModel does not
   # provide: validates_associated and validates_uniqueness_of.
-  module Validations
+  module Validatable
     extend ActiveSupport::Concern
     include ActiveModel::Validations
 
@@ -41,6 +41,20 @@ module Mongoid
       Threaded.exit_validate(self)
     end
 
+    # Given the provided options, are we performing validations?
+    #
+    # @example Are we performing validations?
+    #   document.performing_validations?(validate: true)
+    #
+    # @param [ Hash ] options The options to check.
+    #
+    # @return [ true, false ] If we are validating.
+    #
+    # @since 4.0.0
+    def performing_validations?(options = {})
+      options[:validate].nil? ? true : options[:validate]
+    end
+
     # Overrides the default ActiveModel behaviour since we need to handle
     # validations of relations slightly different than just calling the
     # getter.

data/lib/mongoid/{validations → validatable}/associated.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 module Mongoid
-  module Validations
+  module Validatable
 
     # Validates whether or not an association is valid or not. Will correctly
     # handle has one and has many associations.
@@ -26,6 +26,8 @@ module Mongoid
       # @param [ Document ] document The document to validate.
       # @param [ Symbol ] attribute The relation to validate.
       # @param [ Object ] value The value of the relation.
+      #
+      # @since 2.0.0
       def validate_each(document, attribute, value)
         begin
           document.begin_validate

data/lib/mongoid/{validations → validatable}/format.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 module Mongoid
-  module Validations
+  module Validatable
 
     # Validates that the specified attributes do or do not match a certain
     # regular expression.

data/lib/mongoid/{validations → validatable}/length.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 module Mongoid
-  module Validations
+  module Validatable
 
     # Validates that the specified attributes do or do not match a certain
     # length.

data/lib/mongoid/{validations → validatable}/localizable.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 module Mongoid
-  module Validations
+  module Validatable
 
     # Adds localization support to validations.
     module Localizable

data/lib/mongoid/{validations → validatable}/macros.rb

@@ -1,5 +1,6 @@
+# encoding: utf-8
 module Mongoid
-  module Validations
+  module Validatable
     module Macros
       extend ActiveSupport::Concern
 
@@ -52,7 +53,7 @@ module Mongoid
       #
       # @since 2.4.0
       def validates_format_of(*args)
-        validates_with(Mongoid::Validations::FormatValidator, _merge_attributes(args))
+        validates_with(FormatValidator, _merge_attributes(args))
       end
 
       # Validates the length of a field.
@@ -69,7 +70,7 @@ module Mongoid
       #
       # @since 2.4.0
       def validates_length_of(*args)
-        validates_with(Mongoid::Validations::LengthValidator, _merge_attributes(args))
+        validates_with(LengthValidator, _merge_attributes(args))
       end
 
       # Validates whether or not a field is present - meaning nil or empty.

data/lib/mongoid/{validations → validatable}/presence.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 module Mongoid
-  module Validations
+  module Validatable
 
     # Validates that the specified attributes are not blank (as defined by
     # Object#blank?).

data/lib/mongoid/{validations → validatable}/queryable.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 module Mongoid
-  module Validations
+  module Validatable
     module Queryable
 
       # Wrap the validation inside the an execution block that alert's the
@@ -22,7 +22,6 @@ module Mongoid
           Threaded.begin_execution("#{klass.name}-validate-with-query")
           yield
         ensure
-          klass.clear_persistence_options unless document.errors.empty?
           Threaded.exit_execution("#{klass.name}-validate-with-query")
         end
       end

data/lib/mongoid/{validations → validatable}/uniqueness.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 module Mongoid
-  module Validations
+  module Validatable
 
     # Validates whether or not a field is unique against the documents in the
     # database.
@@ -173,7 +173,7 @@ module Mongoid
           name = document.database_field_name(item)
           criteria = criteria.where(item => document.attributes[name])
         end
-        criteria = criteria.where(deleted_at: nil) if document.paranoid?
+        criteria = criteria.with(document.persistence_options)
         criteria
       end
 
@@ -306,7 +306,7 @@ module Mongoid
       #
       # @since 3.0.23
       def persistence_options(criteria)
-        (criteria.klass.persistence_options || {}).merge!(consistency: :strong)
+        (criteria.persistence_options || {}).merge!(read: :primary)
       end
 
       # Is the attribute localized?

data/lib/mongoid/version.rb

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

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

@@ -11,14 +11,14 @@ development:
       hosts:
         - localhost:27017
       options:
-        # Change whether the session persists in safe mode by default.
-        # (default: false)
-        # safe: false
+        # Change the default write concern. (default = { w: 1 })
+        # write:
+        # w: 1
 
-        # Change the default consistency model to :eventual or :strong.
-        # :eventual will send reads to secondaries, :strong sends everything
-        # to master. (default: :eventual)
-        # consistency: :eventual
+        # Change the default consistency model to primary, secondary.
+        # 'secondary' will send reads to secondaries, 'primary' sends everything
+        # to master. (default: primary)
+        # read: secondary_preferred
 
         # How many times Moped should attempt to retry an operation after
         # failure. (default: 30)
@@ -29,10 +29,6 @@ development:
         # retry_interval: 1
   # Configure Mongoid specific options. (optional)
   options:
-    # Configuration for whether or not to allow access to fields that do
-    # not have a field definition on the model. (default: true)
-    # allow_dynamic_fields: true
-
     # Enable the identity map, needed for eager loading. (default: false)
     # identity_map_enabled: false
 
@@ -61,7 +57,7 @@ development:
     # admin access. (default: false)
     # skip_version_check: false
 
-    # User Active Support's time zone in conversions. (default: true)
+    # Use Active Support's time zone in conversions. (default: true)
     # use_activesupport_time_zone: true
 
     # Ensure all times are UTC in the app side. (default: false)
@@ -73,7 +69,7 @@ test:
       hosts:
         - localhost:27017
       options:
-        consistency: :strong
+        read: primary
         # In the test environment we lower the retries and retry interval to
         # low amounts for fast failures.
         max_retries: 1

data/lib/rails/generators/mongoid/model/model_generator.rb

@@ -12,7 +12,6 @@ module Mongoid
 
       class_option :timestamps, type: :boolean
       class_option :parent,     type: :string, desc: "The parent class for the generated model"
-      class_option :versioning, type: :boolean, default: false, desc: "Enable mongoid versioning"
       class_option :collection, type: :string, desc: "The collection for storing model's documents"
 
       def create_model_file

data/lib/rails/generators/mongoid/model/templates/model.rb.tt

@@ -6,9 +6,6 @@ class <%= class_name %><%= " < #{options[:parent].classify}" if options[:parent]
 <% if options[:timestamps] -%>
   include Mongoid::Timestamps
 <% end -%>
-<% if options[:versioning] -%>
-  include Mongoid::Versioning
-<% end -%>
 <% if options[:collection] -%>
   store_in collection: "<%= options[:collection] %>"
 <% end -%>

data/lib/rails/generators/mongoid_generator.rb

@@ -11,44 +11,6 @@ module Mongoid
           File.expand_path("../#{base_name}/#{generator_name}/templates", __FILE__)
       end
     end
-
-    class ActiveModel < ::Rails::Generators::ActiveModel
-      def self.all(klass)
-        "#{klass}.all"
-      end
-
-      def self.find(klass, params=nil)
-        "#{klass}.find(#{params})"
-      end
-
-      def self.build(klass, params=nil)
-        if params
-          "#{klass}.new(#{params})"
-        else
-          "#{klass}.new"
-        end
-      end
-
-      def save
-        "#{name}.save"
-      end
-
-      def update_attributes(params=nil)
-        "#{name}.update_attributes(#{params})"
-      end
-
-      def errors
-        "#{name}.errors"
-      end
-
-      def delete
-        "#{name}.delete"
-      end
-
-      def destroy
-        "#{name}.destroy"
-      end
-    end
   end
 end
 
@@ -56,8 +18,9 @@ module Rails
   module Generators
     class GeneratedAttribute
       def type_class
-        return "Time" if type.to_s == "datetime"
-        return "String" if type.to_s == "text"
+        return "Time" if type == :datetime
+        return "String" if type == :text
+        return "Mongoid::Boolean" if type == :boolean
         type.to_s.camelcase
       end
     end

data/lib/rails/mongoid.rb

@@ -7,21 +7,19 @@ module Rails
     # not embedded.
     #
     # @example Create all the indexes.
-    #   Rails::Mongoid.create_indexes("app/models/**/*.rb")
-    #
-    # @param [ Array<String> ] globs The file matching globs.
+    #   Rails::Mongoid.create_indexes
     #
     # @return [ Array<Class> ] The indexed models.
     #
     # @since 2.1.0
-    def create_indexes(*globs)
-      models(*globs).each do |model|
-        next if model.index_options.empty?
-        if !model.embedded? || model.cyclic?
+    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_options.each_pair do |index, options|
-            logger.info("MONGOID: Index: #{index}, Options: #{options}")
+          model.index_specifications.each do |spec|
+            logger.info("MONGOID: Index: #{spec.key}, Options: #{spec.options}")
           end
           model
         else
@@ -31,18 +29,65 @@ module Rails
       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.create_indexes("app/models/**/*.rb")
-    #
-    # @param [ Array<String> ] globs The file matching globs.
+    #   Rails::Mongoid.remove_indexes
     #
     # @return [ Array<Class> ] The un-indexed models.
     #
-    def remove_indexes(*globs)
-      models(*globs).each do |model|
+    def remove_indexes
+      ::Mongoid.models.each do |model|
         next if model.embedded?
         indexes = model.collection.indexes.map{ |doc| doc["name"] }
         indexes.delete_one("_id_")
@@ -52,49 +97,6 @@ module Rails
       end.compact
     end
 
-    # Return all models matching the globs or, if no globs are specified, all
-    # possible models known from engines, the app, any gems, etc.
-    #
-    # @example Return *all* models.  Return all models under app/models/
-    #   Rails::Mongoid.models
-    #   Rails::Mongoid.models("app/models/**/*.rb")
-    #
-    # @param [ String ] glob The file matching glob.
-    #
-    # @return [ Array<Class> ] The models.
-    #
-    def models(*globs)
-      all_possible_models = globs.empty?
-
-      if globs.empty?
-        engines_models_paths = Rails.application.railties.engines.map{|engine| engine.paths["app/models"].expanded}
-        root_models_paths = Rails.application.paths["app/models"]
-        models_paths = engines_models_paths.push(root_models_paths).flatten
-        globs.replace(models_paths.map{|path| "#{path}/**/*.rb"})
-      end
-
-      models = []
-
-      globs.flatten.compact.each do |glob|
-        Dir.glob(glob).map do |file|
-          begin
-            model = determine_model(file, logger)
-            models.push(model)
-          rescue => e
-            logger.error(%Q{MONGOID: Failed to determine model from #{file}:
-              #{e.class}:#{e.message}
-              #{e.backtrace.join("\n")}
-            })
-            nil
-          end
-        end
-      end
-
-      models = (::Mongoid.models | models) if all_possible_models
-
-      models.compact.sort_by { |model| model.name || '' }
-    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.