mongo 1.0.2 → 1.0.3

data/HISTORY

@@ -0,0 +1,164 @@
+1.0.3 2010-6-15
+
+* Optimiztion for BSON::OrderedHash
+* Some important fixes.
+
+1.0.2 2010-6-5
+This is a minor release for fixing an incompatibility with MongoDB v1.5.2
+
+* Fix for boolean response on commands for core server v1.5.2
+* BSON.read_bson_document and b2json executable (neomantra)
+* BSON::ObjectID() shortcut for BSON::ObjectID.from_string (tmm1)
+* Various bug fixes.
+
+1.0.1 2010-5-7
+
+* set Encoding.default_internal
+* DEPRECATE JavaScript string on Collection#find. You now must specify $where explicitly.
+* Added Grid#exist? and GridFileSystem#exist?
+* Support for replication acknowledgment
+* Support for $slice
+* Namespaced OrderedHash under BSON (sleverbor)
+
+1.0 2010-4-29
+Note: if upgrading from versions prior to 0.20, be sure to upgrade
+to 0.20 before upgrading to 1.0.
+
+* Inspected ObjectID is represented in MongoDB extended json format.
+* Support for tailable cursors.
+* Configurable query response batch size (thx. to Aman Gupta)
+
+* bson_ext installs on early release of Ruby 1.8.5 (dfitzgibbon)
+* Deprecated DB#create_index. Use Collection#create_index index.
+* Removed deprecated Grid#put syntax; no longer requires a filename.
+
+0.20.1 2010-4-7
+ * Added bson gem dependency.
+
+0.20 2010-4-7
+If upgrading from a previous version of the Ruby driver, please read these notes carefully,
+along with the 0.20_UPGRADE doc.
+
+* Support for new commands:
+  * Collection#find_and_modify
+  * Collection#stats
+  * DB#stats
+* Query :fields options allows for values of 0 to exclude fields (houdini, railsjedi).
+* GridFS
+  * Option to delete old versions of GridFileSystem entries.
+  * Filename is now optional for Grid#put.
+  * Option to write arbitrary attributes to a file: @grid.put(@data, :favorite_phrase => "blimey!")
+  * Indexes created on the chunks collection are now unique. If you have an existing chunks collection,
+    you may want to remove 
+* Removed the following deprecated items:
+  * GridStore class
+  * RegexpOfHolding class
+  * Paired connections must now be initialized with Connection.paired
+
+* BSON-related code extracted into two separate gems: bson and bson_ext (thx to Chuck Remes).
+  * mongo_ext no longer exists.
+  * BSON::Binary constructor can now take a string, which will be packed into an array.
+  * Exception class adjustments:
+    * Mongo::InvalidObjectID moved to BSON::InvalidObjectID
+    * Mongo::InvalidDocument moved to BSON::InvalidDocument
+    * Mongo::InvalidStringEncoding moved to BSON::InvalidStringEncoding
+    * Mongo::InvalidName replaced by Mongo::InvalidNSName and BSON::InvalidKeyName
+  * BSON types are now namespaced under the BSON module. These types include:
+    * Binary
+    * ObjectID
+    * Code
+    * DBRef
+    * MinKey and MaxKey
+  * Extensions compile on Rubinius (Chuck Remes).
+
+0.19.3 2010-4-5
+* Minor fix for assert_valid_keys.
+
+0.19.2 2010-4-5
+This release fixes a major bug and is the final release
+in the 0.19 series. The next release, 0.20.0, will introduce
+separate gems for bson and bson_ext and may require small
+changes to existing code bases. Expect that release in the next
+few days.
+* Fix for Grid#delete bug.
+* Log messages read like valid ruby driver code.
+* Cursor#has_next.
+* Tests for MongoDB 1.4 features.
+* Flexible index creation method with Mongo::GEO2D constant.
+
+0.19.1 2010-3-2
+* Fix for HashWithIndifferentAccess in ActiveSupport-3.0
+
+0.19 2010-3-1
+* Deprecated GridFS::GridStore. Grid and GridFileSystem classes replace
+the GridFS implementation with a simpler API and vastly-improved performance.
+See http://www.mongodb.org/display/DOCS/GridFS+in+Ruby for more details.
+* Safe mode for Grid and GridFileSystem.
+* Grid and GridFileSystem use Mime/Types to detect content type (if available)
+* Connection API simplified. Use Connection.paired for pairs and Connection.from_uri to
+use MongoDB's connection URI specification.
+* Authentication can be saved so that reauthentication happens automatically
+on reconnect.
+* Raise exception if authentication fails.
+* Raise exception if index creation fails.
+* Removed a number of deprecated methods and classes.
+* Several bug fixes.
+* Nearing 1.0!
+
+0.18.3 2010-1-25
+* Convert docs to YARD
+* Support MongoDB extended JSON on ObjectID#to_json
+* ObjectID#from_time for performing date range queries on _id (thx., Sunny Hirai)
+* GridStore#mv for renaming files (Matt Powell)
+* Safe mode for Collection#remove (Patrick Collison)
+* Support BSON types MinKey and MaxKey
+* DEPRECATED Admin, XMLToRuby, and RegexpOfHolding classes.
+* Handle unsupported Numeric types gracefully (Complex, Rational, BigDecimal)
+* Handle unsupported Time types gracefully (Date, DateTime, ActiveSupport::TimeWithZone)
+* Numerous small bug fixes
+* Minor performance improvements
+
+0.18.2 2009-12-29
+* Significant GridStore performance improvement (thx., Sunny Hirai)
+* Enabled support for keyf on group
+* Support :query option for Collection#distinct
+* Support :finalize option for Collection#group
+* (0.18.1) ObjectID#generation_time returns a created_at timestamp.
+* Deprecated Command#group running as a JS eval; should now be run as a command.
+* Deprecated Cursor#next_object for Cursor#next_document
+* Character encoding fixes for C extension
+* Enforce 4MB limit on document creation
+* Simplified connection pooling code
+* Fixes for connection pooling on Ruby 1.8.6/Windows.
+
+0.18.1 2009-12-05
+* Fixed issue with negative dates in Ruby 1.9
+* Minor refactorings for C extension and BSON classes
+* Ensure UTF-8 in Ruby 1.8
+* Fix for connections on non-default port (Delano Mandelbaum)
+* More explicit test suite tasks for running with/without C extension.
+
+0.18 2009-11-25
+* Connections now support connection pooling. See http://api.mongodb.org/ruby/0.18/classes/Mongo/Connection.html#M000158
+* Deprecated :auto_reconnect option on connection; if the driver fails to
+  connect, it will automatically try to reconnect on the subsequent operation.
+  See http://www.mongodb.org/display/DOCS/Replica+Pairs+in+Ruby
+* Added Collection#map_reduce helper (Christos Trochalakis)
+* Deprecated DB#db_command in favor of DB#command.
+* Removed deprecated old sort options, :offset, and Connection#clear.
+* Lots of internal code restructuring for better maintainability.
+
+0.17.1 2009-11-17
+* Index ordering fix
+* Notice to install mongo_ext
+
+0.17 2009-11-16
+* Performance improvements
+  * large document inserts twice as fast as 0.16
+  * queries 18% faster than 0.16 on average
+  * see benchmark comparison: http://gist.github.com/236062
+* Support for multi-update for Mongo >= 1.1.3 (See Collection#update)
+* Collection#distinct
+* Connection#copy_database (voodootikigod)
+* C optimizations for ByteBuffer#to_s and ObjectID#generate (seancribbs)
+* Continue code restructuring for performance and simplicity.

data/README.rdoc

@@ -21,6 +21,15 @@ Here's a quick code sample. See the MongoDB Ruby Tutorial
 
 = Installation
 
+=== Ruby Versions
+
+The driver works and is consistently tested on Ruby 1.8.6, 1.8.7, and 1.9.1.
+
+Note that if you're on 1.8.7, be sure that you're using a patchlevel >= 249. There
+are some IO bugs in earlier versions.
+
+=== Gems
+
 The driver's gems are hosted at Rubygems.org[http://rubygems.org]. Make sure you're
 using the latest version of rubygems:
 

data/Rakefile

@@ -110,7 +110,7 @@ end
 
 desc "Generate documentation"
 task :rdoc do
-  version = eval(File.read("mongo-ruby-driver.gemspec")).version
+  version = eval(File.read("mongo.gemspec")).version
   out = File.join('html', version.to_s)
   FileUtils.rm_rf('html')
   system "rdoc --main README.rdoc --op #{out} --inline-source --quiet README.rdoc `find lib -name '*.rb'`"
@@ -121,7 +121,7 @@ task :ydoc do
   require File.join(File.dirname(__FILE__), 'lib', 'mongo')
   out = File.join('ydoc', Mongo::VERSION)
   FileUtils.rm_rf('ydoc')
-  system "yardoc lib/**/*.rb lib/mongo/**/*.rb -e docs/yard_ext.rb -p docs/templates -o #{out} --title MongoRuby-#{Mongo::VERSION}"
+  system "yardoc lib/**/*.rb lib/mongo/**/*.rb lib/bson/**/*.rb -e docs/yard_ext.rb -p docs/templates -o #{out} --title MongoRuby-#{Mongo::VERSION}"
 end
 
 desc "Publish documentation to mongo.rubyforge.org"
@@ -136,7 +136,7 @@ namespace :gem do
   task :install do
     sh "gem build bson.gemspec"
     sh "gem install bson-*.gem"
-    sh "gem build mongo-ruby-driver.gemspec"
+    sh "gem build mongo.gemspec"
     sh "gem install mongo-*.gem"
     sh "rm mongo-*.gem"
     sh "rm bson-*.gem"

data/lib/mongo.rb

@@ -3,7 +3,7 @@
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
 module Mongo
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end
 
 module Mongo

data/lib/mongo/collection.rb

@@ -374,7 +374,7 @@ module Mongo
     #
     # @core indexes create_index-instance_method
     def create_index(spec, opts={})
-      opts.assert_valid_keys(:min, :max, :background, :unique, :dropDups)
+      opts.assert_valid_keys(:min, :max, :name, :background, :unique, :dropDups)
       field_spec = BSON::OrderedHash.new
       if spec.is_a?(String) || spec.is_a?(Symbol)
         field_spec[spec.to_s] = 1
@@ -392,7 +392,7 @@ module Mongo
           "should be either a string, symbol, or an array of arrays."
       end
 
-      name = generate_index_name(field_spec)
+      name = opts.delete(:name) || generate_index_name(field_spec)
 
       selector = {
         :name   => name,
@@ -434,8 +434,8 @@ module Mongo
 
     # Atomically update and return a document using MongoDB's findAndModify command. (MongoDB > 1.3.0)
     #
-    # @option opts [Hash] :update (nil) the update operation to perform on the matched document.
     # @option opts [Hash] :query ({}) a query selector document for matching the desired document.
+    # @option opts [Hash] :update (nil) the update operation to perform on the matched document.
     # @option opts [Array, String, OrderedHash] :sort ({}) specify a sort option for the query using any
     #   of the sort options available for Cursor#sort. Sort order is important if the query will be matching
     #   multiple documents since only the first matching document will be updated and returned.
@@ -670,6 +670,8 @@ module Mongo
       message = BSON::ByteBuffer.new([0, 0, 0, 0])
       BSON::BSON_RUBY.serialize_cstr(message, "#{@db.name}.#{collection_name}")
       documents.each { |doc| message.put_array(BSON::BSON_CODER.serialize(doc, check_keys, true).to_a) }
+      raise InvalidOperation, "Exceded maximum insert size of 16,000,000 bytes" if message.size > 16_000_000
+
       if safe
         @connection.send_message_with_safe_check(Mongo::Constants::OP_INSERT, message, @db.name,
           "#{@db.name}['#{collection_name}'].insert(#{documents.inspect})", safe)

data/lib/mongo/connection.rb

@@ -32,7 +32,7 @@ module Mongo
     STANDARD_HEADER_SIZE = 16
     RESPONSE_HEADER_SIZE = 20
 
-    MONGODB_URI_MATCHER = /(([.\w\d]+):([\w\d]+)@)?([.\w\d]+)(:([\w\d]+))?(\/([-\d\w]+))?/
+    MONGODB_URI_MATCHER = /(([.\w\d]+):([\w\d]+)@)?([-.\w\d]+)(:([\w\d]+))?(\/([-\d\w]+))?/
     MONGODB_URI_SPEC = "mongodb://[username:password@]host1[:port1][,host2[:port2],...[,hostN[:portN]]][/database]"
 
     attr_reader :logger, :size, :host, :port, :nodes, :auths, :sockets, :checked_out
@@ -437,9 +437,10 @@ module Mongo
 
           break if is_master || @slave_ok
         rescue SocketError, SystemCallError, IOError => ex
-          socket.close if socket
           close
           false
+        ensure
+          socket.close if socket
         end
       end
       raise ConnectionFailure, "failed to connect to any given host:port" unless socket
@@ -522,11 +523,11 @@ module Mongo
         port  = port.to_i
         db    = matches[8]
 
-        if (uname || pwd || db) && !(uname && pwd && db)
+        if uname && pwd && db
+          add_auth(db, uname, pwd)
+        elsif uname || pwd || db
           raise MongoArgumentError, "MongoDB URI must include all three of username, password, " +
             "and db if any one of these is specified."
-        else
-          add_auth(db, uname, pwd)
         end
 
         nodes << [host, port]

data/{mongo-ruby-driver.gemspec → mongo.gemspec}

@@ -11,7 +11,8 @@ Gem::Specification.new do |s|
 
   s.require_paths = ['lib']
 
-  s.files  = ['README.rdoc', 'Rakefile', 'mongo-ruby-driver.gemspec', 'LICENSE.txt']
+  s.files  = ['README.rdoc', 'HISTORY', 'Rakefile',
+    'mongo.gemspec', 'LICENSE.txt']
   s.files += ['lib/mongo.rb'] + Dir['lib/mongo/**/*.rb']
   s.files += Dir['examples/**/*.rb'] + Dir['bin/**/*.rb']
   s.test_files = Dir['test/**/*.rb']

data/test/collection_test.rb

@@ -115,6 +115,17 @@ class TestCollection < Test::Unit::TestCase
     end
   end
 
+  def test_maximum_insert_size
+    docs = []
+    16.times do
+      docs << {'foo' => 'a' * 1_000_000}
+    end
+
+    assert_raise InvalidOperation do
+      @@test.insert(docs)
+    end
+  end
+
   if @@version >= "1.5.1"
     def test_safe_mode_with_advanced_safe_with_invalid_options
       assert_raise_error ArgumentError, "Unknown key(s): wtime" do
@@ -626,6 +637,19 @@ class TestCollection < Test::Unit::TestCase
       end
     end
 
+    should "raise an error if index name is greater than 128" do
+      assert_raise Mongo::OperationFailure do
+        @collection.create_index([['a' * 25, 1], ['b' * 25, 1],
+          ['c' * 25, 1], ['d' * 25, 1], ['e' * 25, 1]])
+      end
+    end
+
+    should "allow for an alternate name to be specified" do
+      @collection.create_index([['a' * 25, 1], ['b' * 25, 1],
+        ['c' * 25, 1], ['d' * 25, 1], ['e' * 25, 1]], :name => 'foo_index')
+      assert @collection.index_information['foo_index']
+    end
+
     should "generate indexes in the proper order" do
       @collection.expects(:insert_documents) do |sel, coll, safe|
         assert_equal 'b_1_a_1', sel[:name]

data/test/connection_test.rb

@@ -24,6 +24,12 @@ class TestConnection < Test::Unit::TestCase
     assert Mongo::Support.ok?(server_info)
   end
 
+  def test_connection_uri
+    con = Connection.from_uri("mongodb://localhost:27017")
+    assert_equal "localhost", con.host
+    assert_equal 27017, con.port
+  end
+
   def test_server_version
     assert_match /\d\.\d+(\.\d+)?/, @mongo.server_version.to_s
   end

data/test/unit/connection_test.rb

@@ -7,6 +7,7 @@ class ConnectionTest < Test::Unit::TestCase
       def new_mock_socket
         socket = Object.new
         socket.stubs(:setsockopt).with(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
+        socket.expects(:close)
         socket
       end
 
@@ -65,6 +66,12 @@ class ConnectionTest < Test::Unit::TestCase
         assert_equal ['localhost', 27017], @conn.nodes[0]
       end
 
+      should "allow a complex host names" do
+        host_name = "foo.bar-12345.org"
+        @conn = Connection.from_uri("mongodb://#{host_name}", :connect => false)
+        assert_equal [host_name, 27017], @conn.nodes[0]
+      end
+
       should "parse a uri specifying multiple nodes" do
         @conn = Connection.from_uri("mongodb://localhost:27017,mydb.com:27018", :connect => false)
         assert_equal ['localhost', 27017], @conn.nodes[0]

metadata

@@ -1,29 +1,38 @@
 --- !ruby/object:Gem::Specification 
 name: mongo
 version: !ruby/object:Gem::Version 
-  version: 1.0.2
+  prerelease: false
+  segments: 
+  - 1
+  - 0
+  - 3
+  version: 1.0.3
 platform: ruby
 authors: 
-  - Jim Menard
-  - Mike Dirolf
-  - Kyle Banker
+- Jim Menard
+- Mike Dirolf
+- Kyle Banker
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-06-05 00:00:00 -04:00
+date: 2010-06-15 00:00:00 -04:00
 default_executable: 
 dependencies: 
-  - !ruby/object:Gem::Dependency 
-    name: bson
-    type: :runtime
-    version_requirement: 
-    version_requirements: !ruby/object:Gem::Requirement 
-      requirements: 
-        - - "="
-          - !ruby/object:Gem::Version 
-            version: 1.0.2
-      version: 
+- !ruby/object:Gem::Dependency 
+  name: bson
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        - 3
+        version: 1.0.3
+  type: :runtime
+  version_requirements: *id001
 description: A Ruby driver for MongoDB. For more information about Mongo, see http://www.mongodb.org.
 email: mongodb-dev@googlegroups.com
 executables: []
@@ -31,92 +40,95 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-  - README.rdoc
+- README.rdoc
 files: 
-  - README.rdoc
-  - Rakefile
-  - mongo-ruby-driver.gemspec
-  - LICENSE.txt
-  - lib/mongo.rb
-  - lib/mongo/collection.rb
-  - lib/mongo/connection.rb
-  - lib/mongo/cursor.rb
-  - lib/mongo/db.rb
-  - lib/mongo/exceptions.rb
-  - lib/mongo/gridfs/grid.rb
-  - lib/mongo/gridfs/grid_ext.rb
-  - lib/mongo/gridfs/grid_file_system.rb
-  - lib/mongo/gridfs/grid_io.rb
-  - lib/mongo/util/conversions.rb
-  - lib/mongo/util/core_ext.rb
-  - lib/mongo/util/server_version.rb
-  - lib/mongo/util/support.rb
-  - examples/admin.rb
-  - examples/capped.rb
-  - examples/cursor.rb
-  - examples/gridfs.rb
-  - examples/index_test.rb
-  - examples/info.rb
-  - examples/queries.rb
-  - examples/simple.rb
-  - examples/strict.rb
-  - examples/types.rb
-  - bin/bson_benchmark.rb
-  - bin/fail_if_no_c.rb
+- README.rdoc
+- HISTORY
+- Rakefile
+- mongo.gemspec
+- LICENSE.txt
+- lib/mongo.rb
+- lib/mongo/collection.rb
+- lib/mongo/connection.rb
+- lib/mongo/cursor.rb
+- lib/mongo/db.rb
+- lib/mongo/exceptions.rb
+- lib/mongo/gridfs/grid.rb
+- lib/mongo/gridfs/grid_ext.rb
+- lib/mongo/gridfs/grid_file_system.rb
+- lib/mongo/gridfs/grid_io.rb
+- lib/mongo/util/conversions.rb
+- lib/mongo/util/core_ext.rb
+- lib/mongo/util/server_version.rb
+- lib/mongo/util/support.rb
+- examples/admin.rb
+- examples/capped.rb
+- examples/cursor.rb
+- examples/gridfs.rb
+- examples/index_test.rb
+- examples/info.rb
+- examples/queries.rb
+- examples/simple.rb
+- examples/strict.rb
+- examples/types.rb
+- bin/bson_benchmark.rb
+- bin/fail_if_no_c.rb
 has_rdoc: true
 homepage: http://www.mongodb.org
 licenses: []
 
 post_install_message: 
 rdoc_options: 
-  - --main
-  - README.rdoc
-  - --inline-source
+- --main
+- README.rdoc
+- --inline-source
 require_paths: 
-  - lib
+- lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  version: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  version: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Ruby driver for the MongoDB
 test_files: 
-  - test/collection_test.rb
-  - test/connection_test.rb
-  - test/conversions_test.rb
-  - test/cursor_test.rb
-  - test/db_api_test.rb
-  - test/db_connection_test.rb
-  - test/db_test.rb
-  - test/grid_file_system_test.rb
-  - test/grid_io_test.rb
-  - test/grid_test.rb
-  - test/slave_connection_test.rb
-  - test/support_test.rb
-  - test/test_helper.rb
-  - test/threading_test.rb
-  - test/auxillary/1.4_features.rb
-  - test/auxillary/authentication_test.rb
-  - test/auxillary/autoreconnect_test.rb
-  - test/replica/count_test.rb
-  - test/replica/insert_test.rb
-  - test/replica/pooled_insert_test.rb
-  - test/replica/query_test.rb
-  - test/threading/test_threading_large_pool.rb
-  - test/unit/collection_test.rb
-  - test/unit/connection_test.rb
-  - test/unit/cursor_test.rb
-  - test/unit/db_test.rb
+- test/auxillary/1.4_features.rb
+- test/auxillary/authentication_test.rb
+- test/auxillary/autoreconnect_test.rb
+- test/collection_test.rb
+- test/connection_test.rb
+- test/conversions_test.rb
+- test/cursor_test.rb
+- test/db_api_test.rb
+- test/db_connection_test.rb
+- test/db_test.rb
+- test/grid_file_system_test.rb
+- test/grid_io_test.rb
+- test/grid_test.rb
+- test/replica/count_test.rb
+- test/replica/insert_test.rb
+- test/replica/pooled_insert_test.rb
+- test/replica/query_test.rb
+- test/slave_connection_test.rb
+- test/support_test.rb
+- test/test_helper.rb
+- test/threading/test_threading_large_pool.rb
+- test/threading_test.rb
+- test/unit/collection_test.rb
+- test/unit/connection_test.rb
+- test/unit/cursor_test.rb
+- test/unit/db_test.rb