jonbell-grip 0.1.1 → 0.1.2

data/Rakefile

@@ -15,7 +15,7 @@ begin
     gem.version     = Grip::Version
 
     gem.add_dependency 'wand', '>= 0.2.1'
-    gem.add_development_dependency 'mongo_mapper', '0.7.1'
+    gem.add_development_dependency 'mongo_mapper', '0.7.4'
     gem.add_development_dependency 'shoulda'
   end
   Jeweler::GemcutterTasks.new

data/jonbell-grip.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{jonbell-grip}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Nunemaker", "Jonathan Bell"]
-  s.date = %q{2010-03-25}
+  s.date = %q{2010-04-19}
   s.description = %q{Attachment plugin for MongoMapper that uses GridFS.}
   s.email = %q{nunemaker@gmail.com}
   s.extra_rdoc_files = [
@@ -48,16 +48,16 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<wand>, [">= 0.2.1"])
-      s.add_development_dependency(%q<mongo_mapper>, ["= 0.7.1"])
+      s.add_development_dependency(%q<mongo_mapper>, ["= 0.7.4"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
     else
       s.add_dependency(%q<wand>, [">= 0.2.1"])
-      s.add_dependency(%q<mongo_mapper>, ["= 0.7.1"])
+      s.add_dependency(%q<mongo_mapper>, ["= 0.7.4"])
       s.add_dependency(%q<shoulda>, [">= 0"])
     end
   else
     s.add_dependency(%q<wand>, [">= 0.2.1"])
-    s.add_dependency(%q<mongo_mapper>, ["= 0.7.1"])
+    s.add_dependency(%q<mongo_mapper>, ["= 0.7.4"])
     s.add_dependency(%q<shoulda>, [">= 0"])
   end
 end

data/lib/grip.rb

@@ -20,7 +20,7 @@ module Grip
       end
 
       define_method("#{name}=") do |file|
-        self["#{name}_id"]   = Mongo::ObjectID.new
+        self["#{name}_id"]   = BSON::ObjectID.new
         self["#{name}_size"] = File.size(file)
         self["#{name}_type"] = Wand.wave(file.path)
         self["#{name}_name"] = if file.respond_to?(:original_filename)
@@ -53,7 +53,7 @@ module Grip
           content_type = self["#{name}_type"]
 
           if file.respond_to?(:read)
-            self.class.grid.put(file.read, self["#{name}_name"], :content_type => content_type, :_id => self["#{name}_id"])
+            self.class.grid.put(file.read, :filename => self["#{name}_name"], :content_type => content_type, :_id => self["#{name}_id"])
           end
         end
       end

data/lib/grip/version.rb

@@ -1,3 +1,3 @@
 module Grip
-  Version = '0.1.1'
+  Version = '0.1.2'
 end

data/test/test_grip.rb

@@ -51,9 +51,9 @@ class GripTest < Test::Unit::TestCase
     assert_not_nil @doc.image_id
     assert_not_nil @doc.pdf_id
     assert_not_nil embedded_doc.file_id
-    assert_kind_of Mongo::ObjectID, @doc.image_id
-    assert_kind_of Mongo::ObjectID, @doc.pdf_id
-    assert_kind_of Mongo::ObjectID, embedded_doc.file_id
+    assert_kind_of BSON::ObjectID, @doc.image_id
+    assert_kind_of BSON::ObjectID, @doc.pdf_id
+    assert_kind_of BSON::ObjectID, embedded_doc.file_id
 
     assert_equal "image/png", @grid.get(@doc.image_id).content_type
     assert_equal "application/pdf", @grid.get(@doc.pdf_id).content_type
@@ -96,9 +96,9 @@ class GripTest < Test::Unit::TestCase
 
   test "cleans up attachments on destroy" do
     @doc.destroy
-    assert_raises(Mongo::GridError) { @grid.get(@doc.image_id) }
-    assert_raises(Mongo::GridError) { @grid.get(@doc.pdf_id) }
-    assert_raises(Mongo::GridError) { @grid.get(embedded_doc.file_id) }
+    assert_raises(Mongo::GridFileNotFound) { @grid.get(@doc.image_id) }
+    assert_raises(Mongo::GridFileNotFound) { @grid.get(@doc.pdf_id) }
+    assert_raises(Mongo::GridFileNotFound) { @grid.get(embedded_doc.file_id) }
   end
   
   def embedded_doc

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - John Nunemaker
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-25 00:00:00 -05:00
+date: 2010-04-19 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,8 +42,8 @@ dependencies:
         segments: 
         - 0
         - 7
-        - 1
-        version: 0.7.1
+        - 4
+        version: 0.7.4
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency