dragonfly 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6a1155a49050b3a3077261fae1e4171180f96df
-  data.tar.gz: c45adb992820172d12aa9a2dc2e6da9d283a93a3
+  metadata.gz: 0c7ef9f7d15b8aa06c44ce7e52c5da69be5c43ee
+  data.tar.gz: 9daf8a467a894251790c3f2a40ddfde9fcc36808
 SHA512:
-  metadata.gz: 8510a94d6b279c349b99db139015bd36fa098b0badebfad02245e14d21a7d1a29a180b8a17790b49b5082f9c6833843bf77027b3cf72d522e69e2bc99e92332a
-  data.tar.gz: f087a85e74a5c47955caaae28e1fff406cdfad07fbbc6babc55b2eba6771158ffb1921e9a3fad95484146ca605660deee583955d213eb45bf84de26a8da79abc
+  metadata.gz: 3ba7140e8176f2bc9609343fe5b73be21c9e0a010dc91498faff2fe7b87622ca7f143cd26230884a162635669d968c02c2e309eaa8ccd19fdb2738ab98679cf5
+  data.tar.gz: cdadf8324dae8dc6cf359bbb0fb106e859d418edd95a177844146a6edd11d8bd8affa48432de8116aca2eb8b738dae615874f8c7b8e32394d17f291872817370

data/History.md

@@ -1,3 +1,10 @@
+1.0.7 (2014-08-26)
+===================
+Changes
+--------
+- Job#sha uses better algorithm
+- renamed `protect_from_dos_attacks` -> `verify_urls` and turn on by default
+
 1.0.6 (2014-08-22)
 ===================
 Features

data/README.md

@@ -54,7 +54,7 @@ Installation
 
 or in your Gemfile
 ```ruby
-gem 'dragonfly', '~> 1.0.6'
+gem 'dragonfly', '~> 1.0.7'
 ```
 
 Require with

data/lib/dragonfly/app.rb

@@ -103,10 +103,15 @@ module Dragonfly
         obj.server.add_to_fetch_url_whitelist(patterns)
       end
 
-      writer :dragonfly_url, :protect_from_dos_attacks, :url_format, :url_host, :url_path_prefix,
+      writer :dragonfly_url, :verify_urls, :url_format, :url_host, :url_path_prefix,
              :for => :server
       meth :before_serve, :for => :server
 
+      def protect_from_dos_attacks(boolean)
+        verify_urls(boolean)
+        Dragonfly.warn("configuration option protect_from_dos_attacks is deprecated - use verify_urls instead")
+      end
+
       def method_missing(meth, *args)
         raise NoMethodError, "no method '#{meth}' for App configuration - but the configuration API has changed! see docs at http://markevans.github.io/dragonfly for details"
       end

data/lib/dragonfly/image_magick/processors/thumb.rb

@@ -16,9 +16,9 @@ module Dragonfly
         }
 
         # Geometry string patterns
-        RESIZE_GEOMETRY         = /^\d*x\d*[><%^!]?$|^\d+@$/ # e.g. '300x200!'
-        CROPPED_RESIZE_GEOMETRY = /^(\d+)x(\d+)#(\w{1,2})?$/ # e.g. '20x50#ne'
-        CROP_GEOMETRY           = /^(\d+)x(\d+)([+-]\d+)?([+-]\d+)?(\w{1,2})?$/ # e.g. '30x30+10+10'
+        RESIZE_GEOMETRY         = /\A\d*x\d*[><%^!]?\z|\A\d+@\z/ # e.g. '300x200!'
+        CROPPED_RESIZE_GEOMETRY = /\A(\d+)x(\d+)#(\w{1,2})?\z/ # e.g. '20x50#ne'
+        CROP_GEOMETRY           = /\A(\d+)x(\d+)([+-]\d+)?([+-]\d+)?(\w{1,2})?\z/ # e.g. '30x30+10+10'
 
         def update_url(url_attributes, geometry, opts={})
           format = opts['format']
@@ -57,9 +57,9 @@ module Dragonfly
           height  = opts['height']
           gravity = GRAVITIES[opts['gravity']]
           x       = "#{opts['x'] || 0}"
-          x = '+' + x unless x[/^[+-]/]
+          x = '+' + x unless x[/\A[+-]/]
           y       = "#{opts['y'] || 0}"
-          y = '+' + y unless y[/^[+-]/]
+          y = '+' + y unless y[/\A[+-]/]
 
           "#{"-gravity #{gravity} " if gravity}-crop #{width}x#{height}#{x}#{y} +repage"
         end

data/lib/dragonfly/job.rb

@@ -153,9 +153,9 @@ module Dragonfly
     def sha
       unless app.secret
         raise CannotGenerateSha, "A secret is required to sign and verify Dragonfly job requests. "\
-                                 "Use `secret '...'` or disable `protect_from_dos_attacks` in your config."
+                                 "Use `secret '...'` or `verify_urls false` (not recommended!) in your config."
       end
-      Digest::SHA1.hexdigest("#{to_unique_s}#{app.secret}")[0...8]
+      OpenSSL::HMAC.hexdigest('SHA256', app.secret, to_unique_s)[0,16]
     end
 
     def validate_sha!(sha)

data/lib/dragonfly/job/fetch_url.rb

@@ -27,16 +27,16 @@ module Dragonfly
       end
 
       def url
-        @url ||= uri =~ /^\w+:[^\d]/ ? uri : "http://#{uri}"
+        @url ||= uri =~ /\A\w+:[^\d]/ ? uri : "http://#{uri}"
       end
 
       def filename
         return if data_uri?
-        @filename ||= parse_url(url).path[/[^\/]+$/]
+        @filename ||= parse_url(url).path[/[^\/]+\z/]
       end
 
       def data_uri?
-        uri =~ /^data:/
+        uri =~ /\Adata:/
       end
 
       def apply
@@ -71,7 +71,7 @@ module Dragonfly
       end
 
       def update_from_data_uri
-        mime_type, b64_data = uri.scan(/^data:([^;]+);base64,(.*)$/)[0]
+        mime_type, b64_data = uri.scan(/\Adata:([^;]+);base64,(.*)$/)[0]
         if mime_type && b64_data
           data = Base64.decode64(b64_data)
           ext = app.ext_for(mime_type)

data/lib/dragonfly/server.rb

@@ -20,9 +20,10 @@ module Dragonfly
       self.url_format = '/:job/:name'
       @fetch_file_whitelist = Whitelist.new
       @fetch_url_whitelist = Whitelist.new
+      @verify_urls = true
     end
 
-    attr_accessor :protect_from_dos_attacks, :url_host, :url_path_prefix, :dragonfly_url
+    attr_accessor :verify_urls, :url_host, :url_path_prefix, :dragonfly_url
 
     attr_reader :url_format, :fetch_file_whitelist, :fetch_url_whitelist
 
@@ -53,7 +54,7 @@ module Dragonfly
       elsif (params = url_mapper.params_for(env["PATH_INFO"], env["QUERY_STRING"])) && params['job']
         job = Job.deserialize(params['job'], app)
         validate_job!(job)
-        job.validate_sha!(params['sha']) if protect_from_dos_attacks
+        job.validate_sha!(params['sha']) if verify_urls
         response = Response.new(job, env)
         catch(:halt) do
           if before_serve_callback && response.will_be_served?
@@ -83,7 +84,7 @@ module Dragonfly
       params = job.url_attributes.extract(url_mapper.params_in_url)
       params.merge!(stringify_keys(opts))
       params['job'] = job.serialize
-      params['sha'] = job.sha if protect_from_dos_attacks
+      params['sha'] = job.sha if verify_urls
       url = url_mapper.url_for(params)
       "#{host}#{path_prefix}#{url}"
     end

data/lib/dragonfly/url_mapper.rb

@@ -68,7 +68,7 @@ module Dragonfly
         i += 1
         segments[i].regexp_string
       end
-      @url_regexp = Regexp.new('^' + regexp_string + '$')
+      @url_regexp = Regexp.new('\A' + regexp_string + '\z')
     end
 
   end

data/lib/dragonfly/version.rb

@@ -1,3 +1,3 @@
 module Dragonfly
-  VERSION = '1.0.6'
+  VERSION = '1.0.7'
 end

data/lib/rails/generators/dragonfly/templates/initializer.rb.erb

@@ -4,7 +4,6 @@ require 'dragonfly'
 Dragonfly.app.configure do
   plugin :imagemagick
 
-  protect_from_dos_attacks true
   secret "<%= generate_secret %>"
 
   url_format "/media/:job/:name"

data/spec/dragonfly/app_spec.rb

@@ -1,10 +1,6 @@
 require 'spec_helper'
 require 'rack/mock'
 
-def request(app, path)
-  Rack::MockRequest.new(app).get(path)
-end
-
 describe Dragonfly::App do
 
   describe ".instance" do
@@ -172,7 +168,7 @@ describe Dragonfly::App do
     let (:job) { app.fetch('eggs') }
 
     it "should give the server url by default" do
-      app.url_for(job).should =~ %r{^/\w+$}
+      app.url_for(job).should =~ %r{^/\w+}
     end
     it "should allow configuring" do
       app.configure do

data/spec/dragonfly/image_magick/plugin_spec.rb

@@ -72,7 +72,7 @@ describe "a configured imagemagick app" do
     describe "convert" do
       it "sanity check with format" do
         thumb = image.convert('-resize 1x1!', 'format' => 'jpg')
-        thumb.url.should =~ /^\/beach\.jpg\?job=\w+/
+        thumb.url.should =~ /^\/beach\.jpg\?.*job=\w+/
         thumb.width.should == 1
         thumb.format.should == 'jpeg'
         thumb.meta['format'].should == 'jpg'
@@ -80,7 +80,7 @@ describe "a configured imagemagick app" do
 
       it "sanity check without format" do
         thumb = image.convert('-resize 1x1!')
-        thumb.url.should =~ /^\/beach\.png\?job=\w+/
+        thumb.url.should =~ /^\/beach\.png\?.*job=\w+/
         thumb.width.should == 1
         thumb.format.should == 'png'
         thumb.meta['format'].should be_nil
@@ -90,7 +90,7 @@ describe "a configured imagemagick app" do
     describe "encode" do
       it "sanity check" do
         thumb = image.encode('jpg')
-        thumb.url.should =~ /^\/beach\.jpg\?job=\w+/
+        thumb.url.should =~ /^\/beach\.jpg\?.*job=\w+/
         thumb.format.should == 'jpeg'
         thumb.meta['format'].should == 'jpg'
       end

data/spec/dragonfly/job_spec.rb

@@ -405,7 +405,7 @@ describe Dragonfly::Job do
     end
 
     it "should be of the correct format" do
-      @job.sha.should =~ /^\w{8}$/
+      @job.sha.should =~ /^\w{16}$/
     end
 
     it "should be the same for the same job steps" do

data/spec/dragonfly/model/model_spec.rb

@@ -1110,7 +1110,7 @@ describe "models" do
 
     it "should give the correct url" do
       @item.retained_preview_image = @pending_string
-      @item.preview_image.url.should =~ %r{^/\w+/dog.biscuit$}
+      @item.preview_image.url.should =~ %r{^/\w+/dog.biscuit}
     end
 
     it "should raise an error if the pending string contains a non-magic attr method" do

data/spec/dragonfly/server_spec.rb

@@ -1,10 +1,6 @@
 require 'spec_helper'
 require 'rack/mock'
 
-def request(app, path)
-  Rack::MockRequest.new(app).get(path)
-end
-
 describe Dragonfly::Server do
 
   describe "responses" do
@@ -32,8 +28,8 @@ describe Dragonfly::Server do
         '/name.ext'
       ].each do |suffix|
 
-        it "should return successfully when given the url with suffix #{suffix.inspect}" do
-          url = "/media/#{@job.serialize}#{suffix}"
+        it "should return successfully when given the url with suffix #{suffix.inspect} and the correct sha parameter" do
+          url = "/media/#{@job.serialize}#{suffix}?sha=#{@job.sha}"
           response = request(@server, url)
           response.status.should == 200
           response.body.should == 'HELLO THERE'
@@ -42,16 +38,16 @@ describe Dragonfly::Server do
 
       end
 
-      it "should return successfully with the correct sha given and protection on" do
-        @server.protect_from_dos_attacks = true
-        url = "/media/#{@job.serialize}?sha=#{@job.sha}"
+      it "should return successfully without a sha if protection is off" do
+        @server.verify_urls = false
+        url = "/media/#{@job.serialize}"
         response = request(@server, url)
         response.status.should == 200
         response.body.should == 'HELLO THERE'
       end
 
       it "should return a cacheable response" do
-        url = "/media/#{@job.serialize}"
+        url = "/media/#{@job.serialize}?sha=#{@job.sha}"
         response = request(@server, url)
         response.status.should == 200
         response.headers['Cache-Control'].should == "public, max-age=31536000"
@@ -59,7 +55,7 @@ describe Dragonfly::Server do
 
       it "should return successfully even if the job is in the query string" do
         @server.url_format = '/'
-        url = "/?job=#{@job.serialize}"
+        url = "/?job=#{@job.serialize}&sha=#{@job.sha}"
         response = request(@server, url)
         response.status.should == 200
         response.body.should == 'HELLO THERE'
@@ -67,15 +63,13 @@ describe Dragonfly::Server do
     end
 
     describe "unsuccessful requests" do
-      it "should return a 400 if no sha given but protection on" do
-        @server.protect_from_dos_attacks = true
+      it "should return a 400 if no sha given" do
         url = "/media/#{@job.serialize}"
         response = request(@server, url)
         response.status.should == 400
       end
 
-      it "should return a 400 if wrong sha given and protection on" do
-        @server.protect_from_dos_attacks = true
+      it "should return a 400 if wrong sha given" do
         url = "/media/#{@job.serialize}?sha=asdfs"
         response = request(@server, url)
         response.status.should == 400
@@ -137,6 +131,10 @@ describe Dragonfly::Server do
         response.content_type.should == 'text/plain'
       end
 
+      before do
+        @server.verify_urls = false
+      end
+
       describe "fetch_file" do
         it "should return a 403 Forbidden when someone uses fetch_file " do
           assert_forbidden @app.fetch_file('samples/egg.png')
@@ -197,6 +195,7 @@ describe Dragonfly::Server do
     describe "params" do
       before(:each) do
         server.url_format = '/media/:job/:zoo'
+        server.verify_urls = false
       end
       it "substitutes the relevant params" do
         server.url_for(job).should == "/media/#{job.serialize}"
@@ -220,6 +219,7 @@ describe Dragonfly::Server do
       describe "basename" do
         before(:each) do
           server.url_format = '/:job/:basename'
+          server.verify_urls = false
         end
         it "should use the name" do
           job.url_attributes.name = 'hello.egg'
@@ -233,6 +233,7 @@ describe Dragonfly::Server do
       describe "ext" do
         before(:each) do
           server.url_format = '/:job.:ext'
+          server.verify_urls = false
         end
         it "should use the name" do
           job.url_attributes.name = 'hello.egg'
@@ -245,6 +246,10 @@ describe Dragonfly::Server do
     end
 
     describe "host" do
+      before do
+        server.verify_urls = false
+      end
+
       it "should add the host to the url if configured" do
         server.url_host = 'http://some.server:4000'
         server.url_for(job).should == "http://some.server:4000/#{job.serialize}"
@@ -263,6 +268,7 @@ describe Dragonfly::Server do
     describe "path_prefix" do
       before do
         server.url_format = '/media/:job'
+        server.verify_urls = false
       end
 
       it "adds the path_prefix to the url if configured" do
@@ -280,11 +286,8 @@ describe Dragonfly::Server do
       end
     end
 
-    describe "Denial of Service protection" do
-      before(:each) do
-        server.protect_from_dos_attacks = true
-      end
-      it "should generate the correct url" do
+    describe "URL verification" do
+      it "should generate a URL with a sha parameter by default" do
         server.url_for(job).should == "/#{job.serialize}?sha=#{job.sha}"
       end
     end
@@ -309,7 +312,7 @@ describe Dragonfly::Server do
       end
 
       it "should be called before serving" do
-        response = request(@server, "/#{@job.serialize}")
+        response = request(@server, "/#{@job.serialize}?sha=#{@job.sha}")
         response.body.should == 'TEST'
         @x.should == 'TEST'
       end
@@ -326,6 +329,7 @@ describe Dragonfly::Server do
         @server.before_serve do |job, env|
           throw :halt, [200, {}, ['hello']]
         end
+        @server.verify_urls = false
       end
 
       it 'return the specified response instead of job.result' do

data/spec/dragonfly/url_mapper_spec.rb

@@ -24,7 +24,7 @@ describe Dragonfly::UrlMapper do
   describe "url_regexp" do
     it "should return a regexp with non-greedy optional groups that include the preceding slash/dot/dash" do
       url_mapper = Dragonfly::UrlMapper.new('/media/:job/:basename-:size.:format')
-      url_mapper.url_regexp.should == %r{^/media(/[^\/\-\.]+?)?(/[^\/\-\.]+?)?(\-[^\/\-\.]+?)?(\.[^\/\-\.]+?)?$}
+      url_mapper.url_regexp.should == %r{\A/media(/[^\/\-\.]+?)?(/[^\/\-\.]+?)?(\-[^\/\-\.]+?)?(\.[^\/\-\.]+?)?\z}
     end
 
     it "should allow setting custom patterns in the url" do
@@ -33,12 +33,12 @@ describe Dragonfly::UrlMapper do
         :size => '\d',
         :format => '[^\.]'
       )
-      url_mapper.url_regexp.should == %r{^/media(/\w+?)?(\-\d+?)?(\.[^\.]+?)?$}
+      url_mapper.url_regexp.should == %r{\A/media(/\w+?)?(\-\d+?)?(\.[^\.]+?)?\z}
     end
 
     it "should make optional match patterns (ending in ?) apply to the whole group including the preceding seperator" do
       url_mapper = Dragonfly::UrlMapper.new('/media/:job', :job => '\w')
-      url_mapper.url_regexp.should == %r{^/media(/\w+?)?$}
+      url_mapper.url_regexp.should == %r{\A/media(/\w+?)?\z}
     end
   end
 

data/spec/functional/configuration_spec.rb

@@ -16,4 +16,16 @@ describe "configuration" do
     end
     app.fetch_url_whitelist.should include 'http://something'
   end
+
+  describe "deprecations" do
+    it "protect_from_dos_attacks" do
+      Dragonfly.should_receive(:warn).with(/deprecated/)
+      expect {
+        app.configure do
+          protect_from_dos_attacks false
+        end
+      }.to change(app.server, :verify_urls)
+    end
+  end
+
 end

data/spec/functional/model_urls_spec.rb

@@ -34,72 +34,64 @@ describe "model urls" do
   it "should include the name in the url if it has the magic attribute" do
     @item.preview_image = new_tempfile
     @item.save!
-    @item.preview_image.url.should =~ %r{^/media/\w+/hello\.txt$}
+    @item.preview_image.url.should =~ %r{^/media/\w+/hello\.txt}
   end
 
   it "should still include the name in the url if it has the magic attribute on reload" do
     @item.preview_image = new_tempfile
     @item.save!
     item = @item_class.find(@item.id)
-    item.preview_image.url.should =~ %r{^/media/\w+/hello\.txt$}
+    item.preview_image.url.should =~ %r{^/media/\w+/hello\.txt}
   end
 
   it "should work for other magic attributes in the url" do
     @app.server.url_format = '/:job/:some_analyser_method'
     @item.preview_image = new_tempfile
     @item.save!
-    @item.preview_image.url.should =~ %r{^/\w+/53$}
-    @item_class.find(@item.id).preview_image.url.should =~ %r{^/\w+/53$}
+    @item.preview_image.url.should =~ %r{^/\w+/53}
+    @item_class.find(@item.id).preview_image.url.should =~ %r{^/\w+/53}
   end
 
   it "should work without the name if the name magic attr doesn't exist" do
     @item.other_image = new_tempfile
     @item.save!
     item = @item_class.find(@item.id)
-    item.other_image.url.should =~ %r{^/media/\w+$}
+    item.other_image.url.should =~ %r{^/media/\w+}
   end
 
   it "should not add the name when there's no magic attr, even if the name is set (for consistency)" do
     @item.other_image = new_tempfile
     @item.save!
     @item.other_image.name = 'test.txt'
-    @item.other_image.url.should =~ %r{^/media/\w+$}
+    @item.other_image.url.should =~ %r{^/media/\w+}
   end
 
   it "should include the name in the url even if it has no ext" do
     @item.preview_image = new_tempfile("hello", 'hello')
     @item.save!
     item = @item_class.find(@item.id)
-    item.preview_image.url.should =~ %r{^/media/\w+/hello$}
+    item.preview_image.url.should =~ %r{^/media/\w+/hello}
   end
 
   it "should change the ext when there's an encoding step" do
     @item.preview_image = new_tempfile
     @item.save!
     item = @item_class.find(@item.id)
-    item.preview_image.encode(:bum).url.should =~ %r{^/media/\w+/hello\.bum$}
+    item.preview_image.encode(:bum).url.should =~ %r{^/media/\w+/hello\.bum}
   end
 
   it "should not include the name if it has none" do
     @item.preview_image = "HELLO"
     @item.save!
     item = @item_class.find(@item.id)
-    item.preview_image.url.should =~ %r{^/media/\w+$}
+    item.preview_image.url.should =~ %r{^/media/\w+}
   end
 
   it "should have an ext when there's an encoding step but no name" do
     @item.preview_image = "HELLO"
     @item.save!
     item = @item_class.find(@item.id)
-    item.preview_image.encode(:bum).url.should =~ %r{^/media/\w+/file\.bum$}
-  end
-
-  it "should work as normal with dos protection" do
-    @app.server.protect_from_dos_attacks = true
-    @item.preview_image = new_tempfile
-    @item.save!
-    item = @item_class.find(@item.id)
-    item.preview_image.url.should =~ %r{^/media/\w+/hello\.txt\?sha=\w+$}
+    item.preview_image.encode(:bum).url.should =~ %r{^/media/\w+/file\.bum}
   end
 
   it "should allow configuring the url" do
@@ -109,14 +101,14 @@ describe "model urls" do
     @item.preview_image = new_tempfile
     @item.save!
     item = @item_class.find(@item.id)
-    item.preview_image.url.should =~ %r{^/img/\w+$}
+    item.preview_image.url.should =~ %r{^/img/\w+}
   end
 
   it "should still get params from magic attributes even when chained" do
     @item.preview_image = new_tempfile
     @item.save!
     item = @item_class.find(@item.id)
-    item.preview_image.thumb('30x30').url.should =~ %r{^/media/\w+/hello\.txt$}
+    item.preview_image.thumb('30x30').url.should =~ %r{^/media/\w+/hello\.txt}
   end
 
 end

data/spec/functional/remote_on_the_fly_spec.rb

@@ -32,17 +32,17 @@ describe "remote on-the-fly urls" do
   end
 
   it "should give the url for the server" do
-    @job.url.should == "/#{@job.serialize}"
+    @job.url.should == "/#{@job.serialize}?sha=#{@job.sha}"
   end
 
   it "should store the content when first called" do
     File.exist?('tmp/dragonfly_test_urls/yay.txt').should be_false
-    @app.server.call('PATH_INFO' => @job.url, 'REQUEST_METHOD' => 'GET')
+    request(@app, @job.url)
     File.read('tmp/dragonfly_test_urls/yay.txt').should == 'TEST'
   end
 
   it "should point to the external url the second time" do
-    @app.server.call('PATH_INFO' => @job.url, 'REQUEST_METHOD' => 'GET')
+    request(@app, @job.url)
     @job.url.should == '/dragonfly_test_urls/yay.txt'
   end
 

data/spec/functional/urls_spec.rb

@@ -2,17 +2,18 @@ require 'spec_helper'
 
 describe "urls" do
 
-  def request(app, path)
-    Rack::MockRequest.new(app).get(path)
-  end
-
   def job_should_match(array)
     Dragonfly::Response.should_receive(:new).with do |job, env|
       job.to_a.should == array
     end.and_return(double('response', :to_response => [200, {'Content-Type' => 'text/plain'}, ["OK"]]))
   end
 
-  let (:app) { test_app.configure{ processor(:thumb){} } }
+  let (:app) {
+    test_app.configure{
+      processor(:thumb){}
+      verify_urls false
+    }
+  }
 
   it "works with old marshalled urls (including with tildes in them)" do
     app.allow_legacy_urls = true

data/spec/spec_helper.rb

@@ -18,6 +18,7 @@ SAMPLES_DIR = Pathname.new(File.expand_path('../../samples', __FILE__))
 
 RSpec.configure do |c|
   c.include ModelHelpers
+  c.include RackHelpers
 end
 
 def todo

data/spec/support/rack_helpers.rb

@@ -0,0 +1,7 @@
+module RackHelpers
+
+  def request(app, path)
+    Rack::MockRequest.new(app).get(path)
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dragonfly
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Mark Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-22 00:00:00.000000000 Z
+date: 2014-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -234,6 +234,7 @@ files:
 - spec/support/argument_matchers.rb
 - spec/support/image_matchers.rb
 - spec/support/model_helpers.rb
+- spec/support/rack_helpers.rb
 - spec/support/simple_matchers.rb
 - tmp/.gitignore
 homepage: http://github.com/markevans/dragonfly
@@ -321,4 +322,5 @@ test_files:
 - spec/support/argument_matchers.rb
 - spec/support/image_matchers.rb
 - spec/support/model_helpers.rb
+- spec/support/rack_helpers.rb
 - spec/support/simple_matchers.rb