bson 2.0.0.rc2 → 2.0.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 26c195c903e73023d0f0ddbc6bd8b802965a2a32
-  data.tar.gz: 5a678021165a243c12330f9bc5fa8f192ea2beaa
+  metadata.gz: 41a5e08411dc7f036bd335197bfae4940fc8e581
+  data.tar.gz: 442009c85516195c17958b9902b05882d0b52e02
 SHA512:
-  metadata.gz: ce3afab5e81c5c6179e715637693765e54fdb9d459b79684ec8210b862ec73b7940b10aa527bbf7bc9dfece19a69b01f4c86adccaadbf18f33ba5ec407cf9454
-  data.tar.gz: 55ebdf9995b846d805666bab644ca34df8b90d37ced302fe4eb2d921240d6a023290a84dd8ac651dac8cadcffea5a685ccb13858c90a59776d78b929c1f7b1bb
+  metadata.gz: ac26809de3598a7fd2482a800677dbc43311394a0e78710d62d0a64147dd491e9d73518c448ef9198771824bb87f5fccafcf952478e42590378961e251e1c525
+  data.tar.gz: 7c82220f69ed5a030707ab67da9e7dcc328c4541769d1a0bc3eaf893d3f3fa3971a2565131fbde8de3ffbb86ea8ff5b20f81136f875be3254f6bca6b4f386ea9

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/NOTICE

@@ -1,2 +1,2 @@
 Ruby BSON
-Copyright (C) 2009-2013 10gen, Inc.
+Copyright (C) 2009-2013 MongoDB, Inc.

data/README.md

@@ -175,7 +175,7 @@ As of 2.0.0, this project adheres to the [Semantic Versioning Specification](htt
 License
 -------
 
-Copyright (C) 2013 10gen Inc.
+Copyright (C) 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/Rakefile

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 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.
@@ -78,11 +78,17 @@ task :clean_all => :clean do
   end
 end
 
+# Run bundle exec rake release with mri and jruby.
 task :release => :build do
   system "git tag -a v#{BSON::VERSION} -m 'Tagging release: #{BSON::VERSION}'"
   system "git push --tags"
-  system "gem push bson-#{BSON::VERSION}.gem"
-  system "rm bson-#{BSON::VERSION}.gem"
+  if jruby?
+    system "gem push bson-#{BSON::VERSION}-java.gem"
+    system "rm bson-#{BSON::VERSION}-java.gem"
+  else
+    system "gem push bson-#{BSON::VERSION}.gem"
+    system "rm bson-#{BSON::VERSION}.gem"
+  end
 end
 
 namespace :benchmark do

data/ext/bson/native.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 10gen Inc.
+ * Copyright (C) 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.
@@ -13,10 +13,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+#ifdef MINGW32
+
+#include <winsock2.h>
+#include <windows.h>
+
+#else
 
 #include <arpa/inet.h>
-#include <stdint.h>
 #include <sys/time.h>
+
+#endif
+
+
+#include <stdint.h>
 #include <sys/types.h>
 #include <time.h>
 #include <unistd.h>
@@ -223,23 +233,6 @@ static char rb_bson_machine_id[HOST_NAME_MAX];
  */
 static unsigned int rb_bson_object_id_counter = 0;
 
-/**
- * Get the current time in milliseconds, used in object id generation.
- *
- * @example Get the current time in milliseconds.
- *    rb_current_time_milliseconds();
- *
- * @return [ int ] The current time in millis.
- *
- * @since 2.0.0
- */
-static unsigned long rb_current_time_milliseconds()
-{
-  struct timeval time;
-  gettimeofday(&time, NULL);
-  return (time.tv_sec) * 1000 + (time.tv_usec) / 1000;
-}
-
 /**
  * Take the provided params and return the encoded bytes or a default one.
  *
@@ -318,17 +311,17 @@ static VALUE rb_float_from_bson_double(VALUE self, VALUE value)
  *
  * @since 2.0.0
  */
-static VALUE rb_object_id_generator_next(int argc, VALUE* time, VALUE self)
+static VALUE rb_object_id_generator_next(int argc, VALUE* args, VALUE self)
 {
   char bytes[12];
   unsigned long t;
   unsigned short pid = htons(getpid());
 
-  if (argc == 0 || (argc == 1 && *time == Qnil)) {
-    t = rb_current_time_milliseconds();
+  if (argc == 0 || (argc == 1 && *args == Qnil)) {
+    t = htonl((int) time(NULL));
   }
   else {
-    t = htonl(NUM2UINT(rb_funcall(*time, rb_intern("to_i"), 0)));
+    t = htonl(NUM2UINT(rb_funcall(*args, rb_intern("to_i"), 0)));
   }
 
   memcpy(&bytes, &t, 4);

data/lib/bson.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 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/array.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 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.
@@ -51,6 +51,23 @@ module BSON
       end
     end
 
+    # Convert the array to an object id. This will only work for arrays of size
+    # 12 where the elements are all strings.
+    #
+    # @example Convert the array to an object id.
+    #   array.to_bson_object_id
+    #
+    # @note This is used for repairing legacy bson data.
+    #
+    # @raise [ InvalidObjectId ] If the array is not 12 elements.
+    #
+    # @return [ String ] The raw object id bytes.
+    #
+    # @since 2.0.0
+    def to_bson_object_id
+      ObjectId.repair(self) { pack("C*") }
+    end
+
     module ClassMethods
 
       # Deserialize the array from BSON.

data/lib/bson/binary.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 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.
@@ -91,6 +91,7 @@ module BSON
     #
     # @since 2.0.0
     def initialize(data = "", type = :generic)
+      validate_type!(type)
       @data = data
       @type = type
     end
@@ -130,6 +131,60 @@ module BSON
       new(data, type)
     end
 
+    # Raised when providing an invalid type to the Binary.
+    #
+    # @since 2.0.0
+    class InvalidType < RuntimeError
+
+      # @!attribute type
+      #   @return [ Object ] The invalid type.
+      #   @since 2.0.0
+      attr_reader :type
+
+      # Instantiate the new error.
+      #
+      # @example Instantiate the error.
+      #   InvalidType.new(:error)
+      #
+      # @param [ Object ] type The invalid type.
+      #
+      # @since 2.0.0
+      def initialize(type)
+        @type = type
+      end
+
+      # Get the custom error message for the exception.
+      #
+      # @example Get the message.
+      #   error.message
+      #
+      # @return [ String ] The error message.
+      #
+      # @since 2.0.0
+      def message
+        "#{type.inspect} is not a valid binary type. " +
+          "Please use one of #{SUBTYPES.keys.map(&:inspect).join(", ")}."
+      end
+    end
+
+    private
+
+    # Validate the provided type is a valid type.
+    #
+    # @api private
+    #
+    # @example Validate the type.
+    #   binary.validate_type!(:user)
+    #
+    # @param [ Object ] type The provided type.
+    #
+    # @raise [ InvalidType ] The the type is invalid.
+    #
+    # @since 2.0.0
+    def validate_type!(type)
+      raise InvalidType.new(type) unless SUBTYPES.has_key?(type)
+    end
+
     # Register this type when the module is loaded.
     #
     # @since 2.0.0

data/lib/bson/boolean.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 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/code.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 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/code_with_scope.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 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/document.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 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/encodable.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 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/environment.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 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/false_class.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 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/float.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 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/hash.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 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/int32.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 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/int64.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 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/integer.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 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/json.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 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/max_key.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 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/min_key.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 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/nil_class.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 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/object_id.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 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.
@@ -158,7 +158,7 @@ module BSON
     # @example Get the raw bson bytes.
     #   object_id.to_bson
     #
-    # @note Since Moped's BSON and 10gen BSON before 2.0.0 have different
+    # @note Since Moped's BSON and MongoDB BSON before 2.0.0 have different
     #   internal representations, we will attempt to repair the data for cases
     #   where the object was instantiated in a non-standard way. (Like a
     #   Marshal.load)
@@ -169,7 +169,7 @@ module BSON
     #
     # @since 2.0.0
     def to_bson(encoded = ''.force_encoding(BINARY))
-      repair!(@data) if defined?(@data)
+      repair if defined?(@data)
       @raw_data ||= @@generator.next
       encoded << @raw_data
     end
@@ -194,8 +194,9 @@ module BSON
 
     private
 
-    def data=(data)
-      @raw_data = data
+    def repair
+      @raw_data = @data.to_bson_object_id
+      remove_instance_variable(:@data)
     end
 
     class << self
@@ -226,7 +227,7 @@ module BSON
       # @since 2.0.0
       def from_data(data)
         object_id = allocate
-        object_id.send(:data=, data)
+        object_id.instance_variable_set(:@raw_data, data)
         object_id
       end
 
@@ -283,6 +284,27 @@ module BSON
       def legal?(string)
         string.to_s =~ /^[0-9a-f]{24}$/i ? true : false
       end
+
+      # Executes the provided block only if the size of the provided object is
+      # 12. Used in legacy id repairs.
+      #
+      # @example Execute in a repairing block.
+      #   BSON::ObjectId.repair("test") { obj }
+      #
+      # @param [ String, Array ] object The object to repair.
+      #
+      # @raise [ Invalid ] If the array is not 12 elements.
+      #
+      # @return [ String ] The result of the block.
+      #
+      # @since 2.0.0
+      def repair(object)
+        if object.size == 12
+          block_given? ? yield(object) : object
+        else
+          raise Invalid.new("#{object.inspect} is not a valid object id.")
+        end
+      end
     end
 
     # Inner class that encapsulates the behaviour of actually generating each

data/lib/bson/regexp.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 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/registry.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 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/specialized.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 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/string.rb

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 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.
@@ -80,6 +80,23 @@ module BSON
       to_bson_string(encoded) << NULL_BYTE
     end
 
+    # Convert the string to an object id. This will only work for strings of size
+    # 12.
+    #
+    # @example Convert the string to an object id.
+    #   string.to_bson_object_id
+    #
+    # @note This is used for repairing legacy bson data.
+    #
+    # @raise [ InvalidObjectId ] If the string is not 12 elements.
+    #
+    # @return [ String ] The raw object id bytes.
+    #
+    # @since 2.0.0
+    def to_bson_object_id
+      ObjectId.repair(self)
+    end
+
     # Convert the string to a UTF-8 string then force to binary. This is so
     # we get errors for strings that are not UTF-8 encoded.
     #

data/lib/bson/symbol.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 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/time.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 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/timestamp.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 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/true_class.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 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/undefined.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 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/version.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 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.
@@ -13,5 +13,5 @@
 # limitations under the License.
 
 module BSON
-  VERSION = "2.0.0.rc2"
+  VERSION = "2.0.0.rc3"
 end

data/spec/bson/array_spec.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 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.
@@ -28,4 +28,31 @@ describe Array do
     it_behaves_like "a serializable bson element"
     it_behaves_like "a deserializable bson element"
   end
+
+  describe "#to_bson_object_id" do
+
+    context "when the array has 12 elements" do
+
+      let(:array) do
+        [ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12 ]
+      end
+
+      let(:converted) do
+        array.to_bson_object_id
+      end
+
+      it "returns the array as a string" do
+        expect(converted).to eq(array.pack("C*"))
+      end
+    end
+
+    context "when the array does not have 12 elements" do
+
+      it "raises an exception" do
+        expect {
+          [ 1 ].to_bson_object_id
+        }.to raise_error(BSON::ObjectId::Invalid)
+      end
+    end
+  end
 end

data/spec/bson/binary_spec.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 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.
@@ -31,6 +31,18 @@ describe BSON::Binary do
     it_behaves_like "a JSON serializable object"
   end
 
+  describe "#initialize" do
+
+    context "when he type is invalid" do
+
+      it "raises an error" do
+        expect {
+          described_class.new("testing", :error)
+        }.to raise_error(BSON::Binary::InvalidType)
+      end
+    end
+  end
+
   describe "#to_bson/#from_bson" do
 
     let(:type) { 5.chr }

data/spec/bson/boolean_spec.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 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/spec/bson/code_spec.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 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/spec/bson/code_with_scope_spec.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 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/spec/bson/document_spec.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 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/spec/bson/false_class_spec.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 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/spec/bson/float_spec.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 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/spec/bson/hash_spec.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 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/spec/bson/int32_spec.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 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/spec/bson/int64_spec.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 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/spec/bson/integer_spec.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 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/spec/bson/json_spec.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 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/spec/bson/max_key_spec.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 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/spec/bson/min_key_spec.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 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/spec/bson/nil_class_spec.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 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/spec/bson/object_id_spec.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 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.
@@ -444,6 +444,34 @@ describe BSON::ObjectId do
     end
   end
 
+  describe "#marshal_load" do
+
+    context "when the object id was dumped in the old format" do
+
+      let(:legacy) do
+        "\x04\bo:\x13BSON::ObjectId\x06:\n" +
+          "@data[\x11iUi\x01\xE2i,i\x00i\x00i\x00i\x00i\x00i\x00i\x00i\x00i\x00"
+      end
+
+      let(:object_id) do
+        Marshal.load(legacy)
+      end
+
+      let(:expected) do
+        described_class.from_time(Time.utc(2013, 1, 1))
+      end
+
+      it "properly loads the object id" do
+        expect(object_id).to eq(expected)
+      end
+
+      it "removes the bad legacy data" do
+        object_id.to_bson
+        expect(object_id.instance_variable_get(:@data)).to be_nil
+      end
+    end
+  end
+
   describe "#to_bson/#from_bson" do
 
     let(:time) { Time.utc(2013, 1, 1) }

data/spec/bson/regexp_spec.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 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/spec/bson/registry_spec.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 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/spec/bson/string_spec.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 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.
@@ -128,6 +128,33 @@ describe String do
     end
   end
 
+  describe "#to_bson_object_id" do
+
+    context "when the string has 12 characters" do
+
+      let(:string) do
+        "123456789012"
+      end
+
+      let(:converted) do
+        string.to_bson_object_id
+      end
+
+      it "returns the array as a string" do
+        expect(converted).to eq(string)
+      end
+    end
+
+    context "when the array does not have 12 elements" do
+
+      it "raises an exception" do
+        expect {
+          "test".to_bson_object_id
+        }.to raise_error(BSON::ObjectId::Invalid)
+      end
+    end
+  end
+
   describe "#to_bson_string" do
 
     context "when the string is valid" do

data/spec/bson/symbol_spec.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 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/spec/bson/time_spec.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 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/spec/bson/timestamp_spec.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 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/spec/bson/true_class_spec.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 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/spec/bson/undefined_spec.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 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/spec/bson_spec.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 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/spec/spec_helper.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 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/spec/support/shared_examples.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bson
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc2
+  version: 2.0.0.rc3
 platform: ruby
 authors:
 - Tyler Brock
@@ -33,7 +33,7 @@ cert_chain:
   8v7zLF2XliYbfurYIwkcXs8yPn8ggApBIy9bX6VJxRs/l2+UvqzaHIFaFy/F8/GP
   RNTuXsVG5NDACo7Q
   -----END CERTIFICATE-----
-date: 2013-09-23 00:00:00.000000000 Z
+date: 2013-10-14 00:00:00.000000000 Z
 dependencies: []
 description: A full featured BSON specification implementation, in Ruby
 email: