dragonfly 0.4.3 → 0.4.4

data/History.txt

@@ -0,0 +1,13 @@
+0.4.4 (2010-02-16)
+==================
+
+Better late than never to start logging change history...
+
+New features
+------------
+- added aspect_ratio to rmagick_analyser
+
+Added support
+-------------
+- support for ruby 1.9
+- added development dependencies to gemspec for easier setting up

data/Rakefile

@@ -10,10 +10,18 @@ begin
     s.homepage = "http://github.com/markevans/dragonfly"
     s.authors = ["Mark Evans"]
     s.add_dependency('rack')
+    s.add_development_dependency 'jeweler'
+    s.add_development_dependency 'yard'
+    s.add_development_dependency 'rmagick'
+    s.add_development_dependency 'aws-s3'
+    s.add_development_dependency 'rspec'
+    s.add_development_dependency 'cucumber'
+    s.add_development_dependency 'activerecord'
+    s.add_development_dependency 'sqlite3-ruby'
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError
-  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
+  puts "Jeweler not available. Install it with: (sudo) gem install jeweler"
 end
 
 require 'rake/rdoctask'
@@ -25,33 +33,41 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-require 'yard'
-YARD::Rake::YardocTask.new do |t|
-  t.files   = ['lib/**/*.rb']
-  t.options = %w(-e yard/setup.rb)
-end
-YARD::Rake::YardocTask.new 'yard:changed' do |t|
-  t.files   = `git status | grep '.rb' | grep modified | grep -v yard | cut -d' ' -f4`.split
-  t.options = %w(-e yard/setup.rb)
+begin
+  require 'yard'
+  YARD::Rake::YardocTask.new do |t|
+    t.files   = ['lib/**/*.rb']
+    t.options = %w(-e yard/setup.rb)
+  end
+  YARD::Rake::YardocTask.new 'yard:changed' do |t|
+    t.files   = `git status | grep '.rb' | grep modified | grep -v yard | cut -d' ' -f4`.split
+    t.options = %w(-e yard/setup.rb)
+  end
+rescue LoadError
+  puts "YARD is not available. To run the documentation tasks, install it with: (sudo) gem install yard"
 end
 
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |t|
-  t.libs << 'lib' << 'spec'
-  t.spec_files = FileList['spec/**/*_spec.rb']
-end
+begin
+  require 'spec/rake/spectask'
+  Spec::Rake::SpecTask.new(:spec) do |t|
+    t.libs << 'lib' << 'spec'
+    t.spec_files = FileList['spec/**/*_spec.rb']
+  end
 
-Spec::Rake::SpecTask.new(:rcov) do |t|
-  t.libs << 'lib' << 'spec'
-  t.spec_files = FileList['spec/**/*_spec.rb']
-  t.rcov = true
+  Spec::Rake::SpecTask.new(:rcov) do |t|
+    t.libs << 'lib' << 'spec'
+    t.spec_files = FileList['spec/**/*_spec.rb']
+    t.rcov = true
+  end
+rescue LoadError
+  puts "RSpec is not available. To run tests, install it with: (sudo) gem install rspec"
 end
 
 begin
   require 'cucumber/rake/task'
   Cucumber::Rake::Task.new(:features)
 rescue LoadError
-  puts "Cucumber is not available. In order to run features, you must: sudo gem install cucumber"
+  puts "Cucumber is not available. To run features, install it with: (sudo) gem install cucumber"
 end
 
 task :default => [:spec, :features]

data/VERSION

@@ -1 +1 @@
-0.4.3
+0.4.4

data/dragonfly.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{dragonfly}
-  s.version = "0.4.3"
+  s.version = "0.4.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mark Evans"]
-  s.date = %q{2010-01-24}
+  s.date = %q{2010-02-16}
   s.email = %q{mark@new-bamboo.co.uk}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -18,6 +18,7 @@ Gem::Specification.new do |s|
   s.files = [
     ".gitignore",
      ".yardopts",
+     "History.txt",
      "LICENSE",
      "README.md",
      "Rakefile",
@@ -58,6 +59,8 @@ Gem::Specification.new do |s|
      "lib/dragonfly/app.rb",
      "lib/dragonfly/configurable.rb",
      "lib/dragonfly/core_ext/object.rb",
+     "lib/dragonfly/core_ext/string.rb",
+     "lib/dragonfly/core_ext/symbol.rb",
      "lib/dragonfly/data_storage.rb",
      "lib/dragonfly/data_storage/base.rb",
      "lib/dragonfly/data_storage/base64_data_store.rb",
@@ -97,6 +100,8 @@ Gem::Specification.new do |s|
      "spec/dragonfly/analysis/r_magick_analyser_spec.rb",
      "spec/dragonfly/app_spec.rb",
      "spec/dragonfly/configurable_spec.rb",
+     "spec/dragonfly/core_ext/string_spec.rb",
+     "spec/dragonfly/core_ext/symbol_spec.rb",
      "spec/dragonfly/data_storage/data_store_spec.rb",
      "spec/dragonfly/data_storage/file_data_store_spec.rb",
      "spec/dragonfly/data_storage/s3_data_store_spec.rb",
@@ -107,7 +112,6 @@ Gem::Specification.new do |s|
      "spec/dragonfly/middleware_spec.rb",
      "spec/dragonfly/parameters_spec.rb",
      "spec/dragonfly/processing/rmagick_processor_spec.rb",
-     "spec/dragonfly/shared_middleware_spec.rb",
      "spec/dragonfly/temp_object_spec.rb",
      "spec/dragonfly/url_handler_spec.rb",
      "spec/dragonfly_spec.rb",
@@ -138,6 +142,8 @@ Gem::Specification.new do |s|
      "spec/dragonfly/analysis/r_magick_analyser_spec.rb",
      "spec/dragonfly/app_spec.rb",
      "spec/dragonfly/configurable_spec.rb",
+     "spec/dragonfly/core_ext/string_spec.rb",
+     "spec/dragonfly/core_ext/symbol_spec.rb",
      "spec/dragonfly/data_storage/data_store_spec.rb",
      "spec/dragonfly/data_storage/file_data_store_spec.rb",
      "spec/dragonfly/data_storage/s3_data_store_spec.rb",
@@ -148,7 +154,6 @@ Gem::Specification.new do |s|
      "spec/dragonfly/middleware_spec.rb",
      "spec/dragonfly/parameters_spec.rb",
      "spec/dragonfly/processing/rmagick_processor_spec.rb",
-     "spec/dragonfly/shared_middleware_spec.rb",
      "spec/dragonfly/temp_object_spec.rb",
      "spec/dragonfly/url_handler_spec.rb",
      "spec/dragonfly_spec.rb",
@@ -163,10 +168,35 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rack>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
+      s.add_development_dependency(%q<yard>, [">= 0"])
+      s.add_development_dependency(%q<rmagick>, [">= 0"])
+      s.add_development_dependency(%q<aws-s3>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, [">= 0"])
+      s.add_development_dependency(%q<cucumber>, [">= 0"])
+      s.add_development_dependency(%q<activerecord>, [">= 0"])
+      s.add_development_dependency(%q<sqlite3-ruby>, [">= 0"])
     else
       s.add_dependency(%q<rack>, [">= 0"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency(%q<yard>, [">= 0"])
+      s.add_dependency(%q<rmagick>, [">= 0"])
+      s.add_dependency(%q<aws-s3>, [">= 0"])
+      s.add_dependency(%q<rspec>, [">= 0"])
+      s.add_dependency(%q<cucumber>, [">= 0"])
+      s.add_dependency(%q<activerecord>, [">= 0"])
+      s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
     end
   else
     s.add_dependency(%q<rack>, [">= 0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<yard>, [">= 0"])
+    s.add_dependency(%q<rmagick>, [">= 0"])
+    s.add_dependency(%q<aws-s3>, [">= 0"])
+    s.add_dependency(%q<rspec>, [">= 0"])
+    s.add_dependency(%q<cucumber>, [">= 0"])
+    s.add_dependency(%q<activerecord>, [">= 0"])
+    s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
   end
 end
+

data/features/steps/dragonfly_steps.rb

@@ -56,5 +56,9 @@ Then /^the image should have format '(.+?)'$/ do |format|
 end
 
 Then /^the response should have the same content as the file "([^\"]*)"$/ do |name|
-  @response.body.should == $app.fetch(TEMP_FILES[name]).data
+  if RUBY_VERSION =~ /^1\.8/
+    @response.body.should == $app.fetch(TEMP_FILES[name]).data
+  else
+    @response.body.force_encoding('BINARY').should == $app.fetch(TEMP_FILES[name]).data.force_encoding('BINARY')
+  end
 end

data/features/support/env.rb

@@ -2,7 +2,6 @@ $LOAD_PATH.unshift(File.dirname(__FILE__) + '/../../lib')
 require 'dragonfly'
 require 'spec/expectations'
 require 'test/unit/assertions'
-require 'ruby-debug'
 require File.dirname(__FILE__) + '/../../spec/image_matchers.rb'
 
 # A hack as system calls weren't using my path

data/lib/dragonfly.rb

@@ -31,3 +31,5 @@ autoload_files_in_dir("#{File.dirname(__FILE__)}/dragonfly", 'Dragonfly')
 
 require 'rubygems'
 require File.dirname(__FILE__) + '/dragonfly/core_ext/object'
+require File.dirname(__FILE__) + '/dragonfly/core_ext/string'
+require File.dirname(__FILE__) + '/dragonfly/core_ext/symbol'

data/lib/dragonfly/active_record_extensions/attachment.rb

@@ -71,7 +71,7 @@ module Dragonfly
       end
 
       def respond_to?(method)
-        super || methods_to_delegate_to_temp_object.include?(method.to_s)
+        super || methods_to_delegate_to_temp_object.include?(method.to_method_name)
       end
 
       def ext
@@ -124,10 +124,14 @@ module Dragonfly
         analyser.callable_methods
       end
       
+      def can_delegate_to_temp_object?(meth)
+        methods_to_delegate_to_temp_object.include?(meth.to_method_name)
+      end
+      
       def magic_attributes
         parent_model.class.column_names.select { |name|
           name =~ /^#{attribute_name}_(.+)$/ &&
-            (methods_to_delegate_to_temp_object.include?($1) || %w(size ext name).include?($1))
+            (can_delegate_to_temp_object?($1) || %w(size ext name).include?($1))
         }
       end
       
@@ -151,7 +155,7 @@ module Dragonfly
       end
       
       def method_missing(meth, *args, &block)
-        if methods_to_delegate_to_temp_object.include?(meth.to_s)
+        if can_delegate_to_temp_object?(meth)
           has_magic_attribute_for?(meth) ? magic_attribute_for(meth) : temp_object.send(meth, *args, &block)
         else
           super

data/lib/dragonfly/analysis/r_magick_analyser.rb

@@ -13,6 +13,11 @@ module Dragonfly
         rmagick_image(image).rows
       end
       
+      def aspect_ratio(image)
+        rmagick_data = rmagick_image(image)
+        rmagick_data.columns.to_f / rmagick_data.rows
+      end
+      
       def depth(image)
         rmagick_image(image).depth
       end

data/lib/dragonfly/core_ext/string.rb

@@ -0,0 +1,9 @@
+class String
+  
+  # Ruby 1.8 reports methods as strings,
+  # whereas 1.9 reports them as symbols
+  def to_method_name
+    RUBY_VERSION =~ /^1.8/ ? self : to_sym
+  end
+  
+end

data/lib/dragonfly/core_ext/symbol.rb

@@ -0,0 +1,9 @@
+class Symbol
+  
+  # Ruby 1.8 reports methods as strings,
+  # whereas 1.9 reports them as symbols
+  def to_method_name
+    RUBY_VERSION =~ /^1.8/ ? to_s : self
+  end
+  
+end

data/lib/dragonfly/delegator.rb

@@ -28,7 +28,7 @@ module Dragonfly
     end
     
     def has_callable_method?(method)
-      callable_methods.include?(method.to_s)
+      callable_methods.include?(method.to_method_name)
     end
     
     private

data/lib/dragonfly/parameters.rb

@@ -152,8 +152,8 @@ module Dragonfly
     def to_sorted_array
       [
         uid,
-        format,
-        processing_method,
+        format.to_s,
+        processing_method.to_s,
         processing_options.sort{|a,b| a[0].to_s <=> b[0].to_s },
         encoding.sort{|a,b| a[0].to_s <=> b[0].to_s }
       ]

data/lib/dragonfly/processing/r_magick_processor.rb

@@ -195,13 +195,13 @@ module Dragonfly
         padding_parts = str.gsub('px','').split(/\s+/).map{|px| px.to_i}
         case padding_parts.size
         when 1
-          p = *padding_parts
+          p = padding_parts.first
           [p,p,p,p]
         when 2
-          p,q = *padding_parts
+          p,q = padding_parts
           [p,q,p,q]
         when 3
-          p,q,r = *padding_parts
+          p,q,r = padding_parts
           [p,q,r,q]
         when 4
           padding_parts

data/lib/dragonfly/temp_object.rb

@@ -1,3 +1,4 @@
+require 'stringio'
 require 'tempfile'
 
 module Dragonfly
@@ -79,7 +80,7 @@ module Dragonfly
     
     def size
       if initialized_data
-        initialized_data.size
+        initialized_data.bytesize
       else
         File.size(path)
       end

data/lib/dragonfly/url_handler.rb

@@ -94,11 +94,10 @@ module Dragonfly
     attr_reader :parameters_class
 
     def symbolize_keys(hash)
-      hash = hash.dup
-      hash.each do |key, value|
-        hash[key.to_sym] = hash.delete(key)
+      hash.inject({}) do |memo, (key, value)|
+        memo[key.to_sym] = hash[key]
+        memo
       end
-      hash
     end
 
     def validate_parameters(parameters, query)

data/spec/dragonfly/active_record_extensions/model_spec.rb

@@ -449,11 +449,12 @@ describe Item do
         @item.preview_image.respond_to?(:number_of_As).should be_true
       end
       it "should include analyser methods in methods" do
-        @item.preview_image.methods.include?('number_of_As').should be_true
+        @item.preview_image.methods.include?('number_of_As'.to_method_name).should be_true
       end
       it "should include analyser methods in public_methods" do
-        @item.preview_image.public_methods.include?('number_of_As').should be_true
+        @item.preview_image.public_methods.include?('number_of_As'.to_method_name).should be_true
       end
+      
       it "should update when something new is assigned" do
         @item.preview_image = 'ANEWDATASTRING'
         @item.preview_image.number_of_As.should == 3

data/spec/dragonfly/analysis/r_magick_analyser_spec.rb

@@ -16,6 +16,10 @@ describe Dragonfly::Analysis::RMagickAnalyser do
     @analyser.height(@beach).should == 355
   end
   
+  it "should return the aspect ratio" do
+    @analyser.aspect_ratio(@beach).should == (280.0/355.0)
+  end
+  
   it "should return the number of colours" do
     @analyser.number_of_colours(@beach).should == 34703
   end

data/spec/dragonfly/core_ext/string_spec.rb

@@ -0,0 +1,17 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+describe String do
+  
+  describe "to_method_name" do
+    if RUBY_VERSION =~ /^1.8/
+      it "should return a string" do
+        'hello'.to_method_name.should == 'hello'
+      end
+    else
+      it "should return a symbol" do
+        'hello'.to_method_name.should == :hello
+      end
+    end
+  end
+  
+end

data/spec/dragonfly/core_ext/symbol_spec.rb

@@ -0,0 +1,17 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+describe Symbol do
+  
+  describe "to_method_name" do
+    if RUBY_VERSION =~ /^1.8/
+      it "should return a string" do
+        :hello.to_method_name.should == 'hello'
+      end
+    else
+      it "should return a symbol" do
+        :hello.to_method_name.should == :hello
+      end
+    end
+  end
+  
+end

data/spec/dragonfly/delegatable_spec.rb

@@ -18,13 +18,13 @@ describe Dragonfly::Delegatable do
   
   describe "delegatable_methods" do
     it "should include all methods defined after including, including mixed-in and inherited" do
-      B.new.delegatable_methods.sort.should == %w(a b m)
+      B.new.delegatable_methods.should == [:b, :m, :a].map{|m| m.to_method_name }
     end
     
     it "should work the second (cached) time" do
       b = B.new
       b.delegatable_methods
-      b.delegatable_methods.sort.should == %w(a b m)
+      b.delegatable_methods.should == [:b, :m, :a].map{|m| m.to_method_name }
     end
     
   end

data/spec/dragonfly/delegator_spec.rb

@@ -81,7 +81,7 @@ describe Dragonfly::Delegator do
     end
 
     it "should return all the callable methods" do
-      @delegator.callable_methods.sort.should == %w(clean drive open_back_doors open_boot pick_up)
+      @delegator.callable_methods.sort.should == %w(clean drive open_back_doors open_boot pick_up).map{|m| m.to_method_name }
     end
     
     it "should say if if has a callable method (as a string)" do

data/spec/dragonfly/middleware_spec.rb

@@ -2,7 +2,7 @@ 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']}"]] }
+  lambda{|env| [200, {"Content-Type" => "text/html"}, ["dummy_rack_app body"]] }
 end
 
 describe Dragonfly::Middleware do
@@ -24,7 +24,7 @@ describe Dragonfly::Middleware do
     )
     response = make_request(@stack, 'hello.png?howare=you')
     response.status.should == 200
-    response.body.should == 'hello.png, howare=you'
+    response.body.should == 'dummy_rack_app body'
   end
 
   it "should return as per the dragonfly app if the app returns a 200" do

data/spec/dragonfly/temp_object_spec.rb

@@ -40,9 +40,9 @@ describe Dragonfly::TempObject do
     it "should yield 8192 bytes each time" do
       parts = get_parts(@temp_object)
       parts[0...-1].each do |part|
-        part.length.should == 8192
+        part.bytesize.should == 8192
       end
-      parts.last.length.should <= 8192
+      parts.last.bytesize.should <= 8192
     end
     
   end

data/spec/spec_helper.rb

@@ -1,6 +1,5 @@
 require 'spec'
 require 'rubygems'
-require 'ruby-debug'
 
 require File.dirname(__FILE__) + '/../lib/dragonfly'
 $:.unshift(File.dirname(__FILE__))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dragonfly
 version: !ruby/object:Gem::Version 
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors: 
 - Mark Evans
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-24 00:00:00 +00:00
+date: 2010-02-16 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,6 +22,86 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: jeweler
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: yard
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: rmagick
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: aws-s3
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: cucumber
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: activerecord
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: sqlite3-ruby
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: 
 email: mark@new-bamboo.co.uk
 executables: []
@@ -34,6 +114,7 @@ extra_rdoc_files:
 files: 
 - .gitignore
 - .yardopts
+- History.txt
 - LICENSE
 - README.md
 - Rakefile
@@ -74,6 +155,8 @@ files:
 - lib/dragonfly/app.rb
 - lib/dragonfly/configurable.rb
 - lib/dragonfly/core_ext/object.rb
+- lib/dragonfly/core_ext/string.rb
+- lib/dragonfly/core_ext/symbol.rb
 - lib/dragonfly/data_storage.rb
 - lib/dragonfly/data_storage/base.rb
 - lib/dragonfly/data_storage/base64_data_store.rb
@@ -113,6 +196,8 @@ files:
 - spec/dragonfly/analysis/r_magick_analyser_spec.rb
 - spec/dragonfly/app_spec.rb
 - spec/dragonfly/configurable_spec.rb
+- spec/dragonfly/core_ext/string_spec.rb
+- spec/dragonfly/core_ext/symbol_spec.rb
 - spec/dragonfly/data_storage/data_store_spec.rb
 - spec/dragonfly/data_storage/file_data_store_spec.rb
 - spec/dragonfly/data_storage/s3_data_store_spec.rb
@@ -123,7 +208,6 @@ files:
 - spec/dragonfly/middleware_spec.rb
 - spec/dragonfly/parameters_spec.rb
 - spec/dragonfly/processing/rmagick_processor_spec.rb
-- spec/dragonfly/shared_middleware_spec.rb
 - spec/dragonfly/temp_object_spec.rb
 - spec/dragonfly/url_handler_spec.rb
 - spec/dragonfly_spec.rb
@@ -176,6 +260,8 @@ test_files:
 - spec/dragonfly/analysis/r_magick_analyser_spec.rb
 - spec/dragonfly/app_spec.rb
 - spec/dragonfly/configurable_spec.rb
+- spec/dragonfly/core_ext/string_spec.rb
+- spec/dragonfly/core_ext/symbol_spec.rb
 - spec/dragonfly/data_storage/data_store_spec.rb
 - spec/dragonfly/data_storage/file_data_store_spec.rb
 - spec/dragonfly/data_storage/s3_data_store_spec.rb
@@ -186,7 +272,6 @@ test_files:
 - spec/dragonfly/middleware_spec.rb
 - spec/dragonfly/parameters_spec.rb
 - spec/dragonfly/processing/rmagick_processor_spec.rb
-- spec/dragonfly/shared_middleware_spec.rb
 - spec/dragonfly/temp_object_spec.rb
 - spec/dragonfly/url_handler_spec.rb
 - spec/dragonfly_spec.rb

data/spec/dragonfly/shared_middleware_spec.rb

@@ -1,44 +0,0 @@
-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", :shared => true do
-
-  # REQUIRES THAT @stack and Dragonfly::App[:images] IS DEFINED
-
-  def make_request(app, url)
-    Rack::MockRequest.new(app).get(url)
-  end
-
-  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