diff --git a/README.rdoc b/README.rdoc index 8377a52..7e4047a 100644 --- a/README.rdoc +++ b/README.rdoc @@ -17,8 +17,8 @@ This version is currently based off of mongo-0.20.1. As of mongo-0.19.1, there have been significant changes to GridFS. I do not plan to support versions of the mongo driver prior to 0.19. There are -some compatibility issues with mongo-0.19 vs. mongo-0.20 (Mongo::ObjectID -vs. BSON::ObjectID). For now, I am choosing to support mongo-0.20. +some compatibility issues with mongo-0.19 vs. mongo-0.20 (Mongo::ObjectId +vs. BSON::ObjectId). For now, I am choosing to support mongo-0.20. == Installation diff --git a/Rakefile b/Rakefile index ba5563c..1e020f3 100644 --- a/Rakefile +++ b/Rakefile @@ -10,10 +10,10 @@ begin gem.homepage = "http://github.com/skinandbones/rack-gridfs" gem.authors = ["Blake Carlson"] gem.rubyforge_project = "rack-gridfs" - + gem.add_dependency('rack') - gem.add_dependency('mongo', '>= 1.0.1') - + gem.add_dependency('mongo', '>= 1.0.8') + gem.add_development_dependency('mocha', '0.9.4') gem.add_development_dependency('rack-test') gem.add_development_dependency('shoulda') diff --git a/lib/rack/gridfs.rb b/lib/rack/gridfs.rb index 579ecd6..35807e9 100644 --- a/lib/rack/gridfs.rb +++ b/lib/rack/gridfs.rb @@ -41,7 +41,7 @@ def gridfs_request(id) grid = Mongo::GridFileSystem.new(db) file = grid.open(id, 'r') [200, {'Content-Type' => file.content_type}, [file.read]] - rescue Mongo::GridError, BSON::InvalidObjectID + rescue Mongo::GridError, BSON::InvalidObjectId [404, {'Content-Type' => 'text/plain'}, ['File not found.']] rescue Mongo::GridFileNotFound [404, {'Content-Type' => 'text/plain'}, ['File not found.']] diff --git a/rack-gridfs.gemspec b/rack-gridfs.gemspec index a38276a..d1e77ea 100644 --- a/rack-gridfs.gemspec +++ b/rack-gridfs.gemspec @@ -48,14 +48,14 @@ Gem::Specification.new do |s| if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then s.add_runtime_dependency(%q, [">= 0"]) s.add_runtime_dependency(%q, [">= 3.0.0"]) - s.add_runtime_dependency(%q, [">= 1.0.4"]) + s.add_runtime_dependency(%q, [">= 1.0.8"]) s.add_development_dependency(%q, ["= 0.9.4"]) s.add_development_dependency(%q, [">= 0"]) s.add_development_dependency(%q, [">= 0"]) else s.add_dependency(%q, [">= 0"]) s.add_dependency(%q, [">= 3.0.0"]) - s.add_dependency(%q, [">= 1.0.4"]) + s.add_dependency(%q, [">= 1.0.8"]) s.add_dependency(%q, ["= 0.9.4"]) s.add_dependency(%q, [">= 0"]) s.add_dependency(%q, [">= 0"]) @@ -63,7 +63,7 @@ Gem::Specification.new do |s| else s.add_dependency(%q, [">= 0"]) s.add_dependency(%q, [">= 3.0.0"]) - s.add_dependency(%q, [">= 1.0.4"]) + s.add_dependency(%q, [">= 1.0.8"]) s.add_dependency(%q, ["= 0.9.4"]) s.add_dependency(%q, [">= 0"]) s.add_dependency(%q, [">= 0"])