Added support for Mongoid 4.

Author: dblock

.travis.yml

@@ -6,6 +6,10 @@ rvm:
   - 2.0.0
   - 2.1.0
 
+env:
+  - MONGOID_VERSION=3
+  - MONGOID_VERSION=4
+
 language: ruby
 
 cache: bundler

CHANGELOG.md

@@ -1,6 +1,7 @@
 Next Release
 ============
 
+* [#3](https://github.com/dblock/mongoid-shell/pull/3): Added Mongoid 4.x support - [@pawelniewie](https://github.com/pawelniewie), [@dblock](https://github.com/dblock).
 * [#2](https://github.com/dblock/mongoid-shell/pull/2): Added support for `--noIndexRestore` to `Mongoid::Shell::Commands::Mongorestore` - [@macreery](https://github.com/macreery).
 * [#1](https://github.com/dblock/mongoid-shell/pull/1): Enforced compatibility with Mongoid 3.x only - [@macreery](https://github.com/macreery).
 * Fix: the `mongorestore` command requires a primary node in a replica set - [@dblock](https://github.com/dblock).

Gemfile

@@ -1,12 +1,19 @@
-source "http://rubygems.org"
-
-gem 'mongoid', '~> 3.1'
+source 'http://rubygems.org'
 
 gemspec
 
+case version = ENV['MONGOID_VERSION'] || '~> 3.1'
+when /4/
+  gem 'mongoid', github: 'mongoid/mongoid'
+when /3/
+  gem 'mongoid', '~> 3.1'
+else
+  gem 'mongoid', version
+end
+
 group :development, :test do
-  gem "rake"
-  gem "bundler"
-  gem "rspec"
-  gem "rubocop", "~> 0.16.0"
+  gem 'rake'
+  gem 'bundler'
+  gem 'rspec'
+  gem 'rubocop', '~> 0.16.0'
 end

lib/mongoid-shell.rb

@@ -3,6 +3,7 @@
 I18n.load_path << File.join(File.dirname(__FILE__), "config", "locales", "en.yml")
 
 require 'mongoid/shell/version'
+require 'mongoid/shell/mongoid'
 require 'mongoid/shell/errors'
 require 'mongoid/shell/properties'
 require 'mongoid/shell/commands'

lib/mongoid/shell/commands/base.rb

@@ -27,7 +27,7 @@ def vargs(args = {})
           args.map do |key, property|
             value = send(property)
             next unless value
-            if value.is_a? Boolean
+            if value.is_a?(Boolean) || value.is_a?(TrueClass)
               key
             else
               value = value.to_s

lib/mongoid/shell/mongoid.rb

@@ -0,0 +1,7 @@
+module Mongoid
+  module Shell
+    def self.mongoid3?
+      ::Mongoid.const_defined? :Observer # deprecated in Mongoid 4.x
+    end
+  end
+end

lib/mongoid/shell/properties/host.rb

@@ -9,7 +9,11 @@ def host
           @host || begin
             node = session.cluster.nodes.first
             raise Mongoid::Shell::Errors::SessionNotConnectedError unless node
-            node.address == "localhost:27017" ? nil : node.address
+            if Mongoid::Shell.mongoid3?
+              node.address == "localhost:27017" ? nil : node.address
+            else
+              node.address.original == "localhost:27017" ? nil : node.address.original
+            end
           end
         end
       end

lib/mongoid/shell/properties/password.rb

@@ -7,10 +7,23 @@ module Password
         # current password
         def password
           @password || begin
-            return nil unless session.context.cluster.auth && session.context.cluster.auth.first
-            session.context.cluster.auth.first[1][1]
+            if Mongoid::Shell.mongoid3?
+              return nil unless session.context.cluster.auth && session.context.cluster.auth.first
+              session.context.cluster.auth.first[1][1]
+            else
+              node = session.cluster.nodes.first
+              raise Mongoid::Shell::Errors::SessionNotConnectedError unless node
+              return nil unless node.credentials.has_key? db || node.credentials[db].empty?
+              node.credentials[db][1]
+            end
           end
         end
+
+        private
+
+        def db
+          @db || session.send(:current_database).name
+        end
       end
     end
   end

lib/mongoid/shell/properties/primary.rb

@@ -10,7 +10,11 @@ def primary
             raise Mongoid::Shell::Errors::SessionNotConnectedError unless session.cluster.nodes.any?
             node = session.cluster.nodes.find(&:primary?)
             raise Mongoid::Shell::Errors::MissingPrimaryNodeError unless node
-            node.address == "localhost:27017" ? nil : node.address
+            if Mongoid::Shell.mongoid3?
+              node.address == "localhost:27017" ? nil : node.address
+            else
+              node.address.original == "localhost:27017" ? nil : node.address.original
+            end
           end
         end
       end

lib/mongoid/shell/properties/username.rb

@@ -7,10 +7,23 @@ module Username
         # current username
         def username
           @username || begin
-            return nil unless session.context.cluster.auth && session.context.cluster.auth.first
-            session.context.cluster.auth.first[1][0]
+            if Mongoid::Shell.mongoid3?
+              return nil unless session.context.cluster.auth && session.context.cluster.auth.first
+              session.context.cluster.auth.first[1][0]
+            else
+              node = session.cluster.nodes.first
+              raise Mongoid::Shell::Errors::SessionNotConnectedError unless node
+              return nil unless node.credentials.has_key? db || node.credentials[db].empty?
+              node.credentials[db][0]
+            end
           end
         end
+
+        private
+
+        def db
+          @db || session.send(:current_database).name
+        end
       end
     end
   end

mongoid-shell.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.email = "[email protected]"
   s.platform = Gem::Platform::RUBY
   s.required_rubygems_version = '>= 1.3.6'
-  s.files = `git ls-files`.split("\n")
+  s.files = Dir['LICENSE.md', 'README.md', 'CHANGELOG.md', 'lib/**/*']
   s.require_paths = [ "lib" ]
   s.homepage = "http://github.com/dblock/mongoid-shell"
   s.licenses = [ "MIT" ]

spec/mongoid/commands/mongorestore_spec.rb

@@ -69,7 +69,7 @@
         Mongoid::Shell::Commands::Mongorestore.new(
           session: @session,
           restore: "a folder"
-        ).to_s.should == "mongorestore --host flame.mongohq.com:27017 --db mongoid --username user --password password \"a folder\""
+        ).to_s.should == "mongorestore --host something.mongohq.com:27017 --db mongoid --username user --password password \"a folder\""
       end
     end
     context "url" do

spec/support/config/mongoid.yml

@@ -1,18 +1,13 @@
-# Tell Mongoid which environment this configuration is for.
 production:
-  # This starts the session configuration settings. You may have as
-  # many sessions as you like, but you must have at least 1 named
-  # 'default'.
   sessions:
-    # Define the default session.
     default:
       database: mongoid_shell_tests
       hosts:
         - localhost:27017
     single_host:
       # A single remote server.
       hosts:
-        - flame.mongohq.com:27017
+        - something.mongohq.com:27017
       database: mongoid
       username: user
       password: password
@@ -23,11 +18,6 @@ production:
         - dedicated2.myapp.com:27017
         - dedicated3.myapp.com:27017
       database: mongoid
-      # We can set session specific options, like reads executing
-      # on secondary nodes, and defaulting the session to safe mode.
-      options:
-        consistency: :eventual
-        safe: true
       username: user
       password: password
     # This configuration shows an authenticated replica set via a uri.

spec/support/helpers/moped_session_helper.rb

@@ -1,7 +1,11 @@
 module MopedSessionHelper
   # returns a Moped session with stubbed address resolution
   def moped_session(name)
-    Moped::Node.any_instance.stub(:resolve_address).and_return(false)
+    if Mongoid::Shell.mongoid3?
+      Moped::Node.any_instance.stub(:resolve_address).and_return(false)
+    else
+      Moped::Address.any_instance.stub(:resolve).and_return(false)
+    end
     config = File.join(File.dirname(__FILE__), "../../support/config/mongoid.yml")
     Mongoid.load! config, :production
     session = Mongoid::Sessions.with_name(name)