mongo 1.1 → 1.1.1

data/HISTORY

@@ -1,3 +1,8 @@
+1.1.1 2010-10-14
+* Several critical JRuby bug fixes
+* Fixes for JRuby in 1.9 mode
+* Check keys and move id only when necessary for JRuby encoder
+
 1.1 2010-10-4
 * Official JRuby support via Java extensons for BSON (beta)
 * Connection#lock! and Connection#unlock! for easy fsync lock

data/README.rdoc

@@ -23,7 +23,7 @@ Here's a quick code sample. See the MongoDB Ruby Tutorial
 
 === Ruby Versions
 
-The driver works and is consistently tested on Ruby 1.8.6, 1.8.7, and 1.9.1.
+The driver works and is consistently tested on Ruby 1.8.6, 1.8.7, and 1.9.2, and JRuby 1.5.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.
@@ -39,7 +39,7 @@ Then you can install the mongo gem as follows:
 
   $ gem install mongo
 
-The driver also requires the BSON gem:
+The driver also requires the bson gem:
 
   $ gem install bson
 
@@ -47,6 +47,11 @@ And for a significant performance boost, you'll want to install the C extensions
 
   $ gem install bson_ext
 
+Note that bson_ext isn't used with JRuby. Instead, some native Java extensions are bundled with the bson gem.
+If you ever need to modify these extenions, you can recompile with the following rake task:
+
+  $ rake build:java
+
 === From the GitHub source
 
 The source code is available at http://github.com/mongodb/mongo-ruby-driver.
@@ -290,7 +295,7 @@ the bson_ext C extension enabled.
 
   $ rake test:c
 
-Or, to test without the extension:
+If you want to test the basic Ruby encoder, or if you're running JRuby:
 
   $ rake test:ruby
 

data/Rakefile

@@ -26,8 +26,8 @@ namespace :build do
     jar_dir   = File.join(java_dir, 'jar')
 
     jruby_jar = File.join(jar_dir, 'jruby.jar')
-    mongo_jar = File.join(jar_dir, 'mongo.jar')
-    bson_jar = File.join(jar_dir, 'bson.jar')
+    mongo_jar = File.join(jar_dir, 'mongo-2.2.jar')
+    bson_jar = File.join(jar_dir, 'bson-2.2.jar')
 
     src_base   = File.join(java_dir, 'src')
 
@@ -65,7 +65,7 @@ namespace :test do
     Rake::Task['test:pooled_threading'].invoke
     Rake::Task['test:drop_databases'].invoke
   end
-  
+
   Rake::TestTask.new(:unit) do |t|
     t.test_files = FileList['test/unit/*_test.rb']
     t.verbose    = true
@@ -142,7 +142,7 @@ namespace :test do
   end
 
   Rake::TestTask.new(:bson) do |t|
-    t.test_files = FileList['test/mongo_bson/*_test.rb']
+    t.test_files = FileList['test/bson/*_test.rb']
     t.verbose    = true
   end
 
@@ -172,12 +172,6 @@ task :ydoc do
   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"
-task :publish => [:rdoc] do
-  # Assumes docs are in ./html
-  Rake::RubyForgePublisher.new(GEM, RUBYFORGE_USER).upload
-end
-
 namespace :gem do
 
   desc "Install the gem locally"

data/lib/mongo.rb

@@ -3,7 +3,7 @@
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
 module Mongo
-  VERSION = "1.1"
+  VERSION = "1.1.1"
 end
 
 module Mongo
@@ -50,4 +50,9 @@ require 'mongo/exceptions'
 require 'mongo/gridfs/grid_ext'
 require 'mongo/gridfs/grid'
 require 'mongo/gridfs/grid_io'
+if RUBY_PLATFORM =~ /java/
+  require 'mongo/gridfs/grid_io_fix'
+end
 require 'mongo/gridfs/grid_file_system'
+
+

data/lib/mongo/connection.rb

@@ -106,7 +106,6 @@ module Mongo
       # Mutex for synchronizing pool access
       @connection_mutex = Mutex.new
 
-
       # Create a mutex when a new key, in this case a socket,
       # is added to the hash.
       @safe_mutexes = Hash.new { |h, k| h[k] = Mutex.new }
@@ -157,7 +156,7 @@ module Mongo
     # @return [Mongo::Connection]
     def self.multi(nodes, opts={})
       unless nodes.length > 0 && nodes.all? {|n| n.is_a? Array}
-        raise MongoArgumentError, "Connection.paired requires at least one node to be specified."
+        raise MongoArgumentError, "Connection.multi requires at least one node to be specified."
       end
       # Block returns an array, the first element being an array of nodes and the second an array
       # of authorizations for the database.

data/lib/mongo/gridfs/grid_io_fix.rb

@@ -0,0 +1,38 @@
+# encoding: UTF-8
+
+# --
+# Copyright (C) 2008-2010 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.
+# ++
+
+module Mongo
+  class GridIO
+
+    # This fixes a comparson issue in JRuby 1.9
+    def get_md5
+      md5_command            = BSON::OrderedHash.new
+      md5_command['filemd5'] = @files_id
+      md5_command['root']    = @fs_name
+      @server_md5 = @files.db.command(md5_command)['md5']
+      if @safe
+        @client_md5 = @local_md5.hexdigest
+        if @local_md5.to_s != @server_md5.to_s
+          raise GridMD5Failure, "File on server failed MD5 check"
+        end
+      else
+        @server_md5
+      end
+    end
+  end
+end

data/mongo.gemspec

@@ -32,5 +32,5 @@ Gem::Specification.new do |s|
   s.email = 'mongodb-dev@googlegroups.com'
   s.homepage = 'http://www.mongodb.org'
 
-  s.add_dependency(%q<bson>, [">= 1.0.5"])
+  s.add_dependency(%q<bson>, [">= 1.1.1"])
 end

data/test/bson/bson_test.rb

@@ -12,32 +12,30 @@ rescue LoadError
   warn 'Mocking time with zone'
   module ActiveSupport
     class TimeWithZone
+      def initialize(utc_time, zone)
+      end
     end
   end
-  Zone = ActiveSupport::TimeWithZone.new
+  Zone = ActiveSupport::TimeWithZone.new(Time.now.utc, 'EST')
 end
 
 class BSONTest < Test::Unit::TestCase
 
   include BSON
 
-  # This setup allows us to change the decoders for
-  # cross-coder compatibility testing
   def setup
     @encoder = BSON::BSON_CODER
-    @decoder = @encoder
   end
 
   def assert_doc_pass(doc, options={})
     bson = @encoder.serialize(doc)
     if options[:debug]
-      puts "DEBUGGIN DOC:"
+      puts "DEBUGGING DOC:"
       p bson.to_a
       puts "DESERIALIZES TO:"
-      p @decoder.deserialize(bson)
     end
-    assert_equal @decoder.serialize(doc).to_a, bson.to_a
-    assert_equal doc, @decoder.deserialize(bson)
+    assert_equal @encoder.serialize(doc).to_a, bson.to_a
+    assert_equal doc, @encoder.deserialize(bson)
   end
 
   def test_require_hash
@@ -76,23 +74,31 @@ class BSONTest < Test::Unit::TestCase
     end
   end
 
+  def test_round_trip
+    doc = {'doc' => 123}
+    @encoder.deserialize(@encoder.serialize(doc))
+  end
+
   # In 1.8 we test that other string encodings raise an exception.
   # In 1.9 we test that they get auto-converted.
   if RUBY_VERSION < '1.9'
-    require 'iconv'
-    def test_invalid_string
-      string = Iconv.conv('iso-8859-1', 'utf-8', 'aé')
-      doc = {'doc' => string}
-      assert_raise InvalidStringEncoding do
-        @encoder.serialize(doc)
+    if ! RUBY_PLATFORM =~ /java/
+      require 'iconv'
+      def test_non_utf8_string
+        string = Iconv.conv('iso-8859-1', 'utf-8', 'aé')
+        doc = {'doc' => string}
+        assert_doc_pass(doc)
+        assert_raise InvalidStringEncoding do
+          @encoder.serialize(doc)
+        end
       end
-    end
 
-    def test_invalid_key
-      key = Iconv.conv('iso-8859-1', 'utf-8', 'aé')
-      doc = {key => 'hello'}
-      assert_raise InvalidStringEncoding do
-        @encoder.serialize(doc)
+      def test_non_utf8_key
+        key = Iconv.conv('iso-8859-1', 'utf-8', 'aé')
+        doc = {key => 'hello'}
+        assert_raise InvalidStringEncoding do
+          @encoder.serialize(doc)
+        end
       end
     end
   else
@@ -167,7 +173,21 @@ class BSONTest < Test::Unit::TestCase
   def test_object
     doc = {'doc' => {'age' => 42, 'name' => 'Spongebob', 'shoe_size' => 9.5}}
     assert_doc_pass(doc)
-    bson = BSON::BSON_CODER.serialize(doc)
+  end
+
+  def test_embedded_document_with_nil
+    doc = {'doc' => {'age' => 42, 'name' => nil, 'shoe_size' => 9.5}}
+    assert_doc_pass(doc)
+  end
+
+  def test_embedded_document_with_date
+    doc = {'doc' => {'age' => 42, 'date' => Time.now.utc, 'shoe_size' => 9.5}}
+    bson = @encoder.serialize(doc)
+    doc2 = @encoder.deserialize(bson)
+    assert doc['doc']
+    assert_equal 42,  doc['doc']['age']
+    assert_equal 9.5, doc['doc']['shoe_size']
+    assert_in_delta Time.now, doc['doc']['date'], 1
   end
 
   def test_oid
@@ -193,7 +213,7 @@ class BSONTest < Test::Unit::TestCase
   def test_date
     doc = {'date' => Time.now}
     bson = @encoder.serialize(doc)
-    doc2 = @decoder.deserialize(bson)
+    doc2 = @encoder.deserialize(bson)
     # Mongo only stores up to the millisecond
     assert_in_delta doc['date'], doc2['date'], 0.001
   end
@@ -201,7 +221,7 @@ class BSONTest < Test::Unit::TestCase
   def test_date_returns_as_utc
     doc = {'date' => Time.now}
     bson = @encoder.serialize(doc)
-    doc2 = @decoder.deserialize(bson)
+    doc2 = @encoder.deserialize(bson)
     assert doc2['date'].utc?
   end
 
@@ -209,7 +229,7 @@ class BSONTest < Test::Unit::TestCase
     begin
       doc = {'date' => Time.utc(1600)}
       bson = @encoder.serialize(doc)
-      doc2 = @decoder.deserialize(bson)
+      doc2 = @encoder.deserialize(bson)
       # Mongo only stores up to the millisecond
       assert_in_delta doc['date'], doc2['date'], 2
     rescue ArgumentError
@@ -240,7 +260,7 @@ class BSONTest < Test::Unit::TestCase
     doc = {}
     doc['dbref'] = DBRef.new('namespace', oid)
     bson = @encoder.serialize(doc)
-    doc2 = @decoder.deserialize(bson)
+    doc2 = @encoder.deserialize(bson)
 
     # Java doesn't deserialize to DBRefs
     if RUBY_PLATFORM =~ /java/
@@ -255,7 +275,7 @@ class BSONTest < Test::Unit::TestCase
   def test_symbol
     doc = {'sym' => :foo}
     bson = @encoder.serialize(doc)
-    doc2 = @decoder.deserialize(bson)
+    doc2 = @encoder.deserialize(bson)
     assert_equal :foo, doc2['sym']
   end
 
@@ -265,7 +285,7 @@ class BSONTest < Test::Unit::TestCase
 
     doc = {'bin' => bin}
     bson = @encoder.serialize(doc)
-    doc2 = @decoder.deserialize(bson)
+    doc2 = @encoder.deserialize(bson)
     bin2 = doc2['bin']
     assert_kind_of Binary, bin2
     assert_equal 'binstring', bin2.to_s
@@ -276,7 +296,7 @@ class BSONTest < Test::Unit::TestCase
     b = Binary.new('somebinarystring')
     doc = {'bin' => b}
     bson = @encoder.serialize(doc)
-    doc2 = @decoder.deserialize(bson)
+    doc2 = @encoder.deserialize(bson)
     bin2 = doc2['bin']
     assert_kind_of Binary, bin2
     assert_equal 'somebinarystring', bin2.to_s
@@ -288,7 +308,7 @@ class BSONTest < Test::Unit::TestCase
 
     doc = {'bin' => bin}
     bson = @encoder.serialize(doc)
-    doc2 = @decoder.deserialize(bson)
+    doc2 = @encoder.deserialize(bson)
     bin2 = doc2['bin']
     assert_kind_of Binary, bin2
     assert_equal [1, 2, 3, 4, 5], bin2.to_a
@@ -302,7 +322,7 @@ class BSONTest < Test::Unit::TestCase
 
       doc = {'bin' => bin}
       bson = @encoder.serialize(doc)
-      doc2 = @decoder.deserialize(bson)
+      doc2 = @encoder.deserialize(bson)
       bin2 = doc2['bin']
       assert_kind_of Binary, bin2
       assert_equal [1, 2, 3, 4, 5], bin2.to_a
@@ -316,7 +336,7 @@ class BSONTest < Test::Unit::TestCase
 
     doc = {'bin' => bb}
     bson = @encoder.serialize(doc)
-    doc2 = @decoder.deserialize(bson)
+    doc2 = @encoder.deserialize(bson)
     bin2 = doc2['bin']
     assert_kind_of Binary, bin2
     assert_equal [1, 2, 3, 4, 5], bin2.to_a
@@ -327,12 +347,12 @@ class BSONTest < Test::Unit::TestCase
     val = BSON::OrderedHash.new
     val['not_id'] = 1
     val['_id'] = 2
-    roundtrip = @decoder.deserialize(@encoder.serialize(val, false, true).to_s)
+    roundtrip = @encoder.deserialize(@encoder.serialize(val, false, true).to_s)
     assert_kind_of BSON::OrderedHash, roundtrip
     assert_equal '_id', roundtrip.keys.first
 
     val = {'a' => 'foo', 'b' => 'bar', :_id => 42, 'z' => 'hello'}
-    roundtrip = @decoder.deserialize(@encoder.serialize(val, false, true).to_s)
+    roundtrip = @encoder.deserialize(@encoder.serialize(val, false, true).to_s)
     assert_kind_of BSON::OrderedHash, roundtrip
     assert_equal '_id', roundtrip.keys.first
   end
@@ -345,7 +365,7 @@ class BSONTest < Test::Unit::TestCase
   if !(RUBY_PLATFORM =~ /java/)
     def test_timestamp
       val = {"test" => [4, 20]}
-      assert_equal val, @decoder.deserialize([0x13, 0x00, 0x00, 0x00,
+      assert_equal val, @encoder.deserialize([0x13, 0x00, 0x00, 0x00,
                                         0x11, 0x74, 0x65, 0x73,
                                         0x74, 0x00, 0x04, 0x00,
                                         0x00, 0x00, 0x14, 0x00,
@@ -424,6 +444,14 @@ class BSONTest < Test::Unit::TestCase
     assert_equal @encoder.serialize(one).to_a, @encoder.serialize(dup).to_a
   end
 
+  def test_duplicate_keys
+    #dup = {"_foo" => "foo", :_foo => "foo"}
+    #one = {"_foo" => "foo"}
+
+    #assert_equal @encoder.serialize(one).to_a, @encoder.serialize(dup).to_a
+    warn "Pending test for duplicate keys"
+  end
+
   def test_no_duplicate_id_when_moving_id
     dup = {"_id" => "foo", :_id => "foo"}
     one = {:_id => "foo"}
@@ -477,12 +505,9 @@ class BSONTest < Test::Unit::TestCase
                  "\000\004\000\000\000abc\000\002key\000\004\000\000\000abc\000\000",
                  @encoder.serialize(a, false, true).to_s
 
-    # Java doesn't support this. Isn't actually necessary.
-    if !(RUBY_PLATFORM =~ /java/)
-      assert_equal ")\000\000\000\002text\000\004\000\000\000abc\000\002key" +
-                   "\000\004\000\000\000abc\000\020_id\000\001\000\000\000\000",
-                   @encoder.serialize(a, false, false).to_s
-    end
+    assert_equal ")\000\000\000\002text\000\004\000\000\000abc\000\002key" +
+                 "\000\004\000\000\000abc\000\020_id\000\001\000\000\000\000",
+                 @encoder.serialize(a, false, false).to_s
   end
 
   def test_move_id_with_nested_doc
@@ -507,22 +532,4 @@ class BSONTest < Test::Unit::TestCase
     end
   end
 
-  # Mocking this class for testing
-  class ::HashWithIndifferentAccess < Hash; end
-
-  def test_keep_id_with_hash_with_indifferent_access
-    doc = HashWithIndifferentAccess.new
-    embedded = HashWithIndifferentAccess.new
-    embedded['_id'] = ObjectId.new
-    doc['_id']      = ObjectId.new
-    doc['embedded'] = [embedded]
-    @encoder.serialize(doc, false, true).to_a
-    assert doc.has_key?("_id")
-    assert doc['embedded'][0].has_key?("_id")
-
-    doc['_id'] = ObjectId.new
-    @encoder.serialize(doc, false, true).to_a
-    assert doc.has_key?("_id")
-  end
-
 end

data/test/bson/byte_buffer_test.rb

@@ -7,7 +7,7 @@ class ByteBufferTest < Test::Unit::TestCase
   def setup
     @buf = ByteBuffer.new
   end
-  
+
   def test_initial_state
     assert_equal 0, @buf.position
     assert_equal [], @buf.to_a

data/test/bson/hash_with_indifferent_access_test.rb

@@ -0,0 +1,38 @@
+# encoding:utf-8
+require './test/test_helper'
+require './test/support/hash_with_indifferent_access'
+
+class HashWithIndifferentAccessTest < Test::Unit::TestCase
+  include BSON
+
+  def setup
+    @encoder = BSON::BSON_CODER
+  end
+
+  def test_document
+    doc = HashWithIndifferentAccess.new
+    doc['foo'] = 1
+    doc['bar'] = 'baz'
+
+    bson = @encoder.serialize(doc)
+    assert_equal doc, @encoder.deserialize(bson.to_s)
+  end
+
+  def test_embedded_document
+    jimmy = HashWithIndifferentAccess.new
+    jimmy['name']     = 'Jimmy'
+    jimmy['species'] = 'Siberian Husky'
+
+    stats = HashWithIndifferentAccess.new
+    stats['eyes'] = 'blue'
+
+    person = HashWithIndifferentAccess.new
+    person['_id'] = BSON::ObjectId.new
+    person['name'] = 'Mr. Pet Lover'
+    person['pets'] = [jimmy, {'name' => 'Sasha'}]
+    person['stats'] = stats
+
+    bson = @encoder.serialize(person)
+    assert_equal person, @encoder.deserialize(bson.to_s)
+  end
+end