mongodb-mongo 0.14 → 0.14.1

data/README.rdoc

@@ -256,7 +256,7 @@ validator script.
 
 = Documentation
 
-This documentation is available online at http://mongo.rubyforge.org. You can
+This documentation is available online at http://api.mongodb.org/ruby. You can
 generate the documentation if you have the source by typing
 
   $ rake rdoc
@@ -297,6 +297,9 @@ Paul Dlug, paul.dlug@gmail.com
 * Generate _id on the client side if not provided
 * Collection#insert and Collection#save return _id
 
+Durran Jordan and Les Hill, durran@gmail.com
+* DB#collections
+
 = License
 
  Copyright 2008-2009 10gen Inc.

data/lib/mongo/db.rb

@@ -192,6 +192,14 @@ module Mongo
       names.map {|name| name.sub(@name + '.', '')}
     end
 
+    # Retruns an array of Collection instances, one for each collection in this
+    # database.
+    def collections
+      collection_names.map do |collection_name|
+        Collection.new(self, collection_name)
+      end
+    end
+
     # Returns a cursor over query result hashes. Each hash contains a
     # 'name' string and optionally an 'options' hash. If +coll_name+ is
     # specified, an array of length 1 is returned.

data/mongo-ruby-driver.gemspec

@@ -83,13 +83,12 @@ TEST_FILES = ['test/mongo-qa/_common.rb',
 
 Gem::Specification.new do |s|
   s.name = 'mongo'
-  s.version = '0.14'
+  s.version = '0.14.1'
   s.platform = Gem::Platform::RUBY
   s.summary = 'Ruby driver for the 10gen Mongo DB'
   s.description = 'A Ruby driver for the 10gen Mongo DB. For more information about Mongo, see http://www.mongodb.org.'
 
   s.require_paths = ['lib']
-
   s.files = PACKAGE_FILES
   s.test_files = TEST_FILES
 

data/test/test_collection.rb

@@ -48,7 +48,7 @@ class TestCollection < Test::Unit::TestCase
     a = {"hello" => "world"}
     @@test.insert(a)
     @@test.insert(a)
-    assert @@db.error.include? "E11000"
+    assert(@@db.error.include?("E11000"))
 
     assert_raise OperationFailure do
       @@test.insert(a, :safe => true)
@@ -92,7 +92,7 @@ class TestCollection < Test::Unit::TestCase
 
     @@test.save("hello" => "world")
     @@test.save("hello" => "world")
-    assert @@db.error.include? "E11000"
+    assert(@@db.error.include?("E11000"))
 
     assert_raise OperationFailure do
       @@test.save({"hello" => "world"}, :safe => true)
@@ -137,19 +137,19 @@ class TestCollection < Test::Unit::TestCase
   def test_insert_adds_id
     doc = {"hello" => "world"}
     @@test.insert(doc)
-    assert doc.include? :_id
+    assert(doc.include?(:_id))
 
     docs = [{"hello" => "world"}, {"hello" => "world"}]
     @@test.insert(docs)
     docs.each do |doc|
-      assert doc.include? :_id
+      assert(doc.include?(:_id))
     end
   end
 
   def test_save_adds_id
     doc = {"hello" => "world"}
     @@test.save(doc)
-    assert doc.include? :_id
+    assert(doc.include?(:_id))
   end
 
   def test_optional_find_block
@@ -183,8 +183,10 @@ class TestCollection < Test::Unit::TestCase
 
     assert_equal :mike, @@test.find_one(:foo => :mike)["foo"]
     assert_equal :mike, @@test.find_one("foo" => :mike)["foo"]
-    assert_equal nil, @@test.find_one(:foo => "mike")
-    assert_equal nil, @@test.find_one("foo" => "mike")
+
+    # TODO enable these tests conditionally based on server version (if >1.0)
+    # assert_equal :mike, @@test.find_one(:foo => "mike")["foo"]
+    # assert_equal :mike, @@test.find_one("foo" => "mike")["foo"]
   end
 
   def test_group_with_scope

data/test/test_db.rb

@@ -63,6 +63,18 @@ class DBTest < Test::Unit::TestCase
     }
   end
 
+  def test_collections
+    @@db.collection("test.durran").insert("foo" => 5)
+    @@db.collection("test.les").insert("bar" => 0)
+
+    colls = @@db.collections()
+    assert_not_nil colls.select { |coll| coll.name == "test.durran" }
+    assert_not_nil colls.select { |coll| coll.name == "test.les" }
+    assert_equal [], colls.select { |coll| coll.name == "does_not_exist" }
+
+    assert_kind_of Collection, colls[0]
+  end
+
   def test_pair
     @@db.close
     @@users = nil

data/test/test_db_api.rb

@@ -809,4 +809,24 @@ class DBAPITest < Test::Unit::TestCase
       @@db.collection("test").find({}, :snapshot => true, :sort => 'a').to_a
     end
   end
+
+  def test_encodings
+    if RUBY_VERSION >= '1.9'
+      ascii = "hello world"
+      utf8 = "hello world".encode("UTF-8")
+      iso8859 = "hello world".encode("ISO-8859-1")
+
+      assert_equal "US-ASCII", ascii.encoding.name
+      assert_equal "UTF-8", utf8.encoding.name
+      assert_equal "ISO-8859-1", iso8859.encoding.name
+
+      @@coll.clear
+      @@coll.save("ascii" => ascii, "utf8" => utf8, "iso8859" => iso8859)
+      doc = @@coll.find_one()
+
+      assert_equal "UTF-8", doc["ascii"].encoding.name
+      assert_equal "UTF-8", doc["utf8"].encoding.name
+      assert_equal "UTF-8", doc["iso8859"].encoding.name
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongodb-mongo
 version: !ruby/object:Gem::Version 
-  version: "0.14"
+  version: 0.14.1
 platform: ruby
 authors: 
 - Jim Menard
@@ -76,7 +76,6 @@ files:
 - lib/mongo.rb
 has_rdoc: true
 homepage: http://www.mongodb.org
-licenses: 
 post_install_message: 
 rdoc_options: 
 - --main
@@ -99,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: Ruby driver for the 10gen Mongo DB