mongodb-mongo 0.12 → 0.13

data/{tests → test}/test_db_api.rb

@@ -4,11 +4,10 @@ require 'test/unit'
 
 # NOTE: assumes Mongo is running
 class DBAPITest < Test::Unit::TestCase
-  include XGen::Mongo
-  include XGen::Mongo::Driver
+  include Mongo
 
-  @@db = Mongo.new(ENV['MONGO_RUBY_DRIVER_HOST'] || 'localhost',
-                   ENV['MONGO_RUBY_DRIVER_PORT'] || Mongo::DEFAULT_PORT).db('ruby-mongo-test')
+  @@db = Connection.new(ENV['MONGO_RUBY_DRIVER_HOST'] || 'localhost',
+                        ENV['MONGO_RUBY_DRIVER_PORT'] || Connection::DEFAULT_PORT).db('ruby-mongo-test')
   @@coll = @@db.collection('test')
 
   def setup
@@ -501,25 +500,18 @@ class DBAPITest < Test::Unit::TestCase
     cursor = @@coll.find()
     rows = cursor.to_a
 
-    # Make sure we get back exactly the same array the next time we ask
-    rows2 = cursor.to_a
-    assert_same rows, rows2
-
-    # Make sure we can still iterate after calling to_a
-    rows_with_each = cursor.collect{|row| row}
-    assert_equal rows, rows_with_each
+    assert_raise InvalidOperation do
+      cursor.to_a
+    end
 
-    # Make sure we can iterate more than once after calling to_a
+    cursor.each { |doc| fail "should be no docs in each now" }
   end
 
   def test_to_a_after_each
     cursor = @@coll.find
     cursor.each { |row| row }
-    begin
+    assert_raise InvalidOperation do
       cursor.to_a
-      fail "expected \"can't call\" error"
-    rescue => ex
-      assert_equal "can't call Cursor#to_a after calling Cursor#each", ex.to_s
     end
   end
 
@@ -536,8 +528,8 @@ class DBAPITest < Test::Unit::TestCase
     @@coll.insert('a' => 3)
 
     assert_equal 3, @@coll.count
-    assert_equal 1, @@coll.count('$where' => Code.new('this.a > 2'))
-    assert_equal 2, @@coll.count('$where' => Code.new('this.a > i', {'i' => 1}))
+    assert_equal 1, @@coll.find('$where' => Code.new('this.a > 2')).count()
+    assert_equal 2, @@coll.find('$where' => Code.new('this.a > i', {'i' => 1})).count()
   end
 
   def test_eval
@@ -554,7 +546,7 @@ class DBAPITest < Test::Unit::TestCase
     assert_equal 2, @@db.eval(Code.new("return i;", {"i" => 2}))
     assert_equal 5, @@db.eval(Code.new("i + 3;", {"i" => 2}))
 
-    assert_raise RuntimeError do
+    assert_raise OperationFailure do
       @@db.eval("5 ++ 5;")
     end
   end
@@ -600,13 +592,30 @@ class DBAPITest < Test::Unit::TestCase
     test = @@db.collection("test")
 
     assert_equal [], test.group([], {}, {"count" => 0}, "function (obj, prev) { prev.count++; }")
+    assert_equal [], test.group([], {}, {"count" => 0}, "function (obj, prev) { prev.count++; }", true)
 
     test.insert("a" => 2)
     test.insert("b" => 5)
     test.insert("a" => 1)
 
     assert_equal 3, test.group([], {}, {"count" => 0}, "function (obj, prev) { prev.count++; }")[0]["count"]
+    assert_equal 3, test.group([], {}, {"count" => 0}, "function (obj, prev) { prev.count++; }", true)[0]["count"]
     assert_equal 1, test.group([], {"a" => {"$gt" => 1}}, {"count" => 0}, "function (obj, prev) { prev.count++; }")[0]["count"]
+    assert_equal 1, test.group([], {"a" => {"$gt" => 1}}, {"count" => 0}, "function (obj, prev) { prev.count++; }", true)[0]["count"]
+
+    test.insert("a" => 2, "b" => 3)
+    expected = [{"a" => 2, "count" => 2},
+                {"a" => nil, "count" => 1},
+                {"a" => 1, "count" => 1}]
+    assert_equal expected, test.group(["a"], {}, {"count" => 0}, "function (obj, prev) { prev.count++; }")
+    assert_equal expected, test.group(["a"], {}, {"count" => 0}, "function (obj, prev) { prev.count++; }", true)
+
+    assert_raise OperationFailure do
+      test.group([], {}, {}, "5 ++ 5")
+    end
+    assert_raise OperationFailure do
+      test.group([], {}, {}, "5 ++ 5", true)
+    end
   end
 
   def test_deref
@@ -800,18 +809,4 @@ class DBAPITest < Test::Unit::TestCase
       @@db.collection("test").find({}, :snapshot => true, :sort => 'a').to_a
     end
   end
-
-# TODO this test fails with error message "Undefed Before end of object"
-# That is a database error. The undefined type may go away.
-
-#   def test_insert_undefined
-#     doc = {'undef' => Undefined.new}
-#     @@coll.clear
-#     @@coll.insert(doc)
-#     p @@db.error                 # DEBUG
-#     assert_equal 1, @@coll.count
-#     row = @@coll.find().next_object
-#     assert_not_nil row
-#   end
-
 end

data/{tests → test}/test_db_connection.rb

@@ -5,12 +5,12 @@ require 'test/unit'
 # NOTE: assumes Mongo is running
 class DBConnectionTest < Test::Unit::TestCase
 
-  include XGen::Mongo::Driver
+  include Mongo
 
   def test_no_exceptions
     host = ENV['MONGO_RUBY_DRIVER_HOST'] || 'localhost'
-    port = ENV['MONGO_RUBY_DRIVER_PORT'] || Mongo::DEFAULT_PORT
-    db = Mongo.new(host, port).db('ruby-mongo-demo')
+    port = ENV['MONGO_RUBY_DRIVER_PORT'] || Connection::DEFAULT_PORT
+    db = Connection.new(host, port).db('ruby-mongo-demo')
     coll = db.collection('test')
     coll.clear
     db.error

data/{tests → test}/test_grid_store.rb

@@ -5,11 +5,11 @@ require 'mongo/gridfs'
 
 class GridStoreTest < Test::Unit::TestCase
 
-  include XGen::Mongo::Driver
-  include XGen::Mongo::GridFS
+  include Mongo
+  include GridFS
 
-  @@db = Mongo.new(ENV['MONGO_RUBY_DRIVER_HOST'] || 'localhost',
-                   ENV['MONGO_RUBY_DRIVER_PORT'] || Mongo::DEFAULT_PORT).db('ruby-mongo-test')
+  @@db = Connection.new(ENV['MONGO_RUBY_DRIVER_HOST'] || 'localhost',
+                        ENV['MONGO_RUBY_DRIVER_PORT'] || Connection::DEFAULT_PORT).db('ruby-mongo-test')
   @@files = @@db.collection('fs.files')
   @@chunks = @@db.collection('fs.chunks')
 

data/{tests → test}/test_message.rb

@@ -4,7 +4,7 @@ require 'test/unit'
 
 class MessageTest < Test::Unit::TestCase
 
-  include XGen::Mongo::Driver
+  include Mongo
 
   def setup
     @msg = Message.new(42)

data/{tests → test}/test_objectid.rb

@@ -4,7 +4,7 @@ require 'test/unit'
 
 class ObjectIDTest < Test::Unit::TestCase
 
-  include XGen::Mongo::Driver
+  include Mongo
 
   def setup
     @t = 42
@@ -53,8 +53,8 @@ class ObjectIDTest < Test::Unit::TestCase
 
   def test_save_and_restore
     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')
+    port = ENV['MONGO_RUBY_DRIVER_PORT'] || Connection::DEFAULT_PORT
+    db = Connection.new(host, port).db('ruby-mongo-test')
     coll = db.collection('test')
 
     coll.clear

data/{tests → test}/test_round_trip.rb

@@ -13,7 +13,7 @@ require 'test/unit'
 # of this project), then we find the BSON test files there and use those, too.
 class RoundTripTest < Test::Unit::TestCase
 
-  include XGen::Mongo::Driver
+  include Mongo
 
   @@ruby = nil
 
@@ -64,7 +64,11 @@ EOS
   #   generated)
   def one_round_trip(dir, name)
     obj = File.open(File.join(dir, "#{name}.xson")) { |f|
-      XMLToRuby.new.xml_to_ruby(f)
+      begin
+        XMLToRuby.new.xml_to_ruby(f)
+      rescue => ex # unsupported type
+        return
+      end
     }
 
     File.open(File.join(dir, "#{name}.bson"), 'rb') { |f|

data/{tests → test}/test_threading.rb

@@ -4,11 +4,11 @@ require 'test/unit'
 
 class TestThreading < Test::Unit::TestCase
 
-  include XGen::Mongo::Driver
+  include Mongo
 
   @@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')
+  @@port = ENV['MONGO_RUBY_DRIVER_PORT'] || Connection::DEFAULT_PORT
+  @@db = Connection.new(@@host, @@port).db('ruby-mongo-test')
   @@coll = @@db.collection('thread-test-collection')
 
   def test_threading

data/test/test_xgen.rb

@@ -0,0 +1,73 @@
+# Copyright (C) 2009 10gen Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+$LOAD_PATH[0,0] = File.join(File.dirname(__FILE__), '..', 'lib')
+require 'mongo'
+require 'test/unit'
+
+# TODO these tests should be removed - just testing for the deprecated
+# XGen::Mongo::Driver include path
+class TestXGen < Test::Unit::TestCase
+  @@db = XGen::Mongo::Driver::Connection.new(ENV['MONGO_RUBY_DRIVER_HOST'] || 'localhost',
+                                             ENV['MONGO_RUBY_DRIVER_PORT'] || XGen::Mongo::Driver::Connection::DEFAULT_PORT).db('ruby-mongo-test')
+  @@test = @@db.collection('test')
+
+  def setup
+    @@test.clear
+  end
+
+  def test_sort
+    @@test.save('x' => 2)
+    @@test.save('x' => 1)
+    @@test.save('x' => 3)
+
+    assert_equal 1, @@test.find({}, :sort => {'x' => XGen::Mongo::ASCENDING}).to_a()[0]['x']
+    assert_equal 3, @@test.find({}, :sort => {'x' => XGen::Mongo::DESCENDING}).to_a()[0]['x']
+  end
+
+  def test_gridfs
+    XGen::Mongo::GridFS::GridStore.open(@@db, 'foobar', 'w') { |f| f.write('hello world!') }
+    assert XGen::Mongo::GridFS::GridStore.exist?(@@db, 'foobar')
+    assert !XGen::Mongo::GridFS::GridStore.exist?(@@db, 'mike')
+  end
+end
+
+class TestXGenInclude < Test::Unit::TestCase
+  include XGen::Mongo::GridFS
+  include XGen::Mongo::Driver
+  include XGen::Mongo
+
+  @@db = Connection.new(ENV['MONGO_RUBY_DRIVER_HOST'] || 'localhost',
+                        ENV['MONGO_RUBY_DRIVER_PORT'] || Connection::DEFAULT_PORT).db('ruby-mongo-test')
+  @@test = @@db.collection('test')
+
+  def setup
+    @@test.clear
+  end
+
+  def test_sort
+    @@test.save('x' => 2)
+    @@test.save('x' => 1)
+    @@test.save('x' => 3)
+
+    assert_equal 1, @@test.find({}, :sort => {'x' => ASCENDING}).to_a()[0]['x']
+    assert_equal 3, @@test.find({}, :sort => {'x' => DESCENDING}).to_a()[0]['x']
+  end
+
+  def test_gridfs
+    GridStore.open(@@db, 'foobar', 'w') { |f| f.write('hello world!') }
+    assert GridStore.exist?(@@db, 'foobar')
+    assert !GridStore.exist?(@@db, 'mike')
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongodb-mongo
 version: !ruby/object:Gem::Version 
-  version: "0.12"
+  version: "0.13"
 platform: ruby
 authors: 
 - Jim Menard
@@ -44,6 +44,7 @@ files:
 - examples/types.rb
 - lib/mongo/admin.rb
 - lib/mongo/collection.rb
+- lib/mongo/connection.rb
 - lib/mongo/cursor.rb
 - lib/mongo/db.rb
 - lib/mongo/gridfs/chunk.rb
@@ -61,7 +62,6 @@ files:
 - lib/mongo/message/remove_message.rb
 - lib/mongo/message/update_message.rb
 - lib/mongo/message.rb
-- lib/mongo/mongo.rb
 - lib/mongo/query.rb
 - lib/mongo/types/binary.rb
 - lib/mongo/types/code.rb
@@ -104,33 +104,34 @@ signing_key:
 specification_version: 2
 summary: Ruby driver for the 10gen Mongo DB
 test_files: 
-- tests/mongo-qa/_common.rb
-- tests/mongo-qa/admin
-- tests/mongo-qa/capped
-- tests/mongo-qa/count1
-- tests/mongo-qa/dbs
-- tests/mongo-qa/find
-- tests/mongo-qa/find1
-- tests/mongo-qa/gridfs_in
-- tests/mongo-qa/gridfs_out
-- tests/mongo-qa/indices
-- tests/mongo-qa/remove
-- tests/mongo-qa/stress1
-- tests/mongo-qa/test1
-- tests/mongo-qa/update
-- tests/test_admin.rb
-- tests/test_bson.rb
-- tests/test_byte_buffer.rb
-- tests/test_chunk.rb
-- tests/test_collection.rb
-- tests/test_cursor.rb
-- tests/test_db.rb
-- tests/test_db_api.rb
-- tests/test_db_connection.rb
-- tests/test_grid_store.rb
-- tests/test_message.rb
-- tests/test_mongo.rb
-- tests/test_objectid.rb
-- tests/test_ordered_hash.rb
-- tests/test_threading.rb
-- tests/test_round_trip.rb
+- test/mongo-qa/_common.rb
+- test/mongo-qa/admin
+- test/mongo-qa/capped
+- test/mongo-qa/count1
+- test/mongo-qa/dbs
+- test/mongo-qa/find
+- test/mongo-qa/find1
+- test/mongo-qa/gridfs_in
+- test/mongo-qa/gridfs_out
+- test/mongo-qa/indices
+- test/mongo-qa/remove
+- test/mongo-qa/stress1
+- test/mongo-qa/test1
+- test/mongo-qa/update
+- test/test_admin.rb
+- test/test_bson.rb
+- test/test_byte_buffer.rb
+- test/test_chunk.rb
+- test/test_collection.rb
+- test/test_connection.rb
+- test/test_cursor.rb
+- test/test_db.rb
+- test/test_db_api.rb
+- test/test_db_connection.rb
+- test/test_grid_store.rb
+- test/test_message.rb
+- test/test_objectid.rb
+- test/test_ordered_hash.rb
+- test/test_threading.rb
+- test/test_round_trip.rb
+- test/test_xgen.rb

data/lib/mongo/mongo.rb

@@ -1,164 +0,0 @@
-# --
-# Copyright (C) 2008-2009 10gen Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ++
-
-require 'mongo/db'
-
-module XGen
-  module Mongo
-    module Driver
-
-      # Represents a Mongo database server.
-      class Mongo
-
-        DEFAULT_PORT = 27017
-
-        # Create a Mongo database server instance. You specify either one or a
-        # pair of servers. If one, you also say if connecting to a slave is
-        # OK. In either case, the host default is "localhost" and port default
-        # is DEFAULT_PORT.
-        #
-        # If you specify a pair, pair_or_host is a hash with two keys :left
-        # and :right. Each key maps to either
-        # * a server name, in which case port is DEFAULT_PORT
-        # * a port number, in which case server is "localhost"
-        # * an array containing a server name and a port number in that order
-        #
-        # +options+ are passed on to each DB instance:
-        #
-        # :slave_ok :: Only used if one host is specified. If false, when
-        #              connecting to that host/port a DB object will check to
-        #              see if the server is the master. If it is not, an error
-        #              is thrown.
-        #
-        # :auto_reconnect :: If a DB connection gets closed (for example, we
-        #                    have a server pair and saw the "not master"
-        #                    error, which closes the connection), then
-        #                    automatically try to reconnect to the master or
-        #                    to the single server we have been given. Defaults
-        #                    to +false+.
-        #
-        # Since that's so confusing, here are a few examples:
-        #
-        #  Mongo.new                         # localhost, DEFAULT_PORT, !slave
-        #  Mongo.new("localhost")            # localhost, DEFAULT_PORT, !slave
-        #  Mongo.new("localhost", 3000)      # localhost, 3000, slave not ok
-        #  # localhost, 3000, slave ok
-        #  Mongo.new("localhost", 3000, :slave_ok => true)
-        #  # localhost, DEFAULT_PORT, auto reconnect
-        #  Mongo.new(nil, nil, :auto_reconnect => true)
-        #
-        #  # A pair of servers. DB will always talk to the master. On socket
-        #  # error or "not master" error, we will auto-reconnect to the
-        #  # current master.
-        #  Mongo.new({:left  => ["db1.example.com", 3000],
-        #             :right => "db2.example.com"}, # DEFAULT_PORT
-        #            nil, :auto_reconnect => true)
-        #
-        #  # Here, :right is localhost/DEFAULT_PORT. No auto-reconnect.
-        #  Mongo.new({:left => ["db1.example.com", 3000]})
-        #
-        # When a DB object first connects to a pair, it will find the master
-        # instance and connect to that one.
-        def initialize(pair_or_host=nil, port=nil, options={})
-          @pair = case pair_or_host
-                   when String
-                     [[pair_or_host, port ? port.to_i : DEFAULT_PORT]]
-                   when Hash
-                    connections = []
-                    connections << pair_val_to_connection(pair_or_host[:left])
-                    connections << pair_val_to_connection(pair_or_host[:right])
-                    connections
-                   when nil
-                     [['localhost', DEFAULT_PORT]]
-                   end
-          @options = options
-        end
-
-        # Return the XGen::Mongo::Driver::DB named +db_name+. The slave_ok and
-        # auto_reconnect options passed in via #new may be overridden here.
-        # See DB#new for other options you can pass in.
-        def db(db_name, options={})
-          XGen::Mongo::Driver::DB.new(db_name, @pair, @options.merge(options))
-        end
-
-        # Returns a hash containing database names as keys and disk space for
-        # each as values.
-        def database_info
-          doc = single_db_command('admin', :listDatabases => 1)
-          h = {}
-          doc['databases'].each { |db|
-            h[db['name']] = db['sizeOnDisk'].to_i
-          }
-          h
-        end
-
-        # Returns an array of database names.
-        def database_names
-          database_info.keys
-        end
-
-        # Not implemented.
-        def clone_database(from)
-          raise "not implemented"
-        end
-
-        # Not implemented.
-        def copy_database(from_host, from_db, to_db)
-          raise "not implemented"
-        end
-
-        # Drops the database +name+.
-        def drop_database(name)
-          single_db_command(name, :dropDatabase => 1)
-        end
-
-        protected
-
-        # Turns an array containing a host name string and a
-        # port number integer into a [host, port] pair array.
-        def pair_val_to_connection(a)
-          case a
-          when nil
-            ['localhost', DEFAULT_PORT]
-          when String
-            [a, DEFAULT_PORT]
-          when Integer
-            ['localhost', a]
-          when Array
-            a
-          end
-        end
-
-        # Send cmd (a hash, possibly ordered) to the admin database and return
-        # the answer. Raises an error unless the return is "ok" (DB#ok?
-        # returns +true+).
-        def single_db_command(db_name, cmd)
-          db = nil
-          begin
-            db = db(db_name)
-            doc = db.db_command(cmd)
-            raise "error retrieving database info: #{doc.inspect}" unless db.ok?(doc)
-            doc
-          ensure
-            db.close if db
-          end
-        end
-
-      end
-    end
-  end
-end
-