bson 1.0.2 → 1.0.3

data/Rakefile

@@ -110,7 +110,7 @@ end
 
 desc "Generate documentation"
 task :rdoc do
-  version = eval(File.read("mongo-ruby-driver.gemspec")).version
+  version = eval(File.read("mongo.gemspec")).version
   out = File.join('html', version.to_s)
   FileUtils.rm_rf('html')
   system "rdoc --main README.rdoc --op #{out} --inline-source --quiet README.rdoc `find lib -name '*.rb'`"
@@ -121,7 +121,7 @@ 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 -e docs/yard_ext.rb -p docs/templates -o #{out} --title MongoRuby-#{Mongo::VERSION}"
+  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"
@@ -136,7 +136,7 @@ namespace :gem do
   task :install do
     sh "gem build bson.gemspec"
     sh "gem install bson-*.gem"
-    sh "gem build mongo-ruby-driver.gemspec"
+    sh "gem build mongo.gemspec"
     sh "gem install mongo-*.gem"
     sh "rm mongo-*.gem"
     sh "rm bson-*.gem"

data/bin/b2json

@@ -40,10 +40,10 @@ end
 # print usage
 def usage()
     STDERR << <<END_OF_USAGE
-usage:  b2json.rb [-h] [file1 [file2]]
+usage:  b2json [-h] [file1 [file2]]
 
    Converts a BSON file to JSON on STDOUT.
-   You can pass multiple filename.
+   You can pass multiple filenames.
    If no filenames are passed, then STDIN is consumed.
 
 END_OF_USAGE

data/lib/bson.rb

@@ -5,7 +5,7 @@ $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 MINIMUM_BSON_EXT_VERSION = "1.0.1"
 
 module BSON
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
   def self.serialize(obj, check_keys=false, move_id=false)
     BSON_CODER.serialize(obj, check_keys, move_id)
   end

data/lib/bson/ordered_hash.rb

@@ -20,6 +20,8 @@
 #
 # Under Ruby 1.9 and greater, this class has no added methods because Ruby's
 # Hash already keeps its keys ordered by order of insertion.
+require 'set'
+
 module BSON
   class OrderedHash < Hash
 
@@ -55,6 +57,7 @@ module BSON
       def initialize(*a, &b)
         super
         @ordered_keys = []
+        @ordered_set = Set.new
       end
 
       def keys
@@ -63,7 +66,11 @@ module BSON
 
       def []=(key, value)
         @ordered_keys ||= []
-        @ordered_keys << key unless @ordered_keys.include?(key)
+        @ordered_set ||= Set.new
+        unless @ordered_set.member?(key)
+          @ordered_keys << key
+          @ordered_set.add(key)
+        end
         super(key, value)
       end
 
@@ -93,6 +100,7 @@ module BSON
         @ordered_keys ||= []
         @ordered_keys += other.keys # unordered if not an BSON::OrderedHash
         @ordered_keys.uniq!
+        @ordered_set = Set.new(@ordered_keys)
         super(other)
       end
 
@@ -106,6 +114,7 @@ module BSON
 
       def delete(key, &block)
         @ordered_keys.delete(key) if @ordered_keys
+        @ordered_set.delete(key) if @ordered_set
         super
       end
 
@@ -119,6 +128,7 @@ module BSON
 
       def clear
         super
+        @ordered_set.clear
         @ordered_keys = []
       end
 

data/test/mongo_bson/jruby_encode_test.rb

@@ -36,15 +36,33 @@ class BSONTest < Test::Unit::TestCase
   include BSON
   
   def setup
-    @coder = BSON::BSON_CODER
+    @encoder = BSON::BSON_CODER
   end
 
   def assert_doc_pass(doc)
-    bson = @coder.serialize(doc)
-    assert_equal doc, @coder.deserialize(bson)
+    bson = @encoder.serialize(doc)
+    assert_equal doc, @encoder.deserialize(bson)
   end
 
-#  def test_symbol_key
+  def test_null
+    #doc = {"\x00" => "foo"}
+    #@encoder.serialize(doc)
+    @encoder.serialize({"a" => (Regexp.compile "ab\x00c")})
+  end
+
+#  def test_null_character
+#    #assert_raise InvalidDocument do
+#     bson = @encoder.serialize({"\x00" => "a"})
+#     puts bson
+#    #end
+#    puts BSON_RUBY.deserialize(bson)
+#
+#    #assert_raise InvalidDocument do
+#    #  @encoder.serialize({"a" => (Regexp.compile "ab\x00c")})
+#    #end
+#  end
+#
+##  def test_symbol_key
 #    doc     = {:foo => "bar"}
 #    p doc.keys
 #    bson    = @coder.serialize(doc)
@@ -55,17 +73,17 @@ class BSONTest < Test::Unit::TestCase
 #  def test_string
 #    assert_doc_pass({'doc' => 'hello, world'})
 #  end
+##
+#  require 'iconv'
+#      def test_invalid_string
+#      require 'iconv'
+#      string = Iconv.conv('iso-8859-1', 'utf-8', 'aé')
+#      doc = {'doc' => string}
+#      bson = @coder.serialize(doc)
+#      assert_equal doc, @coder.deserialize(bson)
+#    end
+#
 #
-  require 'iconv'
-      def test_invalid_string
-      require 'iconv'
-      string = Iconv.conv('iso-8859-1', 'utf-8', 'aé')
-      doc = {'doc' => string}
-      bson = @coder.serialize(doc)
-      assert_equal doc, @coder.deserialize(bson)
-    end
-
-
 #  def test_nested_string
 #    assert_doc_pass({'doc' => {'text' => 'hello, world'}})
 #  end

data/test/mongo_bson/json_test.rb

@@ -0,0 +1,20 @@
+require 'test/test_helper'
+require 'rubygems'
+require 'json'
+
+class JSONTest < Test::Unit::TestCase
+
+  include Mongo
+  include BSON
+
+  def assert_json(obj, json)
+    assert_equal json, obj.to_json
+    assert_equal obj, obj.class.json_create(json)
+  end
+
+  def test_json
+    id = ObjectID.new
+    assert_json id, "{\"$oid\": \"#{id}\"}"
+  end
+
+end

metadata

@@ -1,45 +1,49 @@
 --- !ruby/object:Gem::Specification 
 name: bson
 version: !ruby/object:Gem::Version 
-  version: 1.0.2
+  prerelease: false
+  segments: 
+  - 1
+  - 0
+  - 3
+  version: 1.0.3
 platform: ruby
 authors: 
-  - Jim Menard
-  - Mike Dirolf
-  - Kyle Banker
+- Jim Menard
+- Mike Dirolf
+- Kyle Banker
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-06-05 00:00:00 -04:00
+date: 2010-06-15 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
+- b2json
 extensions: []
 
 extra_rdoc_files: []
 
 files: 
-  - Rakefile
-  - bson.gemspec
-  - 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/objectid.rb
-  - bin/b2json
+- Rakefile
+- bson.gemspec
+- LICENSE.txt
+- lib/bson.rb
+- lib/bson/bson_c.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/objectid.rb
+- bin/b2json
 has_rdoc: true
 homepage: http://www.mongodb.org
 licenses: []
@@ -48,32 +52,35 @@ post_install_message:
 rdoc_options: []
 
 require_paths: 
-  - lib
+- lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  version: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  version: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Ruby implementation of BSON
 test_files: 
-  - test/mongo_bson/basic_test.rb
-  - test/mongo_bson/binary_test.rb
-  - test/mongo_bson/bson_test.rb
-  - test/mongo_bson/byte_buffer_test.rb
-  - test/mongo_bson/jruby_bson_test.rb
-  - test/mongo_bson/jruby_encode_test.rb
-  - test/mongo_bson/objectid_test.rb
-  - test/mongo_bson/ordered_hash_test.rb
+- test/mongo_bson/basic_test.rb
+- test/mongo_bson/binary_test.rb
+- test/mongo_bson/bson_test.rb
+- test/mongo_bson/byte_buffer_test.rb
+- test/mongo_bson/jruby_bson_test.rb
+- test/mongo_bson/jruby_encode_test.rb
+- test/mongo_bson/json_test.rb
+- test/mongo_bson/objectid_test.rb
+- test/mongo_bson/ordered_hash_test.rb

data/lib/bson/bson_java.rb

@@ -1,123 +0,0 @@
-# encoding: UTF-8
-# A thin wrapper for the CBson class
-module BSON
-  module JMongo
-    import com.mongodb.BasicDBList
-    import com.mongodb.BasicDBObject
-    import com.mongodb.Bytes
-    import org.bson.BSONDecoder
-    import org.bson.BSONEncoder
-
-    import org.bson.BSONCallback
-    import org.bson.types.BasicBSONList
-    import org.bson.BasicBSONObject
-    import org.bson.types.Binary
-    import org.bson.types.ObjectId
-    import org.bson.types.Symbol
-    import org.bson.types.CodeWScope
-  end
-end
-
-module BSON
-  class BSON_JAVA
-    #ENC = JMongo::BSONEncoder.new
-    BSON::ObjectID
-
-    ENC = Java::OrgJbson::RubyBSONEncoder.new(JRuby.runtime)
-    DEC = JMongo::BSONDecoder.new
-
-
-    def self.deserialize(buf)
-      if buf.is_a? String
-        buf = ByteBuffer.new(buf.unpack("C*")) if buf
-      end
-      callback = Java::OrgJbson::RubyBSONCallback.new(JRuby.runtime)
-      DEC.decode(buf.to_a.to_java(Java::byte), callback)
-      callback.get
-    end
-
-    def deserialize(buf)
-      callback = Java::OrgJbson::RubyBSONCallback.new(JRuby.runtime)
-      DEC.decode(buf.to_a.to_java(Java::byte), callback)
-      callback.get
-    end
-
-    def self.serialize(obj, check=false, move=false)
-      ENC.encode(obj)
-    end
-
-    def to_dbobject obj
-      case obj
-      when Array
-        array_to_dblist obj
-      when Hash
-        hash_to_dbobject obj
-      #when BSON::Binary
-      #  JMongo::Binary.new(obj.subtype, obj.to_a)
-      when BSON::ObjectID
-        JMongo::ObjectId.new(obj.to_s)
-      when Regexp
-        str     = obj.source
-        options = obj.options
-        options_flag = 0
-        options_flag |= JavaPattern::CASE_INSENSITIVE if ((options & Regexp::IGNORECASE) != 0)
-        options_flag |= JavaPattern::MULTILINE  if ((options & Regexp::MULTILINE) != 0)
-        #options_flag |= JavaPattern::EXTENDED if ((options & Regexp::EXTENDED) != 0)
-        Java::JavaUtilRegex::Pattern.compile(str, options_flag)
-      when Symbol
-        JMongo::Symbol.new(obj)
-      when BSON::Binary
-        obj.put_int(obj.size, 0)
-        b = JMongo::Binary.new(obj.subtype, obj.to_a.to_java(Java::byte))
-        obj.to_a.to_java(Java::byte)
-      when BSON::DBRef
-
-
-      else
-        # primitive value, no conversion necessary
-        #puts "Un-handled class type [#{obj.class}]"
-        obj
-      end
-    end
-
-    def from_java_object(obj)
-      case obj
-       when JMongo::BasicBSONList
-        obj
-       when JMongo::BasicBSONObject
-        hsh = {}
-        obj.toMap.keySet.each do |key|
-          value    = obj.get(key)
-          hsh[key] = self.from_java_object(value)
-        end
-        hsh
-       when JMongo::ObjectId
-         BSON::ObjectID.from_string(obj.toStringMongod())
-       else
-         obj
-       end
-    end
-
-    private
-
-    def hash_to_dbobject doc
-      obj = JMongo::BasicDBObject.new
-
-      doc.each_pair do |key, value|
-        obj.append(key, to_dbobject(value))
-      end
-
-      obj
-    end
-
-    def array_to_dblist ary
-      list = JMongo::BasicDBList.new
-
-      ary.each_with_index do |element, index|
-        list.put(index, to_dbobject(element))
-      end
-
-      list
-    end
-  end
-end