bson 1.3.0.rc0 → 1.3.0

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.0"
 
 module BSON
-  VERSION = "1.3.0.rc0"
+  VERSION = "1.3.0"
 
   if defined? Mongo::DEFAULT_MAX_BSON_SIZE
     DEFAULT_MAX_BSON_SIZE = Mongo::DEFAULT_MAX_BSON_SIZE

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/ordered_hash.rb

@@ -62,11 +62,11 @@ module BSON
       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 +74,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 +96,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 +106,7 @@ module BSON
       
       def dup
         result = OrderedHash.new
-        @ordered_keys ||= []
+        #@ordered_keys ||= []
         @ordered_keys.each do |key|
           result[key] = self[key]
         end

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

metadata

@@ -1,8 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: bson
 version: !ruby/object:Gem::Version 
-  prerelease: 6
-  version: 1.3.0.rc0
+  prerelease: false
+  segments: 
+  - 1
+  - 3
+  - 0
+  version: 1.3.0
 platform: ruby
 authors: 
 - Jim Menard
@@ -12,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-29 00:00:00 -04:00
+date: 2011-04-01 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -28,29 +32,28 @@ 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/bson_c.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/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
+- lib/bson/byte_buffer.rb
+- lib/bson/bson_java.rb
 - bin/b2json
 - bin/j2bson
-- 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/binary_test.rb
 - test/bson/object_id_test.rb
-- test/bson/ordered_hash_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
 has_rdoc: true
 homepage: http://www.mongodb.org
 licenses: []
@@ -65,27 +68,30 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !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
+      segments: 
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.3.7
 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/binary_test.rb
 - test/bson/object_id_test.rb
-- test/bson/ordered_hash_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