mongo 1.2.3 → 1.2.4

data/Rakefile

@@ -175,6 +175,14 @@ namespace :gem do
     sh "rm bson_ext-*.gem"
   end
 
+  desc "Build all gems"
+  task :build_all do
+    sh "gem build mongo.gemspec"
+    sh "gem build bson.gemspec"
+    sh "gem build bson.java.gemspec"
+    sh "gem build bson_ext.gemspec"
+  end
+
 end
 
 namespace :ci do

data/docs/HISTORY.md

@@ -1,11 +1,18 @@
 # MongoDB Ruby Driver History
 
+### 1.2.4
+2011-2-23
+
+* Fix the exception message shown when there's an IOError (malditogeek)
+* Another update to map-reduce docs for v1.8. Note that if you use the new
+  output option {:out => {:inline => true}}, then you must also specify
+  :raw => true.
+
 ### 1.2.3
 2011-2-22
 
-* Updated docs for v1.8 map-reduce and ensure that :raw option
-  is used when no collection name is returned.
-* Minor Collection#group doc update.
+* Update docs for map-reduce command
+* Minor doc fix
 
 ### 1.2.2
 2011-2-15

data/lib/mongo.rb

@@ -19,7 +19,7 @@
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
 module Mongo
-  VERSION = "1.2.3"
+  VERSION = "1.2.4"
 end
 
 module Mongo

data/lib/mongo/collection.rb

@@ -509,7 +509,7 @@ module Mongo
       @db.command(cmd)['value']
     end
 
-    # Perform a map/reduce operation on the current collection.
+    # Perform a map-reduce operation on the current collection.
     #
     # @param [String, BSON::Code] map a map function, written in JavaScript.
     # @param [String, BSON::Code] reduce a reduce function, written in JavaScript.
@@ -529,11 +529,13 @@ module Mongo
     # @option opts [Boolean ] :verbose (false) if true, provides statistics on job execution time.
     # @option opts [Boolean] :raw (false) if true, return the raw result object from the map_reduce command, and not
     #   the instantiated collection that's returned by default. Note if a collection name isn't returned in the
-    #   map-reduce output (as, for example, when using :out => {:inline => 1}), then this option will be
-    #   forced to true.
+    #   map-reduce output (as, for example, when using :out => {:inline => 1}), then you must specify this option
+    #   or an ArgumentError will be raised.
     #
     # @return [Collection, Hash] a Mongo::Collection object or a Hash with the map-reduce command's results.
     #
+    # @raise ArgumentError if you specify {:out => {:inline => true}} but don't specify :raw => true.
+    #
     # @see http://www.mongodb.org/display/DOCS/MapReduce Offical MongoDB map/reduce documentation.
     #
     # @core mapreduce map_reduce-instance_method
@@ -553,10 +555,13 @@ module Mongo
         raise Mongo::OperationFailure, "map-reduce failed: #{result['errmsg']}"
       end
 
-      if raw || !result["result"]
+      if raw
         result
-      else
+      elsif result["result"]
         @db[result["result"]]
+      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."
       end
     end
     alias :mapreduce :map_reduce

data/lib/mongo/util/pool.rb

@@ -49,8 +49,7 @@ module Mongo
         begin
           sock.close
         rescue IOError => ex
-          warn "IOError when attempting to close socket connected "
-           + "to #{@host}:#{@port}: #{ex.inspect}"
+          warn "IOError when attempting to close socket connected to #{@host}:#{@port}: #{ex.inspect}"
         end
       end
       @host = @port = nil

data/test/collection_test.rb

@@ -485,7 +485,11 @@ class TestCollection < Test::Unit::TestCase
       res = @@test.map_reduce(m, r, :out => {:reduce => output_collection})
       assert res.find.to_a.any? {|doc| doc["_id"] == 3 && doc["value"]["count"] == 2}
 
-      res = @@test.map_reduce(m, r, :out => {:inline => 1})
+      assert_raise ArgumentError do
+        @@test.map_reduce(m, r, :out => {:inline => 1})
+      end
+
+      @@test.map_reduce(m, r, :raw => true, :out => {:inline => 1})
       assert res["results"]
     end
   end

data/test/connection_test.rb

@@ -264,5 +264,15 @@ class TestConnection < Test::Unit::TestCase
       end
       assert_equal 0, @con.primary_pool.checked_out.size
     end
+
+    should "show a proper exception message if an IOError is raised while closing a socket" do
+      fake_socket = Mocha::Mock.new
+      fake_socket.stubs(:close).raises(IOError.new)
+      fake_socket.stub_everything
+      TCPSocket.expects(:new).returns(fake_socket)
+
+      @con.primary_pool.checkout_new_socket
+      assert_equal [], @con.primary_pool.close
+    end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mongo
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: false
   segments: 
   - 1
   - 2
-  - 3
-  version: 1.2.3
+  - 4
+  version: 1.2.4
 platform: ruby
 authors: 
 - Jim Menard
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-22 00:00:00 -05:00
+date: 2011-02-23 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,12 +28,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 25
+        hash: 23
         segments: 
         - 1
         - 2
-        - 3
-        version: 1.2.3
+        - 4
+        version: 1.2.4
   type: :runtime
   version_requirements: *id001
 description: A Ruby driver for MongoDB. For more information about Mongo, see http://www.mongodb.org.