joint 0.3.1 → 0.3.2

data/Rakefile

@@ -18,12 +18,12 @@ Jeweler::Tasks.new do |gem|
   
   gem.add_dependency 'wand', '>= 0.2.1'
   gem.add_dependency 'mime-types'
+  gem.add_dependency 'mongo_mapper', '>= 0.7.4'
 
   gem.add_development_dependency 'jeweler'
   gem.add_development_dependency 'shoulda'
   gem.add_development_dependency 'mocha'
   gem.add_development_dependency 'jnunemaker-matchy'
-  gem.add_development_dependency 'mongo_mapper', '>= 0.7.2'
 end
 Jeweler::GemcutterTasks.new
 

data/lib/joint.rb

@@ -36,7 +36,7 @@ module Joint
           if file.nil?
             nil_attachments << :#{name}
           else
-            self["#{name}_id"]             = Mongo::ObjectID.new if self["#{name}_id"].nil?
+            self["#{name}_id"]             = BSON::ObjectID.new if self["#{name}_id"].nil?
             self["#{name}_size"]           = File.size(file)
             self["#{name}_type"]           = Wand.wave(file.path)
             self["#{name}_name"]           = Joint.file_name(file)
@@ -67,8 +67,9 @@ module Joint
           next unless io.respond_to?(:read)
           io.rewind if io.respond_to?(:rewind)
           grid.delete(send(name).id)
-          grid.put(io.read, send(name).name, {
+          grid.put(io.read, {
             :_id          => send(name).id,
+            :filename     => send(name).name,
             :content_type => send(name).type,
           })
         end

data/lib/joint/version.rb

@@ -1,3 +1,3 @@
 module Joint
-  Version = '0.3.1'
+  Version = '0.3.2'
 end

data/test/test_joint.rb

@@ -112,8 +112,8 @@ class JointTest < Test::Unit::TestCase
       subject.image_id.should_not be_nil
       subject.file_id.should_not be_nil
 
-      subject.image_id.should be_instance_of(Mongo::ObjectID)
-      subject.file_id.should be_instance_of(Mongo::ObjectID)
+      subject.image_id.should be_instance_of(BSON::ObjectID)
+      subject.file_id.should be_instance_of(BSON::ObjectID)
     end
 
     should "allow accessing keys through attachment proxy" do
@@ -126,8 +126,8 @@ class JointTest < Test::Unit::TestCase
       subject.image.id.should_not be_nil
       subject.file.id.should_not be_nil
 
-      subject.image.id.should be_instance_of(Mongo::ObjectID)
-      subject.file.id.should be_instance_of(Mongo::ObjectID)
+      subject.image.id.should be_instance_of(BSON::ObjectID)
+      subject.file.id.should be_instance_of(BSON::ObjectID)
     end
 
     should "proxy unknown methods to GridIO object" do
@@ -251,8 +251,8 @@ class JointTest < Test::Unit::TestCase
       subject.image?.should be(false)
     end
 
-    should "raise Mongo::GridError" do
-      assert_raises(Mongo::GridError) { subject.image.read }
+    should "raise Mongo::GridFileNotFound" do
+      assert_raises(Mongo::GridFileNotFound) { subject.image.read }
     end
   end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - John Nunemaker
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-07 00:00:00 -04:00
+date: 2010-04-18 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -44,7 +44,7 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: jeweler
+  name: mongo_mapper
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
@@ -52,11 +52,13 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        version: "0"
-  type: :development
+        - 7
+        - 4
+        version: 0.7.4
+  type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: shoulda
+  name: jeweler
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
@@ -68,7 +70,7 @@ dependencies:
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: mocha
+  name: shoulda
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
@@ -80,7 +82,7 @@ dependencies:
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: jnunemaker-matchy
+  name: mocha
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     requirements: 
@@ -92,7 +94,7 @@ dependencies:
   type: :development
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: mongo_mapper
+  name: jnunemaker-matchy
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     requirements: 
@@ -100,9 +102,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 7
-        - 2
-        version: 0.7.2
+        version: "0"
   type: :development
   version_requirements: *id007
 description: MongoMapper and GridFS joined in file upload love.