dragonfly 0.4.0 → 0.4.1

data/README.md

@@ -10,11 +10,9 @@ To use simply for image thumbnails etc. in Rails...
 
 environment.rb:
 
-    config.gem 'rmagick'
-    config.gem 'rack-cache'
-
-    config.gem 'dragonfly', :lib => 'dragonfly/rails/images'
-    config.middleware.use 'Dragonfly::MiddlewareWithCache', :images
+    config.gem 'rmagick',    :lib => 'RMagick'
+    config.gem 'rack-cache', :lib => 'rack/cache'
+    config.gem 'dragonfly',  :lib => 'dragonfly/rails/images', :source => 'http://gemcutter.org'
 
 Migration:
 

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.4.1

data/dragonfly.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dragonfly}
-  s.version = "0.4.0"
+  s.version = "0.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mark Evans"]
-  s.date = %q{2010-01-04}
+  s.date = %q{2010-01-07}
   s.email = %q{mark@new-bamboo.co.uk}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -70,7 +70,6 @@ Gem::Specification.new do |s|
      "lib/dragonfly/encoding/transparent_encoder.rb",
      "lib/dragonfly/extended_temp_object.rb",
      "lib/dragonfly/middleware.rb",
-     "lib/dragonfly/middleware_with_cache.rb",
      "lib/dragonfly/parameters.rb",
      "lib/dragonfly/processing/base.rb",
      "lib/dragonfly/processing/r_magick_processor.rb",
@@ -101,7 +100,6 @@ Gem::Specification.new do |s|
      "spec/dragonfly/encoding/r_magick_encoder_spec.rb",
      "spec/dragonfly/extended_temp_object_spec.rb",
      "spec/dragonfly/middleware_spec.rb",
-     "spec/dragonfly/middleware_with_cache_spec.rb",
      "spec/dragonfly/parameters_spec.rb",
      "spec/dragonfly/processing/rmagick_processor_spec.rb",
      "spec/dragonfly/shared_middleware_spec.rb",
@@ -141,7 +139,6 @@ Gem::Specification.new do |s|
      "spec/dragonfly/encoding/r_magick_encoder_spec.rb",
      "spec/dragonfly/extended_temp_object_spec.rb",
      "spec/dragonfly/middleware_spec.rb",
-     "spec/dragonfly/middleware_with_cache_spec.rb",
      "spec/dragonfly/parameters_spec.rb",
      "spec/dragonfly/processing/rmagick_processor_spec.rb",
      "spec/dragonfly/shared_middleware_spec.rb",

data/extra_docs/UsingWithRails.md

@@ -7,29 +7,16 @@ The quick way
 -------------
 In environment.rb:
 
-    config.gem 'rmagick'
-    config.gem 'rack-cache'
-
-    config.gem 'dragonfly', :lib => 'dragonfly/rails/images'
-    config.middleware.use 'Dragonfly::MiddlewareWithCache', :images
+    config.gem 'rmagick',    :lib => 'RMagick'
+    config.gem 'rack-cache', :lib => 'rack/cache'
+    config.gem 'dragonfly',  :lib => 'dragonfly/rails/images', :source => 'http://gemcutter.org'
 
 The required file 'dragonfly/rails/images.rb' initializes a dragonfly app, configures it to use rmagick processing, encoding, etc.,
-and registers the app so that you can use ActiveRecord accessors.
+registers the app so that you can use ActiveRecord accessors, and inserts it into the Rails middleware stack.
 
 Because in this case it's configured to use {http://tomayko.com/src/rack-cache/ rack-cache} and {http://rmagick.rubyforge.org/ rmagick},
 you should include the first two lines above.
 
-The line `config.middleware.use 'Dragonfly::MiddlewareWithCache', :images` configures rails to use a {Dragonfly::MiddlewareWithCache middleware} which uses the named app (named `:images`), and puts
-{http://tomayko.com/src/rack-cache/ Rack::Cache} in front of it for performance.
-You can pass extra arguments to this line which will go directly to configuring Rack::Cache (see its docs for how to configure it).
-The default configuration for Rack::Cache is
-
-    {
-      :verbose     => true,
-      :metastore   => 'file:/var/cache/rack/meta',
-      :entitystore => 'file:/var/cache/rack/body'
-    }
-
 To see what you can do with the active record accessors, see {file:ActiveRecord}.
 
 The more explicit way - using an initializer
@@ -39,9 +26,9 @@ in an initializer.
 
 In that case in environment.rb we only need:
 
-    config.gem 'rmagick'      # if used
-    config.gem 'rack-cache'   # if used
-    config.gem 'dragonfly'
+    config.gem 'rmagick',    :lib => 'RMagick'                 # if used
+    config.gem 'rack-cache', :lib => 'rack/cache'              # if used
+    config.gem 'dragonfly',  :source => 'http://gemcutter.org'
 
 The easiest way to create the initializer is using the supplied generator
 (which will be visible if you have the dragonfly gem installed).
@@ -71,7 +58,7 @@ but make sure to change the 'secret' configuration option, so as to protect your
         d.root_path = "#{Rails.root}/public/system/dragonfly/#{Rails.env}"
       end
       c.url_handler.configure do |u|
-        u.secret = 'd54d2f8f44e81e9a6c4ec5ba76bc8ba12cf95717'
+        u.secret = 'fed49e269eebed54cc85b28a6c51cba6a543e7b5'
         u.path_prefix = '/media'
       end
     end
@@ -84,7 +71,14 @@ but make sure to change the 'secret' configuration option, so as to protect your
     ActiveRecord::Base.register_dragonfly_app(:image, Dragonfly::App[:images])
 
     # Add the Dragonfly App to the middleware stack
-    ActionController::Dispatcher.middleware.use Dragonfly::Middleware, :images
-    
-    # USE THIS INSTEAD IF YOU WANT TO CACHE REQUESTS WITH Rack::Cache (remember to add config.gem for 'rack-cache')
-    # ActionController::Dispatcher.middleware.use Dragonfly::MiddlewareWithCache, :images
+    ActionController::Dispatcher.middleware.insert_after ActionController::Failsafe, Dragonfly::Middleware, :images
+
+    # # UNCOMMENT THIS IF YOU WANT TO CACHE REQUESTS WITH Rack::Cache, and add the line
+    # #   config.gem 'rack-cache', :lib => 'rack/cache'
+    # # to environment.rb
+    # require 'rack/cache'
+    # ActionController::Dispatcher.middleware.insert_before Dragonfly::Middleware, Rack::Cache, {
+    #   :verbose     => true,
+    #   :metastore   => "file:#{Rails.root}/tmp/dragonfly/cache/meta",
+    #   :entitystore => "file:#{Rails.root}/tmp/dragonfly/cache/body"
+    # }

data/generators/dragonfly_app/templates/initializer.erb

@@ -22,7 +22,14 @@ ActiveRecord::Base.extend Dragonfly::ActiveRecordExtensions
 ActiveRecord::Base.register_dragonfly_app(:<%= accessor_prefix %>, Dragonfly::App[:<%= app_name %>])
 
 # Add the Dragonfly App to the middleware stack
-ActionController::Dispatcher.middleware.use Dragonfly::Middleware, :<%= app_name %>
+ActionController::Dispatcher.middleware.insert_after ActionController::Failsafe, Dragonfly::Middleware, :<%= app_name %>
 
-# USE THIS INSTEAD IF YOU WANT TO CACHE REQUESTS WITH Rack::Cache (remember to add config.gem for 'rack-cache')
-# ActionController::Dispatcher.middleware.use Dragonfly::MiddlewareWithCache, :<%= app_name %>
+# # UNCOMMENT THIS IF YOU WANT TO CACHE REQUESTS WITH Rack::Cache, and add the line
+# #   config.gem 'rack-cache', :lib => 'rack/cache'
+# # to environment.rb
+# require 'rack/cache'
+# ActionController::Dispatcher.middleware.insert_before Dragonfly::Middleware, Rack::Cache, {
+#   :verbose     => true,
+#   :metastore   => "file:#{Rails.root}/tmp/dragonfly/cache/meta",
+#   :entitystore => "file:#{Rails.root}/tmp/dragonfly/cache/body"
+# }

data/lib/dragonfly/rails/images.rb

@@ -1,4 +1,5 @@
 require 'dragonfly'
+require 'rack/cache'
 
 ### The dragonfly app ###
 
@@ -18,3 +19,11 @@ end
 ### Extend active record ###
 ActiveRecord::Base.extend Dragonfly::ActiveRecordExtensions
 ActiveRecord::Base.register_dragonfly_app(:image, app)
+
+### Insert the middleware ###
+ActionController::Dispatcher.middleware.insert_after ActionController::Failsafe, Dragonfly::Middleware, :images
+ActionController::Dispatcher.middleware.insert_before Dragonfly::Middleware, Rack::Cache, {
+  :verbose     => true,
+  :metastore   => "file:#{Rails.root}/tmp/dragonfly/cache/meta",
+  :entitystore => "file:#{Rails.root}/tmp/dragonfly/cache/body"
+}

data/spec/dragonfly/middleware_spec.rb

@@ -1,14 +1,48 @@
-require File.dirname(__FILE__) + '/shared_middleware_spec'
+require File.dirname(__FILE__) + '/../spec_helper'
+require 'rack'
+
+def dummy_rack_app
+  lambda{|env| [200, {"Content-Type" => "text/html"}, ["#{env['PATH_INFO']}, #{env['QUERY_STRING']}"]] }
+end
 
 describe Dragonfly::Middleware do
-  
+
+  def make_request(app, url)
+    Rack::MockRequest.new(app).get(url)
+  end
+
   before(:each) do
     @stack = Rack::Builder.new do
       use Dragonfly::Middleware, :images
       run dummy_rack_app
     end
   end
-  
-  it_should_behave_like 'dragonfly middleware'
+
+  it "should continue the calling chain if the app returns a 404 for that url" do
+    Dragonfly::App[:images].should_receive(:call).and_return(
+      [404, {"Content-Type" => 'text/plain'}, ['Not found']]
+    )
+    response = make_request(@stack, 'hello.png?howare=you')
+    response.status.should == 200
+    response.body.should == 'hello.png, howare=you'
+  end
+
+  it "should return as per the dragonfly app if the app returns a 200" do
+    Dragonfly::App[:images].should_receive(:call).and_return(
+      [200, {"Content-Type" => 'text/plain'}, ['ABCD']]
+    )
+    response = make_request(@stack, 'hello.png?howare=you')
+    response.status.should == 200
+    response.body.should == 'ABCD'
+  end
+
+  it "should return as per the dragonfly app if the app returns a 400" do
+    Dragonfly::App[:images].should_receive(:call).and_return(
+      [400, {"Content-Type" => 'text/plain'}, ['ABCD']]
+    )
+    response = make_request(@stack, 'hello.png?howare=you')
+    response.status.should == 400
+    response.body.should == 'ABCD'
+  end
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dragonfly
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors: 
 - Mark Evans
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-04 00:00:00 +00:00
+date: 2010-01-07 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -86,7 +86,6 @@ files:
 - lib/dragonfly/encoding/transparent_encoder.rb
 - lib/dragonfly/extended_temp_object.rb
 - lib/dragonfly/middleware.rb
-- lib/dragonfly/middleware_with_cache.rb
 - lib/dragonfly/parameters.rb
 - lib/dragonfly/processing/base.rb
 - lib/dragonfly/processing/r_magick_processor.rb
@@ -117,7 +116,6 @@ files:
 - spec/dragonfly/encoding/r_magick_encoder_spec.rb
 - spec/dragonfly/extended_temp_object_spec.rb
 - spec/dragonfly/middleware_spec.rb
-- spec/dragonfly/middleware_with_cache_spec.rb
 - spec/dragonfly/parameters_spec.rb
 - spec/dragonfly/processing/rmagick_processor_spec.rb
 - spec/dragonfly/shared_middleware_spec.rb
@@ -179,7 +177,6 @@ test_files:
 - spec/dragonfly/encoding/r_magick_encoder_spec.rb
 - spec/dragonfly/extended_temp_object_spec.rb
 - spec/dragonfly/middleware_spec.rb
-- spec/dragonfly/middleware_with_cache_spec.rb
 - spec/dragonfly/parameters_spec.rb
 - spec/dragonfly/processing/rmagick_processor_spec.rb
 - spec/dragonfly/shared_middleware_spec.rb

data/lib/dragonfly/middleware_with_cache.rb

@@ -1,26 +0,0 @@
-require 'rack/cache'
-
-module Dragonfly
-  class MiddlewareWithCache < Middleware
-    
-    def initialize(app, dragonfly_app_name, rack_cache_opts={})
-      super(app, dragonfly_app_name)
-      @rack_cache_opts = {
-        :verbose     => true,
-        :metastore   => 'file:/var/cache/rack/meta',
-        :entitystore => 'file:/var/cache/rack/body'
-      }.merge(rack_cache_opts)
-    end
-    
-    private
-    
-    def endpoint
-      rack_cache_opts = @rack_cache_opts
-      @endpoint ||= Rack::Builder.new do
-        use Rack::Cache, rack_cache_opts
-        run super
-      end
-    end
-    
-  end
-end

data/spec/dragonfly/middleware_with_cache_spec.rb

@@ -1,14 +0,0 @@
-require File.dirname(__FILE__) + '/shared_middleware_spec'
-
-describe Dragonfly::MiddlewareWithCache do
-  
-  before(:each) do
-    @stack = Rack::Builder.new do
-      use Dragonfly::MiddlewareWithCache, :images
-      run dummy_rack_app
-    end
-  end
-  
-  it_should_behave_like 'dragonfly middleware'
-  
-end