dragonfly 0.6.2 → 0.7.0

data/.gitignore

@@ -8,3 +8,5 @@ doc
 tmp
 fixtures/*/tmp_app
 .ginger
+.bundle
+spec/spec.log

data/.specopts

@@ -0,0 +1,2 @@
+--colour
+

data/.yardopts

@@ -2,15 +2,21 @@
 -e yard/setup.rb
 -
 README.md
-extra_docs/GettingStarted.md
-extra_docs/UsingWithRails.md
-extra_docs/ActiveRecord.md
+extra_docs/GeneralUsage.md
+extra_docs/Rails2.md
+extra_docs/Rails3.md
+extra_docs/Rack.md
+extra_docs/Sinatra.md
+extra_docs/Heroku.md
+extra_docs/Models.md
 extra_docs/DataStorage.md
-extra_docs/Shortcuts.md
 extra_docs/Analysers.md
 extra_docs/Processing.md
 extra_docs/Encoding.md
+extra_docs/Generators.md
+extra_docs/Configuration.md
+extra_docs/URLs.md
+extra_docs/Caching.md
 extra_docs/MimeTypes.md
-extra_docs/ExampleUseCases.md
 LICENSE
 History.md

data/Gemfile

@@ -0,0 +1,22 @@
+source :rubygems
+
+# These gems are needed for development and testing
+
+gem 'aws-s3'
+gem 'bson_ext'
+gem 'capybara'
+gem 'cucumber', '0.8.5'
+gem 'cucumber-rails'
+gem 'database_cleaner', '>= 0.5.0'
+gem 'jeweler',  '~> 1.4'
+gem 'gherkin', '2.1.4' # 2.1.5 seems to segfault on Ruby 1.9.2
+gem 'mongo'
+gem 'nokogiri', '1.5.0.beta.2' # 1.4.3.1 segfaults on Ruby 1.9.2
+gem 'rack', '~>1.1'
+gem 'rack-cache'
+gem 'rails', '3.0.0.rc', :require => nil
+gem 'rake'
+gem 'rmagick', '2.12.2', :require => nil
+gem 'rspec', '~> 1.3'
+gem 'sqlite3-ruby', '1.3.0' # 1.3.1 segfaults on Ruby 1.9.2
+gem 'yard'

data/Gemfile.rails.2.3.5

@@ -0,0 +1,13 @@
+source :rubygems
+
+gem 'capybara'
+gem 'cucumber', '0.8.5'
+gem 'cucumber-rails'
+gem 'database_cleaner', '>= 0.5.0'
+gem 'gherkin', '2.1.4'
+gem 'nokogiri', '1.5.0.beta.2'
+gem 'rack-cache', :require => nil
+gem 'rails', '2.3.5', :require => nil
+gem 'rmagick', '2.12.2', :require => nil
+gem 'rspec', '~> 1.3'
+gem 'sqlite3-ruby', '1.3.0'

data/History.md

@@ -1,3 +1,52 @@
+0.7.0 (2010-08-25)
+==================
+
+Features
+--------
+- Ability to chain processing, encoding
+- Added Generators for arbitrary content generation
+- 'fetch_file' method for easily getting local files
+- ActiveModel support
+- Mongoid support
+- Better Sinatra, etc. support (using 'to_response')
+- Data stores now store meta, name and format information too
+- Added Mongo Data Store
+- temp_objects maintain name, meta, etc. across processing, encoding, etc.
+- added portrait? and landscape? to RMagick analyser
+- Ability to add single custom processor/encoder/analyser/generator
+- added flip and flop to RMagick processor
+- ability to configure whether it trusts the file extension
+- nice text response for root path
+- ability to configure url host
+- ability to override path_prefix/host when calling url
+- routed endpoints
+- simple endpoints
+- more intelligent working out of Content-Type to send back
+
+Fixes
+-----
+- proper use of ETags
+- remove whitespace from file/s3 datastore uids
+- dragonfly/rails/images url-encodes rack-cache config for windows users
+
+Changes
+-------
+- Dragonfly::App[:images] -> Dragonfly[:images]
+- Moved text/plasma generation into Generator
+- Use of lazy 'Job' objects
+- simplified shortcuts interface
+- changed interface for attaching to ActiveRecord
+- simplified saved configurations and allow referring to them as symbols
+- Removed need for Base class for datastores, processors, analysers and encoders
+- FileCommandAnalyser included in Rails config, not RMagick
+- better use of logging module for sharing logs between classes
+- mounting the app is down the middleware/elsewhere, not the app itself
+- DOS protection off by default
+- encoded urls
+- got rid of unnecessary configurable sha_length
+
+
+
 0.6.2 (2010-06-24)
 ==================
 Features

data/README.md

@@ -1,28 +1,17 @@
 Dragonfly
 ===========
 
-Dragonfly is a <a href="http://rack.rubyforge.org">Rack</a> framework for on-the-fly processing and encoding.
-It includes an extension for Ruby on Rails to enable easy image handling.
+Dragonfly is a <a href="http://rack.rubyforge.org">Rack</a> framework for on-the-fly image handling.
 
-For the lazy Rails user
------------------------
-To use simply for image thumbnails etc. in Rails...
+Ideal for using with Ruby on Rails (2.3 and 3), Sinatra and all that gubbins.
 
-**environment.rb** (Rails 2.3 only):
-
-    config.gem 'rmagick',    :lib => 'RMagick'
-    config.gem 'rack-cache', :lib => 'rack/cache'
-    config.gem 'dragonfly'
-
-**Gemfile** (Rails 3 only):
+For the lazy Rails user...
+--------------------------
+**Gemfile**:
 
     gem 'rmagick',    :require => 'RMagick'
     gem 'rack-cache', :require => 'rack/cache'
-    gem 'dragonfly'
-
-The above assumes that you have http://gemcutter.org as one of your gem sources.
-If not you should add it, e.g. `gem source --add http://gemcutter.org` from the command line,
-or add `source http://gemcutter.org` to your Gemfile.
+    gem 'dragonfly', '~>0.7.0'
 
 **Initializer** (e.g. config/initializers/dragonfly.rb):
 
@@ -35,7 +24,8 @@ or add `source http://gemcutter.org` to your Gemfile.
 **Model**:
 
     class Album < ActiveRecord::Base
-      image_accessor :cover_image            # Defines reader/writer for cover_image
+      image_accessor :cover_image            # 'image_accessor' is provided by Dragonfly
+                                             # this defines a reader/writer for cover_image
       # ...
     end
 
@@ -47,24 +37,23 @@ or add `source http://gemcutter.org` to your Gemfile.
       ...
     <% end %>
 
+NB: REMEMBER THE MULTIPART BIT!!!
 
 **View** (to display):
 
-    <%= image_tag @album.cover_image.url(:gif) %>
-    <%= image_tag @album.cover_image.url('400x200') %>
-    <%= image_tag @album.cover_image.url('100x100!', :png) %>
-    <%= image_tag @album.cover_image.url('100x100#') %>
-    <%= image_tag @album.cover_image.url('50x50+30+30sw', :tiff) %>
-    <%= image_tag @album.cover_image.url(:rotate, 15) %>
+    <%= image_tag @album.cover_image.url %>
+    <%= image_tag @album.cover_image.thumb('400x200#').url %>
+    <%= image_tag @album.cover_image.jpg.url %>
+    <%= image_tag @album.cover_image.process(:greyscale).encode(:tiff).url %>
     ...etc.
 
 Using outside of rails, custom storage/processing/encoding/analysis, and more...
 --------------------------------------------------------------------------------
-Dragonfly is primarily a Rack app, the Rails part of it being nothing more than a separate layer on top of the main code, which means you can use it as a standalone app, or with Sinatra, Merb, etc.
+Dragonfly is primarily a Rack app, so you can use it as a standalone app, or with Sinatra, Merb, etc.
 
-It is intended to be highly customizable, and is not limited to images, but any data type that could suit on-the-fly processing/encoding.
+It's highly customizable, and works with any data type (not just images).
 
-For more info, consult the <a href="http://markevans.github.com/dragonfly">DOCUMENTATION</a>
+For more info, consult the <a href="http://markevans.github.com/dragonfly"><big><strong>DOCUMENTATION</strong></big></a>
 
 Issues
 ======
@@ -76,7 +65,8 @@ Suggestions/Questions
 
 Credits
 =======
-- <a href="http://github.com/markevans">Mark Evans</a> (author)
+- [Mark Evans](http://github.com/markevans) (author)
+
 
 Copyright
 ========

data/Rakefile

@@ -4,22 +4,13 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |s|
     s.name = "dragonfly"
-    s.summary = %Q{Dragonfly is an on-the-fly Rack processing/encoding framework.
-    It includes an extension for Ruby on Rails for easy image handling}
+    s.summary = %Q{Dragonfly is an on-the-fly Rack-based image handling framework.
+    It is suitable for use with Rails, Sinatra and other web frameworks. Although it's mainly used for images,
+    it can handle any content type.}
     s.email = "mark@new-bamboo.co.uk"
     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 'cucumber-rails'
-    s.add_development_dependency 'activerecord'
-    s.add_development_dependency 'sqlite3-ruby'
-    s.add_development_dependency 'ginger'
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError
@@ -49,41 +40,38 @@ rescue LoadError
   puts "YARD is not available. To run the documentation tasks, install it with: (sudo) gem install yard"
 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
+desc "Run all the specs"
+task :spec do
+  system "bundle exec spec -O .specopts spec/dragonfly"
+end
 
-  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"
+desc "Run the active model specs"
+task :model_spec do
+  system "bundle exec spec -O .specopts spec/dragonfly/active_model_extensions"
 end
 
-begin
-  require 'cucumber/rake/task'
-  Cucumber::Rake::Task.new(:features)
-rescue LoadError
-  puts "Cucumber is not available. To run features, install it with: (sudo) gem install cucumber"
+desc "Run the active_record specs (AR 2.3)"
+task :model_spec_235 do
+  system "export BUNDLE_GEMFILE=Gemfile.rails.2.3.5 && bundle exec spec -O .specopts spec/dragonfly/active_model_extensions"
 end
 
-begin
-  require 'ginger'
-rescue LoadError
-  puts "To run 'rake', to test everything, you need the Ginger gem. Install it with: (sudo) gem install ginger"
+task :features do
+  system "bundle exec cucumber"
 end
+
 task :default do
-  system 'ginger spec && rake features'
+  # Do everything!!!
+  puts "*** Running all the specs using the default Gemfile ***"
+  Rake::Task['spec'].invoke
+  puts "*** Running the model specs with Gemfile.rails.2.3.5 ***"
+  Rake::Task['model_spec_235'].invoke
+  puts "*** Running the features ***"
+  Rake::Task['features'].invoke
 end
 
 desc 'Set up a Rails app ready for testing'
 namespace :rails do
-  
+
   task :setup do
     version = ENV['RAILS_VERSION']
     raise "Please give a RAILS_VERSION, e.g. RAILS_VERSION=2.3.5" unless version

data/VERSION

@@ -1 +1 @@
-0.6.2
+0.7.0

data/config.ru

@@ -1,6 +1,9 @@
-require File.dirname(__FILE__) + '/config'
 require 'rubygems'
 require 'rack/cache'
+require File.dirname(__FILE__) + '/lib/dragonfly'
+
+APP = Dragonfly[:images].configure_with(:rmagick) do |c|
+end
 
 use Rack::Cache,
   :verbose     => true,

data/dragonfly.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dragonfly}
-  s.version = "0.6.2"
+  s.version = "0.7.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mark Evans"]
-  s.date = %q{2010-06-24}
+  s.date = %q{2010-08-25}
   s.email = %q{mark@new-bamboo.co.uk}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -17,31 +17,39 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".gitignore",
+     ".specopts",
      ".yardopts",
+     "Gemfile",
+     "Gemfile.rails.2.3.5",
      "History.md",
      "LICENSE",
      "README.md",
      "Rakefile",
      "VERSION",
-     "config.rb",
      "config.ru",
      "docs.watchr",
      "dragonfly.gemspec",
-     "extra_docs/ActiveRecord.md",
      "extra_docs/Analysers.md",
+     "extra_docs/Caching.md",
+     "extra_docs/Configuration.md",
      "extra_docs/DataStorage.md",
      "extra_docs/Encoding.md",
-     "extra_docs/ExampleUseCases.md",
-     "extra_docs/GettingStarted.md",
+     "extra_docs/GeneralUsage.md",
+     "extra_docs/Generators.md",
+     "extra_docs/Heroku.md",
      "extra_docs/Index.md",
      "extra_docs/MimeTypes.md",
+     "extra_docs/Models.md",
      "extra_docs/Processing.md",
-     "extra_docs/Shortcuts.md",
-     "extra_docs/UsingWithRails.md",
+     "extra_docs/Rack.md",
+     "extra_docs/Rails2.md",
+     "extra_docs/Rails3.md",
+     "extra_docs/Sinatra.md",
+     "extra_docs/URLs.md",
      "features/images.feature",
      "features/no_processing.feature",
      "features/rails_2.3.5.feature",
-     "features/rails_3.0.0.beta3.feature",
+     "features/rails_3.0.0.rc.feature",
      "features/steps/common_steps.rb",
      "features/steps/dragonfly_steps.rb",
      "features/steps/rails_steps.rb",
@@ -51,87 +59,91 @@ Gem::Specification.new do |s|
      "fixtures/files/app/views/albums/show.html.erb",
      "fixtures/files/config/initializers/dragonfly.rb",
      "fixtures/files/features/manage_album_images.feature",
-     "fixtures/files/features/step_definitions/album_steps.rb",
+     "fixtures/files/features/step_definitions/image_steps.rb",
      "fixtures/files/features/support/paths.rb",
+     "fixtures/files/features/text_images.feature",
      "fixtures/rails_2.3.5/template.rb",
-     "fixtures/rails_3.0.0.beta3/template.rb",
+     "fixtures/rails_3.0.0.rc/template.rb",
      "irbrc.rb",
      "lib/dragonfly.rb",
-     "lib/dragonfly/active_record_extensions.rb",
-     "lib/dragonfly/active_record_extensions/attachment.rb",
-     "lib/dragonfly/active_record_extensions/class_methods.rb",
-     "lib/dragonfly/active_record_extensions/instance_methods.rb",
-     "lib/dragonfly/active_record_extensions/validations.rb",
-     "lib/dragonfly/analyser_list.rb",
-     "lib/dragonfly/analysis/base.rb",
+     "lib/dragonfly/active_model_extensions.rb",
+     "lib/dragonfly/active_model_extensions/attachment.rb",
+     "lib/dragonfly/active_model_extensions/class_methods.rb",
+     "lib/dragonfly/active_model_extensions/instance_methods.rb",
+     "lib/dragonfly/active_model_extensions/validations.rb",
+     "lib/dragonfly/analyser.rb",
      "lib/dragonfly/analysis/file_command_analyser.rb",
      "lib/dragonfly/analysis/r_magick_analyser.rb",
      "lib/dragonfly/app.rb",
-     "lib/dragonfly/belongs_to_app.rb",
-     "lib/dragonfly/config/heroku_rails_images.rb",
-     "lib/dragonfly/config/r_magick_images.rb",
-     "lib/dragonfly/config/r_magick_text.rb",
-     "lib/dragonfly/config/rails_defaults.rb",
-     "lib/dragonfly/config/rails_images.rb",
+     "lib/dragonfly/config/heroku.rb",
+     "lib/dragonfly/config/r_magick.rb",
+     "lib/dragonfly/config/rails.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",
      "lib/dragonfly/data_storage/file_data_store.rb",
+     "lib/dragonfly/data_storage/mongo_data_store.rb",
      "lib/dragonfly/data_storage/s3data_store.rb",
-     "lib/dragonfly/data_storage/transparent_data_store.rb",
-     "lib/dragonfly/delegatable.rb",
-     "lib/dragonfly/delegator.rb",
-     "lib/dragonfly/encoder_list.rb",
-     "lib/dragonfly/encoding/base.rb",
+     "lib/dragonfly/encoder.rb",
      "lib/dragonfly/encoding/r_magick_encoder.rb",
-     "lib/dragonfly/encoding/transparent_encoder.rb",
-     "lib/dragonfly/extended_temp_object.rb",
+     "lib/dragonfly/endpoint.rb",
+     "lib/dragonfly/function_manager.rb",
+     "lib/dragonfly/generation/r_magick_generator.rb",
+     "lib/dragonfly/generator.rb",
+     "lib/dragonfly/job.rb",
+     "lib/dragonfly/job_builder.rb",
+     "lib/dragonfly/job_definitions.rb",
+     "lib/dragonfly/job_endpoint.rb",
+     "lib/dragonfly/loggable.rb",
      "lib/dragonfly/middleware.rb",
-     "lib/dragonfly/parameters.rb",
-     "lib/dragonfly/processing/base.rb",
      "lib/dragonfly/processing/r_magick_processor.rb",
-     "lib/dragonfly/processing/r_magick_text_processor.rb",
-     "lib/dragonfly/processor_list.rb",
+     "lib/dragonfly/processor.rb",
+     "lib/dragonfly/r_magick_utils.rb",
      "lib/dragonfly/rails/images.rb",
+     "lib/dragonfly/routed_endpoint.rb",
+     "lib/dragonfly/serializer.rb",
+     "lib/dragonfly/simple_cache.rb",
+     "lib/dragonfly/simple_endpoint.rb",
      "lib/dragonfly/temp_object.rb",
-     "lib/dragonfly/url_handler.rb",
      "samples/beach.png",
      "samples/egg.png",
      "samples/round.gif",
      "samples/sample.docx",
      "samples/taj.jpg",
      "spec/argument_matchers.rb",
-     "spec/dragonfly/active_record_extensions/attachment_spec.rb",
-     "spec/dragonfly/active_record_extensions/migration.rb",
-     "spec/dragonfly/active_record_extensions/model_spec.rb",
-     "spec/dragonfly/active_record_extensions/models.rb",
-     "spec/dragonfly/active_record_extensions/spec_helper.rb",
+     "spec/dragonfly/active_model_extensions/active_model_setup.rb",
+     "spec/dragonfly/active_model_extensions/active_record_setup.rb",
+     "spec/dragonfly/active_model_extensions/model_spec.rb",
+     "spec/dragonfly/active_model_extensions/spec_helper.rb",
+     "spec/dragonfly/analyser_spec.rb",
      "spec/dragonfly/analysis/file_command_analyser_spec.rb",
      "spec/dragonfly/analysis/r_magick_analyser_spec.rb",
      "spec/dragonfly/app_spec.rb",
-     "spec/dragonfly/belongs_to_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/mongo_data_store_spec.rb",
      "spec/dragonfly/data_storage/s3_data_store_spec.rb",
-     "spec/dragonfly/delegatable_spec.rb",
-     "spec/dragonfly/delegator_spec.rb",
+     "spec/dragonfly/deprecation_spec.rb",
      "spec/dragonfly/encoding/r_magick_encoder_spec.rb",
-     "spec/dragonfly/extended_temp_object_spec.rb",
+     "spec/dragonfly/function_manager_spec.rb",
+     "spec/dragonfly/generation/r_magick_generator_spec.rb",
+     "spec/dragonfly/job_builder_spec.rb",
+     "spec/dragonfly/job_definitions_spec.rb",
+     "spec/dragonfly/job_endpoint_spec.rb",
+     "spec/dragonfly/job_spec.rb",
+     "spec/dragonfly/loggable_spec.rb",
      "spec/dragonfly/middleware_spec.rb",
-     "spec/dragonfly/parameters_spec.rb",
      "spec/dragonfly/processing/r_magick_processor_spec.rb",
-     "spec/dragonfly/processing/r_magick_text_processor_spec.rb",
+     "spec/dragonfly/routed_endpoint_spec.rb",
+     "spec/dragonfly/serializer_spec.rb",
+     "spec/dragonfly/simple_cache_spec.rb",
+     "spec/dragonfly/simple_endpoint_spec.rb",
      "spec/dragonfly/temp_object_spec.rb",
-     "spec/dragonfly/url_handler_spec.rb",
-     "spec/dragonfly_spec.rb",
-     "spec/ginger_scenarios.rb",
      "spec/image_matchers.rb",
      "spec/simple_matchers.rb",
      "spec/spec_helper.rb",
@@ -145,37 +157,41 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/markevans/dragonfly}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
-  s.summary = %q{Dragonfly is an on-the-fly Rack processing/encoding framework. It includes an extension for Ruby on Rails for easy image handling}
+  s.rubygems_version = %q{1.3.7}
+  s.summary = %q{Dragonfly is an on-the-fly Rack-based image handling framework. It is suitable for use with Rails, Sinatra and other web frameworks. Although it's mainly used for images, it can handle any content type.}
   s.test_files = [
     "spec/argument_matchers.rb",
-     "spec/dragonfly/active_record_extensions/attachment_spec.rb",
-     "spec/dragonfly/active_record_extensions/migration.rb",
-     "spec/dragonfly/active_record_extensions/model_spec.rb",
-     "spec/dragonfly/active_record_extensions/models.rb",
-     "spec/dragonfly/active_record_extensions/spec_helper.rb",
+     "spec/dragonfly/active_model_extensions/active_model_setup.rb",
+     "spec/dragonfly/active_model_extensions/active_record_setup.rb",
+     "spec/dragonfly/active_model_extensions/model_spec.rb",
+     "spec/dragonfly/active_model_extensions/spec_helper.rb",
+     "spec/dragonfly/analyser_spec.rb",
      "spec/dragonfly/analysis/file_command_analyser_spec.rb",
      "spec/dragonfly/analysis/r_magick_analyser_spec.rb",
      "spec/dragonfly/app_spec.rb",
-     "spec/dragonfly/belongs_to_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/mongo_data_store_spec.rb",
      "spec/dragonfly/data_storage/s3_data_store_spec.rb",
-     "spec/dragonfly/delegatable_spec.rb",
-     "spec/dragonfly/delegator_spec.rb",
+     "spec/dragonfly/deprecation_spec.rb",
      "spec/dragonfly/encoding/r_magick_encoder_spec.rb",
-     "spec/dragonfly/extended_temp_object_spec.rb",
+     "spec/dragonfly/function_manager_spec.rb",
+     "spec/dragonfly/generation/r_magick_generator_spec.rb",
+     "spec/dragonfly/job_builder_spec.rb",
+     "spec/dragonfly/job_definitions_spec.rb",
+     "spec/dragonfly/job_endpoint_spec.rb",
+     "spec/dragonfly/job_spec.rb",
+     "spec/dragonfly/loggable_spec.rb",
      "spec/dragonfly/middleware_spec.rb",
-     "spec/dragonfly/parameters_spec.rb",
      "spec/dragonfly/processing/r_magick_processor_spec.rb",
-     "spec/dragonfly/processing/r_magick_text_processor_spec.rb",
+     "spec/dragonfly/routed_endpoint_spec.rb",
+     "spec/dragonfly/serializer_spec.rb",
+     "spec/dragonfly/simple_cache_spec.rb",
+     "spec/dragonfly/simple_endpoint_spec.rb",
      "spec/dragonfly/temp_object_spec.rb",
-     "spec/dragonfly/url_handler_spec.rb",
-     "spec/dragonfly_spec.rb",
-     "spec/ginger_scenarios.rb",
      "spec/image_matchers.rb",
      "spec/simple_matchers.rb",
      "spec/spec_helper.rb"
@@ -185,43 +201,13 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= 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<cucumber-rails>, [">= 0"])
-      s.add_development_dependency(%q<activerecord>, [">= 0"])
-      s.add_development_dependency(%q<sqlite3-ruby>, [">= 0"])
-      s.add_development_dependency(%q<ginger>, [">= 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<cucumber-rails>, [">= 0"])
-      s.add_dependency(%q<activerecord>, [">= 0"])
-      s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
-      s.add_dependency(%q<ginger>, [">= 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<cucumber-rails>, [">= 0"])
-    s.add_dependency(%q<activerecord>, [">= 0"])
-    s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
-    s.add_dependency(%q<ginger>, [">= 0"])
   end
 end