mongoid 4.0.2 → 5.0.0.beta

data/spec/spec_helper.rb

@@ -14,18 +14,17 @@ end
 require "action_controller"
 require "mongoid"
 require "rspec"
-require "helpers"
 
 # These environment variables can be set if wanting to test against a database
 # that is not on the local machine.
-ENV["MONGOID_SPEC_HOST"] ||= "localhost"
+ENV["MONGOID_SPEC_HOST"] ||= "127.0.0.1"
 ENV["MONGOID_SPEC_PORT"] ||= "27017"
 
 # These are used when creating any connection in the test suite.
 HOST = ENV["MONGOID_SPEC_HOST"]
 PORT = ENV["MONGOID_SPEC_PORT"].to_i
 
-# Moped.logger.level = Logger::DEBUG
+Mongo::Logger.logger.level = Logger::INFO
 # Mongoid.logger.level = Logger::DEBUG
 
 # When testing locally we use the database named mongoid_test. However when
@@ -40,31 +39,43 @@ def database_id_alt
   "mongoid_test_alt"
 end
 
+require 'support/authorization'
+require 'support/expectations'
+
+# Give MongoDB time to start up on the travis ci environment.
+if (ENV['CI'] == 'travis')
+  starting = true
+  client = Mongo::Client.new(['127.0.0.1:27017'])
+  while starting
+    begin
+      client.command(Mongo::Server::Monitor::STATUS)
+      break
+    rescue Mongo::Error::OperationFailure => e
+      sleep(2)
+      client.cluster.scan!
+    end
+  end
+end
+
 CONFIG = {
-  sessions: {
+  clients: {
     default: {
       database: database_id,
-      hosts: [ "#{HOST}:#{PORT}" ]
+      hosts: [ "#{HOST}:#{PORT}" ],
+      options: {
+        server_selection_timeout: 0.5,
+        max_pool_size: 1,
+        heartbeat_frequency: 180,
+        user: MONGOID_ROOT_USER.name,
+        password: MONGOID_ROOT_USER.password,
+        auth_source: Mongo::Database::ADMIN
+      }
     }
   }
 }
 
-# Can we connect to MongoHQ from this box?
-def mongohq_connectable?
-  ENV["MONGOHQ_REPL_PASS"].present?
-end
-
-def purge_database_alt!
-  session = Mongoid::Sessions.default
-  session.use(database_id_alt)
-  session.collections.each do |collection|
-    collection.drop
-  end
-end
-
-def mongodb_version
-  session = Mongoid::Sessions.default
-  session.command(buildinfo: 1)["version"]
+def non_legacy_server?
+  Mongoid::Clients.default.cluster.servers.first.features.write_command_enabled?
 end
 
 # Set the database that the spec suite connects to.
@@ -96,16 +107,22 @@ end
 I18n.config.enforce_available_locales = false
 
 RSpec.configure do |config|
-  config.include Mongoid::SpecHelpers
   config.raise_errors_for_deprecations!
+  config.include(Mongoid::Expectations)
+
+  config.before(:suite) do
+    client = Mongo::Client.new(["#{HOST}:#{PORT}"])
+    begin
+      # Create the root user administrator as the first user to be added to the
+      # database. This user will need to be authenticated in order to add any
+      # more users to any other databases.
+      client.database.users.create(MONGOID_ROOT_USER)
+    rescue Exception => e
+    end
+  end
 
   # Drop all collections and clear the identity map before each spec.
   config.before(:each) do
     Mongoid.purge!
   end
-
-  # Filter out MongoHQ specs if we can't connect to it.
-  config.filter_run_excluding(config: ->(value){
-    return true if value == :mongohq && !mongohq_connectable?
-  })
 end

data/spec/support/authorization.rb

@@ -0,0 +1,12 @@
+# Set up a root user so we can set up authentication on a database level.
+MONGOID_ROOT_USER = Mongo::Auth::User.new(
+  database: Mongo::Database::ADMIN,
+  user: 'mongoid-user',
+  password: 'password',
+  roles: [
+    Mongo::Auth::Roles::USER_ADMIN_ANY_DATABASE,
+    Mongo::Auth::Roles::DATABASE_ADMIN_ANY_DATABASE,
+    Mongo::Auth::Roles::READ_WRITE_ANY_DATABASE,
+    Mongo::Auth::Roles::HOST_MANAGER
+  ]
+)

data/spec/support/expectations.rb

@@ -0,0 +1,14 @@
+module Mongoid
+  module Expectations
+
+    def expect_query(number)
+      # There are both start and complete events for each query.
+      expect(Mongo::Logger.logger).to receive(:debug?).exactly(number * 2).times.and_call_original
+      yield
+    end
+
+    def expect_no_queries(&block)
+      expect_query(0, &block)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongoid
 version: !ruby/object:Gem::Version
-  version: 4.0.2
+  version: 5.0.0.beta
 platform: ruby
 authors:
 - Durran Jordan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-19 00:00:00.000000000 Z
+date: 2015-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -39,19 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.3.37
 - !ruby/object:Gem::Dependency
-  name: moped
+  name: mongo
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.1.0.beta
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.1.0.beta
 - !ruby/object:Gem::Dependency
   name: origin
   requirement: !ruby/object:Gem::Requirement
@@ -93,29 +93,33 @@ files:
 - lib/mongoid/attributes/processing.rb
 - lib/mongoid/attributes/readonly.rb
 - lib/mongoid/changeable.rb
+- lib/mongoid/clients.rb
+- lib/mongoid/clients/factory.rb
+- lib/mongoid/clients/options.rb
+- lib/mongoid/clients/storage_options.rb
+- lib/mongoid/clients/thread_options.rb
+- lib/mongoid/clients/validators.rb
+- lib/mongoid/clients/validators/storage.rb
 - lib/mongoid/composable.rb
 - lib/mongoid/config.rb
 - lib/mongoid/config/environment.rb
 - lib/mongoid/config/options.rb
 - lib/mongoid/config/validators.rb
+- lib/mongoid/config/validators/client.rb
 - lib/mongoid/config/validators/option.rb
-- lib/mongoid/config/validators/session.rb
 - lib/mongoid/contextual.rb
 - lib/mongoid/contextual/aggregable/memory.rb
 - lib/mongoid/contextual/aggregable/mongo.rb
 - lib/mongoid/contextual/atomic.rb
 - lib/mongoid/contextual/command.rb
-- lib/mongoid/contextual/find_and_modify.rb
 - lib/mongoid/contextual/geo_near.rb
 - lib/mongoid/contextual/map_reduce.rb
 - lib/mongoid/contextual/memory.rb
 - lib/mongoid/contextual/mongo.rb
 - lib/mongoid/contextual/none.rb
 - lib/mongoid/contextual/queryable.rb
-- lib/mongoid/contextual/text_search.rb
 - lib/mongoid/copyable.rb
 - lib/mongoid/criteria.rb
-- lib/mongoid/criteria/#findable.rb#
 - lib/mongoid/criteria/findable.rb
 - lib/mongoid/criteria/inspectable.rb
 - lib/mongoid/criteria/marshalable.rb
@@ -147,19 +151,19 @@ files:
 - lib/mongoid/errors/invalid_time.rb
 - lib/mongoid/errors/invalid_value.rb
 - lib/mongoid/errors/inverse_not_found.rb
+- lib/mongoid/errors/mixed_client_configuration.rb
 - lib/mongoid/errors/mixed_relations.rb
-- lib/mongoid/errors/mixed_session_configuration.rb
 - lib/mongoid/errors/mongoid_error.rb
 - lib/mongoid/errors/nested_attributes_metadata_not_found.rb
-- lib/mongoid/errors/no_default_session.rb
+- lib/mongoid/errors/no_client_config.rb
+- lib/mongoid/errors/no_client_database.rb
+- lib/mongoid/errors/no_client_hosts.rb
+- lib/mongoid/errors/no_clients_config.rb
+- lib/mongoid/errors/no_default_client.rb
 - lib/mongoid/errors/no_environment.rb
 - lib/mongoid/errors/no_map_reduce_output.rb
 - lib/mongoid/errors/no_metadata.rb
 - lib/mongoid/errors/no_parent.rb
-- lib/mongoid/errors/no_session_config.rb
-- lib/mongoid/errors/no_session_database.rb
-- lib/mongoid/errors/no_session_hosts.rb
-- lib/mongoid/errors/no_sessions_config.rb
 - lib/mongoid/errors/readonly_attribute.rb
 - lib/mongoid/errors/readonly_document.rb
 - lib/mongoid/errors/scope_overwrite.rb
@@ -204,7 +208,6 @@ files:
 - lib/mongoid/indexable/validators/options.rb
 - lib/mongoid/inspectable.rb
 - lib/mongoid/interceptable.rb
-- lib/mongoid/log_subscriber.rb
 - lib/mongoid/loggable.rb
 - lib/mongoid/matchable.rb
 - lib/mongoid/matchable/all.rb
@@ -235,7 +238,6 @@ files:
 - lib/mongoid/persistable/unsettable.rb
 - lib/mongoid/persistable/updatable.rb
 - lib/mongoid/persistable/upsertable.rb
-- lib/mongoid/positional.rb
 - lib/mongoid/query_cache.rb
 - lib/mongoid/railtie.rb
 - lib/mongoid/railties/database.rake
@@ -304,17 +306,8 @@ files:
 - lib/mongoid/scopable.rb
 - lib/mongoid/selectable.rb
 - lib/mongoid/serializable.rb
-- lib/mongoid/sessions.rb
-- lib/mongoid/sessions/factory.rb
-- lib/mongoid/sessions/mongo_uri.rb
-- lib/mongoid/sessions/options.rb
-- lib/mongoid/sessions/storage_options.rb
-- lib/mongoid/sessions/thread_options.rb
-- lib/mongoid/sessions/validators.rb
-- lib/mongoid/sessions/validators/storage.rb
 - lib/mongoid/shardable.rb
 - lib/mongoid/stateful.rb
-- lib/mongoid/support/query_counter.rb
 - lib/mongoid/tasks/database.rake
 - lib/mongoid/tasks/database.rb
 - lib/mongoid/threaded.rb
@@ -390,6 +383,7 @@ files:
 - spec/app/models/circus.rb
 - spec/app/models/code.rb
 - spec/app/models/comment.rb
+- spec/app/models/company.rb
 - spec/app/models/contextable_item.rb
 - spec/app/models/contractor.rb
 - spec/app/models/cookie.rb
@@ -484,6 +478,7 @@ files:
 - spec/app/models/product.rb
 - spec/app/models/profile.rb
 - spec/app/models/pronunciation.rb
+- spec/app/models/pub.rb
 - spec/app/models/purchase.rb
 - spec/app/models/question.rb
 - spec/app/models/quiz.rb
@@ -509,6 +504,9 @@ files:
 - spec/app/models/song.rb
 - spec/app/models/sound.rb
 - spec/app/models/square.rb
+- spec/app/models/staff.rb
+- spec/app/models/store_as_dup_test1.rb
+- spec/app/models/store_as_dup_test2.rb
 - spec/app/models/strategy.rb
 - spec/app/models/sub_item.rb
 - spec/app/models/subscription.rb
@@ -539,8 +537,6 @@ files:
 - spec/app/models/word_origin.rb
 - spec/app/models/writer.rb
 - spec/config/mongoid.yml
-- spec/helpers.rb
-- spec/mongoid/#atomic_spec.rb#
 - spec/mongoid/atomic/modifiers_spec.rb
 - spec/mongoid/atomic/paths/embedded/many_spec.rb
 - spec/mongoid/atomic/paths/embedded/one_spec.rb
@@ -551,6 +547,9 @@ files:
 - spec/mongoid/attributes/readonly_spec.rb
 - spec/mongoid/attributes_spec.rb
 - spec/mongoid/changeable_spec.rb
+- spec/mongoid/clients/factory_spec.rb
+- spec/mongoid/clients/options_spec.rb
+- spec/mongoid/clients_spec.rb
 - spec/mongoid/composable_spec.rb
 - spec/mongoid/config/environment_spec.rb
 - spec/mongoid/config/options_spec.rb
@@ -558,13 +557,11 @@ files:
 - spec/mongoid/contextual/aggregable/memory_spec.rb
 - spec/mongoid/contextual/aggregable/mongo_spec.rb
 - spec/mongoid/contextual/atomic_spec.rb
-- spec/mongoid/contextual/find_and_modify_spec.rb
 - spec/mongoid/contextual/geo_near_spec.rb
 - spec/mongoid/contextual/map_reduce_spec.rb
 - spec/mongoid/contextual/memory_spec.rb
 - spec/mongoid/contextual/mongo_spec.rb
 - spec/mongoid/contextual/none_spec.rb
-- spec/mongoid/contextual/text_search_spec.rb
 - spec/mongoid/copyable_spec.rb
 - spec/mongoid/criteria/findable_spec.rb
 - spec/mongoid/criteria/inspectable_spec.rb
@@ -594,18 +591,18 @@ files:
 - spec/mongoid/errors/invalid_storage_options_spec.rb
 - spec/mongoid/errors/invalid_time_spec.rb
 - spec/mongoid/errors/inverse_not_found_spec.rb
+- spec/mongoid/errors/mixed_client_configuration_spec.rb
 - spec/mongoid/errors/mixed_relations_spec.rb
-- spec/mongoid/errors/mixed_session_configuration_spec.rb
 - spec/mongoid/errors/mongoid_error_spec.rb
 - spec/mongoid/errors/nested_attributes_metadata_not_found_spec.rb
+- spec/mongoid/errors/no_client_config_spec.rb
+- spec/mongoid/errors/no_client_database_spec.rb
+- spec/mongoid/errors/no_client_hosts_spec.rb
+- spec/mongoid/errors/no_clients_config_spec.rb
 - spec/mongoid/errors/no_environment_spec.rb
 - spec/mongoid/errors/no_map_reduce_output_spec.rb
 - spec/mongoid/errors/no_metadata_spec.rb
 - spec/mongoid/errors/no_parent_spec.rb
-- spec/mongoid/errors/no_session_config_spec.rb
-- spec/mongoid/errors/no_session_database_spec.rb
-- spec/mongoid/errors/no_session_hosts_spec.rb
-- spec/mongoid/errors/no_sessions_config_spec.rb
 - spec/mongoid/errors/readonly_attribute_spec.rb
 - spec/mongoid/errors/readonly_document_spec.rb
 - spec/mongoid/errors/scope_overwrite_spec.rb
@@ -649,7 +646,6 @@ files:
 - spec/mongoid/indexable_spec.rb
 - spec/mongoid/inspectable_spec.rb
 - spec/mongoid/interceptable_spec.rb
-- spec/mongoid/log_subscriber_spec.rb
 - spec/mongoid/loggable_spec.rb
 - spec/mongoid/matchable/all_spec.rb
 - spec/mongoid/matchable/and_spec.rb
@@ -680,7 +676,6 @@ files:
 - spec/mongoid/persistable/updatable_spec.rb
 - spec/mongoid/persistable/upsertable_spec.rb
 - spec/mongoid/persistable_spec.rb
-- spec/mongoid/positional_spec.rb
 - spec/mongoid/query_cache_spec.rb
 - spec/mongoid/railties/document_spec.rb
 - spec/mongoid/relations/accessors_spec.rb
@@ -738,10 +733,6 @@ files:
 - spec/mongoid/scopable_spec.rb
 - spec/mongoid/selectable_spec.rb
 - spec/mongoid/serializable_spec.rb
-- spec/mongoid/sessions/factory_spec.rb
-- spec/mongoid/sessions/mongo_uri_spec.rb
-- spec/mongoid/sessions/options_spec.rb
-- spec/mongoid/sessions_spec.rb
 - spec/mongoid/shardable_spec.rb
 - spec/mongoid/stateful_spec.rb
 - spec/mongoid/tasks/database_rake_spec.rb
@@ -764,6 +755,8 @@ files:
 - spec/mongoid_spec.rb
 - spec/rails/mongoid_spec.rb
 - spec/spec_helper.rb
+- spec/support/authorization.rb
+- spec/support/expectations.rb
 homepage: http://mongoid.org
 licenses:
 - MIT
@@ -784,7 +777,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: mongoid
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Elegant Persistance in Ruby for MongoDB.
@@ -835,6 +828,7 @@ test_files:
 - spec/app/models/circus.rb
 - spec/app/models/code.rb
 - spec/app/models/comment.rb
+- spec/app/models/company.rb
 - spec/app/models/contextable_item.rb
 - spec/app/models/contractor.rb
 - spec/app/models/cookie.rb
@@ -929,6 +923,7 @@ test_files:
 - spec/app/models/product.rb
 - spec/app/models/profile.rb
 - spec/app/models/pronunciation.rb
+- spec/app/models/pub.rb
 - spec/app/models/purchase.rb
 - spec/app/models/question.rb
 - spec/app/models/quiz.rb
@@ -954,6 +949,9 @@ test_files:
 - spec/app/models/song.rb
 - spec/app/models/sound.rb
 - spec/app/models/square.rb
+- spec/app/models/staff.rb
+- spec/app/models/store_as_dup_test1.rb
+- spec/app/models/store_as_dup_test2.rb
 - spec/app/models/strategy.rb
 - spec/app/models/sub_item.rb
 - spec/app/models/subscription.rb
@@ -984,8 +982,6 @@ test_files:
 - spec/app/models/word_origin.rb
 - spec/app/models/writer.rb
 - spec/config/mongoid.yml
-- spec/helpers.rb
-- spec/mongoid/#atomic_spec.rb#
 - spec/mongoid/atomic/modifiers_spec.rb
 - spec/mongoid/atomic/paths/embedded/many_spec.rb
 - spec/mongoid/atomic/paths/embedded/one_spec.rb
@@ -996,6 +992,9 @@ test_files:
 - spec/mongoid/attributes/readonly_spec.rb
 - spec/mongoid/attributes_spec.rb
 - spec/mongoid/changeable_spec.rb
+- spec/mongoid/clients/factory_spec.rb
+- spec/mongoid/clients/options_spec.rb
+- spec/mongoid/clients_spec.rb
 - spec/mongoid/composable_spec.rb
 - spec/mongoid/config/environment_spec.rb
 - spec/mongoid/config/options_spec.rb
@@ -1003,13 +1002,11 @@ test_files:
 - spec/mongoid/contextual/aggregable/memory_spec.rb
 - spec/mongoid/contextual/aggregable/mongo_spec.rb
 - spec/mongoid/contextual/atomic_spec.rb
-- spec/mongoid/contextual/find_and_modify_spec.rb
 - spec/mongoid/contextual/geo_near_spec.rb
 - spec/mongoid/contextual/map_reduce_spec.rb
 - spec/mongoid/contextual/memory_spec.rb
 - spec/mongoid/contextual/mongo_spec.rb
 - spec/mongoid/contextual/none_spec.rb
-- spec/mongoid/contextual/text_search_spec.rb
 - spec/mongoid/copyable_spec.rb
 - spec/mongoid/criteria/findable_spec.rb
 - spec/mongoid/criteria/inspectable_spec.rb
@@ -1039,18 +1036,18 @@ test_files:
 - spec/mongoid/errors/invalid_storage_options_spec.rb
 - spec/mongoid/errors/invalid_time_spec.rb
 - spec/mongoid/errors/inverse_not_found_spec.rb
+- spec/mongoid/errors/mixed_client_configuration_spec.rb
 - spec/mongoid/errors/mixed_relations_spec.rb
-- spec/mongoid/errors/mixed_session_configuration_spec.rb
 - spec/mongoid/errors/mongoid_error_spec.rb
 - spec/mongoid/errors/nested_attributes_metadata_not_found_spec.rb
+- spec/mongoid/errors/no_client_config_spec.rb
+- spec/mongoid/errors/no_client_database_spec.rb
+- spec/mongoid/errors/no_client_hosts_spec.rb
+- spec/mongoid/errors/no_clients_config_spec.rb
 - spec/mongoid/errors/no_environment_spec.rb
 - spec/mongoid/errors/no_map_reduce_output_spec.rb
 - spec/mongoid/errors/no_metadata_spec.rb
 - spec/mongoid/errors/no_parent_spec.rb
-- spec/mongoid/errors/no_session_config_spec.rb
-- spec/mongoid/errors/no_session_database_spec.rb
-- spec/mongoid/errors/no_session_hosts_spec.rb
-- spec/mongoid/errors/no_sessions_config_spec.rb
 - spec/mongoid/errors/readonly_attribute_spec.rb
 - spec/mongoid/errors/readonly_document_spec.rb
 - spec/mongoid/errors/scope_overwrite_spec.rb
@@ -1094,7 +1091,6 @@ test_files:
 - spec/mongoid/indexable_spec.rb
 - spec/mongoid/inspectable_spec.rb
 - spec/mongoid/interceptable_spec.rb
-- spec/mongoid/log_subscriber_spec.rb
 - spec/mongoid/loggable_spec.rb
 - spec/mongoid/matchable/all_spec.rb
 - spec/mongoid/matchable/and_spec.rb
@@ -1125,7 +1121,6 @@ test_files:
 - spec/mongoid/persistable/updatable_spec.rb
 - spec/mongoid/persistable/upsertable_spec.rb
 - spec/mongoid/persistable_spec.rb
-- spec/mongoid/positional_spec.rb
 - spec/mongoid/query_cache_spec.rb
 - spec/mongoid/railties/document_spec.rb
 - spec/mongoid/relations/accessors_spec.rb
@@ -1183,10 +1178,6 @@ test_files:
 - spec/mongoid/scopable_spec.rb
 - spec/mongoid/selectable_spec.rb
 - spec/mongoid/serializable_spec.rb
-- spec/mongoid/sessions/factory_spec.rb
-- spec/mongoid/sessions/mongo_uri_spec.rb
-- spec/mongoid/sessions/options_spec.rb
-- spec/mongoid/sessions_spec.rb
 - spec/mongoid/shardable_spec.rb
 - spec/mongoid/stateful_spec.rb
 - spec/mongoid/tasks/database_rake_spec.rb
@@ -1209,3 +1200,5 @@ test_files:
 - spec/mongoid_spec.rb
 - spec/rails/mongoid_spec.rb
 - spec/spec_helper.rb
+- spec/support/authorization.rb
+- spec/support/expectations.rb