Move to Mongoid 5 beta

Author: durran

Gemfile

@@ -6,9 +6,10 @@ gem "carrierwave"
 gem "carrierwave-mongoid", require: "carrierwave/mongoid"
 gem "decent_exposure"
 
-gem "mongoid", github: "mongoid/mongoid"
+gem "mongoid", "~> 5.0.0.beta"
 
 gem 'mimetype-fu', require: 'mimetype_fu'
+gem 'responders'
 
 group :development, :test do
   gem "fabrication"

Gemfile.lock

@@ -1,92 +1,79 @@
-GIT
-  remote: git://github.com/mongoid/mongoid.git
-  revision: 8333e67b5598252772585efb79801def49b6aa29
-  specs:
-    mongoid (5.0.0)
-      activemodel (~> 4.0)
-      mongo (~> 2.0)
-      origin (~> 2.1)
-      tzinfo (>= 0.3.37)
-
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.2.1)
-      actionpack (= 4.2.1)
-      actionview (= 4.2.1)
-      activejob (= 4.2.1)
+    actionmailer (4.2.3)
+      actionpack (= 4.2.3)
+      actionview (= 4.2.3)
+      activejob (= 4.2.3)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.1)
-      actionview (= 4.2.1)
-      activesupport (= 4.2.1)
+    actionpack (4.2.3)
+      actionview (= 4.2.3)
+      activesupport (= 4.2.3)
       rack (~> 1.6)
       rack-test (~> 0.6.2)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.1)
-    actionview (4.2.1)
-      activesupport (= 4.2.1)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (4.2.3)
+      activesupport (= 4.2.3)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.1)
-    activejob (4.2.1)
-      activesupport (= 4.2.1)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    activejob (4.2.3)
+      activesupport (= 4.2.3)
       globalid (>= 0.3.0)
-    activemodel (4.2.1)
-      activesupport (= 4.2.1)
+    activemodel (4.2.3)
+      activesupport (= 4.2.3)
       builder (~> 3.1)
-    activerecord (4.2.1)
-      activemodel (= 4.2.1)
-      activesupport (= 4.2.1)
+    activerecord (4.2.3)
+      activemodel (= 4.2.3)
+      activesupport (= 4.2.3)
       arel (~> 6.0)
-    activesupport (4.2.1)
+    activesupport (4.2.3)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    arel (6.0.0)
-    bson (3.0.4)
+    arel (6.0.2)
+    bson (3.1.2)
     builder (3.2.2)
     carrierwave (0.10.0)
       activemodel (>= 3.2.0)
       activesupport (>= 3.2.0)
       json (>= 1.7)
       mime-types (>= 1.16)
-    carrierwave-mongoid (0.1.0)
-      carrierwave
-      mongoid
-    celluloid (0.16.0)
-      timers (~> 4.0.0)
+    carrierwave-mongoid (0.7.1)
+      carrierwave (>= 0.8.0, < 0.11.0)
+      mongoid (>= 3.0, < 5.0)
+      mongoid-grid_fs (>= 1.3, < 3.0)
     coderay (1.1.0)
     decent_exposure (2.3.2)
     diff-lcs (1.2.5)
     erubis (2.7.0)
     fabrication (2.13.2)
-    ffi (1.9.8)
+    ffi (1.9.10)
     formatador (0.2.5)
     globalid (0.3.5)
       activesupport (>= 4.1.0)
-    guard (2.12.5)
+    guard (2.12.8)
       formatador (>= 0.2.4)
-      listen (~> 2.7)
+      listen (>= 2.7, <= 4.0)
       lumberjack (~> 1.0)
       nenv (~> 0.1)
       notiffany (~> 0.0)
       pry (>= 0.9.12)
       shellany (~> 0.0)
       thor (>= 0.18.1)
     guard-compat (1.2.1)
-    guard-rspec (4.5.2)
+    guard-rspec (4.6.2)
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    hitimes (1.2.2)
     i18n (0.7.0)
     json (1.8.3)
-    listen (2.10.0)
-      celluloid (~> 0.16.0)
+    listen (3.0.2)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
     loofah (2.0.2)
@@ -99,8 +86,16 @@ GEM
     mimetype-fu (0.1.2)
     mini_portile (0.6.2)
     minitest (5.7.0)
-    mongo (2.0.4)
+    mongo (2.1.0.beta)
       bson (~> 3.0)
+    mongoid (5.0.0.beta)
+      activemodel (~> 4.0)
+      mongo (= 2.1.0.beta)
+      origin (~> 2.1)
+      tzinfo (>= 0.3.37)
+    mongoid-grid_fs (2.1.0)
+      mime-types (>= 1.0, < 3.0)
+      mongoid (>= 3.0, < 5.0)
     nenv (0.2.0)
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
@@ -112,19 +107,19 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    rack (1.6.1)
+    rack (1.6.4)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.2.1)
-      actionmailer (= 4.2.1)
-      actionpack (= 4.2.1)
-      actionview (= 4.2.1)
-      activejob (= 4.2.1)
-      activemodel (= 4.2.1)
-      activerecord (= 4.2.1)
-      activesupport (= 4.2.1)
+    rails (4.2.3)
+      actionmailer (= 4.2.3)
+      actionpack (= 4.2.3)
+      actionview (= 4.2.3)
+      activejob (= 4.2.3)
+      activemodel (= 4.2.3)
+      activerecord (= 4.2.3)
+      activesupport (= 4.2.3)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.1)
+      railties (= 4.2.3)
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
@@ -134,48 +129,48 @@ GEM
       rails-deprecated_sanitizer (>= 1.0.1)
     rails-html-sanitizer (1.0.2)
       loofah (~> 2.0)
-    railties (4.2.1)
-      actionpack (= 4.2.1)
-      activesupport (= 4.2.1)
+    railties (4.2.3)
+      actionpack (= 4.2.3)
+      activesupport (= 4.2.3)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.4.2)
     rb-fsevent (0.9.5)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
-    rspec (3.2.0)
-      rspec-core (~> 3.2.0)
-      rspec-expectations (~> 3.2.0)
-      rspec-mocks (~> 3.2.0)
-    rspec-core (3.2.3)
-      rspec-support (~> 3.2.0)
-    rspec-expectations (3.2.1)
+    responders (2.1.0)
+      railties (>= 4.2.0, < 5)
+    rspec (3.3.0)
+      rspec-core (~> 3.3.0)
+      rspec-expectations (~> 3.3.0)
+      rspec-mocks (~> 3.3.0)
+    rspec-core (3.3.2)
+      rspec-support (~> 3.3.0)
+    rspec-expectations (3.3.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.2.0)
-    rspec-mocks (3.2.1)
+      rspec-support (~> 3.3.0)
+    rspec-mocks (3.3.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.2.0)
-    rspec-rails (3.2.2)
+      rspec-support (~> 3.3.0)
+    rspec-rails (3.3.3)
       actionpack (>= 3.0, < 4.3)
       activesupport (>= 3.0, < 4.3)
       railties (>= 3.0, < 4.3)
-      rspec-core (~> 3.2.0)
-      rspec-expectations (~> 3.2.0)
-      rspec-mocks (~> 3.2.0)
-      rspec-support (~> 3.2.0)
-    rspec-support (3.2.2)
+      rspec-core (~> 3.3.0)
+      rspec-expectations (~> 3.3.0)
+      rspec-mocks (~> 3.3.0)
+      rspec-support (~> 3.3.0)
+    rspec-support (3.3.0)
     shellany (0.0.1)
     slop (3.6.0)
     sprockets (3.2.0)
       rack (~> 1.0)
-    sprockets-rails (2.3.1)
+    sprockets-rails (2.3.2)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
     thor (0.19.1)
     thread_safe (0.3.5)
-    timers (4.0.1)
-      hitimes
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
 
@@ -190,6 +185,7 @@ DEPENDENCIES
   guard-rspec
   jruby-openssl
   mimetype-fu
-  mongoid!
+  mongoid (~> 5.0.0.beta)
   rails (~> 4.2)
+  responders
   rspec-rails

app/models/reference/role.rb

@@ -34,7 +34,7 @@ class Role
       #   Reference::Role.visitors
       #
       # @return [ Array<Reference::Role> ] The matching roles.
-      scope "#{name}s", where(name: name)
+      scope "#{name}s", ->{ where(name: name) }
 
       # Since there is only one of each role, this provides a convenience for
       # getting the only role for the provided name.

app/models/user.rb

@@ -69,7 +69,7 @@ class User
     #   User.subscribers
     #
     # @return [ Array<User> ] The matching users.
-    scope "#{name}s", where("role.name" => name.to_s)
+    scope "#{name}s", ->{ where("role.name" => name.to_s) }
   end
 
   # Does the user have the ability to perform the supplied action?

app/workers/mongoid_worker.rb

@@ -22,10 +22,10 @@ development:
         #   mode: :secondary_preferred
 
         # The name of the user for authentication.
-        # user: 'user'
+        user: echo-user
 
         # The password of the user for authentication.
-        # password: 'password'
+        password: password
 
         # The user's database roles.
         # roles:
@@ -37,7 +37,7 @@ development:
         # auth_mech: :scram
 
         # The database or source to authenticate the user against. (default: admin)
-        # auth_source: admin
+        auth_source: admin
 
         # Force a the driver cluster to behave in a certain manner instead of auto-
         # discovering. Can be one of: :direct, :replica_set, :sharded. Set to :direct
@@ -108,7 +108,7 @@ development:
 
     # Preload all models in development, needed when models use
     # inheritance. (default: false)
-    # preload_models: false
+    preload_models: true
 
     # Raise an error when performing a #find and the document is not found.
     # (default: true)
@@ -131,5 +131,8 @@ test:
         - localhost:27017
       options:
         read:
-          mode: primary
+          mode: :primary
         max_pool_size: 1
+        user: echo-user
+        password: password
+        auth_source: admin

config/mongoid.yml

@@ -272,7 +272,7 @@
       end
 
       it "returns true" do
-        subscribe.should be_true
+        subscribe.should be true
       end
     end
   end

spec/models/user_spec.rb

@@ -1,5 +1,4 @@
 require "rubygems"
-require "spork"
 
 ENV["RAILS_ENV"] ||= "test"
 
@@ -10,7 +9,31 @@
 # in spec/support/ and its subdirectories.
 Dir[Rails.root.join("spec/support/**/*.rb")].each{ |f| require f }
 
+ECHO_USER = Mongo::Auth::User.new(
+  database: Mongo::Database::ADMIN,
+  user: 'echo-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
+  ]
+)
+
 RSpec.configure do |config|
+
+  config.before(:suite) do
+    client = Mongo::Client.new(["127.0.0.1:27017"])
+    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(ECHO_USER)
+    rescue Exception => e
+    end
+  end
+
   # Clean up all collections before each spec runs.
   config.before do
     Mongoid.purge!