bson 1.9.2-java → 1.10.0-java

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: bcefde7a056a56bcee5f360d2919ced4a7ae809a
+  data.tar.gz: e6bafce576e3e0e12a47d3473160383ff29da65f
+SHA512:
+  metadata.gz: 56e2cad5dc2aeb4c9f3f826813922fc11f7a2a1f606e854903398ccc39c21ac03872b518b9845db8b71ed0ef07da29256d8aa3acaaa3720ba69f5b8aa77d2622
+  data.tar.gz: 8ff97ceded56759addf309cffe0aa7bf9f68b612816778c5a624f0ea2352ab6f0dd18abfbb03978b607ad5e984cbdc89ccc1c4cca0e945fe98713b1ff0ccac4d

data/LICENSE

@@ -175,7 +175,7 @@
 
    END OF TERMS AND CONDITIONS
 
-   Copyright (C) 2008-2013 10gen, Inc.
+   Copyright (C) 2008-2013 MongoDB, Inc.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

data/VERSION

@@ -1 +1 @@
-1.9.2
+1.10.0

data/bin/b2json

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # encoding: UTF-8
 
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 2009-2013 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/bin/j2bson

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # encoding: UTF-8
 
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 2009-2013 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/bson.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 2009-2013 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,8 +19,8 @@ module BSON
     BSON_CODER.serialize(obj, check_keys, move_id)
   end
 
-  def self.deserialize(buf=nil)
-    BSON_CODER.deserialize(buf)
+  def self.deserialize(buf=nil, opts={})
+    BSON_CODER.deserialize(buf, opts)
   end
 
   # Reads a single BSON document from an IO object.
@@ -108,5 +108,6 @@ require 'bson/types/binary'
 require 'bson/types/code'
 require 'bson/types/dbref'
 require 'bson/types/min_max_keys'
+require 'bson/types/regex'
 require 'bson/types/object_id'
 require 'bson/types/timestamp'

data/lib/bson/bson_c.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 2009-2013 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -20,8 +20,8 @@ module BSON
       ByteBuffer.new(CBson.serialize(obj, check_keys, move_id, max_bson_size))
     end
 
-    def self.deserialize(buf=nil)
-      CBson.deserialize(ByteBuffer.new(buf).to_s)
+    def self.deserialize(buf=nil, opts={})
+      CBson.deserialize(ByteBuffer.new(buf).to_s, opts)
     end
 
     def self.max_bson_size

data/lib/bson/bson_java.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 2009-2013 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@ require 'jruby'
 
 include Java
 
-jar_dir = File.join(File.dirname(__FILE__), '../../ext/jbson')
+jar_dir = File.expand_path(File.join(File.dirname(__FILE__), '../../ext/jbson'))
 require File.join(jar_dir, 'lib/java-bson.jar')
 require File.join(jar_dir, 'target/jbson.jar')
 
@@ -28,9 +28,10 @@ module BSON
       ByteBuffer.new(enc.encode(obj))
     end
 
-    def self.deserialize(buf)
+    def self.deserialize(buf, opts={})
       dec = Java::OrgJbson::RubyBSONDecoder.new
       callback = Java::OrgJbson::RubyBSONCallback.new(JRuby.runtime)
+      callback.set_opts(opts);
       dec.decode(buf.to_s.to_java_bytes, callback)
       callback.get
     end

data/lib/bson/bson_ruby.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 2009-2013 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -108,8 +108,8 @@ module BSON
       new(max_bson_size).serialize(obj, check_keys, move_id)
     end
 
-    def self.deserialize(buf=nil)
-      new.deserialize(buf)
+    def self.deserialize(buf=nil, opts={})
+      new.deserialize(buf, opts)
     end
 
     def serialize(obj, check_keys=false, move_id=false)
@@ -199,7 +199,7 @@ module BSON
       end
     end
 
-    def deserialize(buf=nil)
+    def deserialize(buf=nil, opts={})
       # If buf is nil, use @buf, assumed to contain already-serialized BSON.
       # This is only true during testing.
       if buf.is_a? String
@@ -233,13 +233,13 @@ module BSON
           doc[key] = deserialize_oid_data(@buf)
         when ARRAY
           key = deserialize_cstr(@buf)
-          doc[key] = deserialize_array_data(@buf)
+          doc[key] = deserialize_array_data(@buf, opts)
         when REGEX
           key = deserialize_cstr(@buf)
-          doc[key] = deserialize_regex_data(@buf)
+          doc[key] = deserialize_regex_data(@buf, opts)
         when OBJECT
           key = deserialize_cstr(@buf)
-          doc[key] = deserialize_object_data(@buf)
+          doc[key] = deserialize_object_data(@buf, opts)
         when BOOLEAN
           key = deserialize_cstr(@buf)
           doc[key] = deserialize_boolean_data(@buf)
@@ -316,10 +316,10 @@ module BSON
       buf.get_long
     end
 
-    def deserialize_object_data(buf)
+    def deserialize_object_data(buf, opts={})
       size = buf.get_int
       buf.position -= 4
-      object = @encoder.new.deserialize(buf.get(size))
+      object = @encoder.new.deserialize(buf.get(size), opts)
       if object.has_key? "$ref"
         DBRef.new(object["$ref"], object["$id"])
       else
@@ -327,22 +327,20 @@ module BSON
       end
     end
 
-    def deserialize_array_data(buf)
-      h = deserialize_object_data(buf)
+    def deserialize_array_data(buf, opts={})
+      h = deserialize_object_data(buf, opts)
       a = []
       h.each { |k, v| a[k.to_i] = v }
       a
     end
 
-    def deserialize_regex_data(buf)
+    def deserialize_regex_data(buf, opts={})
+      compile = opts.key?(:compile_regex) ? opts[:compile_regex] : true
+      compile = true if compile.nil?
       str = deserialize_cstr(buf)
       options_str = deserialize_cstr(buf)
-      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)
+      bson_regex = BSON::Regex.new(str, options_str)
+      compile ? bson_regex.try_compile : bson_regex
     end
 
     def deserialize_timestamp_data(buf)
@@ -371,7 +369,7 @@ module BSON
       encoded_str(str)
     end
 
-    def deserialize_code_w_scope_data(buf)
+    def deserialize_code_w_scope_data(buf, opts={})
       buf.get_int
       len = buf.get_int
       code = buf.get(len)[0..-2]
@@ -381,7 +379,7 @@ module BSON
 
       scope_size = buf.get_int
       buf.position -= 4
-      scope = @encoder.new.deserialize(buf.get(scope_size))
+      scope = @encoder.new.deserialize(buf.get(scope_size), opts)
 
       Code.new(encoded_str(code), scope)
     end
@@ -497,12 +495,22 @@ module BSON
 
       options = val.options
       options_str = ''
-      options_str << 'i' if ((options & Regexp::IGNORECASE) != 0)
-      if ((options & Regexp::MULTILINE) != 0)
-        options_str << 'm'
-        options_str << 's'
+
+      if val.is_a?(BSON::Regex)
+        options_str << 'i' if ((options & BSON::Regex::IGNORECASE) != 0)
+        options_str << 'l' if ((options & BSON::Regex::LOCALE_DEPENDENT) != 0)
+        options_str << 'm' if ((options & BSON::Regex::MULTILINE) != 0)
+        options_str << 's' if ((options & BSON::Regex::DOTALL) != 0)
+        options_str << 'u' if ((options & BSON::Regex::UNICODE) != 0)
+        options_str << 'x' if ((options & BSON::Regex::EXTENDED) != 0)
+      else
+        options_str << 'm' # Ruby regular expressions always use multiline mode
+        options_str << 'i' if ((options & Regexp::IGNORECASE) != 0)
+        # dotall on the server is multiline in Ruby
+        options_str << 's' if ((options & Regexp::MULTILINE) != 0)
+        options_str << 'x' if ((options & Regexp::EXTENDED) != 0)
       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
       self.class.serialize_cstr(buf, options_str.split(//).sort.uniq.join)
@@ -596,7 +604,7 @@ module BSON
         STRING
       when Array
         ARRAY
-      when Regexp
+      when Regexp, BSON::Regex
         REGEX
       when ObjectId
         OID

data/lib/bson/byte_buffer.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 2009-2013 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,8 +12,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+require 'bson/grow'
+
 module BSON
   class ByteBuffer
+    include BSON::Grow
 
     attr_reader :order, :max_size
 

data/lib/bson/exceptions.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 2009-2013 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/bson/grow.rb

@@ -0,0 +1,173 @@
+# encoding: utf-8
+
+# Copyright (C) 2009-2013 MongoDB, 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.
+
+module BSON
+  module Grow
+    # module with methods to grow BSON docs/objects/arrays
+    # this module is intended for internal use and is subject to change
+    # proper usage is essential as minimal overhead is preferred over usage checks
+    # unfinish! returns unfinished BSON for faster growing with bang! methods
+    # bang! methods work on unfinished BSON with neither terminating nulls nor proper sizes
+    # finish! must be called to finish BSON after using bang! methods
+    # corresponding non-bang methods work on finished BSON
+    # object/array methods should be paired, ex., array!/b_end! and array/b_end
+    # push!/push and push_doc!/push_doc append to arrays with correct keys
+    # b_end needs a better name
+
+    def to_e # Extract bytes for elements from BSON
+      @str[4...-1]
+    end
+
+    def to_t # Extract type from (single-element) BSON
+      @str[4,1]
+    end
+
+    def to_v # Extract value from (single-element) BSON
+      @str[(@str.index(NULL_BYTE,5)+1)...-1]
+    end
+
+    def finish_one!(offset = 0) # Appends terminating null byte and sets size
+      put(0)
+      put_int(@str.size - offset, offset)
+      @cursor = @str.size
+      self
+    end
+
+    def unfinish! # Backup past terminating null bytes
+      @b_pos ||= [0]
+      @cursor = @str.size - @b_pos.size # BSON::BSON_CODER.serialize may not restore @cursor
+      self
+    end
+
+    def finish! # Append all terminating null bytes and set all sizes
+      @b_pos ||= [0]
+      (@b_pos.size-1).downto(0){|i| finish_one!(@b_pos[i])}
+      self
+    end
+
+    def grow!(bson) # Appends BSON elements unfinished
+      put_binary(bson.to_e)
+      self
+    end
+
+    def grow(bson) # Appends BSON elements finished
+      @b_pos ||= [0]
+      put_binary(bson.to_e, @str.size - @b_pos.size)
+      finish!
+    end
+
+    def push!(bson) # Appends BSON element value with correct key unfinished
+      @a_index ||= [0]
+      @b_pos ||= [0]
+      put_binary(bson.to_t)
+      put_binary(@a_index[-1].to_s)
+      put_binary(NULL_BYTE)
+      @a_index[-1] += 1
+      put_binary(bson.to_v)
+      self
+    end
+
+    def push(bson) # Appends BSON element value with correct key finished
+      @a_index ||= [0]
+      @b_pos ||= [0]
+      put_binary(bson.to_t, @str.size - @b_pos.size)
+      put_binary(@a_index[-1].to_s)
+      put_binary(NULL_BYTE)
+      @a_index[-1] += 1
+      put_binary(bson.to_v)
+      finish!
+    end
+
+    def push_doc!(bson) # Appends BSON doc with correct key unfinished
+      @a_index ||= [0]
+      @b_pos ||= [0]
+      put(BSON::BSON_RUBY::OBJECT)
+      put_binary(@a_index[-1].to_s)
+      put(0)
+      @a_index[-1] += 1
+      put_binary(bson.to_s)
+      self
+    end
+
+    def push_doc(bson) # Appends BSON doc with correct key finished
+      @a_index ||= [0]
+      @b_pos ||= [0]
+      put(BSON::BSON_RUBY::OBJECT, @str.size - @b_pos.size)
+      put_binary(@a_index[-1].to_s)
+      put(0)
+      @a_index[-1] += 1
+      put_binary(bson.to_s)
+      finish!
+    end
+
+    def b_do!(key, type = BSON::BSON_RUBY::OBJECT) # Append object/array element unfinished
+      put(type)
+      BSON::BSON_RUBY.serialize_cstr(self, key)
+      @b_pos ||= [0]
+      @a_index ||= [0]
+      @b_pos << @cursor # mark position of size
+      @a_index << 0
+      put_int(0)
+      self
+    end
+
+    def b_do(key, type = BSON::BSON_RUBY::OBJECT) # Append object/array element finished
+      @b_pos ||= [0]
+      @cursor = @str.size - @b_pos.size
+      b_do!(key, type)
+      finish!
+    end
+
+    def doc!(key) # Append object element unfinished
+      b_do!(key, BSON::BSON_RUBY::OBJECT)
+    end
+
+    def doc(key) # Append object element finished
+      b_do(key, BSON::BSON_RUBY::OBJECT)
+    end
+
+    def array!(key) # Append array element unfinished
+      b_do!(key, BSON::BSON_RUBY::ARRAY)
+    end
+
+    def array(key) # Append array element finished
+      b_do(key, BSON::BSON_RUBY::ARRAY)
+    end
+
+    def b_end! # End object/array unfinished - next operation will be up one level
+      @b_pos ||= [0]
+      finish_one!(@b_pos[-1])
+      @b_pos.pop
+      @a_index ||= [0]
+      @a_index.pop
+      self
+    end
+
+    def b_end # End object/array finished - next operation will be up one level
+      @b_pos ||= [0]
+      @b_pos.pop
+      @a_index ||= [0]
+      @a_index.pop
+      self
+    end
+
+    def clear! # Clear internal state for reuse
+      @b_pos = @a_index = nil
+      self
+    end
+
+  end
+end

data/lib/bson/ordered_hash.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 2009-2013 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -41,6 +41,16 @@ module BSON
       instance_of?(BSON::OrderedHash)
     end
 
+    def reject
+      return to_enum(:reject) unless block_given?
+      dup.tap {|hash| hash.reject!{|k, v| yield k, v}}
+    end
+
+    def select
+      return to_enum(:select) unless block_given?
+      dup.tap {|hash| hash.reject!{|k, v| ! yield k, v}}
+    end
+
     # We only need the body of this class if the RUBY_VERSION is before 1.9
     if RUBY_VERSION < '1.9'
       attr_accessor :ordered_keys
@@ -142,21 +152,16 @@ module BSON
         self
       end
 
-      def reject(&block)
-        clone = self.clone
-        return clone unless block_given?
-        clone.delete_if(&block)
-      end
-
-      def reject!(&block)
-        changed = false
-        self.each do |k,v|
-          if yield k, v
-            changed = true
-            delete(k)
+      def reject!
+        return to_enum(:reject!) unless block_given?
+        raise "can't modify frozen BSON::OrderedHash" if frozen?
+        keys = @ordered_keys.dup
+        @ordered_keys.each do |k|
+          if yield k, self[k]
+            keys.delete(k)
           end
         end
-        changed ? self : nil
+        keys == @ordered_keys ? nil : @ordered_keys = keys
       end
 
       def clear

data/lib/bson/support/hash_with_indifferent_access.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 2009-2013 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -49,6 +49,16 @@ module ActiveSupport
       end
     end
 
+    def reject
+      return to_enum(:reject) unless block_given?
+      dup.tap {|hash| hash.reject!{|k, v| yield k, v}}
+    end
+
+    def select
+      return to_enum(:select) unless block_given?
+      dup.tap {|hash| hash.reject!{|k, v| ! yield k, v}}
+    end
+    
     alias_method :regular_writer, :[]= unless method_defined?(:regular_writer)
     alias_method :regular_update, :update unless method_defined?(:regular_update)
 

data/lib/bson/types/binary.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 2009-2013 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -35,7 +35,7 @@ module BSON
     #
     # @param [Array, String] data to story as BSON binary. If a string is given, the on
     #   Ruby 1.9 it will be forced to the binary encoding.
-    # @param [Fixnum] one of four values specifying a BSON binary subtype. Possible values are
+    # @param [Fixnum] subtype one of four values specifying a BSON binary subtype. Possible values are
     #   SUBTYPE_BYTES, SUBTYPE_UUID, SUBTYPE_MD5, and SUBTYPE_USER_DEFINED.
     #
     # @see http://www.mongodb.org/display/DOCS/BSON#BSON-noteondatabinary BSON binary subtypes.

data/lib/bson/types/code.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 2009-2013 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@ module BSON
     # Wrap code to be evaluated by MongoDB.
     #
     # @param [String] code the JavaScript code.
-    # @param [Hash] a document mapping identifiers to values, which
+    # @param [Hash] scope a document mapping identifiers to values, which
     #   represent the scope in which the code is to be executed.
     def initialize(code, scope={})
       @code  = code

data/lib/bson/types/dbref.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 2009-2013 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -21,10 +21,8 @@ module BSON
 
     # Create a DBRef. Use this class in conjunction with DB#dereference.
     #
-    # @param [String] a collection name
-    # @param [ObjectId] an object id
-    #
-    # @core dbrefs constructor_details
+    # @param [String] namespace a collection name.
+    # @param [ObjectId] object_id an object id.
     def initialize(namespace, object_id)
       @namespace = namespace
       @object_id = object_id

data/lib/bson/types/min_max_keys.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 2009-2013 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/bson/types/object_id.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 2009-2013 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,9 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'thread'
-require 'socket'
 require 'digest/md5'
+require 'socket'
 
 module BSON
 
@@ -23,8 +22,6 @@ module BSON
   end
 
   # Generates MongoDB object ids.
-  #
-  # @core objectids
   class ObjectId
     attr_accessor :data
 

data/lib/bson/types/regex.rb

@@ -0,0 +1,116 @@
+# Copyright (C) 2009-2013 MongoDB, 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.
+
+module BSON
+
+  # generates a wrapped Regexp with lazy compilation.
+  # can represent flags not supported in Ruby's core Regexp class before compilation.
+  class Regex
+
+    IGNORECASE = 0x01
+    LOCALE_DEPENDENT = 0x02
+    MULTILINE = 0x04
+    DOTALL = 0x08
+    UNICODE = 0x10
+    EXTENDED = 0x20
+
+    attr_accessor :pattern
+    alias_method  :source, :pattern
+    attr_accessor :options
+
+    # Create a new regexp.
+    #
+    # @param pattern [String]
+    # @param opts [Array, String]
+    def initialize(pattern, *opts)
+      @pattern = pattern
+      @options = opts.first.is_a?(Fixnum) ? opts.first : str_opts_to_int(opts.join)
+    end
+
+    # Check equality of this wrapped Regexp with another.
+    #
+    # @param [BSON::Regex] regexp
+    def eql?(regexp)
+      regexp.kind_of?(BSON::Regex) &&
+        self.pattern == regexp.pattern &&
+        self.options == regexp.options
+    end
+    alias_method :==, :eql?
+
+    # Get a human-readable representation of this BSON Regex.
+    def inspect
+      "#<BSON::Regex:0x#{self.object_id} " <<
+      "@pattern=#{@pattern}>, @options=#{@options}>"
+    end
+
+    # Clone or dup the current BSON::Regex.
+    def initialize_copy
+      a_copy = self.dup
+      a_copy.pattern = self.pattern.dup
+      a_copy.options = self.options.dup
+      a_copy
+    end
+
+    # Attempt to convert a native Ruby Regexp to a BSON::Regex.
+    #
+    # @note Warning: Ruby regular expressions use a different syntax and different
+    #   set of flags than BSON regular expressions. A regular expression matches different
+    #   strings when executed in Ruby than it matches when used in a MongoDB query,
+    #   if it can be used in a query at all.
+    #
+    # @param regexp [Regexp] The native Ruby regexp object to convert to BSON::Regex.
+    #
+    # @return [BSON::Regex]
+    def self.from_native(regexp)
+      pattern = regexp.source
+      opts = 0
+      opts |= MULTILINE  # multiline mode is always on for Ruby regular expressions
+      opts |= IGNORECASE if (Regexp::IGNORECASE & regexp.options != 0)
+      opts |= DOTALL     if (Regexp::MULTILINE  & regexp.options != 0)
+      opts |= EXTENDED   if (Regexp::EXTENDED   & regexp.options != 0)
+      self.new(pattern, opts)
+    end
+
+    # Compile the BSON::Regex.
+    #
+    # @note Warning: regular expressions retrieved from the server may include a pattern
+    #   that cannot be compiled into a Ruby regular expression, or which matches a
+    #   different set of strings in Ruby than it does when used in a MongoDB query,
+    #   or it may have flags that are not supported by Ruby regular expressions.
+    #
+    # @return [Regexp] A ruby core Regexp object.
+    def try_compile
+      regexp_opts = 0
+      regexp_opts |= Regexp::IGNORECASE if (options & IGNORECASE != 0)
+      regexp_opts |= Regexp::MULTILINE  if (options & DOTALL != 0)
+      regexp_opts |= Regexp::EXTENDED   if (options & EXTENDED != 0)
+      Regexp.new(pattern, regexp_opts)
+    end
+
+    private
+    # Convert the string options to an integer.
+    #
+    # @return [Fixnum] The Integer representation of the options.
+    def str_opts_to_int(str_opts="")
+      opts = 0
+      opts |= IGNORECASE       if str_opts.include?('i')
+      opts |= LOCALE_DEPENDENT if str_opts.include?('l')
+      opts |= MULTILINE        if str_opts.include?('m')
+      opts |= DOTALL           if str_opts.include?('s')
+      opts |= UNICODE          if str_opts.include?('u')
+      opts |= EXTENDED         if str_opts.include?('x')
+      opts
+    end
+  end
+end

data/lib/bson/types/timestamp.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 2009-2013 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bson
 version: !ruby/object:Gem::Version
-  version: 1.9.2
-  prerelease:
+  version: 1.10.0
 platform: java
 authors:
 - Tyler Brock
@@ -15,9 +14,9 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDODCCAiCgAwIBAgIBADANBgkqhkiG9w0BAQUFADBCMRQwEgYDVQQDDAtkcml2
+  MIIDfDCCAmSgAwIBAgIBATANBgkqhkiG9w0BAQUFADBCMRQwEgYDVQQDDAtkcml2
   ZXItcnVieTEVMBMGCgmSJomT8ixkARkWBTEwZ2VuMRMwEQYKCZImiZPyLGQBGRYD
-  Y29tMB4XDTEzMDIwMTE0MTEzN1oXDTE0MDIwMTE0MTEzN1owQjEUMBIGA1UEAwwL
+  Y29tMB4XDTE0MDIxOTE1MTEyNloXDTE1MDIxOTE1MTEyNlowQjEUMBIGA1UEAwwL
   ZHJpdmVyLXJ1YnkxFTATBgoJkiaJk/IsZAEZFgUxMGdlbjETMBEGCgmSJomT8ixk
   ARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANFdSAa8fRm1
   bAM9za6Z0fAH4g02bqM1NGnw8zJQrE/PFrFfY6IFCT2AsLfOwr1maVm7iU1+kdVI
@@ -25,16 +24,17 @@ cert_chain:
   JxmcPYs5fDN6BgYc6XXgUjy3m+Kwha2pGctdciUOwEfOZ4RmNRlEZKCMLRHdFP8j
   4WTnJSGfXDiuoXICJb5yOPOZPuaapPSNXp93QkUdsqdKC32I+KMpKKYGBQ6yisfA
   5MyVPPCzLR1lP5qXVGJPnOqUAkvEUfCahg7EP9tI20qxiXrR6TSEraYhIFXL0EGY
-  u8KAcPHm5KkCAwEAAaM5MDcwCQYDVR0TBAIwADAdBgNVHQ4EFgQUW3dZsX70mlSM
-  CiPrZxAGA1vwfNcwCwYDVR0PBAQDAgSwMA0GCSqGSIb3DQEBBQUAA4IBAQCIa/Y6
-  xS7YWBxkn9WP0EMnJ3pY9vef9DTmLSi/2jz8PzwlKQ89zNTrqSUD8LoQZmBqCJBt
-  dKSQ/RUnaHJuxh8HWvWubP8EBYTuf+I1DFnRv648IF3MR1tCQumVL0XcYMvZcxBj
-  a/p+8DomWTQqUdNbNoGywwjtVBWfDdwFV8Po1XcN/AtpILOJQd9J77INIGGCHxZo
-  6SOHHaNknlE9H0w6q0SVxZKZI8/+2c447V0NrHIw1Qhe0tAGJ9V1u3ky8gyxe0SM
-  8v7zLF2XliYbfurYIwkcXs8yPn8ggApBIy9bX6VJxRs/l2+UvqzaHIFaFy/F8/GP
-  RNTuXsVG5NDACo7Q
+  u8KAcPHm5KkCAwEAAaN9MHswCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0O
+  BBYEFFt3WbF+9JpUjAoj62cQBgNb8HzXMCAGA1UdEQQZMBeBFWRyaXZlci1ydWJ5
+  QDEwZ2VuLmNvbTAgBgNVHRIEGTAXgRVkcml2ZXItcnVieUAxMGdlbi5jb20wDQYJ
+  KoZIhvcNAQEFBQADggEBALGvdxHF+CnH6QO4PeIce3S8EHuHsYiGLk4sWgNGZkjD
+  V3C4XjlI8rQZxalwQwcauacOGj9x94flWUXruEF7+rjUtig7OIrQK2+uVg86vl8r
+  xy1n2s1d31KsuazEVExe5o19tnVbI9+30P9qPkS+NgaellXpj5c5qnJUGn5BJtzo
+  3D001zXpVnuZvCcE/A4fQ+BEM0zm0oOmA/gWIAFrufOL9oYg1881dRZ+kQytF/9c
+  JrZM8w8wGbIOeLtoQqa7HB/jOYbTahH7KMNh2LHAbOR93hNIJxVRa4iwxiMQ75tN
+  9WUIAJ4AEtjwRg1Bz0OwDo3aucPCBpx77+/FWhv7JYY=
   -----END CERTIFICATE-----
-date: 2013-08-21 00:00:00.000000000 Z
+date: 2014-04-03 00:00:00.000000000 Z
 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
@@ -44,17 +44,20 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- bson.gemspec
 - LICENSE
 - VERSION
 - bin/b2json
 - bin/j2bson
+- bson.gemspec
+- ext/jbson/lib/java-bson.jar
+- ext/jbson/target/jbson.jar
 - 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/grow.rb
 - lib/bson/ordered_hash.rb
 - lib/bson/support/hash_with_indifferent_access.rb
 - lib/bson/types/binary.rb
@@ -62,12 +65,12 @@ files:
 - lib/bson/types/dbref.rb
 - lib/bson/types/min_max_keys.rb
 - lib/bson/types/object_id.rb
+- lib/bson/types/regex.rb
 - lib/bson/types/timestamp.rb
-- ext/jbson/target/jbson.jar
-- ext/jbson/lib/java-bson.jar
 homepage: http://www.mongodb.org
 licenses:
 - Apache License Version 2.0
+metadata: {}
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -77,18 +80,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 requirements: []
 rubyforge_project: bson
-rubygems_version: 1.8.24
+rubygems_version: 2.2.2
 signing_key:
-specification_version: 3
+specification_version: 4
 summary: Ruby implementation of BSON
 test_files: []
 has_rdoc: yard