grip 0.6.12 → 0.7.2

data/VERSION

@@ -1 +1 @@
-0.6.12
+0.7.2

data/grip.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{grip}
-  s.version = "0.6.12"
+  s.version = "0.7.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["twoism", "jnunemaker"]
-  s.date = %q{2010-01-31}
+  s.date = %q{2010-02-17}
   s.description = %q{GridFS attachments for MongoMapper}
   s.email = %q{signalstatic@gmail.com}
   s.extra_rdoc_files = [

data/lib/grip/attachment.rb

@@ -23,11 +23,12 @@ module Grip
     before_destroy  :destroy_file
 
     def file=new_file
+			return if new_file.nil? || (new_file.is_a?(String) && new_file.blank?)
       raise InvalidFile unless (new_file.is_a?(File) || new_file.is_a?(Tempfile))
 
       self.file_name    = new_file.is_a?(Tempfile) ? new_file.original_filename : File.basename(new_file.path)
       self.file_size    = File.size(new_file.path)
-      self.content_type = MIME::Types.type_for(new_file.path)
+      self.content_type = MIME::Types.type_for(self.file_name)
 
       write_to_grid self, new_file
     end
@@ -60,7 +61,7 @@ module Grip
           new_attachment.owner_type   = self.class.to_s
           new_attachment.file_name    = File.basename(file_hash[:uploaded_file].path)
           new_attachment.file_size    = File.size(file_hash[:resized_file].path)
-          new_attachment.content_type = MIME::Types.type_for(file_hash[:uploaded_file].path)[0].content_type
+          new_attachment.content_type = MIME::Types.type_for(new_attachment.file_name)
           new_attachment.save!
 
           write_to_grid new_attachment, file_hash[:resized_file]
@@ -73,6 +74,10 @@ module Grip
       GridFS::GridStore.unlink(self.class.database, grid_key)
     end
 
+		def has_file?
+			!self.file_name.nil?
+		end
+
     def write_to_grid attachment, new_file
       GridFS::GridStore.open(self.class.database, attachment.grid_key, 'w', :content_type => attachment.content_type) do |f|
         f.write new_file.read
@@ -80,6 +85,7 @@ module Grip
     end
 
     def read_from_grid key
+			return nil unless has_file? 
       GridFS::GridStore.new(self.class.database, key, 'r')
     end
   end

data/lib/grip/has_attachment.rb

@@ -25,6 +25,7 @@ module Grip
         end
 
         define_method("#{name}=") do |new_file|
+					return if new_file.nil? || (new_file.is_a?(String) && new_file.blank?)
           raise InvalidFile unless (new_file.is_a?(File) || new_file.is_a?(Tempfile))
           uploaded_files[name] ||= {}
           uploaded_files[name][:file] = new_file

data/test/grip_attachment_test.rb

@@ -2,7 +2,7 @@ require "test_helper"
 
 include Grip
 
-class GripAttachmentTest < Test::Unit::TestCase
+class TestAttachment < Test::Unit::TestCase
   context "An Attachment" do
     setup do
       @attachment   = Attachment.new( :name => "image", :owner_type => "Mock", :owner_id => Mongo::ObjectID.new )
@@ -59,6 +59,15 @@ class GripAttachmentTest < Test::Unit::TestCase
       end
     end
 
+		context "with an empty string or nil" do
+			
+			should "set image to nil" do
+				@attachment.file = ""
+				assert_nil @attachment.file
+			end
+			
+		end
+
   end
 
 end

data/test/has_attachment_test.rb

@@ -30,6 +30,11 @@ class HasAttachmentTest < Test::Unit::TestCase
       assert_equal(1, Doc.after_save.collect(&:method).count)
     end
 
+		should "set to nill with an empty string or nil" do
+        @document.image = ""
+				assert_nil @document.image
+		end
+
     context "when assigned a file" do
       setup do
         @document.image = @image

data/test/test_helper.rb

@@ -7,7 +7,7 @@ require 'factory_girl'
 require 'factories'
 require 'RMagick'
 
-TEST_DB = 'test-grip'
+TEST_DB = 'test-grip' unless Object.const_defined?("TEST_DB")
 
 MongoMapper.database = TEST_DB
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: grip
 version: !ruby/object:Gem::Version 
-  version: 0.6.12
+  version: 0.7.2
 platform: ruby
 authors: 
 - twoism
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-31 00:00:00 -05:00
+date: 2010-02-17 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency