bson 1.1.2 → 1.1.3

data/Rakefile

@@ -161,7 +161,7 @@ task :rdoc do
   version = eval(File.read("mongo.gemspec")).version
   out = File.join('html', version.to_s)
   FileUtils.rm_rf('html')
-  system "rdoc --main README.rdoc --op #{out} --inline-source --quiet README.rdoc `find lib -name '*.rb'`"
+  system "rdoc --main README.md --op #{out} --inline-source --quiet README.md `find lib -name '*.rb'`"
 end
 
 desc "Generate YARD documentation"
@@ -169,7 +169,7 @@ task :ydoc do
   require File.join(File.dirname(__FILE__), 'lib', 'mongo')
   out = File.join('ydoc', Mongo::VERSION)
   FileUtils.rm_rf('ydoc')
-  system "yardoc lib/**/*.rb lib/mongo/**/*.rb lib/bson/**/*.rb -e yard/yard_ext.rb -p yard/templates -o #{out} --title MongoRuby-#{Mongo::VERSION} --files docs/TUTORIAL.md,docs/HISTORY.md,docs/CREDITS.md,docs/1.0_UPGRADE.md"
+  system "yardoc lib/**/*.rb lib/mongo/**/*.rb lib/bson/**/*.rb -e yard/yard_ext.rb -p yard/templates -o #{out} --title MongoRuby-#{Mongo::VERSION} --files docs/TUTORIAL.md,docs/GridFS.md,docs/FAQ.md,docs/REPLICA_SETS.md,docs/WRITE_CONCERN.md,docs/HISTORY.md,docs/CREDITS.md,docs/1.0_UPGRADE.md"
 end
 
 namespace :gem do

data/lib/bson.rb

@@ -2,10 +2,10 @@
 
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
-MINIMUM_BSON_EXT_VERSION = "1.1.2"
+MINIMUM_BSON_EXT_VERSION = "1.1.3"
 
 module BSON
-  VERSION = "1.1.2"
+  VERSION = "1.1.3"
   def self.serialize(obj, check_keys=false, move_id=false)
     BSON_CODER.serialize(obj, check_keys, move_id)
   end
@@ -45,6 +45,10 @@ 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']
+
+    # Raise LoadError unless little endian
+    raise LoadError unless [1,0,0,0].pack("i").bytes.first == 1
+
     require 'bson_ext/cbson'
     raise LoadError unless defined?(CBson::VERSION)
     if CBson::VERSION < MINIMUM_BSON_EXT_VERSION

data/lib/bson/types/object_id.rb

@@ -53,10 +53,7 @@ module BSON
     #
     # @return [Boolean]
     def self.legal?(str)
-      len = 24
-      str =~ /([0-9a-f]+)/i
-      match = $1
-      str && str.length == len && match == str
+      str =~ /^[0-9a-f]{24}$/i ? true : false
     end
 
     # Create an object id from the given time. This is useful for doing range
@@ -152,6 +149,14 @@ module BSON
     def to_json(*a)
       "{\"$oid\": \"#{to_s}\"}"
     end
+    
+    # Create the JSON hash structure convert to MongoDB extended format. Rails 2.3.3 
+    # introduced as_json to create the needed hash structure to encode objects into JSON.
+    # 
+    # @return [Hash] the hash representation as MongoDB extended JSON
+    def as_json(options ={})
+      {"$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

data/test/bson/object_id_test.rb

@@ -127,4 +127,9 @@ class ObjectIdTest < Test::Unit::TestCase
     id = ObjectId.new
     assert_equal "{\"$oid\": \"#{id}\"}", id.to_json
   end
+  
+  def test_as_json
+    id = ObjectId.new
+    assert_equal({"$oid" => id.to_s}, id.as_json)
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bson
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 1
   - 1
-  - 2
-  version: 1.1.2
+  - 3
+  version: 1.1.3
 platform: ruby
 authors: 
 - Jim Menard
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-04 00:00:00 -04:00
+date: 2010-11-29 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -35,30 +35,30 @@ files:
 - 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/bson_c.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/code.rb
 - lib/bson/types/object_id.rb
+- lib/bson/types/binary.rb
+- lib/bson/types/min_max_keys.rb
+- lib/bson/byte_buffer.rb
+- lib/bson/bson_java.rb
 - bin/b2json
 - bin/j2bson
-- ext/java/jar/bson-2.2.jar
-- ext/java/jar/jbson.jar
 - ext/java/jar/jruby.jar
 - ext/java/jar/mongo-2.2.jar
-- test/bson/binary_test.rb
-- test/bson/bson_test.rb
+- ext/java/jar/bson-2.2.jar
+- ext/java/jar/jbson.jar
 - test/bson/byte_buffer_test.rb
-- test/bson/hash_with_indifferent_access_test.rb
-- test/bson/json_test.rb
+- test/bson/binary_test.rb
 - test/bson/object_id_test.rb
+- test/bson/json_test.rb
+- test/bson/bson_test.rb
 - test/bson/ordered_hash_test.rb
+- test/bson/hash_with_indifferent_access_test.rb
 has_rdoc: true
 homepage: http://www.mongodb.org
 licenses: []
@@ -94,10 +94,10 @@ signing_key:
 specification_version: 3
 summary: Ruby implementation of BSON
 test_files: 
-- test/bson/binary_test.rb
-- test/bson/bson_test.rb
 - test/bson/byte_buffer_test.rb
-- test/bson/hash_with_indifferent_access_test.rb
-- test/bson/json_test.rb
+- test/bson/binary_test.rb
 - test/bson/object_id_test.rb
+- test/bson/json_test.rb
+- test/bson/bson_test.rb
 - test/bson/ordered_hash_test.rb
+- test/bson/hash_with_indifferent_access_test.rb