bson 1.0.3 → 1.0.4

data/bin/b2json

@@ -20,6 +20,8 @@
 require 'rubygems'
 require 'bson'
 
+# Note that this will not properly round-trip in all cases
+# from the output generated by j2bson.
 begin
 require 'yajl'
 rescue LoadError

data/bin/j2bson

@@ -0,0 +1,72 @@
+#!/usr/bin/ruby
+# 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.
+# ++
+
+require 'rubygems'
+require 'bson'
+
+# We don't use YAJL because we need to specify the class
+# to store the JSON object in.  BSON is ordered so we need BSON::OrderedHash
+#
+# We use json/pure because json/ext is broken with BSON::OrderedHash
+# (probably for the same reasons that we can't use YAJL).
+#
+# Note that, at the moment, this will not properly round-trip
+# in all cases from the output generated by b2json.
+begin
+require 'json/pure'  # broken with 'json/ext'
+rescue LoadError
+  puts "This script requires json/pure. Please install one of the following:"
+  puts "  gem install json_pure" 
+  puts "  gem install json" 
+  Process.exit
+end
+
+# Convert all JSON objects in an IO into BSON.
+def print_j2bson(io)
+  io.each_line do |line|
+    jsonobj = JSON.parse(line, { :object_class => BSON::OrderedHash } )
+    bsonobj = BSON.serialize(jsonobj)
+    STDOUT << bsonobj.to_s
+  end
+end
+
+# print usage
+def usage()
+    STDERR << <<END_OF_USAGE
+usage:  j2bson [-h] [file1 [file2]]
+
+   Converts a JSON file to BSON on STDOUT.
+   You can pass multiple filenames.
+   If no filenames are passed, then STDIN is consumed.
+
+END_OF_USAGE
+    exit
+end
+
+# no arg, use STDIN
+# -h, print usage and exit
+# otherwise loop of filenames
+if ARGV.empty? then
+    print_j2bson(STDIN)
+    exit
+elsif ARGV[0] == "-h" then
+    usage()
+else
+    ARGV.each { |fname| print_j2bson(File.new(fname)) }
+end

data/bson.gemspec

@@ -13,10 +13,10 @@ Gem::Specification.new do |s|
 
   s.files  = ['Rakefile', 'bson.gemspec', 'LICENSE.txt']
   s.files += ['lib/bson.rb'] + Dir['lib/bson/**/*.rb']
-  s.files += ['bin/b2json']
+  s.files += ['bin/b2json', 'bin/j2bson']
   s.test_files = Dir['test/mongo_bson/*.rb']
 
-  s.executables = ['b2json']
+  s.executables = ['b2json', 'j2bson']
 
   s.has_rdoc = true
 

data/lib/bson.rb

@@ -2,10 +2,10 @@
 
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
-MINIMUM_BSON_EXT_VERSION = "1.0.1"
+MINIMUM_BSON_EXT_VERSION = "1.0.4"
 
 module BSON
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
   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

@@ -27,9 +27,12 @@ module BSON
 
     def ==(other)
       begin
-        !other.nil? &&
-          keys == other.keys &&
-          values == other.values
+        case other
+        when BSON::OrderedHash
+           keys == other.keys && values == other.values
+        else
+          !other.nil? && keys.size == other.keys.size && keys.all? {|x| self[x] == other[x] }
+        end
       rescue
         false
       end

data/lib/bson/types/objectid.rb

@@ -140,7 +140,7 @@ module BSON
     # but lacks an ObjectID type, this JSON format encodes the type using an $oid key.
     #
     # @return [String] the object id represented as MongoDB extended JSON.
-    def to_json(escaped=false)
+    def to_json(*a)
       "{\"$oid\": \"#{to_s}\"}"
     end
 

data/test/mongo_bson/jruby_encode_test.rb

@@ -44,11 +44,23 @@ class BSONTest < Test::Unit::TestCase
     assert_equal doc, @encoder.deserialize(bson)
   end
 
-  def test_null
-    #doc = {"\x00" => "foo"}
-    #@encoder.serialize(doc)
-    @encoder.serialize({"a" => (Regexp.compile "ab\x00c")})
-  end
+#  def test_null
+#    #doc = {"\x00" => "foo"}
+#    #@encoder.serialize(doc)
+#    @encoder.serialize({"a" => (Regexp.compile "ab\x00c")})
+#  end
+
+#  def test_dbref
+#    oid = ObjectID.new
+#    doc = {}
+#    doc['dbref'] = DBRef.new('namespace', oid)
+#    bson = BSON::BSON_CODER.serialize(doc)
+#    doc2 = BSON::BSON_CODER.deserialize(bson)
+#    puts doc2.class
+#    puts doc2
+#    assert_equal 'namespace', doc2['dbref'].namespace
+#    assert_equal oid, doc2['dbref'].object_id
+#  end
 
 #  def test_null_character
 #    #assert_raise InvalidDocument do
@@ -168,15 +180,15 @@ class BSONTest < Test::Unit::TestCase
 #    assert_equal doc, BSON::BSON_CODER.deserialize(bson)
 #  end
 #
-#  def test_ordered_hash
-#    doc = BSON::OrderedHash.new
-#    doc["b"] = 1
-#    doc["a"] = 2
-#    doc["c"] = 3
-#    doc["d"] = 4
-#    bson = BSON::BSON_CODER.serialize(doc)
-#    assert_equal doc, BSON::BSON_CODER.deserialize(bson)
-#  end
+  def test_ordered_hash
+    doc = BSON::OrderedHash.new
+    doc["b"] = 1
+    doc["a"] = 2
+    doc["c"] = 3
+    doc["d"] = 4
+    bson = BSON::BSON_CODER.serialize(doc)
+    assert_equal doc, BSON::BSON_CODER.deserialize(bson)
+  end
 #
 #  def test_object
 #    doc = {'doc' => {'age' => 42, 'name' => 'Spongebob', 'shoe_size' => 9.5}}

data/test/mongo_bson/json_test.rb

@@ -7,14 +7,10 @@ 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
+  def test_object_id_as_json
     id = ObjectID.new
-    assert_json id, "{\"$oid\": \"#{id}\"}"
+    obj = {'_id' => id}
+    assert_equal "{\"_id\":{\"$oid\": \"#{id.to_s}\"}}", obj.to_json
   end
 
 end

data/test/mongo_bson/ordered_hash_test.rb

@@ -140,6 +140,16 @@ class OrderedHashTest < Test::Unit::TestCase
     assert_equal ['crab', 'apple', 3, 'foo'], @oh.values
   end
 
+  def test_equality_with_hash
+    o = BSON::OrderedHash.new
+    o[:a] = 1
+    o[:b] = 2
+    o[:c] = 3
+    r = {:a => 1, :b => 2, :c => 3}
+    assert r == o
+    assert o == r
+  end
+
   def test_update
     other = BSON::OrderedHash.new
     other['f'] = 'foo'

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 3
-  version: 1.0.3
+  - 4
+  version: 1.0.4
 platform: ruby
 authors: 
 - Jim Menard
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-15 00:00:00 -04:00
+date: 2010-07-13 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -24,6 +24,7 @@ description: A Ruby BSON implementation for MongoDB. For more information about
 email: mongodb-dev@googlegroups.com
 executables: 
 - b2json
+- j2bson
 extensions: []
 
 extra_rdoc_files: []
@@ -44,6 +45,7 @@ files:
 - lib/bson/types/min_max_keys.rb
 - lib/bson/types/objectid.rb
 - bin/b2json
+- bin/j2bson
 has_rdoc: true
 homepage: http://www.mongodb.org
 licenses: []