mongo 1.5.2 → 1.6.0

data/Rakefile

@@ -12,6 +12,7 @@ begin
   rescue LoadError
 end
 include Config
+
 ENV['TEST_MODE'] = 'TRUE'
 
 task :java do
@@ -42,10 +43,14 @@ task :test do
   puts "To test the pure ruby driver: \nrake test:ruby\n\n"
 end
 
+task :path do
+    $:.unshift(File.join(File.dirname(__FILE__), 'lib'))
+end
+
 namespace :test do
 
   desc "Test the driver with the C extension enabled."
-  task :c do
+  task :c => :path do
     ENV['C_EXT'] = 'TRUE'
     if ENV['TEST']
       Rake::Task['test:functional'].invoke
@@ -60,7 +65,7 @@ namespace :test do
   end
 
   desc "Test the driver using pure ruby (no C extension)"
-  task :ruby do
+  task :ruby => :path do
     ENV['C_EXT'] = nil
     if ENV['TEST']
       Rake::Task['test:functional'].invoke
@@ -80,6 +85,13 @@ namespace :test do
     t.ruby_opts << '-w'
   end
 
+  desc "Run the replica set test suite"
+  Rake::TestTask.new(:rs_no_threads) do |t|
+    t.test_files = FileList['test/replica_sets/*_test.rb'] - ["test/replica_sets/refresh_with_threads_test.rb"]
+    t.verbose    = true
+    t.ruby_opts << '-w'
+  end
+
   Rake::TestTask.new(:unit) do |t|
     t.test_files = FileList['test/unit/*_test.rb']
     t.verbose    = true
@@ -122,9 +134,9 @@ namespace :test do
     t.ruby_opts << '-w'
   end
 
-  task :drop_databases do |t|
+  task :drop_databases => :path do |t|
     puts "Dropping test databases..."
-    require './lib/mongo'
+    require 'mongo'
     con = Mongo::Connection.new(ENV['MONGO_RUBY_DRIVER_HOST'] || 'localhost',
       ENV['MONGO_RUBY_DRIVER_PORT'] || Mongo::Connection::DEFAULT_PORT)
     con.database_names.each do |name|
@@ -143,13 +155,13 @@ end
 
 desc "Generate YARD documentation"
 task :ydoc do
-  require File.join(File.dirname(__FILE__), 'lib', 'mongo')
+  require 'mongo'
   out = File.join('ydoc', Mongo::VERSION)
   FileUtils.rm_rf('ydoc')
   system "yardoc lib/**/*.rb lib/mongo/**/*.rb lib/bson/**/*.rb -e ./yard/yard_ext.rb -p yard/templates -o #{out} --title MongoRuby-#{Mongo::VERSION} --files docs/TUTORIAL.md,docs/GridFS.md,docs/FAQ.md,docs/REPLICA_SETS.md,docs/WRITE_CONCERN.md,docs/READ_PREFERENCE.md,docs/HISTORY.md,docs/CREDITS.md,docs/RELEASES.md,docs/CREDITS.md,docs/TAILABLE_CURSORS.md"
 end
 
-namespace :bamboo do
+namespace :jenkins do
   task :ci_reporter do
     begin
       require 'ci/reporter/rake/test_unit'
@@ -183,10 +195,14 @@ namespace :gem do
     `rm mongo-*.gem`
     `rm bson-*.gem`
   end
+  
+  desc "Uninstall the optional c extensions"
+  task :uninstall_extensions do
+    `gem uninstall bson_ext`
+  end
 
   desc "Install the optional c extensions"
   task :install_extensions do
-    `gem uninstall bson_ext`
     `gem build bson_ext.gemspec`
     `gem install --no-rdoc --no-ri bson_ext-*.gem`
     `rm bson_ext-*.gem`
@@ -204,7 +220,7 @@ end
 
 namespace :ci do
   namespace :test do
-    task :c do
+    task :c => :path do
       Rake::Task['gem:install'].invoke
       Rake::Task['gem:install_extensions'].invoke
       Rake::Task['test:c'].invoke

data/docs/HISTORY.md

@@ -1,5 +1,20 @@
 # MongoDB Ruby Driver History
 
+### 1.6.0
+2012-02-22
+
+* Added Gemfile
+* ReplSetConnection seed format is now array of 'host:port' strings
+* Added read preference :secondary_only
+* Added ability to log duration -- enabled by default (Cyril Mougel)
+* Added read_only option for DB#add_user (Ariel Salomon)
+* Added :collect_on_error option for bulk-insert (Masahiro Nakagawa)
+* Added and updated URI options (now case insensitive)
+* Bug fix for ReplSet refresh attempting to close a closed socket
+* Default op_timeout for ReplSetConnection is now disabled (was 30 seconds)
+* Support db output option for map reduce (John Ewart)
+* Support for keeping limited versions of files using GridFS (VvanGemert)
+
 ### 1.5.2
 2011-12-13
 

data/docs/READ_PREFERENCE.md

@@ -17,7 +17,7 @@ The Ruby driver allows you to set read preference on each of four levels: the co
 Objects will inherit the default read preference from their parents. Thus, if you set a read preference of `{:read => :secondary}` when creating
 a new connection, then all databases and collections created from that connection will inherit the same setting. See this code example:
 
-    @con = Mongo::ReplSetConnection.new([['localhost', 27017], ['localhost', 27018]], :read => :secondary)
+    @con = Mongo::ReplSetConnection.new(['localhost:27017','localhost:27018'], :read => :secondary)
     @db  = @con['test']
     @collection = @db['foo']
     @collection.find({:name => 'foo'})

data/docs/RELEASES.md

@@ -24,10 +24,24 @@ Before each relese to Rubygems.org, the following steps will be taken:
 
 1. All driver tests will be run on Linux, OS X, and Windows via continuous integration system.
 
-2. HISTORY file will document all significant commits.
+2. Update the HISTORY file and document all significant commits.
 
-3. Version number will be incremented per the semantic version spec described above.
+3. Update the version in lib/bson.rb, lib/mongo/version.rb, and ext/version.h.
 
-4. Appropriate branches and tags will be created in Git repository, as necessary.
+4. Commit: "Release [VERSION]"
 
-5. Docs will be updated to the latest version of the driver and posted [online](http://api.mongodb.org/ruby/current/index.html).
+5. git tag [version]
+
+6. Build gems. Ensure that they have the correct versions.
+
+7. Push tags and commit to GitHub (git push origin master, git push --tags).
+
+8. Build and push docs.
+
+9. Push gems to Rubygems.org.
+
+10. Test that the gem is downloadable from Rubygems.org.
+
+11. Close out release in JIRA.
+
+12. Annouce release on mongodb-user and mongodb-dev.

data/docs/REPLICA_SETS.md

@@ -11,13 +11,13 @@ takes a list of seed nodes followed by any connection options. You'll want to sp
 the driver more chances to connect in the event that any one seed node is offline. Once the driver connects, it will
 cache the replica set topology as reported by the given seed node and use that information if a failover is later required.
 
-    @connection = ReplSetConnection.new(['n1.mydb.net', 27017], ['n2.mydb.net', 27017], ['n3.mydb.net', 27017])
+    @connection = ReplSetConnection.new(['n1.mydb.net:27017', 'n2.mydb.net:27017', 'n3.mydb.net:27017'])
 
 ### Read slaves
 
 If you want to read from a secondary node, you can pass :read => :secondary to ReplSetConnection#new.
 
-    @connection = ReplSetConnection.new(['n1.mydb.net', 27017], ['n2.mydb.net', 27017], ['n3.mydb.net', 27017],
+    @connection = ReplSetConnection.new(['n1.mydb.net:27017', 'n2.mydb.net:27017', 'n3.mydb.net:27017'],
                   :read => :secondary)
 
 A random secondary will be chosen to be read from. In a typical multi-process Ruby application, you'll have a good distribution of reads across secondary nodes.
@@ -48,18 +48,18 @@ having to manually restart your app server, then you should enable it. You can e
 synchronously, which will refresh the replica set data in a synchronous fashion (which may
 ocassionally slow down your queries):
 
-    @connection = ReplSetConnection.new(['n1.mydb.net', 27017], :refresh_mode => :sync)
+    @connection = ReplSetConnection.new(['n1.mydb.net:27017'], :refresh_mode => :sync)
 
 If you want to change the default refresh interval of 90 seconds, you can do so like this:
 
-    @connection = ReplSetConnection.new(['n1.mydb.net', 27017], :refresh_mode => :sync,
+    @connection = ReplSetConnection.new(['n1.mydb.net:27017'], :refresh_mode => :sync,
         :refresh_interval => 60)
 
 Do not set this value to anything lower than 30, or you may start to experience performance issues.
 
 You can also disable refresh mode altogether:
 
-    @connection = ReplSetConnection.new(['n1.mydb.net', 27017], :refresh_mode => false)
+    @connection = ReplSetConnection.new(['n1.mydb.net:27017'], :refresh_mode => false)
 
 And you can call `refresh` manually on any replica set connection:
 

data/docs/WRITE_CONCERN.md

@@ -10,7 +10,7 @@ Write concern is set using the `:safe` option. There are several possible option
     @collection.save({:doc => 'foo'}, :safe => {:w => 2, :wtimeout => 200, :j => true})
 
 The first, `true`, simply indicates that we should request a response from the server to ensure that to errors have occurred. The second, `{:w => 2}`, forces the server to wait until at least two servers have recorded the write. The third does the same but will time out if the replication can't be completed in 200 milliseconds.
-Setting a value for `wtimeout` is encouraed.
+Setting a value for `wtimeout` is encouraged.
 
 Finally, the fourth example forces the journal to sync to disk if journaling is enabled.
 

data/lib/mongo/collection.rb

@@ -264,8 +264,8 @@ module Mongo
     # @return [OrderedHash, Nil]
     #   a single document or nil if no result is found.
     #
-    # @param [Hash, ObjectId, Nil] spec_or_object_id a hash specifying elements 
-    #   which must be present for a document to be included in the result set or an 
+    # @param [Hash, ObjectId, Nil] spec_or_object_id a hash specifying elements
+    #   which must be present for a document to be included in the result set or an
     #   instance of ObjectId to be used as the value for an _id query.
     #   If nil, an empty selector, {}, will be used.
     #
@@ -321,6 +321,10 @@ module Mongo
     #
     # @return [ObjectId, Array]
     #   The _id of the inserted document or a list of _ids of all inserted documents.
+    # @return [[ObjectId, Array], [Hash, Array]]
+    #   1st, the _id of the inserted document or a list of _ids of all inserted documents.
+    #   2nd, a list of invalid documents.
+    #   Return this result format only when :collect_on_error is true.
     #
     # @option opts [Boolean, Hash] :safe (+false+)
     #   run the operation in safe mode, which run a getlasterror command on the
@@ -333,7 +337,13 @@ module Mongo
     # @option opts [Boolean] :continue_on_error (+false+) If true, then
     #   continue a bulk insert even if one of the documents inserted
     #   triggers a database assertion (as in a duplicate insert, for instance).
+    #   If not using safe mode, the list of ids returned will
+    #   include the object ids of all documents attempted on insert, even
+    #   if some are rejected on error. When safe mode is
+    #   enabled, any error will raise an OperationFailure exception.
     #   MongoDB v2.0+.
+    # @option opts [Boolean] :collect_on_error (+false+) if true, then
+    #   collects invalid documents as an array. Note that this option changes the result format.
     #
     # @core insert insert-instance_method
     def insert(doc_or_docs, opts={})
@@ -403,7 +413,7 @@ module Mongo
     # @option opts [Boolean] :upsert (+false+) if true, performs an upsert (update or insert)
     # @option opts [Boolean] :multi (+false+) update all documents matching the selector, as opposed to
     #   just the first matching document. Note: only works in MongoDB 1.1.3 or later.
-    # @option opts [Boolean] :safe (+false+) 
+    # @option opts [Boolean] :safe (+false+)
     #   If true, check that the save succeeded. OperationFailure
     #   will be raised on an error. Note that a safe check requires an extra
     #   round-trip to the database. Safe options provided here will override any safe
@@ -624,7 +634,12 @@ module Mongo
       if raw
         result
       elsif result["result"]
-        @db[result["result"]]
+        if result['result'].is_a? BSON::OrderedHash and result['result'].has_key? 'db' and result['result'].has_key? 'collection'
+          otherdb = @db.connection[result['result']['db']]
+          otherdb[result['result']['collection']]
+        else
+          @db[result["result"]]
+        end
       else
         raise ArgumentError, "Could not instantiate collection from result. If you specified " +
           "{:out => {:inline => true}}, then you must also specify :raw => true to get the results."
@@ -891,12 +906,12 @@ module Mongo
           if [Mongo::ASCENDING, Mongo::DESCENDING, Mongo::GEO2D, Mongo::GEOHAYSTACK].include?(f[1])
             field_spec[f[0].to_s] = f[1]
           else
-            raise MongoArgumentError, "Invalid index field #{f[1].inspect}; " + 
+            raise MongoArgumentError, "Invalid index field #{f[1].inspect}; " +
               "should be one of Mongo::ASCENDING (1), Mongo::DESCENDING (-1) or Mongo::GEO2D ('2d')."
           end
         end
       else
-        raise MongoArgumentError, "Invalid index specification #{spec.inspect}; " + 
+        raise MongoArgumentError, "Invalid index specification #{spec.inspect}; " +
           "should be either a string, symbol, or an array of arrays."
       end
       field_spec
@@ -935,10 +950,28 @@ module Mongo
       else
         message = BSON::ByteBuffer.new("\0\0\0\0")
       end
+
+      collect_on_error = !!flags[:collect_on_error]
+      error_docs = [] if collect_on_error
+
       BSON::BSON_RUBY.serialize_cstr(message, "#{@db.name}.#{collection_name}")
-      documents.each do |doc|
-        message.put_binary(BSON::BSON_CODER.serialize(doc, check_keys, true, @connection.max_bson_size).to_s)
-      end
+      documents =
+        if collect_on_error
+          documents.select do |doc|
+            begin
+              message.put_binary(BSON::BSON_CODER.serialize(doc, check_keys, true, @connection.max_bson_size).to_s)
+              true
+            rescue StandardError => e  # StandardError will be replaced with BSONError
+              doc.delete(:_id)
+              error_docs << doc
+              false
+            end
+          end
+        else
+          documents.each do |doc|
+            message.put_binary(BSON::BSON_CODER.serialize(doc, check_keys, true, @connection.max_bson_size).to_s)
+          end
+        end
       raise InvalidOperation, "Exceded maximum insert size of 16,000,000 bytes" if message.size > 16_000_000
 
       instrument(:insert, :database => @db.name, :collection => collection_name, :documents => documents) do
@@ -948,7 +981,13 @@ module Mongo
           @connection.send_message(Mongo::Constants::OP_INSERT, message)
         end
       end
-      documents.collect { |o| o[:_id] || o['_id'] }
+
+      doc_ids = documents.collect { |o| o[:_id] || o['_id'] }
+      if collect_on_error
+        return doc_ids, error_docs
+      else
+        doc_ids
+      end
     end
 
     def generate_index_name(spec)

data/lib/mongo/connection.rb

@@ -38,7 +38,7 @@ module Mongo
 
     attr_reader :logger, :size, :auths, :primary, :safe, :host_to_try,
       :pool_size, :connect_timeout, :pool_timeout,
-      :primary_pool, :socket_class
+      :primary_pool, :socket_class, :op_timeout
 
     # Create a connection to single MongoDB instance.
     #
@@ -52,7 +52,7 @@ module Mongo
     # Connection#arbiters. This is useful if your application needs to connect manually to nodes other
     # than the primary.
     #
-    # @param [String, Hash] host.
+    # @param [String, Hash] host
     # @param [Integer] port specify a port number here if only one host is being specified.
     #
     # @option opts [Boolean, Hash] :safe (false) Set the default safe-mode options
@@ -348,7 +348,7 @@ module Mongo
       self["admin"].command(oh)
     end
 
-    # Checks if a server is alive. This command will return immediately 
+    # Checks if a server is alive. This command will return immediately
     # even if the server is in a lock.
     #
     # @return [Hash]
@@ -379,14 +379,6 @@ module Mongo
       @slave_ok
     end
 
-    def get_socket_from_thread_local
-      Thread.current[:socket_map] ||= {}
-      Thread.current[:socket_map][self] ||= {}
-      Thread.current[:socket_map][self][:writer] ||= checkout_writer
-      Thread.current[:socket_map][self][:reader] = 
-        Thread.current[:socket_map][self][:writer]
-    end
-
     # Create a new socket and attempt to connect to master.
     # If successful, sets host and port to master and returns the socket.
     #
@@ -415,10 +407,6 @@ module Mongo
     end
     alias :reconnect :connect
 
-    def connecting?
-      @nodes_to_try.length > 0
-    end
-
     # It's possible that we defined connected as all nodes being connected???
     # NOTE: Do check if this needs to be more stringent.
     # Probably not since if any node raises a connection failure, all nodes will be closed.
@@ -550,21 +538,14 @@ module Mongo
       # Timeout on socket connect.
       @connect_timeout = opts[:connect_timeout] || nil
 
-      # Mutex for synchronizing pool access
-      # TODO: remove this.
-      @connection_mutex = Mutex.new
-
       # Global safe option. This is false by default.
       @safe = opts[:safe] || false
-
-      # Condition variable for signal and wait
-      @queue = ConditionVariable.new
-
+      
       # Connection pool for primay node
       @primary      = nil
       @primary_pool = nil
 
-      @logger = opts[:logger] || nil
+      @logger = opts.fetch(:logger, nil)
 
       if @logger
         write_logging_startup_message
@@ -604,6 +585,8 @@ module Mongo
     def check_is_master(node)
       begin
         host, port = *node
+        socket = nil
+        config = nil
 
         if @connect_timeout
           Mongo::TimeoutHandler.timeout(@connect_timeout, OperationTimeout) do

data/lib/mongo/cursor.rb

@@ -199,7 +199,7 @@ module Mongo
     # This method overrides any sort order specified in the Collection#find
     # method, and only the last sort applied has an effect.
     #
-    # @param [Symbol, Array] key_or_list either 1) a key to sort by or 2) 
+    # @param [Symbol, Array] key_or_list either 1) a key to sort by or 2)
     #   an array of [key, direction] pairs to sort by. Direction should
     #   be specified as Mongo::ASCENDING (or :ascending / :asc) or Mongo::DESCENDING (or :descending / :desc)
     #
@@ -522,6 +522,8 @@ module Mongo
         @checkin_connection = true
         if @command || @read_preference == :primary
           socket = @connection.checkout_writer
+        elsif @read_preference == :secondary_only
+          socket = @connection.checkout_secondary
         else
           @read_pool = @connection.read_pool
           socket = @connection.checkout_reader

data/lib/mongo/db.rb

@@ -173,12 +173,15 @@ module Mongo
     #
     # @param [String] username
     # @param [String] password
+    # @param [Boolean] read_only
+    #   Create a read-only user.
     #
     # @return [Hash] an object representing the user.
-    def add_user(username, password)
+    def add_user(username, password, read_only = false)
       users = self[SYSTEM_USER_COLLECTION]
       user  = users.find_one({:user => username}) || {:user => username}
       user['pwd'] = Mongo::Support.hash_password(username, password)
+      user['readOnly'] = true if read_only;
       users.save(user)
       return user
     end
@@ -332,6 +335,7 @@ module Mongo
     # @option opts [Boolean] :fsync (false)
     # @option opts [Integer] :w (nil)
     # @option opts [Integer] :wtimeout (nil)
+    # @option opts [Boolean] :j (false)
     #
     # @return [Hash] the entire response to getlasterror.
     #