Fix remaining 1.8.7 failures in pure ruby

Author: durran

ruby/lib/bson.rb

@@ -35,6 +35,7 @@ class String
     # In versions prior to 1.9 we need to ignore the encoding requests.
     #
     # @since 2.0.0
+    def chr; self; end
     def force_encoding(*); self; end
     def encode(*); self; end
     def encode!(*); self; end

ruby/lib/bson/document.rb

@@ -21,6 +21,11 @@ module BSON
   # @since 2.0.0
   class Document < ::Hash
 
+    # 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.
@@ -298,7 +303,7 @@ def reject(&block)
     # @since 2.0.0
     def replace(other)
       super
-      @order = other.order.dup
+      @order = other.keys
       self
     end
 
@@ -392,6 +397,21 @@ def values
 
     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]
+      #
+      # @param [ Array<Object> ] args The key/value pairs.
+      #
+      # @return [ BSON::Document ] The new document.
+      #
+      # @since 2.0.0
       def [](*args)
         document = new
 
@@ -403,9 +423,7 @@ def [](*args)
           return document
         end
 
-        unless (args.size % 2 == 0)
-          raise ArgumentError.new("odd number of arguments for Hash")
-        end
+        raise ArgumentError.new(ARG_ERROR) unless (args.size % 2 == 0)
 
         args.each_with_index do |val, ind|
           next if (ind % 2 != 0)

ruby/lib/bson/object_id.rb

@@ -216,7 +216,7 @@ def from_time(time, options = {})
       #
       # @since 2.0.0
       def legal?(string)
-        /\A\h{24}\Z/ === string.to_s
+        string.to_s =~ /^[0-9a-f]{24}$/i ? true : false
       end
     end
 

ruby/spec/bson/array_spec.rb

@@ -8,7 +8,7 @@
     let(:type) { 4.chr }
     let(:obj)  {[ "one", "two" ]}
     let(:bson) do
-      { "0" => "one", "1" => "two" }.to_bson
+      BSON::Document["0", "one", "1", "two"].to_bson
     end
 
     it_behaves_like "a bson element"

ruby/spec/bson/document_spec.rb

@@ -524,18 +524,21 @@
       end
     end
 
-    context "when provided hashes" do
+    if ordered_hash_support?
 
-      let(:alternate) do
-        described_class[1 => 2, 3 => 4]
-      end
+      context "when provided hashes" do
 
-      it "sets the keys" do
-        expect(alternate.keys).to eq([ 1, 3 ])
-      end
+        let(:alternate) do
+          described_class[1 => 2, 3 => 4]
+        end
 
-      it "sets the values" do
-        expect(alternate.values).to eq([ 2, 4 ])
+        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
       end
     end
   end
@@ -598,7 +601,7 @@
     context "when the hash is a single level" do
 
       let(:obj) do
-        described_class["key" => "value"]
+        described_class["key","value"]
       end
 
       let(:bson) do
@@ -613,7 +616,7 @@
     context "when the hash is embedded" do
 
       let(:obj) do
-        described_class["field" => { "key" => "value" }]
+        described_class["field", BSON::Document["key", "value"]]
       end
 
       let(:bson) do
@@ -632,7 +635,7 @@
     context "when the keys are utf-8" do
 
       let(:document) do
-        described_class["gültig" => "type"]
+        described_class["gültig", "type"]
       end
 
       it_behaves_like "a document able to handle utf-8"
@@ -641,7 +644,7 @@
     context "when the values are utf-8" do
 
       let(:document) do
-        described_class["type" => "gültig"]
+        described_class["type", "gültig"]
       end
 
       it_behaves_like "a document able to handle utf-8"
@@ -650,7 +653,7 @@
     context "when both the keys and values are utf-8" do
 
       let(:document) do
-        described_class["gültig" => "gültig"]
+        described_class["gültig", "gültig"]
       end
 
       it_behaves_like "a document able to handle utf-8"
@@ -659,7 +662,7 @@
     context "when the regexps are utf-8" do
 
       let(:document) do
-        described_class["type" => /^gültig/]
+        described_class["type", /^gültig/]
       end
 
       it_behaves_like "a document able to handle utf-8"
@@ -668,7 +671,7 @@
     context "when the symbols are utf-8" do
 
       let(:document) do
-        described_class["type" => "gültig".to_sym]
+        described_class["type", "gültig".to_sym]
       end
 
       it_behaves_like "a document able to handle utf-8"
@@ -677,7 +680,7 @@
     context "when utf-8 string values are in an array" do
 
       let(:document) do
-        described_class["type" => ["gültig"]]
+        described_class["type", ["gültig"]]
       end
 
       it_behaves_like "a document able to handle utf-8"
@@ -686,7 +689,7 @@
     context "when utf-8 code values are present" do
 
       let(:document) do
-        described_class["code" => BSON::Code.new("// gültig")]
+        described_class["code", BSON::Code.new("// gültig")]
       end
 
       it_behaves_like "a document able to handle utf-8"
@@ -695,7 +698,7 @@
     pending "when utf-8 code with scope values are present" do
 
       let(:document) do
-        described_class["code" => BSON::CodeWithScope.new("// gültig", {})]
+        described_class["code", BSON::CodeWithScope.new("// gültig", {})]
       end
 
       it_behaves_like "a document able to handle utf-8"
@@ -705,7 +708,7 @@
 
       let(:string) { "gültig" }
       let(:document) do
-        described_class["type" => string.encode("iso-8859-1")]
+        described_class["type", string.encode("iso-8859-1")]
       end
 
       it "encodes and decodes the document properly" do
@@ -719,7 +722,7 @@
 
       let(:string) { "europäischen" }
       let(:document) do
-        described_class["type" => string.encode("binary", "binary")]
+        described_class["type", string.encode("binary", "binary")]
       end
 
       it "encodes and decodes the document properly" do

ruby/spec/bson/object_id_spec.rb

@@ -276,7 +276,7 @@
       end
 
       it "does not include process or sequence information" do
-        expect(object_id.to_s =~ /\A\h{8}0{16}\Z/).to be_true
+        expect(object_id.to_s =~ /\A[0-9a-f]{8}[0]{16}\Z/).to be_true
       end
     end
 
@@ -380,8 +380,11 @@
       expect(object_id.to_s).to eq(expected)
     end
 
-    it "returns the string in UTF-8" do
-      expect(object_id.to_s.encoding).to eq(Encoding.find(BSON::UTF8))
+    if ordered_hash_support?
+
+      it "returns the string in UTF-8" do
+        expect(object_id.to_s.encoding).to eq(Encoding.find(BSON::UTF8))
+      end
     end
 
     it "converts to a readable yaml string" do

ruby/spec/bson/registry_spec.rb

@@ -22,10 +22,20 @@
 
     context "when the type has no corresponding class" do
 
-      it "raises an error" do
-        expect {
-          described_class.get("test")
-        }.to raise_error(KeyError)
+      if ordered_hash_support?
+
+        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
       end
     end
   end

ruby/spec/bson/string_spec.rb

@@ -88,16 +88,19 @@
       it_behaves_like "a binary encoded string"
     end
 
-    context "when the string contains non utf-8 characters" do
+    if ordered_hash_support?
 
-      let(:string) do
-        255.chr
-      end
+      context "when the string contains non utf-8 characters" do
 
-      it "raises an error" do
-        expect {
-          string.to_bson_cstring
-        }.to raise_error(EncodingError)
+        let(:string) do
+          255.chr
+        end
+
+        it "raises an error" do
+          expect {
+            string.to_bson_cstring
+          }.to raise_error(EncodingError)
+        end
       end
     end
   end
@@ -180,16 +183,19 @@
       it_behaves_like "a binary encoded string"
     end
 
-    context "when the string contains non utf-8 characters" do
+    if ordered_hash_support?
 
-      let(:string) do
-        255.chr
-      end
+      context "when the string contains non utf-8 characters" do
 
-      it "raises an error" do
-        expect {
-          string.to_bson_string
-        }.to raise_error(EncodingError)
+        let(:string) do
+          255.chr
+        end
+
+        it "raises an error" do
+          expect {
+            string.to_bson_string
+          }.to raise_error(EncodingError)
+        end
       end
     end
   end