bson 1.4.1-jruby → 1.5.0-jruby

data/lib/bson.rb

@@ -18,10 +18,10 @@
 
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
-MINIMUM_BSON_EXT_VERSION = "1.4.1"
+MINIMUM_BSON_EXT_VERSION = "1.5.0"
 
 module BSON
-  VERSION = "1.4.1"
+  VERSION = "1.5.0"
 
   if defined? Mongo::DEFAULT_MAX_BSON_SIZE
     DEFAULT_MAX_BSON_SIZE = Mongo::DEFAULT_MAX_BSON_SIZE

data/lib/bson/ordered_hash.rb

@@ -130,11 +130,12 @@ module BSON
       end
 
       def delete_if(&block)
-        self.each do |k,v|
-          if yield k, v
-            delete(k)
+        keys.each do |key|
+          if yield key, self[key]
+            delete(key)
           end
         end
+        self
       end
 
       def reject(&block)

data/test/bson/binary_test.rb

@@ -2,14 +2,12 @@
 require './test/bson/test_helper'
 
 class BinaryTest < Test::Unit::TestCase
-  context "Inspecting" do
-    setup do
-      @data = ("THIS IS BINARY " * 50).unpack("c*")
-    end
+  def setup
+    @data = ("THIS IS BINARY " * 50).unpack("c*")
+  end
 
-    should "not display actual data" do
-      binary = BSON::Binary.new(@data)
-      assert_equal "<BSON::Binary:#{binary.object_id}>", binary.inspect
-    end
+  def test_do_not_display_binary_data
+    binary = BSON::Binary.new(@data)
+    assert_equal "<BSON::Binary:#{binary.object_id}>", binary.inspect
   end
 end

data/test/bson/bson_test.rb

@@ -9,6 +9,7 @@ end
 require 'bigdecimal'
 
 begin
+  require 'date'
   require 'tzinfo'
   require 'active_support/core_ext'
   Time.zone = "Pacific Time (US & Canada)"

data/test/bson/ordered_hash_test.rb

@@ -212,6 +212,8 @@ class OrderedHashTest < Test::Unit::TestCase
     assert @oh.keys.include?('z')
     @oh.delete_if { |k,v| k == 'z' }
     assert !@oh.keys.include?('z')
+    @oh.delete_if { |k, v| v > 0 }
+    assert @oh.keys.empty?
   end
 
   def test_reject

data/test/bson/test_helper.rb

@@ -10,23 +10,6 @@ def silently
   result
 end
 
-begin
-  require 'rubygems' if RUBY_VERSION < "1.9.0" && !ENV['C_EXT']
-  silently { require 'shoulda' }
-  silently { require 'mocha' }
-rescue LoadError
-  puts <<MSG
-
-This test suite requires shoulda and mocha.
-You can install them as follows:
-  gem install shoulda
-  gem install mocha
-
-MSG
-
-  exit
-end
-
 require 'bson_ext/cbson' if !(RUBY_PLATFORM =~ /java/) && ENV['C_EXT']
 
 class Test::Unit::TestCase

metadata

@@ -1,106 +1,85 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: bson
-version: !ruby/object:Gem::Version 
-  hash: 5
+version: !ruby/object:Gem::Version
+  version: 1.5.0
   prerelease: 
-  segments: 
-  - 1
-  - 4
-  - 1
-  version: 1.4.1
 platform: jruby
-authors: 
+authors:
 - Jim Menard
 - Mike Dirolf
 - Kyle Banker
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-10-17 00:00:00 -05:00
-default_executable: 
+date: 2011-11-28 00:00:00.000000000Z
 dependencies: []
-
-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.
+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.
 email: mongodb-dev@googlegroups.com
-executables: 
+executables:
 - b2json
 - j2bson
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - LICENSE.txt
 - lib/bson.rb
-- lib/bson/bson_c.rb
 - lib/bson/bson_java.rb
-- lib/bson/bson_ruby.rb
-- lib/bson/byte_buffer.rb
-- lib/bson/exceptions.rb
-- lib/bson/ordered_hash.rb
 - lib/bson/types/binary.rb
-- lib/bson/types/code.rb
-- lib/bson/types/dbref.rb
 - lib/bson/types/min_max_keys.rb
-- lib/bson/types/object_id.rb
 - lib/bson/types/timestamp.rb
+- lib/bson/types/code.rb
+- lib/bson/types/object_id.rb
+- lib/bson/types/dbref.rb
+- lib/bson/exceptions.rb
+- lib/bson/bson_c.rb
+- lib/bson/ordered_hash.rb
+- lib/bson/byte_buffer.rb
+- lib/bson/bson_ruby.rb
 - bin/b2json
 - bin/j2bson
 - ext/java/jar/jbson.jar
 - ext/java/jar/mongo-2.6.5.jar
 - test/bson/binary_test.rb
-- test/bson/bson_string_test.rb
-- test/bson/bson_test.rb
-- test/bson/byte_buffer_test.rb
-- test/bson/hash_with_indifferent_access_test.rb
 - test/bson/json_test.rb
-- test/bson/object_id_test.rb
+- test/bson/byte_buffer_test.rb
 - test/bson/ordered_hash_test.rb
+- test/bson/object_id_test.rb
 - test/bson/test_helper.rb
+- test/bson/bson_test.rb
 - test/bson/timestamp_test.rb
-has_rdoc: true
+- test/bson/hash_with_indifferent_access_test.rb
 homepage: http://www.mongodb.org
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Ruby implementation of BSON
-test_files: 
+test_files:
 - test/bson/binary_test.rb
-- test/bson/bson_string_test.rb
-- test/bson/bson_test.rb
-- test/bson/byte_buffer_test.rb
-- test/bson/hash_with_indifferent_access_test.rb
 - test/bson/json_test.rb
-- test/bson/object_id_test.rb
+- test/bson/byte_buffer_test.rb
 - test/bson/ordered_hash_test.rb
+- test/bson/object_id_test.rb
 - test/bson/test_helper.rb
+- test/bson/bson_test.rb
 - test/bson/timestamp_test.rb
+- test/bson/hash_with_indifferent_access_test.rb

data/test/bson/bson_string_test.rb

@@ -1,30 +0,0 @@
-# encoding:utf-8
-require './test/bson/test_helper'
-require 'complex'
-require 'bigdecimal'
-require 'rational'
-
-class BSONTest < Test::Unit::TestCase
-
-  include BSON
-
-  def setup
-    @encoder = BSON::BSON_CODER
-  end
-
-  def assert_doc_pass(doc, options={})
-    bson = @encoder.serialize(doc)
-    if options[:debug]
-      puts "DEBUGGING DOC:"
-      p bson.to_a
-      puts "DESERIALIZES TO:"
-    end
-    assert_equal @encoder.serialize(doc).to_a, bson.to_a
-    assert_equal doc, @encoder.deserialize(bson)
-  end
-
-  def test_string
-    assert_doc_pass({:a => "hello"})
-  end
-
-end