bson 1.1.5 → 1.2.rc0

data/lib/bson.rb

@@ -2,15 +2,21 @@
 
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
-MINIMUM_BSON_EXT_VERSION = "1.1.5"
+MINIMUM_BSON_EXT_VERSION = "1.2.rc0"
 
 module BSON
-  VERSION = "1.1.5"
+  VERSION = "1.2.rc0"
+
+  if defined? Mongo::DEFAULT_MAX_BSON_SIZE
+    DEFAULT_MAX_BSON_SIZE = Mongo::DEFAULT_MAX_BSON_SIZE
+  else
+    DEFAULT_MAX_BSON_SIZE = 4 * 1024 * 1024
+  end
+
   def self.serialize(obj, check_keys=false, move_id=false)
     BSON_CODER.serialize(obj, check_keys, move_id)
   end
 
-
   def self.deserialize(buf=nil)
     BSON_CODER.deserialize(buf)
   end
@@ -34,7 +40,7 @@ end
 
 if RUBY_PLATFORM =~ /java/
   jar_dir = File.join(File.dirname(__FILE__), '..', 'ext', 'java', 'jar')
-  require File.join(jar_dir, 'mongo-2.2.jar')
+  require File.join(jar_dir, 'mongo-2.4.jar')
   require File.join(jar_dir, 'bson-2.2.jar')
   require File.join(jar_dir, 'jbson.jar')
   require 'bson/bson_java'
@@ -47,7 +53,7 @@ else
     raise LoadError if ENV['TEST_MODE'] && !ENV['C_EXT']
 
     # Raise LoadError unless little endian
-    raise LoadError unless [1,0,0,0].pack("i").bytes.first == 1
+    raise LoadError unless "\x01\x00\x00\x00".unpack("i").first == 1
 
     require 'bson_ext/cbson'
     raise LoadError unless defined?(CBson::VERSION)

data/lib/bson/bson_c.rb

@@ -28,5 +28,12 @@ module BSON
       CBson.deserialize(ByteBuffer.new(buf).to_s)
     end
 
+    def self.max_bson_size
+      CBson.max_bson_size
+    end
+
+    def self.update_max_bson_size(connection)
+      CBson.update_max_bson_size(connection)
+    end
   end
 end

data/lib/bson/bson_java.rb

@@ -17,5 +17,12 @@ module BSON
       callback.get
     end
 
+    def self.max_bson_size
+      Java::OrgJbson::RubyBSONEncoder.max_bson_size(self)
+    end
+
+    def self.update_max_bson_size(connection)
+      Java::OrgJbson::RubyBSONEncoder.update_max_bson_size(self, connection)
+    end
   end
 end

data/lib/bson/bson_ruby.rb

@@ -20,6 +20,10 @@ module BSON
   # A BSON seralizer/deserializer in pure Ruby.
   class BSON_RUBY
 
+    DEFAULT_MAX_BSON_SIZE = 4 * 1024 * 1024
+
+    @@max_bson_size = DEFAULT_MAX_BSON_SIZE
+
     MINKEY = -1
     EOO = 0
     NUMBER = 1
@@ -51,13 +55,13 @@ module BSON
       NULL_BYTE       = "\0".force_encoding('binary').freeze
       UTF8_ENCODING   = Encoding.find('utf-8')
       BINARY_ENCODING = Encoding.find('binary')
-      
+
       def self.to_utf8_binary(str)
         str.encode(UTF8_ENCODING).force_encoding(BINARY_ENCODING)
       end
     else
       NULL_BYTE = "\0"
-      
+
       def self.to_utf8_binary(str)
         begin
           str.unpack("U*")
@@ -68,6 +72,14 @@ module BSON
       end
     end
 
+    def self.update_max_bson_size(connection)
+      @@max_bson_size = connection.max_bson_size
+    end
+
+    def self.max_bson_size
+      @@max_bson_size
+    end
+
     def self.serialize_cstr(buf, val)
       buf.put_binary(to_utf8_binary(val.to_s))
       buf.put_binary(NULL_BYTE)
@@ -120,8 +132,8 @@ module BSON
       end
 
       serialize_eoo_element(@buf)
-      if @buf.size > 4 * 1024 * 1024
-        raise InvalidDocument, "Document is too large (#{@buf.size}). BSON documents are limited to 4MB (#{4 * 1024 * 1024})."
+      if @buf.size > @@max_bson_size
+        raise InvalidDocument, "Document is too large (#{@buf.size}). BSON documents are limited to #{@@max_bson_size} bytes."
       end
       @buf.put_int(@buf.size, 0)
       @buf
@@ -322,11 +334,11 @@ module BSON
     def deserialize_regex_data(buf)
       str = deserialize_cstr(buf)
       options_str = deserialize_cstr(buf)
-      options = 0
-      options |= Regexp::IGNORECASE if options_str.include?('i')
-      options |= Regexp::MULTILINE if options_str.include?('m')
-      options |= Regexp::EXTENDED if options_str.include?('x')
-      Regexp.new(str, options)
+      opts = 0
+      opts |= Regexp::IGNORECASE if options_str.include?('i')
+      opts |= Regexp::MULTILINE if options_str.include?('m')
+      opts |= Regexp::EXTENDED if options_str.include?('x')
+      Regexp.new(str, opts)
     end
 
     def encoded_str(str)

data/test/bson/bson_test.rb

@@ -67,13 +67,26 @@ class BSONTest < Test::Unit::TestCase
     assert_doc_pass(doc)
   end
 
-  def test_document_length
-    doc = {'name' => 'a' * 5 * 1024 * 1024}
+  def test_limit_max_bson_size
+    doc = {'name' => 'a' * BSON_CODER.max_bson_size}
     assert_raise InvalidDocument do
       assert @encoder.serialize(doc)
     end
   end
 
+  def test_max_bson_size
+    assert BSON_CODER.max_bson_size >= BSON::DEFAULT_MAX_BSON_SIZE
+  end
+
+  def test_update_max_bson_size
+    require 'ostruct'
+    mock_conn = OpenStruct.new
+    size      = 7 * 1024 * 1024
+    mock_conn.max_bson_size = size
+    assert_equal size, BSON_CODER.update_max_bson_size(mock_conn)
+    assert_equal size, BSON_CODER.max_bson_size
+  end
+
   def test_round_trip
     doc = {'doc' => 123}
     @encoder.deserialize(@encoder.serialize(doc))
@@ -200,6 +213,15 @@ class BSONTest < Test::Unit::TestCase
     assert_doc_pass(doc)
   end
 
+  def test_array_keys
+    doc = {'doc' => [1, 2, 'a', 'b']}
+    bson = @encoder.serialize(doc).to_a
+    assert_equal 48, bson[14]
+    assert_equal 49, bson[21]
+    assert_equal 50, bson[28]
+    assert_equal 51, bson[37]
+  end
+
   def test_regex
     doc = {'doc' => /foobar/i}
     assert_doc_pass(doc)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bson
 version: !ruby/object:Gem::Version 
-  hash: 25
-  prerelease: false
+  hash: 977940448
+  prerelease: true
   segments: 
   - 1
-  - 1
-  - 5
-  version: 1.1.5
+  - 2
+  - rc0
+  version: 1.2.rc0
 platform: ruby
 authors: 
 - Jim Menard
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-15 00:00:00 -05:00
+date: 2011-01-05 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -31,8 +31,6 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- Rakefile
-- bson.gemspec
 - LICENSE.txt
 - lib/bson.rb
 - lib/bson/bson_ruby.rb
@@ -48,10 +46,6 @@ files:
 - lib/bson/bson_java.rb
 - bin/b2json
 - bin/j2bson
-- ext/java/jar/jruby.jar
-- ext/java/jar/mongo-2.2.jar
-- ext/java/jar/bson-2.2.jar
-- ext/java/jar/jbson.jar
 - test/bson/byte_buffer_test.rb
 - test/bson/binary_test.rb
 - test/bson/object_id_test.rb
@@ -80,12 +74,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 

data/Rakefile

@@ -1,194 +0,0 @@
-# -*- mode: ruby; -*-
-require 'rubygems'
-require 'rubygems/specification'
-require 'fileutils'
-require 'rake'
-require 'rake/testtask'
-require 'rake/gempackagetask'
-begin
-  require 'rake/contrib/rubyforgepublisher'
-rescue LoadError
-end
-require 'rbconfig'
-include Config
-ENV['TEST_MODE'] = 'TRUE'
-
-task :java do
-  Rake::Task['build:java'].invoke
-  Rake::Task['test:ruby'].invoke
-end
-
-namespace :build do
-  desc "Build the java extensions."
-  task :java do
-    puts "Building Java extensions..."
-    java_dir  = File.join(File.dirname(__FILE__), 'ext', 'java')
-    jar_dir   = File.join(java_dir, 'jar')
-
-    jruby_jar = File.join(jar_dir, 'jruby.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')
-
-    system("javac -Xlint:unchecked -classpath #{jruby_jar}:#{mongo_jar}:#{bson_jar} #{File.join(src_base, 'org', 'jbson', '*.java')}")
-    system("cd #{src_base} && jar cf #{File.join(jar_dir, 'jbson.jar')} #{File.join('.', 'org', 'jbson', '*.class')}")
-  end
-end
-
-desc "Test the MongoDB Ruby driver."
-task :test do
-  puts "\nTo test the driver with the C-extensions:\nrake test:c\n\n"
-  puts "To test the pure ruby driver: \nrake test:ruby\n\n"
-end
-
-namespace :test do
-
-  desc "Test the driver with the C extension enabled."
-  task :c do
-    ENV['C_EXT'] = 'TRUE'
-    if ENV['TEST']
-      Rake::Task['test:functional'].invoke
-    else
-      Rake::Task['test:unit'].invoke
-      Rake::Task['test:functional'].invoke
-      Rake::Task['test:bson'].invoke
-      Rake::Task['test:pooled_threading'].invoke
-      Rake::Task['test:drop_databases'].invoke
-    end
-    ENV['C_EXT'] = nil
-  end
-
-  desc "Test the driver using pure ruby (no C extension)"
-  task :ruby do
-    ENV['C_EXT'] = nil
-    if ENV['TEST']
-      Rake::Task['test:functional'].invoke
-    else
-      Rake::Task['test:unit'].invoke
-      Rake::Task['test:functional'].invoke
-      Rake::Task['test:bson'].invoke
-      Rake::Task['test:pooled_threading'].invoke
-      Rake::Task['test:drop_databases'].invoke
-    end
-  end
-
-  desc "Run the replica set test suite"
-  Rake::TestTask.new(:rs) do |t|
-    t.test_files = FileList['test/replica_sets/*_test.rb']
-    t.verbose    = true
-  end
-
-  Rake::TestTask.new(:unit) do |t|
-    t.test_files = FileList['test/unit/*_test.rb']
-    t.verbose    = true
-  end
-
-  Rake::TestTask.new(:functional) do |t|
-    t.test_files = FileList['test/*_test.rb']
-    t.verbose    = true
-  end
-
-  Rake::TestTask.new(:pooled_threading) do |t|
-    t.test_files = FileList['test/threading/*_test.rb']
-    t.verbose    = true
-  end
-
-  Rake::TestTask.new(:auto_reconnect) do |t|
-    t.test_files = FileList['test/auxillary/autoreconnect_test.rb']
-    t.verbose    = true
-  end
-
-  Rake::TestTask.new(:authentication) do |t|
-    t.test_files = FileList['test/auxillary/authentication_test.rb']
-    t.verbose    = true
-  end
-
-  Rake::TestTask.new(:new_features) do |t|
-    t.test_files = FileList['test/auxillary/1.4_features.rb']
-    t.verbose    = true
-  end
-
-  Rake::TestTask.new(:bson) do |t|
-    t.test_files = FileList['test/bson/*_test.rb']
-    t.verbose    = true
-  end
-
-  task :drop_databases do |t|
-    puts "Dropping test databases..."
-    require './lib/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|
-      con.drop_database(name) if name =~ /^ruby-test/
-    end
-  end
-end
-
-desc "Generate RDOC documentation"
-task :rdoc do
-  version = eval(File.read("mongo.gemspec")).version
-  out = File.join('html', version.to_s)
-  FileUtils.rm_rf('html')
-  system "rdoc --main README.md --op #{out} --inline-source --quiet README.md `find lib -name '*.rb'`"
-end
-
-desc "Generate YARD documentation"
-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 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/HISTORY.md,docs/CREDITS.md,docs/1.0_UPGRADE.md"
-end
-
-namespace :bamboo do
-  namespace :test do
-    task :ruby do
-      Rake::Task['test:ruby'].invoke
-    end
-
-    task :c do
-      Rake::Task['gem:install_extensions'].invoke
-      Rake::Task['test:c'].invoke
-    end
-  end
-end
-
-namespace :gem do
-
-  desc "Install the gem locally"
-  task :install do
-    sh "gem build bson.gemspec"
-    sh "gem install --no-rdoc --no-ri bson-*.gem"
-
-    sh "gem build mongo.gemspec"
-    sh "gem install --no-rdoc --no-ri mongo-*.gem"
-
-    sh "rm mongo-*.gem"
-    sh "rm bson-*.gem"
-  end
-
-  desc "Install the optional c extensions"
-  task :install_extensions do
-    sh "gem build bson_ext.gemspec"
-    sh "gem install --no-rdoc --no-ri bson_ext-*.gem"
-    sh "rm bson_ext-*.gem"
-  end
-
-end
-
-namespace :ci do
-  namespace :test do
-    task :c do
-      Rake::Task['gem:install'].invoke
-      Rake::Task['gem:install_extensions'].invoke
-      Rake::Task['test:c'].invoke
-    end
-  end
-end
-
-task :default => :list
-
-task :list do
-  system 'rake -T'
-end

data/bson.gemspec

@@ -1,27 +0,0 @@
-require "./lib/bson"
-
-Gem::Specification.new do |s|
-  s.name = 'bson'
-
-  s.version = BSON::VERSION
-
-  s.platform = Gem::Platform::RUBY
-  s.summary = 'Ruby implementation of BSON'
-  s.description = 'A Ruby BSON implementation for MongoDB. For more information about Mongo, see http://www.mongodb.org. For more information on BSON, see http://www.bsonspec.org.'
-
-  s.require_paths = ['lib']
-
-  s.files  = ['Rakefile', 'bson.gemspec', 'LICENSE.txt']
-  s.files += ['lib/bson.rb'] + Dir['lib/bson/**/*.rb']
-  s.files += ['bin/b2json', 'bin/j2bson']
-  s.files += Dir['ext/java/jar/**/*.jar']
-  s.test_files = Dir['test/bson/*.rb']
-
-  s.executables = ['b2json', 'j2bson']
-
-  s.has_rdoc = true
-
-  s.authors = ['Jim Menard', 'Mike Dirolf', 'Kyle Banker']
-  s.email = 'mongodb-dev@googlegroups.com'
-  s.homepage = 'http://www.mongodb.org'
-end