dragonfly 0.9.3 → 0.9.4

data/History.md

@@ -1,3 +1,10 @@
+0.9.4 (2011-06-10)
+==================
+Fixes
+-----
+- Made use of Rack calling `close` on the response body to clean up tempfiles.
+  The response body is now the job, which delegates `each` to the temp_object.
+
 0.9.3 (2011-06-03)
 ==================
 Fixes

data/README.md

@@ -12,7 +12,7 @@ For the lazy Rails user...
 **Gemfile**:
 
     gem 'rack-cache', :require => 'rack/cache'
-    gem 'dragonfly', '~>0.9.2'
+    gem 'dragonfly', '~>0.9.4'
 
 **Initializer** (e.g. config/initializers/dragonfly.rb):
 

data/VERSION

@@ -1 +1 @@
-0.9.3
+0.9.4

data/dragonfly.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dragonfly}
-  s.version = "0.9.3"
+  s.version = "0.9.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mark Evans"]
-  s.date = %q{2011-06-03}
+  s.date = %q{2011-06-10}
   s.description = %q{Dragonfly is a framework that enables on-the-fly processing for any content type.
   It is especially suited to image handling. Its uses range from image thumbnails to standard attachments to on-demand text generation.}
   s.email = %q{mark@new-bamboo.co.uk}

data/extra_docs/Rails3.md

@@ -33,7 +33,7 @@ application.rb:
 Gemfile
 -------
 
-    gem 'dragonfly', '~>0.9.2'
+    gem 'dragonfly', '~>0.9.4'
     gem 'rack-cache', :require => 'rack/cache'
 
 Capistrano

data/lib/dragonfly/job.rb

@@ -19,7 +19,7 @@ module Dragonfly
 
     extend Forwardable
     def_delegators :result,
-                   :data, :file, :tempfile, :path, :to_file, :size
+                   :data, :file, :tempfile, :path, :to_file, :size, :each
     def_delegator :app, :server
 
     class Step
@@ -201,6 +201,7 @@ module Dragonfly
       @steps = []
       @next_step_index = 0
       @meta = {}
+      @previous_temp_objects = []
       update(content, meta)
     end
 
@@ -211,8 +212,13 @@ module Dragonfly
       end
     end
 
-    attr_accessor :temp_object
     attr_reader :app, :steps
+    attr_reader :temp_object
+
+    def temp_object=(temp_object)
+      previous_temp_objects.push(@temp_object) if @temp_object
+      @temp_object = temp_object
+    end
 
     # define fetch(), fetch!(), process(), etc.
     STEPS.each do |step_class|
@@ -317,10 +323,6 @@ module Dragonfly
       to_app.call(env)
     end
 
-    def to_path
-      "/#{serialize}"
-    end
-
     def to_fetched_job(uid)
       new_job = self.class.new(app, temp_object, meta)
       new_job.fetch!(uid)
@@ -418,6 +420,11 @@ module Dragonfly
       end
     end
     
+    def close
+      previous_temp_objects.each{|temp_object| temp_object.close }
+      temp_object.close if temp_object
+    end
+    
     protected
 
     attr_writer :steps
@@ -425,6 +432,8 @@ module Dragonfly
 
     private
 
+    attr_reader :previous_temp_objects
+
     def format_from_meta
       meta[:format] || (ext.to_sym if ext && app.trust_file_extensions)
     end

data/lib/dragonfly/response.rb

@@ -24,7 +24,7 @@ module Dragonfly
       elsif request.get?
         job.apply
         env['dragonfly.job'] = job
-        [200, success_headers, job.result]
+        [200, success_headers, job]
       end
     rescue DataStorage::DataNotFound, DataStorage::BadUID => e
       app.log.warn(e.message)

data/spec/dragonfly/job_spec.rb

@@ -1022,4 +1022,28 @@ describe Dragonfly::Job do
     end
   end
 
+  describe "close" do
+    before(:each) do
+      @app = test_app
+      @app.generator.add(:toast){ "toast" }
+      @app.processor.add(:upcase){|t| t.data.upcase }
+      @job = @app.generate(:toast)
+      @path1 = @job.tempfile.path
+      @job.process!(:upcase)
+      @path2 = @job.tempfile.path
+    end
+
+    it "should clean up tempfiles for the last temp_object" do
+      File.exist?(@path2).should be_true
+      @job.close
+      File.exist?(@path2).should be_false
+    end
+
+    it "should clean up tempfiles for previous temp_objects" do
+      File.exist?(@path1).should be_true
+      @job.close
+      File.exist?(@path1).should be_false
+    end
+  end
+
 end

metadata

@@ -2,7 +2,7 @@
 name: dragonfly
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors: 
 - Mark Evans
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-03 00:00:00 +01:00
+date: 2011-06-10 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -401,7 +401,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3515566453882631482
+      hash: 1699270307650863016
       segments: 
       - 0
       version: "0"