mongodb-mongo 0.1.4 → 0.2.0

data/lib/mongo/db.rb

@@ -15,6 +15,7 @@
 # ++
 
 require 'socket'
+require 'md5'
 require 'mutex_m'
 require 'mongo/collection'
 require 'mongo/message'
@@ -32,6 +33,7 @@ module XGen
         SYSTEM_NAMESPACE_COLLECTION = "system.namespaces"
         SYSTEM_INDEX_COLLECTION = "system.indexes"
         SYSTEM_PROFILE_COLLECTION = "system.profile"
+        SYSTEM_USER_COLLECTION = "system.users"
         SYSTEM_COMMAND_COLLECTION = "$cmd"
 
         # Strict mode enforces collection existence checks. When +true+,
@@ -94,7 +96,7 @@ module XGen
         # fails, it keeps trying to connect to the remaining nodes until it
         # sucessfully connects.
         def initialize(db_name, nodes, options={})
-          raise "Invalid DB name" if !db_name || (db_name && db_name.length > 0 && db_name.include?("."))
+          raise "Invalid DB name \"#{db_name}\" (must be non-nil, non-zero-length, and can not contain \".\")" if !db_name || (db_name && db_name.length > 0 && db_name.include?("."))
           @name, @nodes = db_name, nodes
           @strict = options[:strict]
           @pk_factory = options[:pk]
@@ -119,6 +121,33 @@ module XGen
           raise "error: failed to connect to any given host:port" unless @socket
         end
 
+        # Add a new user to the database.
+        def add_user(username, password)
+          coll = collection(SYSTEM_USER_COLLECTION)
+          coll.insert(:user => username, :pwd => hash_password(password))
+        end
+
+        def delete_user(username)
+          coll = collection(SYSTEM_USER_COLLECTION)
+          coll.remove(:user => username)
+        end
+
+        # Returns true if +username+ has +password+ in
+        # +SYSTEM_USER_COLLECTION+. +name+ is username, +password+ is
+        # plaintext password.
+        def authenticate(username, password)
+          doc = db_command(:getnonce => 1)
+          raise "error retrieving nonce: #{doc}" unless ok?(doc)
+          nonce = doc['nonce']
+
+          auth = OrderedHash.new
+          auth['authenticate'] = 1
+          auth['user'] = username
+          auth['nonce'] = nonce
+          auth['key'] = MD5.md5("#{nonce}#{username}#{hash_password(password)}").to_s
+          ok?(db_command(auth))
+        end
+
         # Returns an array of collection names. Each name is of the form
         # "database_name.collection_name".
         def collection_names
@@ -203,7 +232,7 @@ module XGen
         def master
           doc = db_command(:ismaster => 1)
           is_master = doc['ismaster']
-          raise "Error retrieving master database" unless ok?(doc) && is_master.kind_of?(Numeric)
+          raise "Error retrieving master database: #{doc.inspect}" unless ok?(doc) && is_master.kind_of?(Numeric)
           case is_master.to_i
           when 1
             "#@host:#@port"
@@ -393,6 +422,12 @@ module XGen
           query(Collection.new(self, SYSTEM_COMMAND_COLLECTION), q).next_object
         end
 
+        private
+
+        def hash_password(plaintext)
+          MD5.new("mongo#{plaintext}").to_s
+        end
+
       end
     end
   end

data/lib/mongo/mongo.rb

@@ -99,10 +99,10 @@ module XGen
           begin
             db = db(db_name)
             doc = db.db_command(cmd)
-            raise "error retrieving database info" unless db.ok?(doc)
+            raise "error retrieving database info: #{doc.inspect}" unless db.ok?(doc)
             doc
           ensure
-            db.close
+            db.close if db
           end
         end
 

data/lib/mongo/util/ordered_hash.rb

@@ -63,6 +63,24 @@ class OrderedHash < Hash
     str << '}'
   end
 
+  def delete(key, &block)
+    @ordered_keys.delete(key)
+    super
+  end
+
+  def delete_if(&block)
+    self.each { |k,v|
+      if yield k, v
+        delete(k)
+      end
+    }
+  end
+
+  def clear
+    super
+    @ordered_keys = []
+  end
+
   end                           # Ruby before 1.9
 
 end

data/mongo-ruby-driver.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'mongo'
-  s.version = '0.1.4'
+  s.version = '0.2.0'
   s.platform = Gem::Platform::RUBY
   s.summary = 'Simple pure-Ruby driver for the 10gen Mongo DB'
   s.description = 'A pure-Ruby driver for the 10gen Mongo DB. For more information about Mongo, see http://www.mongodb.org.'

data/tests/test_db.rb

@@ -1,4 +1,5 @@
 $LOAD_PATH[0,0] = File.join(File.dirname(__FILE__), '..', 'lib')
+require 'md5'
 require 'mongo'
 require 'test/unit'
 
@@ -18,6 +19,8 @@ class DBTest < Test::Unit::TestCase
     @host = ENV['MONGO_RUBY_DRIVER_HOST'] || 'localhost'
     @port = ENV['MONGO_RUBY_DRIVER_PORT'] || Mongo::DEFAULT_PORT
     @db = Mongo.new(@host, @port).db('ruby-mongo-test')
+    @spongebob = 'spongebob'
+    @spongebob_password = 'squarepants'
   end
 
   def teardown
@@ -82,4 +85,46 @@ class DBTest < Test::Unit::TestCase
     end
   end
 
+  def test_add_user
+    coll = @db.collection('system.users')
+    coll.clear
+    begin
+      assert_equal 0, coll.count
+      @db.add_user(@spongebob, @spongebob_password)
+      assert_equal 1, coll.count
+      doc = coll.find({}, :limit => 1).next_object
+      assert_equal @spongebob, doc['user']
+      assert_equal MD5.new("mongo#{@spongebob_password}").to_s, doc['pwd']
+    ensure
+      coll.clear
+    end
+  end
+
+  def test_delete_user
+    coll = @db.collection('system.users')
+    coll.clear
+    begin
+      assert_equal 0, coll.count
+      @db.add_user(@spongebob, @spongebob_password)
+      assert_equal 1, coll.count
+      @db.delete_user(@spongebob)
+      assert_equal 0, coll.count
+    ensure
+      coll.clear
+    end
+  end
+
+  def test_authenticate
+    coll = @db.collection('system.users')
+    coll.clear
+    begin
+      @db.add_user(@spongebob, @spongebob_password)
+      assert !@db.authenticate('nobody', 'nopassword')
+      assert !@db.authenticate(@spongebob, 'squareliederhosen')
+      assert @db.authenticate(@spongebob, @spongebob_password)
+    ensure
+      coll.clear
+    end
+  end
+
 end

data/tests/test_ordered_hash.rb

@@ -82,4 +82,21 @@ class OrderedHashTest < Test::Unit::TestCase
     assert_equal '{"c"=>1, "a"=>2, "z"=>3}', @oh.inspect
   end
 
+  def test_clear
+    @oh.clear
+    assert @oh.keys.empty?
+  end
+
+  def test_delete
+    assert @oh.keys.include?('z')
+    @oh.delete('z')
+    assert !@oh.keys.include?('z')
+  end
+
+  def test_delete_if
+    assert @oh.keys.include?('z')
+    @oh.delete_if { |k,v| k == 'z' }
+    assert !@oh.keys.include?('z')
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongodb-mongo
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors: 
 - Jim Menard