dragonfly 0.9.1 → 0.9.2

data/History.md

@@ -1,3 +1,14 @@
+0.9.2 (2011-05-19)
+==================
+Features
+--------
+- Added env['dragonfly.job'] for use in other Rack middlewares
+- Added CookieMonster middleware for removing 'Set-Cookie' headers
+
+Fixes
+-----
+- Remove 'Set-Cookie' header from any requests coming from a rails route
+
 0.9.1 (2011-05-11)
 ==================
 Features
@@ -8,6 +19,8 @@ Fixes
 -----
 - Improved performance of `resize_and_crop` method, using imagemagick built-in '^' operator
 - Improved server security validations
+- Deal with Excon::Errors::SocketError: EOFError errors which get thrown sometimes from S3 connection
+- Allow files with '..' (but not '../') in the middle of their name in file data store 
 
 0.9.0 (2011-04-27)
 ==================
@@ -60,13 +73,20 @@ Fixes
 -----
 - Performance tweaks regarding temp_objects model accessors and job objects
 
-0.8.4 (2010-04-27)
+0.8.5 (2011-05-11)
+==================
+Fixes
+-----
+- Allow filenames that have '..' in them (but not '../') in the filedatastore
+- Better security for server
+
+0.8.4 (2011-04-27)
 ==================
 Fixes
 -----
 - Security fix for file data store
 
-0.8.2 (2010-01-11)
+0.8.2 (2011-01-11)
 ==================
 Fixes
 -----

data/README.md

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

data/Rakefile

@@ -19,7 +19,6 @@ Jeweler::Tasks.new do |gem|
   gem.homepage = "http://github.com/markevans/dragonfly"
   gem.license = "MIT"
   gem.authors = ["Mark Evans"]
-  gem.add_runtime_dependency('rack')
 end
 Jeweler::RubygemsDotOrgTasks.new
 

data/VERSION

@@ -1 +1 @@
-0.9.1
+0.9.2

data/dragonfly.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dragonfly}
-  s.version = "0.9.1"
+  s.version = "0.9.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mark Evans"]
-  s.date = %q{2011-05-11}
+  s.date = %q{2011-05-19}
   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}
@@ -85,6 +85,7 @@ Gem::Specification.new do |s|
     "lib/dragonfly/config/image_magick.rb",
     "lib/dragonfly/config/rails.rb",
     "lib/dragonfly/configurable.rb",
+    "lib/dragonfly/cookie_monster.rb",
     "lib/dragonfly/core_ext/array.rb",
     "lib/dragonfly/core_ext/hash.rb",
     "lib/dragonfly/core_ext/object.rb",
@@ -117,6 +118,7 @@ Gem::Specification.new do |s|
     "lib/dragonfly/processing/image_magick_processor.rb",
     "lib/dragonfly/processor.rb",
     "lib/dragonfly/rails/images.rb",
+    "lib/dragonfly/railtie.rb",
     "lib/dragonfly/response.rb",
     "lib/dragonfly/routed_endpoint.rb",
     "lib/dragonfly/serializer.rb",
@@ -135,6 +137,7 @@ Gem::Specification.new do |s|
     "spec/dragonfly/analysis/file_command_analyser_spec.rb",
     "spec/dragonfly/app_spec.rb",
     "spec/dragonfly/configurable_spec.rb",
+    "spec/dragonfly/cookie_monster_spec.rb",
     "spec/dragonfly/core_ext/array_spec.rb",
     "spec/dragonfly/core_ext/hash_spec.rb",
     "spec/dragonfly/core_ext/string_spec.rb",
@@ -192,6 +195,7 @@ Gem::Specification.new do |s|
     "spec/dragonfly/analysis/file_command_analyser_spec.rb",
     "spec/dragonfly/app_spec.rb",
     "spec/dragonfly/configurable_spec.rb",
+    "spec/dragonfly/cookie_monster_spec.rb",
     "spec/dragonfly/core_ext/array_spec.rb",
     "spec/dragonfly/core_ext/hash_spec.rb",
     "spec/dragonfly/core_ext/string_spec.rb",
@@ -253,7 +257,6 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<bluecloth>, [">= 0"])
       s.add_development_dependency(%q<bson_ext>, [">= 0"])
       s.add_development_dependency(%q<sqlite3-ruby>, [">= 0"])
-      s.add_runtime_dependency(%q<rack>, [">= 0"])
     else
       s.add_dependency(%q<rack>, [">= 0"])
       s.add_dependency(%q<capybara>, [">= 0"])
@@ -273,7 +276,6 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<bluecloth>, [">= 0"])
       s.add_dependency(%q<bson_ext>, [">= 0"])
       s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
-      s.add_dependency(%q<rack>, [">= 0"])
     end
   else
     s.add_dependency(%q<rack>, [">= 0"])
@@ -294,7 +296,6 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<bluecloth>, [">= 0"])
     s.add_dependency(%q<bson_ext>, [">= 0"])
     s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
-    s.add_dependency(%q<rack>, [">= 0"])
   end
 end
 

data/extra_docs/Generators.md

@@ -17,7 +17,7 @@ where `:some_method` is added by the configured generators.
 
 ImageMagick Generator
 ---------------------
-See {file:Imagemagick}.
+See {file:ImageMagick}.
 
 Custom Generators
 -----------------

data/extra_docs/Rails2.md

@@ -1,7 +1,7 @@
 Using With Rails 2.3
 ====================
 
-**NOTE: RAILS 2.3 IS NOT SUPPORTED IN NEW VERSIONS OF DRAGONFLY SO PLEASE USE VERSION 0.8.4**
+**NOTE: RAILS 2.3 IS NOT SUPPORTED IN NEW VERSIONS OF DRAGONFLY SO PLEASE USE VERSION 0.8.5**
 
 Setting up the quick way
 ------------------------
@@ -36,7 +36,7 @@ Gems
 ----
 environment.rb
 
-    config.gem 'dragonfly', '0.8.4'
+    config.gem 'dragonfly', '0.8.5'
     config.gem 'rack-cache', :lib => 'rack/cache'
 
 Capistrano

data/extra_docs/Rails3.md

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

data/lib/dragonfly/cookie_monster.rb

@@ -0,0 +1,15 @@
+module Dragonfly
+  class CookieMonster
+
+    def initialize(app)
+      @app = app
+    end
+
+    def call(env)
+      status, headers, body = @app.call(env)
+      headers.delete('Set-Cookie') if env['dragonfly.job']
+      [status, headers, body]
+    end
+
+  end
+end

data/lib/dragonfly/railtie.rb

@@ -0,0 +1,10 @@
+require 'dragonfly'
+require 'rails'
+
+module Dragonfly
+  class Railtie < ::Rails::Railtie
+    initializer "dragonfly.railtie.initializer" do |app|
+      app.middleware.insert 0, Dragonfly::CookieMonster
+    end
+  end
+end

data/lib/dragonfly/response.rb

@@ -19,9 +19,11 @@ module Dragonfly
         [304, cache_headers, []]
       elsif request.head?
         job.apply
+        env['dragonfly.job'] = job
         [200, success_headers, []]
       elsif request.get?
         job.apply
+        env['dragonfly.job'] = job
         [200, success_headers, job.result]
       end
     rescue DataStorage::DataNotFound, DataStorage::BadUID => e

data/lib/dragonfly.rb

@@ -36,6 +36,8 @@ require 'dragonfly/core_ext/symbol'
 require 'dragonfly/core_ext/array'
 require 'dragonfly/core_ext/hash'
 
+Dragonfly::Railtie if defined?(::Rails) # Coz it will autoload
+
 module Dragonfly
   class << self
 

data/spec/dragonfly/cookie_monster_spec.rb

@@ -0,0 +1,27 @@
+require 'spec_helper'
+require 'rack'
+
+describe Dragonfly::CookieMonster do
+
+  def app(extra_env={})
+    Rack::Builder.new do
+      use Dragonfly::CookieMonster
+      run proc{|env| env.merge!(extra_env); [200, {"Set-Cookie" => "blah", "Something" => "else"}, ["body here"]] }
+    end
+  end
+
+  it "should not delete the set-cookie header from the response if the response doesn't come from dragonfly" do
+    response = Rack::MockRequest.new(app).get('')
+    response.status.should == 200
+    response.body.should == "body here"
+    response.headers.should == {"Set-Cookie" => "blah", "Something" => "else"}
+  end
+
+  it "should delete the set-cookie header from the response if the response comes from dragonfly" do
+    response = Rack::MockRequest.new(app('dragonfly.job' => mock)).get('')
+    response.status.should == 200
+    response.body.should == "body here"
+    response.headers.should == {"Something" => "else"}
+  end
+
+end

data/spec/dragonfly/job_endpoint_spec.rb

@@ -199,4 +199,31 @@ describe Dragonfly::JobEndpoint do
     end
   end
 
+  describe "setting the job in the env for communicating with other rack middlewares" do
+    before(:each) do
+      @app.generator.add(:test_data){ "TEST DATA" }
+      @job = @app.generate(:test_data)
+      @endpoint = Dragonfly::JobEndpoint.new(@job)
+      @middleware = Class.new do
+        def initialize(app)
+          @app = app
+        end
+        
+        def call(env)
+          @app.call(env)
+          throw :result, env['dragonfly.job']
+        end
+      end
+    end
+    it "should add the job to env" do
+      middleware, endpoint = @middleware, @endpoint
+      app = Rack::Builder.new do
+        use middleware
+        run endpoint
+      end
+      result = catch(:result){ Rack::MockRequest.new(app).get('/') }
+      result.should == @job
+    end
+  end
+
 end

metadata

@@ -2,7 +2,7 @@
 name: dragonfly
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors: 
 - Mark Evans
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-11 00:00:00 +01:00
+date: 2011-05-19 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -211,17 +211,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: *id018
-- !ruby/object:Gem::Dependency 
-  name: rack
-  requirement: &id019 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  type: :runtime
-  prerelease: false
-  version_requirements: *id019
 description: |-
   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.
@@ -301,6 +290,7 @@ files:
 - lib/dragonfly/config/image_magick.rb
 - lib/dragonfly/config/rails.rb
 - lib/dragonfly/configurable.rb
+- lib/dragonfly/cookie_monster.rb
 - lib/dragonfly/core_ext/array.rb
 - lib/dragonfly/core_ext/hash.rb
 - lib/dragonfly/core_ext/object.rb
@@ -333,6 +323,7 @@ files:
 - lib/dragonfly/processing/image_magick_processor.rb
 - lib/dragonfly/processor.rb
 - lib/dragonfly/rails/images.rb
+- lib/dragonfly/railtie.rb
 - lib/dragonfly/response.rb
 - lib/dragonfly/routed_endpoint.rb
 - lib/dragonfly/serializer.rb
@@ -351,6 +342,7 @@ files:
 - spec/dragonfly/analysis/file_command_analyser_spec.rb
 - spec/dragonfly/app_spec.rb
 - spec/dragonfly/configurable_spec.rb
+- spec/dragonfly/cookie_monster_spec.rb
 - spec/dragonfly/core_ext/array_spec.rb
 - spec/dragonfly/core_ext/hash_spec.rb
 - spec/dragonfly/core_ext/string_spec.rb
@@ -409,7 +401,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3227660044973148793
+      hash: 3194904429017796395
       segments: 
       - 0
       version: "0"
@@ -433,6 +425,7 @@ test_files:
 - spec/dragonfly/analysis/file_command_analyser_spec.rb
 - spec/dragonfly/app_spec.rb
 - spec/dragonfly/configurable_spec.rb
+- spec/dragonfly/cookie_monster_spec.rb
 - spec/dragonfly/core_ext/array_spec.rb
 - spec/dragonfly/core_ext/hash_spec.rb
 - spec/dragonfly/core_ext/string_spec.rb