bson 1.1.1 → 1.1.2

data/LICENSE.txt

@@ -175,18 +175,7 @@
 
    END OF TERMS AND CONDITIONS
 
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
+   Copyright 2008-2010 10gen, Inc.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -199,4 +188,3 @@
    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.
-

data/Rakefile

@@ -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 docs/yard_ext.rb -p docs/templates -o #{out} --title MongoRuby-#{Mongo::VERSION}"
+  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"
 end
 
 namespace :gem do
@@ -177,22 +177,35 @@ namespace :gem do
   desc "Install the gem locally"
   task :install do
     sh "gem build bson.gemspec"
-    sh "gem install bson-*.gem"
+    sh "gem install --no-rdoc --no-ri bson-*.gem"
+
     sh "gem build mongo.gemspec"
-    sh "gem install mongo-*.gem"
+    sh "gem install --no-rdoc --no-ri mongo-*.gem"
+
     sh "rm mongo-*.gem"
     sh "rm bson-*.gem"
   end
 
   desc "Install the optional c extensions"
   task :install_extensions do
+    sh "gem uninstall -x -a -I bson_ext"
     sh "gem build bson_ext.gemspec"
-    sh "gem install bson_ext-*.gem"
+    sh "gem install --no-rdoc --no-ri bson_ext-*.gem"
     sh "rm bson_ext-*.gem"
   end
 
 end
 
+namespace :ci do
+  namespace :test do
+    task :c do
+      Rake::Task['gem:install'].invoke
+      Rake::Task['gem:install_extensions'].invoke
+      Rake::Task['test:c'].invoke
+    end
+  end
+end
+
 task :default => :list
 
 task :list do

data/lib/bson.rb

@@ -2,10 +2,10 @@
 
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
-MINIMUM_BSON_EXT_VERSION = "1.1.1"
+MINIMUM_BSON_EXT_VERSION = "1.1.2"
 
 module BSON
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
   def self.serialize(obj, check_keys=false, move_id=false)
     BSON_CODER.serialize(obj, check_keys, move_id)
   end
@@ -60,10 +60,12 @@ else
     module BSON
       BSON_CODER = BSON_RUBY
     end
-    warn "\n**Notice: C extension not loaded. This is required for optimum MongoDB Ruby driver performance."
-    warn "  You can install the extension as follows:\n  gem install bson_ext\n"
-    warn "  If you continue to receive this message after installing, make sure that the"
-    warn "  bson_ext gem is in your load path and that the bson_ext and mongo gems are of the same version.\n"
+    unless ENV['TEST_MODE']
+      warn "\n**Notice: C extension not loaded. This is required for optimum MongoDB Ruby driver performance."
+      warn "  You can install the extension as follows:\n  gem install bson_ext\n"
+      warn "  If you continue to receive this message after installing, make sure that the"
+      warn "  bson_ext gem is in your load path and that the bson_ext and mongo gems are of the same version.\n"
+    end
   end
 end
 

data/test/bson/bson_test.rb

@@ -437,11 +437,13 @@ class BSONTest < Test::Unit::TestCase
   # HashWithIndifferentAccess can cause problems for _id but not for other
   # keys. rather than require rails to test with HWIA directly, we do this
   # somewhat hacky test.
+  #
+  # Note that the driver only eliminates duplicate ids when move_id is true.
   def test_no_duplicate_id
     dup = {"_id" => "foo", :_id => "foo"}
     one = {"_id" => "foo"}
 
-    assert_equal @encoder.serialize(one).to_a, @encoder.serialize(dup).to_a
+    assert_equal @encoder.serialize(one, false, true).to_a, @encoder.serialize(dup, false, true).to_a
   end
 
   def test_duplicate_keys

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bson
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: false
   segments: 
   - 1
   - 1
-  - 1
-  version: 1.1.1
+  - 2
+  version: 1.1.2
 platform: ruby
 authors: 
 - Jim Menard
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-14 00:00:00 -04:00
+date: 2010-11-04 00:00:00 -04:00
 default_executable: 
 dependencies: []