bson 2.1.2-java → 2.2.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f347e0f1027314211132a075d3969868fe5f849
-  data.tar.gz: e9decfbae7546dfdc513bed283f417ce31b4723b
+  metadata.gz: ada22ee89296a96c88b38de4f4dc595f21687565
+  data.tar.gz: dad26ece03f57a45993feab6c409742d2ef81741
 SHA512:
-  metadata.gz: 44f03a856a77956ca580c82f9e11bb0b113db2159d17f4667c227707c494d9ba877a909e95b11e0a7ca063f8a9962fa39134d743f9aa80b8fc58622bddd6b01a
-  data.tar.gz: 923d87a50573391db2722dd016cc21c24a05fd3ad79e7c029d9451f5ac8b116253f6e2f29e2e6f125378666dd5aa6c64926dbded826b9ad72a5462e31e7b01c9
+  metadata.gz: 744c86749ad6f9479c9a0d83b6b9025d170c3ecf79bc17daf2743a9b8080bd01ec27cb192fb7270df8a5f5c4eaebedadf744a32b013e1859a940be146d198ae6
+  data.tar.gz: 0f22b1d3c37109dc5d5d92d7af4cf8787b08916d1da037566248b2b52b128b6eeb8bc70e6a82837c388794529cddd3f1d1dd20d7ecca52581d3565cb68c302e3

data/CHANGELOG.md

@@ -1,6 +1,12 @@
 BSON Changelog
 ==============
 
+## 2.2.0
+
+### Dependency Changes
+
+* Ruby 1.8 interpreters are no longer supported.
+
 ## 2.1.2
 
 ### Bug Fixes

data/README.md

@@ -6,7 +6,7 @@ An implementation of the BSON specification in Ruby.
 Compatibility
 -------------
 
-BSON is tested against MRI (1.8.7+), JRuby (1.5.0+), Rubinius (2.0.0+), and REE.
+BSON is tested against MRI (1.9.2+), JRuby (1.7.0+) and Rubinius (2.0.0+).
 
 Installation
 ------------
@@ -15,7 +15,7 @@ With bundler, add the `bson` gem to your `Gemfile`. As of 2.0.0 native extension
 are bundled with the `bson` gem and `bson_ext` is no longer needed.
 
 ```ruby
-gem "bson", "~> 2.0"
+gem "bson", "~> 2.2"
 ```
 
 Require the `bson` gem in your application.

data/lib/bson/date_time.rb

@@ -37,27 +37,6 @@ module BSON
     def to_bson(encoded = ''.force_encoding(BINARY))
       to_time.to_bson(encoded)
     end
-
-    if Environment.ruby_18?
-
-      # Constant to multiple the seconds fraction my for millis in REE.
-      #
-      # @since 2.1.0
-      FACTOR = 86400000000
-
-      # REE does not define a to_time on DateTime, so if we are using REE we
-      # define it ourselves.
-      #
-      # @example Conver the DateTime to a time.
-      #   date_time.to_time
-      #
-      # @return [ Time ] The converted time.
-      #
-      # @since 2.1.0
-      def to_time
-        ::Time.utc(year, mon, mday, hour, min, sec, (sec_fraction * FACTOR).to_i).getlocal
-      end
-    end
   end
 
   # Enrich the core DateTime class with this module.

data/lib/bson/document.rb

@@ -52,498 +52,5 @@ module BSON
     def [](key)
       super(key) || super(key.to_s)
     end
-
-    # If we have ordered hashes, the a BSON::Document is simply a hash. If we do
-    # not, then we need to import our custom BSON::Document implementation.
-    #
-    # @since 2.0.0
-    unless Environment.retaining_hash_order?
-
-      # Message for argument error when providing bad arguments to [].
-      #
-      # @since 2.0.0
-      ARG_ERROR = "An even number of arguments must be passed to BSON::Document[]."
-
-      # Sets a value for the provided key.
-      #
-      # @example Set the value in the document.
-      #   document[:name] = "Sid"
-      #
-      # @param [ Object ] key The name of the key.
-      # @param [ Object ] value The value for the key.
-      #
-      # @return [ Object ] The passed in value.
-      #
-      # @since 2.0.0
-      def []=(key, value)
-        order.push(key) unless has_key?(key)
-        super
-      end
-
-      # Clear out all elements in the document.
-      #
-      # @example Clear out all elements.
-      #   document.clear
-      #
-      # @return [ BSON::Document ] The empty document.
-      #
-      # @since 2.0.0
-      def clear
-        super
-        order.clear
-        self
-      end
-
-      # Delete a value from the document for the provided key.
-      #
-      # @example Delete a value from the document.
-      #   document.delete(:name)
-      #
-      # @param [ Object ] key The key to delete for.
-      #
-      # @return [ Object ] The deleted value.
-      #
-      # @since 2.0.0
-      def delete(key)
-        if has_key?(key)
-          order.delete_at(order.index(key))
-        end
-        super
-      end
-
-      # Delete each key/value pair in the document for which the provided block
-      # returns true.
-      #
-      # @example Delete each for when the block is true.
-      #   document.delete_if do |key, value|
-      #     value == 1
-      #   end
-      #
-      # @return [ BSON::Document ] The document.
-      #
-      # @since 2.0.0
-      def delete_if
-        super
-        synchronize!
-        self
-      end
-      alias :reject! :delete_if
-
-      # Iterate over each element of the document in insertion order and yield
-      # the key and value.
-      #
-      # @example Iterate over the document.
-      #   document.each do |key, value|
-      #     #...
-      #   end
-      #
-      # @return [ BSON::Document ] The document if a block was given, otherwise
-      #   an enumerator.
-      #
-      # @since 2.0.0
-      def each
-        if block_given?
-          order.each{ |key| yield([ key, self[key]]) }
-          self
-        else
-          to_enum(:each)
-        end
-      end
-
-      # Iterate over each key in the document in insertion order and yield the
-      # key.
-      #
-      # @example Iterate over the keys.
-      #   document.each_key do |key|
-      #     #...
-      #   end
-      #
-      # @return [ BSON::Document ] The document if a block was given, otherwise
-      #   an enumerator.
-      #
-      # @since 2.0.0
-      def each_key
-        if block_given?
-          order.each{ |key| yield(key) }
-          self
-        else
-          to_enum(:each_key)
-        end
-      end
-
-      # Iterate over each value in the document in insertion order and yield the
-      # value.
-      #
-      # @example Iterate over the values.
-      #   document.each_value do |value|
-      #     #...
-      #   end
-      #
-      # @return [ BSON::Document ] The document if a block was given, otherwise
-      #   an enumerator.
-      #
-      # @since 2.0.0
-      def each_value
-        if block_given?
-          order.each{ |key| yield(self[key]) }
-          self
-        else
-          to_enum(:each_value)
-        end
-      end
-
-      # Iterate over each element of the document in insertion order and yield
-      # the key and value.
-      #
-      # @example Iterate over the document.
-      #   document.each_pair do |key, value|
-      #     #...
-      #   end
-      #
-      # @return [ BSON::Document ] The document if a block was given, otherwise
-      #   an enumerator.
-      #
-      # @since 2.0.0
-      def each_pair
-        if block_given?
-          order.each{ |key| yield([ key, self[key]]) }
-          self
-        else
-          to_enum(:each_pair)
-        end
-      end
-
-      # Encode the document with the provided coder.
-      #
-      # @example Encode the document with the coder.
-      #   document.encode_with(coder)
-      #
-      # @param [ Object ] coder The coder.
-      #
-      # @return [ String ] The encoded document.
-      #
-      # @since 2.0.0
-      def encode_with(coder)
-        coder.represent_seq("!bsondoc", map{ |key, value| { key => value }})
-      end
-
-      # Get all the keys in the document, in order.
-      #
-      # @example Get all the keys in the document.
-      #   document.keys
-      #
-      # @return [ Array<Object> ] The ordered keys.
-      #
-      # @since 2.0.0
-      def keys
-        order.dup
-      end
-
-      # Instantiate a new Document.
-      #
-      # @example Instantiate an empty new document.
-      #   BSON::Document.new
-      #
-      # @since 2.0.0
-      def initialize(*args, &block)
-        super
-        @order = []
-      end
-
-      # Inspect the contents of the document.
-      #
-      # @example Inspect the document.
-      #   document.inspect
-      #
-      # @return [ String ] The inspection string.
-      #
-      # @since 2.0.0
-      def inspect
-        "#<BSON::Document #{super}>"
-      end
-
-      # Invert the document - reverses the order of all key/value pairs and
-      # returns a new document.
-      #
-      # @example Invert the document.
-      #   document.invert
-      #
-      # @return [ BSON::Document ] The inverted document.
-      #
-      # @since 2.0.0
-      def invert
-        Document[to_a.map!{ |pair| pair.reverse }]
-      end
-
-      # Merge a document into this document. Will overwrite any existing keys and
-      # add potential new ones. This returns a new document instead of merging in
-      # place.
-      #
-      # @example Merge the document into this document.
-      #   document.merge(other_document)
-      #
-      # @param [ BSON::Document ] other The document to merge in.
-      #
-      # @return [ BSON::Document ] A newly merged document.
-      #
-      # @since 2.0.0
-      def merge(other, &block)
-        dup.merge!(other, &block)
-      end
-
-      # Merge a document into this document. Will overwrite any existing keys and
-      # add potential new ones.
-      #
-      # @example Merge the document into this document.
-      #   document.merge!(other_document)
-      #
-      # @param [ BSON::Document ] other The document to merge in.
-      #
-      # @return [ BSON::Document ] The document.
-      #
-      # @since 2.0.0
-      def merge!(other)
-        if block_given?
-          other.each do |key, value|
-            self[key] = key?(key) ? yield(key, self[key], value) : value
-          end
-        else
-          other.each{ |key, value| self[key] = value }
-        end
-        self
-      end
-      alias :update :merge!
-
-      # Delete each key/value pair in the document for which the provided block
-      # returns true. This returns a new document instead of modifying in place.
-      #
-      # @example Delete each for when the block is true.
-      #   document.reject do |key, value|
-      #     value == 1
-      #   end
-      #
-      # @return [ BSON::Document ] The new document.
-      #
-      # @since 2.0.0
-      def reject(&block)
-        dup.reject!(&block)
-      end
-
-      # Replace this document with the other document.
-      #
-      # @example Replace the contents of this document with the other.
-      #   document.replace(other_document)
-      #
-      # @param [ BSON::Document ] other The other document.
-      #
-      # @return [ BSON::Document ] The document replaced.
-      #
-      # @since 2.0.0
-      def replace(other)
-        super
-        @order = other.keys
-        self
-      end
-
-      # Shift the document by popping off the first key/value pair in the
-      # document.
-      #
-      # @example Shift the document.
-      #   document.shift
-      #
-      # @return [ Array<Object, Object> ] The first key/value pair.
-      #
-      # @since 2.0.0
-      def shift
-        key = order.first
-        value = delete(key)
-        [ key, value ]
-      end
-
-      alias :select :find_all
-
-      # Get the document as an array. This returns a multi-dimensional array
-      # where each element is a [ key, value ] pair in the insertion order.
-      #
-      # @example Get the document as an array.
-      #   document.to_a
-      #
-      # @return [ Array<Array<Object, Object>> ] The pairs in insertion order.
-      #
-      # @since 2.0.0
-      def to_a
-        order.map{ |key| [ key, self[key] ]}
-      end
-
-      # Convert this document to a hash. Since a document is simply an ordered
-      # hash we return self.
-      #
-      # @example Get the document as a hash.
-      #   document.to_hash
-      #
-      # @return [ BSON::Document ] The document.
-      #
-      # @since 2.0.0
-      def to_hash
-        self
-      end
-
-      # Convert the document to yaml.
-      #
-      # @example Convert the document to yaml.
-      #   document.to_yaml
-      #
-      # @param [ Hash ] options The yaml options.
-      #
-      # @return [ String ] The document as yaml.
-      #
-      # @since 2.0.0
-      def to_yaml(options = {})
-        if YAML.const_defined?(:ENGINE) && !YAML::ENGINE.syck?
-          return super
-        end
-        YAML.quick_emit(self, options) do |out|
-          out.seq(taguri) do |seq|
-            each{ |key, value| seq.add(key => value) }
-          end
-        end
-      end
-
-      # Get the custom yaml type for the document.
-      #
-      # @example Get the yaml type.
-      #   document.to_yaml_type
-      #
-      # @return [ String ] "!bsondoc".
-      #
-      # @since 2.0.0
-      def to_yaml_type
-        "!bsondoc"
-      end
-
-      # Get all the values in the document, by order of insertion.
-      #
-      # @example Get all the values in the document.
-      #   document.values
-      #
-      # @return [ Array<Object> ] The ordered values.
-      #
-      # @since 2.0.0
-      def values
-        order.map{ |key| self[key] }
-      end
-
-      class << self
-
-        # Create a new document given the provided arguments. The args can either
-        # be empty in order to instantiate an empty document, or an array of
-        # key/value pairs in the order that they should remain in.
-        #
-        # @example Create a new empty document.
-        #   BSON::Document[]
-        #
-        # @example Create a new document with the provided elements.
-        #   BSON::Document[1, 2, 3, 4]
-        #
-        # @example Create a new document with key/value array pairs.
-        #   BSON::Document[[ 1, 2 ], [ 3, 4 ]]
-        #
-        # @param [ Array<Object> ] args The key/value pairs.
-        #
-        # @return [ BSON::Document ] The new document.
-        #
-        # @since 2.0.0
-        def [](*args)
-          if (args.length == 1 && args.first.is_a?(Array))
-            return document_from_pairs(args)
-          end
-          raise ArgumentError.new(ARG_ERROR) unless (args.size % 2 == 0)
-          document_from_args(args)
-        end
-
-        private
-
-        # Returns a document that will be generated from an array of [ key, value ]
-        # array pairs.
-        #
-        # @api private
-        #
-        # @example Initialize a document from array pairs.
-        #   BSON::Document[[ 1, 2 ], [ 3, 4 ]]
-        #
-        # @param [ Array ] pairs The key/value pairs.
-        #
-        # @since 2.0.0
-        #
-        # @return [ BSON::Document ] The document.
-        def document_from_pairs(pairs)
-          document = new
-          pairs.first.each do |pair|
-            next unless (pair.is_a?(Array))
-            document[pair[0]] = pair[1]
-          end
-          return document
-        end
-
-        # Returns a document that will be generated from an even number of
-        # individual arguments.
-        #
-        # @api private
-        #
-        # @example Initialize a document from args.
-        #   BSON::Document[1, 2, 3, 4]
-        #
-        # @param [ Array ] args The arguments.
-        #
-        # @return [ BSON::Document ] The document.
-        #
-        # @since 2.0.0
-        def document_from_args(args)
-          document = new
-          args.each_with_index do |val, ind|
-            next if (ind % 2 != 0)
-            document[val] = args[ind + 1]
-          end
-          document
-        end
-      end
-
-      private
-
-      # @!attribute order
-      #   @api private
-      #   @return [ Array<String> ] The document keys in order.
-      #   @since 2.0.0
-      attr_reader :order
-
-      # Initialize a copy of the document for use with clone or dup.
-      #
-      # @api private
-      #
-      # @example Clone the document.
-      #   document.clone
-      #
-      # @param [ Object ] other The original copy.
-      #
-      # @since 2.0.0
-      def initialize_copy(other)
-        super
-        @order = other.keys
-      end
-
-      # Ensure that the ordered keys are the same entries as the internal keys.
-      #
-      # @api private
-      #
-      # @example Synchronize the keys.
-      #   document.synchronize!
-      #
-      # @return [ Array<Object> ] The keys.
-      #
-      # @since 2.0.0
-      def synchronize!
-        order.reject!{ |key| !has_key?(key) }
-      end
-    end
   end
 end

data/lib/bson/environment.rb

@@ -32,80 +32,5 @@ module BSON
     def jruby?
       defined?(JRUBY_VERSION)
     end
-
-    # Determine if we are using REE or not.
-    #
-    # @example Are we running with REE?
-    #   Environment.ree?
-    #
-    # @return [ true, false ] If our vm is REE.
-    #
-    # @since 2.1.0
-    def ree?
-      return false unless defined?(RUBY_ENGINE)
-      RUBY_ENGINE == "ruby" && RUBY_DESCRIPTION =~ /Enterprise/
-    end
-
-    # Does the Ruby runtime we are using support ordered hashes?
-    #
-    # @example Does the runtime support ordered hashes?
-    #   Environment.retaining_hash_order?
-    #
-    # @return [ true, false ] If the runtime has ordered hashes.
-    #
-    # @since 2.0.0
-    def retaining_hash_order?
-      jruby? || RUBY_VERSION > "1.9.1"
-    end
-
-    # Are we running in a ruby runtime that is version 1.8.x?
-    #
-    # @example Is the ruby runtime in 1.8 mode?
-    #   Environment.ruby_18?
-    #
-    # @return [ true, false ] If we are running in 1.8.
-    #
-    # @since 2.0.0
-    def ruby_18?
-      RUBY_VERSION < "1.9"
-    end
   end
 end
-
-# In the case where we don't have encoding, we need to monkey
-# patch string to ignore the encoding directives.
-#
-# @since 2.0.0
-if BSON::Environment.ruby_18?
-
-  # Making string in 1.8 respond like a 1.9 string, without any modifications.
-  #
-  # @since 2.0.0
-  class String
-
-    # Simply return the string when asking for it's character.
-    #
-    # @since 2.0.0
-    def chr; self; end
-
-    # Force the string to the provided encoding. NOOP.
-    #
-    # @since 2.0.0
-    def force_encoding(*); self; end
-
-    # Encode the string as the provided type. NOOP.
-    #
-    # @since 2.0.0
-    def encode(*); self; end
-
-    # Encode the string in place. NOOP.
-    #
-    # @since 2.0.0
-    def encode!(*); self; end
-  end
-
-  # No encoding error is defined in 1.8.
-  #
-  # @since 2.0.0
-  class EncodingError < RuntimeError; end
-end

data/lib/bson/int32.rb

@@ -30,7 +30,7 @@ module BSON
     # Constant for the int 32 pack directive.
     #
     # @since 2.0.0
-    PACK = Environment.ruby_18? ? "l".freeze : "l<".freeze
+    PACK = "l<".freeze
 
     # Deserialize an Integer from BSON.
     #

data/lib/bson/int64.rb

@@ -30,7 +30,7 @@ module BSON
     # Constant for the int 64 pack directive.
     #
     # @since 2.0.0
-    PACK = Environment.ruby_18? ? "q".freeze : "q<".freeze
+    PACK = "q<".freeze
 
     # Deserialize an Integer from BSON.
     #

data/lib/bson/version.rb

@@ -13,5 +13,5 @@
 # limitations under the License.
 
 module BSON
-  VERSION = "2.1.2"
+  VERSION = "2.2.0"
 end

data/spec/bson/document_spec.rb

@@ -25,7 +25,7 @@ describe BSON::Document do
     {}
   end
   let(:enum_class) do
-    BSON::Environment.ruby_18? ? Enumerable::Enumerator : Enumerator
+    Enumerator
   end
 
   before do
@@ -559,21 +559,18 @@ describe BSON::Document do
       end
     end
 
-    if BSON::Environment.retaining_hash_order?
+    context "when provided hashes" do
 
-      context "when provided hashes" do
-
-        let(:alternate) do
-          described_class[1 => 2, 3 => 4]
-        end
+      let(:alternate) do
+        described_class[1 => 2, 3 => 4]
+      end
 
-        it "sets the keys" do
-          expect(alternate.keys).to eq([ 1, 3 ])
-        end
+      it "sets the keys" do
+        expect(alternate.keys).to eq([ 1, 3 ])
+      end
 
-        it "sets the values" do
-          expect(alternate.values).to eq([ 2, 4 ])
-        end
+      it "sets the values" do
+        expect(alternate.values).to eq([ 2, 4 ])
       end
     end
   end
@@ -738,7 +735,7 @@ describe BSON::Document do
       it_behaves_like "a document able to handle utf-8"
     end
 
-    pending "when utf-8 code with scope values are present" do
+    context "when utf-8 code with scope values are present" do
 
       let(:document) do
         described_class["code", BSON::CodeWithScope.new("// gültig", {})]

data/spec/bson/object_id_spec.rb

@@ -502,11 +502,8 @@ describe BSON::ObjectId do
       expect(object_id.to_s).to eq(expected)
     end
 
-    unless BSON::Environment.ruby_18?
-
-      it "returns the string in UTF-8" do
-        expect(object_id.to_s.encoding).to eq(Encoding.find(BSON::UTF8))
-      end
+    it "returns the string in UTF-8" do
+      expect(object_id.to_s.encoding).to eq(Encoding.find(BSON::UTF8))
     end
 
     it "converts to a readable yaml string" do

data/spec/bson/registry_spec.rb

@@ -35,20 +35,10 @@ describe BSON::Registry do
 
     context "when the type has no corresponding class" do
 
-      unless BSON::Environment.ruby_18?
-
-        it "raises an error" do
-          expect {
-            described_class.get("test")
-          }.to raise_error(KeyError)
-        end
-      else
-
-        it "raises an error" do
-          expect {
-            described_class.get("test")
-          }.to raise_error(IndexError)
-        end
+      it "raises an error" do
+        expect {
+          described_class.get("test")
+        }.to raise_error(KeyError)
       end
     end
   end

data/spec/bson/string_spec.rb

@@ -111,19 +111,16 @@ describe String do
       it_behaves_like "a binary encoded string"
     end
 
-    unless BSON::Environment.ruby_18?
+    context "when the string contains non utf-8 characters" do
 
-      context "when the string contains non utf-8 characters" do
-
-        let(:string) do
-          255.chr
-        end
+      let(:string) do
+        255.chr
+      end
 
-        it "raises an error" do
-          expect {
-            string.to_bson_cstring
-          }.to raise_error(EncodingError)
-        end
+      it "raises an error" do
+        expect {
+          string.to_bson_cstring
+        }.to raise_error(EncodingError)
       end
     end
   end
@@ -242,19 +239,16 @@ describe String do
       it_behaves_like "a binary encoded string"
     end
 
-    unless BSON::Environment.ruby_18?
+    context "when the string contains non utf-8 characters" do
 
-      context "when the string contains non utf-8 characters" do
-
-        let(:string) do
-          255.chr
-        end
+      let(:string) do
+        255.chr
+      end
 
-        it "raises an error" do
-          expect {
-            string.to_bson_string
-          }.to raise_error(EncodingError)
-        end
+      it "raises an error" do
+        expect {
+          string.to_bson_string
+        }.to raise_error(EncodingError)
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bson
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.2.0
 platform: java
 authors:
 - Tyler Brock
@@ -33,7 +33,7 @@ cert_chain:
   8v7zLF2XliYbfurYIwkcXs8yPn8ggApBIy9bX6VJxRs/l2+UvqzaHIFaFy/F8/GP
   RNTuXsVG5NDACo7Q
   -----END CERTIFICATE-----
-date: 2014-01-16 00:00:00.000000000 Z
+date: 2014-01-24 00:00:00.000000000 Z
 dependencies: []
 description: A full featured BSON specification implementation, in Ruby
 email: