mongoid 3.1.7 → 4.0.2

data/lib/mongoid.rb

@@ -1,34 +1,13 @@
 # encoding: utf-8
-
-# Copyright (c) 2009 - 2011 Durran Jordan and friends.
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-require 'support/ruby_version'
+require "support/ruby_version"
 
 require "delegate"
 require "time"
 require "set"
 
+require "active_support"
 require "active_support/core_ext"
-require 'active_support/json'
+require "active_support/json"
 require "active_support/inflector"
 require "active_support/time_with_zone"
 require "active_model"
@@ -36,49 +15,14 @@ require "active_model"
 require "origin"
 require "moped"
 
-require "mongoid/atomic/positionable"
-require "mongoid/evolvable"
-require "mongoid/extensions"
-require "mongoid/errors"
-require "mongoid/threaded"
-require "mongoid/relations"
-require "mongoid/atomic"
-require "mongoid/attributes"
-require "mongoid/callbacks"
+require "mongoid/version"
 require "mongoid/config"
-require "mongoid/contextual"
-require "mongoid/copyable"
-require "mongoid/equality"
-require "mongoid/criteria"
-require "mongoid/dirty"
-require "mongoid/factory"
-require "mongoid/fields"
-require "mongoid/finders"
-require "mongoid/hierarchy"
-require "mongoid/identity_map"
-require "mongoid/indexes"
-require "mongoid/inspection"
-require "mongoid/json"
 require "mongoid/loggable"
-require "mongoid/matchers"
-require "mongoid/multi_parameter_attributes"
-require "mongoid/nested_attributes"
-require "mongoid/observer"
-require "mongoid/persistence"
-require "mongoid/reloading"
-require "mongoid/scoping"
-require "mongoid/serialization"
 require "mongoid/sessions"
-require "mongoid/sharding"
-require "mongoid/state"
-require "mongoid/timestamps"
-require "mongoid/unit_of_work"
-require "mongoid/validations"
-require "mongoid/version"
-require "mongoid/versioning"
-require "mongoid/components"
-require "mongoid/paranoia"
 require "mongoid/document"
+require "mongoid/log_subscriber"
+require "mongoid/tasks/database"
+require "mongoid/query_cache"
 
 # If we are using Rails then we will include the Mongoid railtie. This has all
 # the nifty initializers that Mongoid needs.
@@ -86,28 +30,20 @@ if defined?(Rails)
   require "mongoid/railtie"
 end
 
-# If we are using any Rack based application then we need the Mongoid rack
-# middleware to ensure our app is running properly.
-if defined?(Rack)
-  require "rack/mongoid"
-end
-
 # add english load path by default
 I18n.load_path << File.join(File.dirname(__FILE__), "config", "locales", "en.yml")
 
 module Mongoid
   extend Loggable
-  extend UnitOfWork
   extend self
 
-  MONGODB_VERSION = "2.0.0"
+  MONGODB_VERSION = "2.2.0"
 
   # Sets the Mongoid configuration options. Best used by passing a block.
   #
   # @example Set up configuration options.
   #   Mongoid.configure do |config|
-  #     config.allow_dynamic_fields = false
-  #     config.use(name: "mongoid_test", host: "localhost", port: 27017)
+  #     config.connect_to("mongoid_test")
   #   end
   #
   # @return [ Config ] The configuration object.
@@ -160,7 +96,5 @@ module Mongoid
   #   Mongoid.database = Mongo::Connection.new.db("test")
   #
   # @since 1.0.0
-  delegate(*(Config.public_instance_methods(false) +
-    ActiveModel::Observing::ClassMethods.public_instance_methods(false) - [:logger=, :logger] <<
-    { to: Config }))
+  delegate(*(Config.public_instance_methods(false) - [ :logger=, :logger ] << { to: Config }))
 end

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

@@ -11,35 +11,60 @@ 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)
-        # max_retries: 30
+        # failure. (default: The number of nodes in the cluster)
+        # max_retries: 20
 
         # The time in seconds that Moped should wait before retrying an
-        # operation on failure. (default: 1)
-        # 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
+        # operation on failure. (default: 0.25)
+        # retry_interval: 0.25
+        
+        # The connection pool size per-node.  This should match or exceed the
+        # number of threads for a multi-threaded application. (default: 5)
+        # pool_size: 5
+        
+        # The time in seconds that Moped should wait for the pool to provide
+        # an available connection.  This number should probably remain at the 
+        # default, unless for some reason you absolutely need to limit the
+        # pool_size, as this wait is only used when the pool is saturated.
+        # (default: 0.5)
+        # pool_timeout: 0.5
+
+        # The time in seconds before Moped will timeout connection and node
+        # operations. (default: 5)
+        # timeout: 5
+        
+        # The amount of time in seconds between forced refreshes of node 
+        # information including the discovery of new peers. (default: 300)
+        # refresh_interval: 300
+        
+        # The amount of time in seconds that a node will be flagged as down.
+        # (default: 30) 
+        # down_interval: 30
+        
+        # Whether connections should use SSL. (default: nil/false)
+        # ssl: false
+        
+        # Whether Moped will use the existing seeds/nodes to find other peers.
+        # (default: true)
+        # auto_discover: true
 
-    # Enable the identity map, needed for eager loading. (default: false)
-    # identity_map_enabled: false
 
+  # Configure Mongoid specific options. (optional)
+  options:
     # Includes the root model name in json serialization. (default: false)
     # include_root_in_json: false
 
-    # Include the _type field in serializaion. (default: false)
+    # Include the _type field in serialization. (default: false)
     # include_type_for_serialization: false
 
     # Preload all models in development, needed when models use
@@ -57,11 +82,7 @@ development:
     # existing method. (default: false)
     # scope_overwrite_exception: false
 
-    # Skip the database version check, used when connecting to a db without
-    # 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 +94,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

@@ -3,98 +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("app/models/**/*.rb")
-    #
-    # @param [ Array<String> ] globs The file matching globs.
-    #
-    # @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?
-          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}")
-          end
-          model
-        else
-          logger.info("MONGOID: Index ignored on: #{model}, please define in the root model.")
-          nil
-        end
-      end.compact
-    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.
-    #
-    # @return [ Array<Class> ] The un-indexed models.
-    #
-    def remove_indexes(*globs)
-      models(*globs).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
-
-    # 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.
@@ -144,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/lib/support/ruby_version.rb

@@ -19,7 +19,7 @@ end
 if invalid_version?
   message = %{
 Mongoid requires MRI version 1.9.3+ or JRuby 1.6.0+ running in 1.9 mode.
-You're current Ruby version is defined as #{RUBY_VERSION}. Please see:
+Your current Ruby version is defined as #{RUBY_VERSION}. Please see:
 http://mongoid.org/en/mongoid/docs/tips.html#ruby for details.
   }
   raise_version_error(message)

data/spec/app/models/account.rb

@@ -1,13 +1,13 @@
 class Account
   include Mongoid::Document
 
-  field :_id, type: String, default: ->{ name.try(:parameterize) }
+  field :_id, type: String, overwrite: true, default: ->{ name.try(:parameterize) }
 
   field :number, type: String
   field :balance, type: String
   field :nickname, type: String
   field :name, type: String
-  field :balanced, type: Boolean, default: ->{ balance? ? true : false }
+  field :balanced, type: Mongoid::Boolean, default: ->{ balance? ? true : false }
 
   field :overridden, type: String
 
@@ -18,10 +18,6 @@ class Account
   has_and_belongs_to_many :agents
   has_one :comment, validate: false
 
-  attr_accessible :nickname, as: [ :default, :admin ]
-  attr_accessible :name, as: [ :default, :admin ]
-  attr_accessible :balance, as: :default
-
   validates_presence_of :name
   validates_presence_of :nickname, on: :upsert
   validates_length_of :name, maximum: 10, on: :create

data/spec/app/models/acolyte.rb

@@ -1,12 +1,13 @@
 class Acolyte
   include Mongoid::Document
+  include Mongoid::Attributes::Dynamic
   field :status
   field :name
 
   embeds_many :versions, as: :memorable
   belongs_to :church
 
-  default_scope asc(:name)
+  default_scope ->{ asc(:name) }
   scope :active, ->{ where(status: "active") }
   scope :named, ->{ where(:name.exists => true) }
 

data/spec/app/models/actor.rb

@@ -7,7 +7,6 @@ class Actor
   accepts_nested_attributes_for :things, allow_destroy: true
 
   define_model_callbacks :custom
-  observable :custom
 
   def do_something
     run_callbacks(:custom) do

data/spec/app/models/address.rb

@@ -1,21 +1,26 @@
 class Address
   include Mongoid::Document
 
-  field :_id, type: String, default: ->{ street.try(:parameterize) }
+  field :_id, type: String, overwrite: true, default: ->{ street.try(:parameterize) }
 
   attr_accessor :mode
 
   field :address_type
   field :number, type: Integer
+  field :no, type: Integer
+  field :h, as: :house, type: Integer
   field :street
   field :city
   field :state
   field :post_code
   field :parent_title
   field :services, type: Array
+  field :aliases, as: :a, type: Array
+  field :test, type: Array
   field :latlng, type: Array
   field :map, type: Hash
   field :move_in, type: DateTime
+  field :end_date, type: Date
   field :s, type: String, as: :suite
   field :name, localize: true
 
@@ -38,8 +43,8 @@ class Address
   belongs_to :account
   belongs_to :band
 
-  scope :without_postcode, where(postcode: nil)
-  scope :rodeo, where(street: "Rodeo Dr") do
+  scope :without_postcode, ->{ where(postcode: nil) }
+  scope :rodeo, ->{ where(street: "Rodeo Dr") } do
     def mansion?
       all? { |address| address.street == "Rodeo Dr" }
     end

data/spec/app/models/animal.rb

@@ -1,7 +1,7 @@
 class Animal
   include Mongoid::Document
 
-  field :_id, type: String, default: ->{ name.try(:parameterize) }
+  field :_id, type: String, overwrite: true, default: ->{ name.try(:parameterize) }
 
   field :name
   field :height, type: Integer

data/spec/app/models/appointment.rb

@@ -1,7 +1,7 @@
 class Appointment
   include Mongoid::Document
-  field :active, type: Boolean, default: true
-  field :timed, type: Boolean, default: true
+  field :active, type: Mongoid::Boolean, default: true
+  field :timed, type: Mongoid::Boolean, default: true
   embedded_in :person
-  default_scope where(active: true)
+  default_scope ->{ where(active: true) }
 end

data/spec/app/models/article.rb

@@ -2,12 +2,9 @@ class Article
   include Mongoid::Document
 
   field :title, type: String
-  field :is_rss, type: Boolean, default: false
+  field :is_rss, type: Mongoid::Boolean, default: false
   field :user_login, type: String
 
-  attr_accessible :title, as: [:default, :parser]
-  attr_accessible :is_rss, as: :parser
-  attr_accessible :user_login
   has_and_belongs_to_many :tags, validate: false
   has_and_belongs_to_many :preferences, inverse_of: nil, validate: false
 end

data/spec/app/models/audio.rb

@@ -0,0 +1,5 @@
+class Audio
+  include Mongoid::Document
+  field :likes, type: Integer
+  default_scope ->{ where(:likes.gt => 100) }
+end

data/spec/app/models/author.rb

@@ -1,6 +1,4 @@
 class Author
   include Mongoid::Document
   field :name, type: String
-
-  belongs_to :paranoid_post
 end

data/spec/app/models/band.rb

@@ -1,7 +1,8 @@
 class Band
   include Mongoid::Document
+  include Mongoid::Attributes::Dynamic
   field :name, type: String
-  field :active, type: Boolean, default: true
+  field :active, type: Mongoid::Boolean, default: true
   field :origin, type: String
   field :genres, type: Array
   field :member_count, type: Integer
@@ -9,7 +10,7 @@ class Band
   field :likes, type: Integer
   field :views, type: Integer
   field :rating, type: Float
-  field :upserted, type: Boolean, default: false
+  field :upserted, type: Mongoid::Boolean, default: false
   field :created, type: DateTime
   field :sales, type: BigDecimal
   field :y, as: :years, type: Integer

data/spec/app/models/bar.rb

@@ -1,5 +1,6 @@
 class Bar
   include Mongoid::Document
+  include Mongoid::Attributes::Dynamic
   field :name, type: String
   field :location, type: Array
   field :lat_lng, type: LatLng

data/spec/app/models/book.rb

@@ -1,5 +1,6 @@
 class Book
   include Mongoid::Document
+  include Mongoid::Attributes::Dynamic
   field :title, type: String
   field :chapters, type: Integer
   belongs_to :series

data/spec/app/models/building.rb

@@ -1,7 +1,5 @@
 class Building
   include Mongoid::Document
-  attr_accessible
-  attr_accessible :building_address, :contractors, as: :admin
   embeds_one :building_address
   embeds_many :contractors
 end

data/spec/app/models/building_address.rb

@@ -1,7 +1,5 @@
 class BuildingAddress
   include Mongoid::Document
-  attr_accessible
-  attr_accessible :city, as: :admin
   embedded_in :building
   field :city, type: String
 end

data/spec/app/models/bus.rb

@@ -1,6 +1,6 @@
 class Bus
   include Mongoid::Document
-  field :saturday, type: Boolean, default: false
+  field :saturday, type: Mongoid::Boolean, default: false
   field :departure_time, type: Time
   field :number, type: Integer
   embedded_in :circuit

data/spec/app/models/canvas.rb

@@ -18,7 +18,7 @@ class Canvas
 
   class Test < Canvas
 
-    field :foo, type: String, default: ->{ "overridden" }
+    field :foo, type: String, overwrite: true, default: ->{ "overridden" }
   end
 end
 

data/spec/app/models/contextable_item.rb

@@ -0,0 +1,5 @@
+class ContextableItem
+  include Mongoid::Document
+  field :title
+  validates :title, presence: true, on: :in_context
+end