grip 0.6.0 → 0.6.1

data/README.rdoc

@@ -13,7 +13,7 @@ The grip gem is hosted on gemcutter.org:
 
     class Doc
       include MongoMapper::Document
-      include Grip
+      include MongoMapper::Grip::HasAttachment
 
       has_grid_attachment :image, :versions => {:thumb => {:width=>50,:height=>50}}
       

data/VERSION

@@ -1 +1 @@
-0.6.0
+0.6.1

data/grip.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{grip}
-  s.version = "0.6.0"
+  s.version = "0.6.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["twoism", "jnunemaker"]

data/lib/grip/attachment.rb

@@ -16,6 +16,7 @@ module MongoMapper
       key :variants,      Hash
       
       after_save :build_variants
+      before_destroy :destroy_file
       
       def file=new_file
         raise InvalidFile unless (new_file.is_a?(File) || new_file.is_a?(Tempfile))
@@ -35,12 +36,6 @@ module MongoMapper
         "#{owner_type.pluralize}/#{owner_id}/#{name}".downcase
       end
       
-      def self.create_method sym, &block
-        define_method sym do |*block.args|
-          yield
-        end
-      end
-      
       private
         def build_variants
           self.variants.each do |variant, dimensions|
@@ -69,6 +64,10 @@ module MongoMapper
             
           end
         end
+        
+        def destroy_file
+          GridFS::GridStore.unlink(self.class.database, grid_key)
+        end
       
         def write_to_grid new_file
           GridFS::GridStore.open(self.class.database, grid_key, 'w', :content_type => content_type) do |f|

data/lib/grip/has_attachment.rb

@@ -30,8 +30,7 @@ module MongoMapper
       def self.included(base)
         base.extend ClassMethods
         base.class_eval do
-          after_save      :save_attachments
-          before_destroy  :destroy_attached_files
+          after_save :save_attachments
           
           many :attachments, :as => :owner, :class_name => "MongoMapper::Grip::Attachment", :dependent => :destroy
         end

data/test/test_has_attachment.rb

@@ -26,10 +26,6 @@ class HasAttachmentTest < Test::Unit::TestCase
       assert_equal(1, Doc.after_save.collect(&:method).count)
     end
     
-    should "have :before_destroy callback" do
-      assert_equal(1, Doc.before_destroy.collect(&:method).count)
-    end
-    
     context "when assigned a file" do
       setup do
         @document.image = @image

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: grip
 version: !ruby/object:Gem::Version 
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors: 
 - twoism