bson 1.3.0.rc0-jruby → 1.3.1-jruby

data/lib/bson/bson_java.rb

@@ -11,7 +11,7 @@ module BSON
     end
 
     def self.deserialize(buf)
-      dec = Java::OrgBson::BSONDecoder.new
+      dec = Java::OrgJbson::RubyBSONDecoder.new
       callback = Java::OrgJbson::RubyBSONCallback.new(JRuby.runtime)
       dec.decode(buf.to_s.to_java_bytes, callback)
       callback.get

data/lib/bson/bson_ruby.rb

@@ -343,6 +343,7 @@ module BSON
       opts = 0
       opts |= Regexp::IGNORECASE if options_str.include?('i')
       opts |= Regexp::MULTILINE if options_str.include?('m')
+      opts |= Regexp::MULTILINE if options_str.include?('s')
       opts |= Regexp::EXTENDED if options_str.include?('x')
       Regexp.new(str, opts)
     end
@@ -500,7 +501,10 @@ module BSON
       options = val.options
       options_str = ''
       options_str << 'i' if ((options & Regexp::IGNORECASE) != 0)
-      options_str << 'm' if ((options & Regexp::MULTILINE) != 0)
+      if ((options & Regexp::MULTILINE) != 0)
+        options_str << 'm'
+        options_str << 's'
+      end
       options_str << 'x' if ((options & Regexp::EXTENDED) != 0)
       options_str << val.extra_options_str if val.respond_to?(:extra_options_str)
       # Must store option chars in alphabetical order

data/lib/bson/byte_buffer.rb

@@ -236,12 +236,12 @@ module BSON
       other.respond_to?(:to_s) && @str == other.to_s
     end
 
-    def to_a
-      @str.unpack("C*")
+    def to_a(format="C*")
+      @str.unpack(format)
     end
 
-    def unpack(args)
-      to_a
+    def unpack(format="C*")
+      to_a(format)
     end
 
     def to_s

data/lib/bson/exceptions.rb

@@ -29,10 +29,7 @@ module BSON
   # Raised when given a string is not valid utf-8 (Ruby 1.8 only).
   class InvalidStringEncoding < BSONError; end
 
-  # Raised when attempting to initialize an invalid ObjectID.
-  class InvalidObjectID < BSONError; end
-
-  # Raised when attempting to initialize an invalid ObjectID.
+  # Raised when attempting to initialize an invalid ObjectId.
   class InvalidObjectId < BSONError; end
 
   # Raised when trying to insert a document that exceeds the 4MB limit or

data/lib/bson/ordered_hash.rb

@@ -57,16 +57,21 @@ module BSON
       end
 
       def initialize(*a, &b)
-        super
         @ordered_keys = []
+        super
+      end
+
+      def yaml_initialize(tag, val)
+        @ordered_keys = []        
+        super
       end
 
       def keys
-        @ordered_keys || []
+        @ordered_keys# || []
       end
 
       def []=(key, value)
-        @ordered_keys ||= []
+        #@ordered_keys ||= []
         unless has_key?(key)
           @ordered_keys << key
         end
@@ -74,14 +79,14 @@ module BSON
       end
 
       def each
-        @ordered_keys ||= []
+        #@ordered_keys ||= []
         @ordered_keys.each { |k| yield k, self[k] }
         self
       end
       alias :each_pair :each
 
       def to_a
-        @ordered_keys ||= []
+        #@ordered_keys ||= []
         @ordered_keys.map { |k| [k, self[k]] }      
       end
 
@@ -96,7 +101,7 @@ module BSON
       end
 
       def merge!(other)
-        @ordered_keys ||= []
+        #@ordered_keys ||= []
         @ordered_keys += other.keys # unordered if not an BSON::OrderedHash
         @ordered_keys.uniq!
         super(other)
@@ -106,7 +111,7 @@ module BSON
       
       def dup
         result = OrderedHash.new
-        @ordered_keys ||= []
+        #@ordered_keys ||= []
         @ordered_keys.each do |key|
           result[key] = self[key]
         end
@@ -125,11 +130,11 @@ module BSON
       end
 
       def delete_if(&block)
-        self.each { |k,v|
+        self.each do |k,v|
           if yield k, v
             delete(k)
           end
-        }
+        end
       end
 
       def reject(&block)
@@ -138,6 +143,17 @@ module BSON
         clone.delete_if(&block)
       end
 
+      def reject!(&block)
+        changed = false
+        self.each do |k,v|
+          if yield k, v
+            changed = true
+            delete(k)
+          end
+        end
+        changed ? self : nil
+      end
+
       def clear
         super
         @ordered_keys = []

data/lib/bson/types/dbref.rb

@@ -26,7 +26,7 @@ module BSON
     # Create a DBRef. Use this class in conjunction with DB#dereference.
     #
     # @param [String] a collection name
-    # @param [ObjectID] an object id
+    # @param [ObjectId] an object id
     #
     # @core dbrefs constructor_details
     def initialize(namespace, object_id)

data/lib/bson.rb

@@ -18,10 +18,10 @@
 
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
-MINIMUM_BSON_EXT_VERSION = "1.3.0.rc0"
+MINIMUM_BSON_EXT_VERSION = "1.3.1"
 
 module BSON
-  VERSION = "1.3.0.rc0"
+  VERSION = "1.3.1"
 
   if defined? Mongo::DEFAULT_MAX_BSON_SIZE
     DEFAULT_MAX_BSON_SIZE = Mongo::DEFAULT_MAX_BSON_SIZE
@@ -57,7 +57,6 @@ end
 if RUBY_PLATFORM =~ /java/
   jar_dir = File.join(File.dirname(__FILE__), '..', 'ext', 'java', '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'
   module BSON

data/test/bson/bson_test.rb

@@ -245,6 +245,11 @@ class BSONTest < Test::Unit::TestCase
     assert_doc_pass(doc)
   end
 
+  def test_regex_multiline
+    doc = {'doc' => /foobar/m}
+    assert_doc_pass(doc)
+  end
+
   def test_boolean
     doc = {'doc' => true}
     assert_doc_pass(doc)

data/test/bson/byte_buffer_test.rb

@@ -21,6 +21,13 @@ class ByteBufferTest < Test::Unit::TestCase
     assert_equal 1, @buf.get
   end
 
+  def test_unpack
+    @buf.put_array([17, 2, 3, 4])
+    assert_equal [17, 2, 3, 4], @buf.to_a
+    assert_equal ["11020304"], @buf.unpack("H*")
+    assert_equal ["11020304"], @buf.to_a("H*")
+  end
+
   def test_one_get_returns_array_length_one
     @buf.put_array([1, 2, 3, 4])
     @buf.rewind

data/test/bson/ordered_hash_test.rb

@@ -187,6 +187,12 @@ class OrderedHashTest < Test::Unit::TestCase
     assert !new.keys.include?('z')
   end
 
+  def test_reject_bang
+    @oh.reject! { |k, v| k == 'z' }
+    assert !@oh.keys.include?('z')
+    assert_nil @oh.reject! { |k, v| k == 'z' }
+  end
+
   def test_clone
     copy = @oh.clone
     assert copy.keys == @oh.keys
@@ -194,7 +200,7 @@ class OrderedHashTest < Test::Unit::TestCase
     copy[:foo] = 1
     assert copy.keys != @oh.keys
   end
-  
+
   def test_dup
     oh2 = @oh.dup
     oh2['f'] = 9

metadata

@@ -1,59 +1,53 @@
 --- !ruby/object:Gem::Specification 
 name: bson
 version: !ruby/object:Gem::Version 
-  prerelease: 6
-  version: 1.3.0.rc0
+  prerelease: false
+  segments: 
+    - 1
+    - 3
+    - 1
+  version: 1.3.1
 platform: jruby
 authors: 
-- Jim Menard
-- Mike Dirolf
-- Kyle Banker
+  - Jim Menard
+  - Mike Dirolf
+  - Kyle Banker
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-03-29 00:00:00 -04:00
+date: 2011-05-11 00:00:00 -04:00
 default_executable: 
 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.
 email: mongodb-dev@googlegroups.com
 executables: 
-- b2json
-- j2bson
+  - b2json
+  - j2bson
 extensions: []
 
 extra_rdoc_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
-- bin/b2json
-- bin/j2bson
-- ext/java/jar/bson-2.2.jar
-- ext/java/jar/jbson.jar
-- ext/java/jar/mongo-2.4.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/ordered_hash_test.rb
-- test/bson/timestamp_test.rb
+  - LICENSE.txt
+  - lib/bson.rb
+  - lib/bson/bson_ruby.rb
+  - lib/bson/bson_c.rb
+  - lib/bson/exceptions.rb
+  - lib/bson/ordered_hash.rb
+  - lib/bson/byte_buffer.rb
+  - lib/bson/bson_java.rb
+  - lib/bson/types/dbref.rb
+  - lib/bson/types/code.rb
+  - lib/bson/types/object_id.rb
+  - lib/bson/types/binary.rb
+  - lib/bson/types/timestamp.rb
+  - lib/bson/types/min_max_keys.rb
+  - bin/b2json
+  - bin/j2bson
+  - ext/java/jar/jbson.jar
+  - ext/java/jar/mongo-2.4.jar
 has_rdoc: true
 homepage: http://www.mongodb.org
 licenses: []
@@ -62,33 +56,34 @@ post_install_message:
 rdoc_options: []
 
 require_paths: 
-- lib
+  - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+          - 0
+        version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 1.3.1
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+          - 0
+        version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Ruby implementation of BSON
 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/ordered_hash_test.rb
-- test/bson/timestamp_test.rb
+  - test/bson/byte_buffer_test.rb
+  - test/bson/binary_test.rb
+  - test/bson/object_id_test.rb
+  - test/bson/json_test.rb
+  - test/bson/timestamp_test.rb
+  - test/bson/bson_test.rb
+  - test/bson/ordered_hash_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/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