bson 1.0.9 → 1.1

data/Rakefile

@@ -13,6 +13,29 @@ require 'rbconfig'
 include Config
 ENV['TEST_MODE'] = 'TRUE'
 
+task :java do
+  Rake::Task['build:java'].invoke
+  Rake::Task['test:ruby'].invoke
+end
+
+namespace :build do
+  desc "Build the java extensions."
+  task :java do
+    puts "Building Java extensions..."
+    java_dir  = File.join(File.dirname(__FILE__), 'ext', 'java')
+    jar_dir   = File.join(java_dir, 'jar')
+
+    jruby_jar = File.join(jar_dir, 'jruby.jar')
+    mongo_jar = File.join(jar_dir, 'mongo.jar')
+    bson_jar = File.join(jar_dir, 'bson.jar')
+
+    src_base   = File.join(java_dir, 'src')
+
+    system("javac -Xlint:unchecked -classpath #{jruby_jar}:#{mongo_jar}:#{bson_jar} #{File.join(src_base, 'org', 'jbson', '*.java')}")
+    system("cd #{src_base} && jar cf #{File.join(jar_dir, 'jbson.jar')} #{File.join('.', 'org', 'jbson', '*.class')}")
+  end
+end
+
 desc "Test the MongoDB Ruby driver."
 task :test do
   puts "\nThis option has changed."

data/bson.gemspec

@@ -14,6 +14,7 @@ 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', 'bin/j2bson']
+  s.files += Dir['ext/java/jar/**/*.jar']
   s.test_files = Dir['test/mongo_bson/*.rb']
 
   s.executables = ['b2json', 'j2bson']

data/lib/bson.rb

@@ -2,10 +2,10 @@
 
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
-MINIMUM_BSON_EXT_VERSION = "1.0.9"
+MINIMUM_BSON_EXT_VERSION = "1.1"
 
 module BSON
-  VERSION = "1.0.9"
+  VERSION = "1.1"
   def self.serialize(obj, check_keys=false, move_id=false)
     BSON_CODER.serialize(obj, check_keys, move_id)
   end
@@ -32,34 +32,44 @@ module BSON
   end
 end
 
-begin
-  # Need this for running test with and without c ext in Ruby 1.9.
-  raise LoadError if ENV['TEST_MODE'] && !ENV['C_EXT']
-  require 'bson_ext/cbson'
-  raise LoadError unless defined?(CBson::VERSION)
-  if CBson::VERSION < MINIMUM_BSON_EXT_VERSION
-    puts "Able to load bson_ext version #{CBson::VERSION}, but >= #{MINIMUM_BSON_EXT_VERSION} is required."
-    raise LoadError
-  end
-  require 'bson/bson_c'
+if RUBY_PLATFORM =~ /java/
+  jar_dir = File.join(File.dirname(__FILE__), '..', 'ext', 'java', 'jar')
+  require File.join(jar_dir, 'mongo.jar')
+  require File.join(jar_dir, 'bson.jar')
+  require File.join(jar_dir, 'jbson.jar')
+  require 'bson/bson_java'
   module BSON
-    BSON_CODER = BSON_C
+    BSON_CODER = BSON_JAVA
   end
-rescue LoadError
-  require 'bson/bson_ruby'
-  module BSON
-    BSON_CODER = BSON_RUBY
+else
+  begin
+    # Need this for running test with and without c ext in Ruby 1.9.
+    raise LoadError if ENV['TEST_MODE'] && !ENV['C_EXT']
+    require 'bson_ext/cbson'
+    raise LoadError unless defined?(CBson::VERSION)
+    if CBson::VERSION < MINIMUM_BSON_EXT_VERSION
+      puts "Able to load bson_ext version #{CBson::VERSION}, but >= #{MINIMUM_BSON_EXT_VERSION} is required."
+      raise LoadError
+    end
+    require 'bson/bson_c'
+    module BSON
+      BSON_CODER = BSON_C
+    end
+  rescue LoadError
+    require 'bson/bson_ruby'
+    module BSON
+      BSON_CODER = BSON_RUBY
+    end
+    warn "\n**Notice: C extension not loaded. This is required for optimum MongoDB Ruby driver performance."
+    warn "  You can install the extension as follows:\n  gem install bson_ext\n"
+    warn "  If you continue to receive this message after installing, make sure that the"
+    warn "  bson_ext gem is in your load path and that the bson_ext and mongo gems are of the same version.\n"
   end
-  warn "\n**Notice: C extension not loaded. This is required for optimum MongoDB Ruby driver performance."
-  warn "  You can install the extension as follows:\n  gem install bson_ext\n"
-  warn "  If you continue to receive this message after installing, make sure that the"
-  warn "  bson_ext gem is in your load path and that the bson_ext and mongo gems are of the same version.\n"
 end
 
 require 'bson/types/binary'
 require 'bson/types/code'
 require 'bson/types/dbref'
-require 'bson/types/objectid'
 require 'bson/types/object_id'
 require 'bson/types/min_max_keys'
 

data/lib/bson/bson_java.rb

@@ -0,0 +1,21 @@
+include Java
+module BSON
+  class BSON_JAVA
+
+    # TODO: Pool or cache instances of RubyBSONEncoder so that
+    # we don't create a new one on each call to #serialize.
+    def self.serialize(obj, check_keys=false, move_id=false)
+      raise InvalidDocument, "BSON_JAVA.serialize takes a Hash" unless obj.is_a?(Hash)
+      enc = Java::OrgJbson::RubyBSONEncoder.new(JRuby.runtime)
+      ByteBuffer.new(enc.encode(obj))
+    end
+
+    def self.deserialize(buf)
+      dec = Java::OrgBson::BSONDecoder.new
+      callback = Java::OrgJbson::RubyBSONCallback.new(JRuby.runtime)
+      dec.decode(buf.to_s.to_java_bytes, callback)
+      callback.get
+    end
+
+  end
+end

data/lib/bson/bson_ruby.rb

@@ -44,6 +44,7 @@ module BSON
 
     def initialize
       @buf = ByteBuffer.new
+      @encoder = BSON_RUBY
     end
 
     if RUBY_VERSION >= '1.9'
@@ -303,7 +304,7 @@ module BSON
     def deserialize_object_data(buf)
       size = buf.get_int
       buf.position -= 4
-      object = BSON_CODER.new().deserialize(buf.get(size))
+      object = @encoder.new().deserialize(buf.get(size))
       if object.has_key? "$ref"
         DBRef.new(object["$ref"], object["$id"])
       else
@@ -358,7 +359,7 @@ module BSON
 
       scope_size = buf.get_int
       buf.position -= 4
-      scope = BSON_CODER.new().deserialize(buf.get(scope_size))
+      scope = @encoder.new().deserialize(buf.get(scope_size))
 
       Code.new(encoded_str(code), scope)
     end
@@ -452,7 +453,7 @@ module BSON
     def serialize_object_element(buf, key, val, check_keys, opcode=OBJECT)
       buf.put(opcode)
       self.class.serialize_key(buf, key)
-      buf.put_array(BSON_CODER.new.serialize(val, check_keys).to_a)
+      buf.put_array(@encoder.new.serialize(val, check_keys).to_a)
     end
 
     def serialize_array_element(buf, key, val, check_keys)
@@ -527,9 +528,9 @@ module BSON
       len_pos = buf.position
       buf.put_int(0)
 
-      buf.put_int(val.length + 1)
-      self.class.serialize_cstr(buf, val)
-      buf.put_array(BSON_CODER.new.serialize(val.scope).to_a)
+      buf.put_int(val.code.length + 1)
+      self.class.serialize_cstr(buf, val.code)
+      buf.put_array(@encoder.new.serialize(val.scope).to_a)
 
       end_pos = buf.position
       buf.put_int(end_pos - len_pos, len_pos)
@@ -564,8 +565,6 @@ module BSON
         ARRAY
       when Regexp
         REGEX
-      when ObjectID
-        OID
       when ObjectId
         OID
       when DBRef

data/lib/bson/ordered_hash.rb

@@ -30,7 +30,7 @@ module BSON
         when BSON::OrderedHash
            keys == other.keys && values == other.values
         else
-          !other.nil? && keys.size == other.keys.size && keys.all? {|x| self[x] == other[x] }
+          super
         end
       rescue
         false
@@ -126,7 +126,7 @@ module BSON
       def reject(&block)
         clone = self.clone
         return clone unless block_given?
-        clone.delete_if &block
+        clone.delete_if(&block)
       end
 
       def clear

data/lib/bson/types/code.rb

@@ -19,10 +19,10 @@
 module BSON
 
   # JavaScript code to be evaluated by MongoDB.
-  class Code < String
+  class Code
 
     # Hash mapping identifiers to their values
-    attr_accessor :scope
+    attr_accessor :scope, :code
 
     # Wrap code to be evaluated by MongoDB.
     #
@@ -30,9 +30,22 @@ module BSON
     # @param [Hash] a document mapping identifiers to values, which
     #   represent the scope in which the code is to be executed.
     def initialize(code, scope={})
-      super(code)
+      @code  = code
       @scope = scope
     end
 
+    def length
+      @code.length
+    end
+
+    def ==(other)
+      self.class == other.class &&
+        @code == other.code && @scope == other.scope
+    end
+
+    def inspect
+      "<BSON::Code:#{object_id} @data=\"#{@code}\" @scope=\"#{@scope.inspect}\">"
+    end
+
   end
 end

data/lib/bson/types/dbref.rb

@@ -38,5 +38,9 @@ module BSON
       "ns: #{namespace}, id: #{object_id}"
     end
 
+    def to_hash
+      {"$ns" => @namespace, "$id" => @object_id }
+    end
+
   end
 end

data/lib/bson/types/object_id.rb

@@ -44,6 +44,8 @@ module BSON
       @data = data || generate
     end
 
+    attr_accessor :data
+
     # Determine if the supplied string is legal. Legal strings will
     # consist of 24 hexadecimal characters.
     #
@@ -106,6 +108,13 @@ module BSON
       @data.dup
     end
 
+    # Get the array representation without cloning.
+    #
+    # @return [Array]
+    def data
+      @data
+    end
+
     # Given a string representation of an ObjectId, return a new ObjectId
     # with that value.
     #

metadata

@@ -1,62 +1,55 @@
 --- !ruby/object:Gem::Specification 
 name: bson
 version: !ruby/object:Gem::Version 
-  hash: 5
   prerelease: false
   segments: 
-  - 1
-  - 0
-  - 9
-  version: 1.0.9
+    - 1
+    - 1
+  version: "1.1"
 platform: ruby
 authors: 
-- Jim Menard
-- Mike Dirolf
-- Kyle Banker
+  - Jim Menard
+  - Mike Dirolf
+  - Kyle Banker
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-09-20 00:00:00 -04:00
+date: 2010-10-04 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: 
-- 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/object_id.rb
-- lib/bson/types/objectid.rb
-- bin/b2json
-- bin/j2bson
-- 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/object_id_test.rb
-- test/mongo_bson/ordered_hash_test.rb
+  - 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/object_id.rb
+  - bin/b2json
+  - bin/j2bson
+  - ext/java/jar/bson.jar
+  - ext/java/jar/jbson.jar
+  - ext/java/jar/jruby.jar
+  - ext/java/jar/mongo.jar
 has_rdoc: true
 homepage: http://www.mongodb.org
 licenses: []
@@ -65,39 +58,27 @@ post_install_message:
 rdoc_options: []
 
 require_paths: 
-- lib
+  - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+          - 0
+        version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+          - 0
+        version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+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/json_test.rb
-- test/mongo_bson/object_id_test.rb
-- test/mongo_bson/ordered_hash_test.rb
+test_files: []
+

data/lib/bson/types/objectid.rb

@@ -1,187 +0,0 @@
-# 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 'thread'
-require 'socket'
-require 'digest/md5'
-
-module BSON
-
-  def BSON::ObjectID(s)
-    ObjectID.from_string(s)
-  end
-
-  # Generates MongoDB object ids.
-  #
-  # @core objectids
-  class ObjectID
-    @@lock  = Mutex.new
-    @@index = 0
-
-    # @deprecated
-    #
-    # Create a new object id. If no parameter is given, an id corresponding
-    # to the ObjectID BSON data type will be created. This is a 12-byte value
-    # consisting of a 4-byte timestamp, a 3-byte machine id, a 2-byte process id,
-    # and a 3-byte counter.
-    #
-    # @param [Array] data should be an array of bytes. If you want
-    #   to generate a standard MongoDB object id, leave this argument blank.
-    def initialize(data=nil)
-      warn "BSON::ObjectID is deprecated. Please use BSON::ObjectId instead."
-      @data = data || generate
-    end
-
-    # Determine if the supplied string is legal. Legal strings will
-    # consist of 24 hexadecimal characters.
-    #
-    # @param [String] str
-    #
-    # @return [Boolean]
-    def self.legal?(str)
-      len = 24
-      str =~ /([0-9a-f]+)/i
-      match = $1
-      str && str.length == len && match == str
-    end
-
-    # Create an object id from the given time. This is useful for doing range
-    # queries; it works because MongoDB's object ids begin
-    # with a timestamp.
-    #
-    # @param [Time] time a utc time to encode as an object id.
-    #
-    # @return [Mongo::ObjectID]
-    #
-    # @example Return all document created before Jan 1, 2010.
-    #   time = Time.utc(2010, 1, 1)
-    #   time_id = ObjectID.from_time(time)
-    #   collection.find({'_id' => {'$lt' => time_id}})
-    def self.from_time(time)
-      self.new([time.to_i,0,0].pack("NNN").unpack("C12"))
-    end
-
-    # Adds a primary key to the given document if needed.
-    #
-    # @param [Hash] doc a document requiring an _id.
-    #
-    # @return [Mongo::ObjectID, Object] returns a newly-created or 
-    #   current _id for the given document.
-    def self.create_pk(doc)
-      doc.has_key?(:_id) || doc.has_key?('_id') ? doc : doc.merge!(:_id => self.new)
-    end
-
-    # Check equality of this object id with another.
-    #
-    # @param [Mongo::ObjectID] object_id
-    def eql?(object_id)
-      @data == object_id.instance_variable_get("@data")
-    end
-    alias_method :==, :eql?
-
-    # Get a unique hashcode for this object.
-    # This is required since we've defined an #eql? method.
-    #
-    # @return [Integer]
-    def hash
-      @data.hash
-    end
-
-    # Get an array representation of the object id.
-    #
-    # @return [Array]
-    def to_a
-      @data.dup
-    end
-
-    # Given a string representation of an ObjectID, return a new ObjectID
-    # with that value.
-    #
-    # @param [String] str
-    #
-    # @return [Mongo::ObjectID]
-    def self.from_string(str)
-      raise InvalidObjectID, "illegal ObjectID format" unless legal?(str)
-      data = []
-      12.times do |i|
-        data[i] = str[i * 2, 2].to_i(16)
-      end
-      self.new(data)
-    end
-
-    # Get a string representation of this object id.
-    #
-    # @return [String]
-    def to_s
-      str = ' ' * 24
-      12.times do |i|
-        str[i * 2, 2] = '%02x' % @data[i]
-      end
-      str
-    end
-
-    def inspect
-      "BSON::ObjectID('#{to_s}')"
-    end
-
-    # Convert to MongoDB extended JSON format. Since JSON includes type information,
-    # 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(*a)
-      "{\"$oid\": \"#{to_s}\"}"
-    end
-
-    # Return the UTC time at which this ObjectID was generated. This may
-    # be used in lieu of a created_at timestamp since this information
-    # is always encoded in the object id.
-    #
-    # @return [Time] the time at which this object was created.
-    def generation_time
-      Time.at(@data.pack("C4").unpack("N")[0]).utc
-    end
-
-    private
-
-    # This gets overwritten by the C extension if it loads.
-    def generate
-      oid = ''
-
-      # 4 bytes current time
-      time = Time.new.to_i
-      oid += [time].pack("N")
-
-      # 3 bytes machine
-      oid += Digest::MD5.digest(Socket.gethostname)[0, 3]
-
-      # 2 bytes pid
-      oid += [Process.pid % 0xFFFF].pack("n")
-
-      # 3 bytes inc
-      oid += [get_inc].pack("N")[1, 3]
-
-      oid.unpack("C12")
-    end
-
-    def get_inc
-      @@lock.synchronize do
-        @@index = (@@index + 1) % 0xFFFFFF
-      end
-    end
-  end
-end