dragonfly 0.8.6 → 0.9.0

data/{.specopts → .rspec}

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

data/.yardopts

@@ -1,14 +1,16 @@
 --main extra_docs/Index.md
--e yard/setup.rb
+-e ./yard/setup.rb
 -
 README.md
 extra_docs/GeneralUsage.md
 extra_docs/Rails2.md
 extra_docs/Rails3.md
+extra_docs/ImageMagick.md
 extra_docs/Rack.md
 extra_docs/Sinatra.md
 extra_docs/Heroku.md
 extra_docs/Mongo.md
+extra_docs/Couch.md
 extra_docs/Models.md
 extra_docs/DataStorage.md
 extra_docs/Analysers.md
@@ -17,7 +19,9 @@ 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/Caching.md
+extra_docs/ServingRemotely.md
+extra_docs/ExampleUseCases.md
 LICENSE
 History.md

data/Gemfile

@@ -1,29 +1,30 @@
 source :rubygems
 
+gem "rack"
+
 # These gems are needed for development and testing
 group :development, :test, :cucumber do
-  gem 'aws-s3'
   gem 'capybara'
-  gem 'cucumber'
-  gem 'cucumber-rails'
-  gem 'database_cleaner', '>= 0.5.0'
-  gem 'jeweler',  '~> 1.4'
-  gem 'gherkin', '~> 2.11.6'
+  gem 'cucumber', '~>0.10.0'
+  gem 'cucumber-rails', '~>0.3.2'
+  gem 'database_cleaner'
+  gem 'jeweler', '~> 1.5.2'
+  gem 'fog'
   gem 'mongo'
-  gem 'nokogiri', '1.5.0.beta.2' # 1.4.3.1 segfaults on Ruby 1.9.2
-  gem 'rack', '~>1.1'
+  gem 'couchrest', '~> 1.0'
   gem 'rack-cache'
-  gem 'rails', '3.0.3', :require => nil
-  gem 'rake', '= 0.8.7'
-  gem 'rspec', '~> 1.3'
+  gem 'rails', '3.0.5', :require => nil
+  gem 'rake'
+  gem 'rspec', '~> 2.5'
+  gem 'webmock'
   gem 'yard'
   if RUBY_PLATFORM == "java"
     gem "jdbc-sqlite3"
     gem "activerecord-jdbcsqlite3-adapter"
     gem "jruby-openssl"
   else
+    gem 'bluecloth'
     gem 'bson_ext'
-    gem 'rmagick', '2.12.2', :require => nil
-    gem 'sqlite3-ruby', '1.3.0' # 1.3.1 segfaults on Ruby 1.9.2
+    gem 'sqlite3-ruby'
   end
 end

data/History.md

@@ -1,17 +1,55 @@
-0.8.6 (2013-03-26)
+0.9.0 (2011-04-27)
 ==================
-Fixes
------
-- Backport of security fix for CVE-2013-1756 (in version 0.9.13)
+Features
+--------
+- Model accessors are configurable
+  - added `after_assign` callback
+  - added `after_unassign` callback
+  - added `copy_to` for e.g. up-front thumbnailing
+  - added `storage_opts` and `storage_xxx`
+- Added model `remove_xxxxx` for using with checkboxes
+- Added model `xxxx_url` for assigning content from a url
+- Added job step `fetch_url`
+- Added `retain!` and model `retained_xxxxx` for avoiding multiple uploads when validations fail
+- Added `image?` to imagemagick analyser
+- Added imagemagick `plain` generator
+- Added `strip` to imagemagick processor
+- Added CouchDataStore that uses a CouchDB as a data storage engine
+- Added `before_serve` callback
+- Allowed for configurable response headers
+- Made url re-definable with `define_url`
+- `validates_property` can take a proc for the message
+- Saved configs can be registered now so they can be used with `configure_with(:symbol)`
+- Configurable objects can fallback to a parent configuration, so e.g. the server can be configured through the parent app's configure block.
+- Allowed initializing data by using a pathname
+- `convert_command` and `identify_command` can be configured on a per-app basis
+- Added `remote_url` and ability for datastores to form urls
+  - Added for File, Couch and S3 datastores
+- Models automatically copy magic attributes into meta
+- S3DataStore configurable headers
+- 'dragonfly/rails/images' slightly smarter and added `file_accessor` for more semantic use of non-image attachments
+- Made dragonfly response configurable
+- Mongo datastore can reuse an existing connection/db
+- FileDataStore can be configured not to store meta (save on extra file)
+
+Changes
+-------
+- Removed `url_path_prefix` and `url_suffix` in favour of `url_format`
+  - Middleware doesn't need mount point argument now
+- Removed support for rails 2.3
+- Removed RMagick support (and extracted into a plugin)
+- ImageMagick processors etc. moved into the ImageMagick namespace
+- moved from aws/s3 -> fog for S3 support
+- Renamed SimpleEndpoint -> Server
+- moved name and meta into Job, simplified, and now they don't cause the job to be applied
+- FileDataStore stores metadata in xxx.meta now, not xxx.extra
+- removed Job methods `uid_basename`, `uid_extname`, `encoded_format` and `encoded_extname` as they are now unnecessary
 
-0.8.5 (2011-05-11)
-==================
 Fixes
 -----
-- Allow filenames that have '..' in them (but not '../') in the filedatastore
-- Better security for server
+- Performance tweaks regarding temp_objects model accessors and job objects
 
-0.8.4 (2011-04-27)
+0.8.4 (2010-04-27)
 ==================
 Fixes
 -----

data/README.md

@@ -5,12 +5,14 @@ Dragonfly is a <a href="http://rack.rubyforge.org">Rack</a> framework for on-the
 
 Ideal for using with Ruby on Rails (2.3 and 3), Sinatra and all that gubbins.
 
+However, Dragonfly is NOT JUST FOR RAILS, and NOT JUST FOR IMAGES!!
+
 For the lazy Rails user...
 --------------------------
 **Gemfile**:
 
     gem 'rack-cache', :require => 'rack/cache'
-    gem 'dragonfly', '~>0.8.6'
+    gem 'dragonfly', '~>0.9.0'
 
 **Initializer** (e.g. config/initializers/dragonfly.rb):
 
@@ -18,7 +20,9 @@ For the lazy Rails user...
 
 **Migration**:
 
-    add_column :albums, :cover_image_uid, :string
+    add_column :albums, :cover_image_uid,  :string
+    add_column :albums, :cover_image_name, :string  # Optional - only if you want urls
+                                                    # to end with the original filename
 
 **Model**:
 
@@ -38,6 +42,22 @@ For the lazy Rails user...
 
 NB: REMEMBER THE MULTIPART BIT!!!
 
+You can avoid having to re-upload when validations fail with
+
+      <%= f.hidden_field :retained_cover_image %>
+
+remove the attachment with
+
+      <%= f.check_box :remove_cover_image %>
+
+assign from some other url with
+
+      <%= f.text_field :cover_image_url %>
+
+and display a thumbnail (on the upload form) with
+
+      <%= image_tag @album.cover_image.thumb('100x100').url if @album.cover_image_uid %>
+
 **View** (to display):
 
     <%= image_tag @album.cover_image.url %>
@@ -59,9 +79,9 @@ If using Capistrano with the above, you probably will want to keep the cache bet
     end
     after 'deploy:update_code', 'dragonfly:symlink'
 
-Using outside of rails, custom storage/processing/encoding/analysis, and more...
---------------------------------------------------------------------------------
-Dragonfly is primarily a Rack app, so you can use it as a standalone app, or with Sinatra, Merb, etc.
+Sinatra, CouchDB, Mongo, Rack, S3, custom storage, processing, and more...
+--------------------------------------------------------------------------
+Dragonfly is not just for Rails - it's primarily a Rack app, so you can use it as a standalone app, or with Sinatra, Merb, etc.
 
 It's highly customizable, and works with any data type (not just images).
 

data/Rakefile

@@ -1,92 +1,50 @@
-require 'rake'
-
+require 'rubygems'
+require 'bundler'
 begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |s|
-    s.name = "dragonfly"
-    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')
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler not available. Install it with: (sudo) gem install jeweler"
+  Bundler.setup(:default, :development)
+rescue Bundler::BundlerError => e
+  $stderr.puts e.message
+  $stderr.puts "Run `bundle install` to install missing gems"
+  exit e.status_code
 end
+require 'rake'
 
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = 'dragonfly'
-  rdoc.options << '--line-numbers' << '--inline-source'
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
+require 'jeweler'
+Jeweler::Tasks.new do |gem|
+  gem.name = "dragonfly"
+  gem.email = "mark@new-bamboo.co.uk"
+  gem.summary = %Q{Ideal gem for handling attachments in Rails, Sinatra and Rack applications.}
+  gem.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.}
+  gem.homepage = "http://github.com/markevans/dragonfly"
+  gem.license = "MIT"
+  gem.authors = ["Mark Evans"]
+  gem.add_runtime_dependency('rack')
 end
+Jeweler::RubygemsDotOrgTasks.new
 
-begin
-  require 'yard'
-  YARD::Rake::YardocTask.new do |t|
-    t.files   = ['lib/**/*.rb']
-    t.options = []
-  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 = []
-  end
-rescue LoadError
-  puts "YARD is not available. To run the documentation tasks, install it with: (sudo) gem install yard"
+require 'rspec/core'
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.pattern = FileList['spec/**/*_spec.rb']
 end
 
-desc "Run all the specs"
-task :spec do
-  system "bundle exec spec -O .specopts spec/dragonfly"
+RSpec::Core::RakeTask.new(:rcov) do |spec|
+  spec.pattern = 'spec/**/*_spec.rb'
+  spec.rcov = true
 end
 
-desc "Run the active model specs"
-task :model_spec do
-  system "bundle exec spec -O .specopts spec/dragonfly/active_model_extensions"
-end
+require 'cucumber/rake/task'
+Cucumber::Rake::Task.new(:features)
 
-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
+task :default => [:spec, :features]
 
-task :features do
-  system "bundle exec cucumber"
+require 'yard'
+YARD::Rake::YardocTask.new do |t|
+  t.files   = ['lib/**/*.rb']
+  t.options = []
 end
-
-task :default do
-  # 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
-    path = File.expand_path("fixtures/rails_#{version}")
-    app_name = 'tmp_app'
-    system %(
-      cd #{path} &&
-      rm -rf #{app_name} &&
-      ../rails _#{version}_ #{app_name} -m template.rb
-    )
-    FileUtils.cp("fixtures/dragonfly_setup.rb", "#{path}/#{app_name}/config/initializers")
-    system %(cd #{path}/#{app_name} && rake db:migrate)
-    puts "*** Created a Rails #{version} app in #{path}/#{app_name} ***"
-    puts "Now just start the server, and go to localhost:3000/albums"
-    puts "***"
-  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 = []
 end

data/VERSION

@@ -1 +1 @@
-0.8.6
+0.9.0

data/dragonfly.gemspec

@@ -4,22 +4,23 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = "dragonfly"
-  s.version = "0.8.6"
+  s.name = %q{dragonfly}
+  s.version = "0.9.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mark Evans"]
-  s.date = "2013-03-26"
-  s.email = "mark@new-bamboo.co.uk"
+  s.date = %q{2011-04-27}
+  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}
   s.extra_rdoc_files = [
     "LICENSE",
     "README.md"
   ]
   s.files = [
-    ".specopts",
+    ".rspec",
     ".yardopts",
     "Gemfile",
-    "Gemfile.rails.2.3.5",
     "History.md",
     "LICENSE",
     "README.md",
@@ -31,11 +32,14 @@ Gem::Specification.new do |s|
     "extra_docs/Analysers.md",
     "extra_docs/Caching.md",
     "extra_docs/Configuration.md",
+    "extra_docs/Couch.md",
     "extra_docs/DataStorage.md",
     "extra_docs/Encoding.md",
+    "extra_docs/ExampleUseCases.md",
     "extra_docs/GeneralUsage.md",
     "extra_docs/Generators.md",
     "extra_docs/Heroku.md",
+    "extra_docs/ImageMagick.md",
     "extra_docs/Index.md",
     "extra_docs/MimeTypes.md",
     "extra_docs/Models.md",
@@ -44,41 +48,41 @@ Gem::Specification.new do |s|
     "extra_docs/Rack.md",
     "extra_docs/Rails2.md",
     "extra_docs/Rails3.md",
+    "extra_docs/ServingRemotely.md",
     "extra_docs/Sinatra.md",
     "extra_docs/URLs.md",
-    "features/3.0.3.feature",
     "features/images.feature",
     "features/no_processing.feature",
-    "features/rails_2.3.5.feature",
+    "features/rails_3.0.5.feature",
     "features/steps/common_steps.rb",
     "features/steps/dragonfly_steps.rb",
     "features/steps/rails_steps.rb",
     "features/support/env.rb",
-    "fixtures/files/app/models/album.rb",
-    "fixtures/files/app/views/albums/new.html.erb",
-    "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/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.3/template.rb",
+    "features/support/setup.rb",
+    "fixtures/rails_3.0.5/files/app/models/album.rb",
+    "fixtures/rails_3.0.5/files/app/views/albums/new.html.erb",
+    "fixtures/rails_3.0.5/files/app/views/albums/show.html.erb",
+    "fixtures/rails_3.0.5/files/config/initializers/dragonfly.rb",
+    "fixtures/rails_3.0.5/files/features/manage_album_images.feature",
+    "fixtures/rails_3.0.5/files/features/step_definitions/helper_steps.rb",
+    "fixtures/rails_3.0.5/files/features/step_definitions/image_steps.rb",
+    "fixtures/rails_3.0.5/files/features/support/paths.rb",
+    "fixtures/rails_3.0.5/files/features/text_images.feature",
+    "fixtures/rails_3.0.5/template.rb",
     "irbrc.rb",
     "lib/dragonfly.rb",
     "lib/dragonfly/active_model_extensions.rb",
     "lib/dragonfly/active_model_extensions/attachment.rb",
+    "lib/dragonfly/active_model_extensions/attachment_class_methods.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/image_magick_analyser.rb",
-    "lib/dragonfly/analysis/r_magick_analyser.rb",
     "lib/dragonfly/app.rb",
     "lib/dragonfly/config/heroku.rb",
     "lib/dragonfly/config/image_magick.rb",
-    "lib/dragonfly/config/r_magick.rb",
     "lib/dragonfly/config/rails.rb",
     "lib/dragonfly/configurable.rb",
     "lib/dragonfly/core_ext/array.rb",
@@ -87,17 +91,22 @@ Gem::Specification.new do |s|
     "lib/dragonfly/core_ext/string.rb",
     "lib/dragonfly/core_ext/symbol.rb",
     "lib/dragonfly/data_storage.rb",
+    "lib/dragonfly/data_storage/couch_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/encoder.rb",
     "lib/dragonfly/encoding/image_magick_encoder.rb",
-    "lib/dragonfly/encoding/r_magick_encoder.rb",
     "lib/dragonfly/function_manager.rb",
-    "lib/dragonfly/generation/hash_with_css_style_keys.rb",
     "lib/dragonfly/generation/image_magick_generator.rb",
-    "lib/dragonfly/generation/r_magick_generator.rb",
     "lib/dragonfly/generator.rb",
+    "lib/dragonfly/hash_with_css_style_keys.rb",
+    "lib/dragonfly/image_magick/analyser.rb",
+    "lib/dragonfly/image_magick/config.rb",
+    "lib/dragonfly/image_magick/encoder.rb",
+    "lib/dragonfly/image_magick/generator.rb",
+    "lib/dragonfly/image_magick/processor.rb",
+    "lib/dragonfly/image_magick/utils.rb",
     "lib/dragonfly/image_magick_utils.rb",
     "lib/dragonfly/job.rb",
     "lib/dragonfly/job_builder.rb",
@@ -106,67 +115,63 @@ Gem::Specification.new do |s|
     "lib/dragonfly/loggable.rb",
     "lib/dragonfly/middleware.rb",
     "lib/dragonfly/processing/image_magick_processor.rb",
-    "lib/dragonfly/processing/r_magick_processor.rb",
     "lib/dragonfly/processor.rb",
-    "lib/dragonfly/r_magick_utils.rb",
     "lib/dragonfly/rails/images.rb",
     "lib/dragonfly/response.rb",
     "lib/dragonfly/routed_endpoint.rb",
     "lib/dragonfly/serializer.rb",
+    "lib/dragonfly/server.rb",
     "lib/dragonfly/simple_cache.rb",
-    "lib/dragonfly/simple_endpoint.rb",
     "lib/dragonfly/temp_object.rb",
+    "lib/dragonfly/url_mapper.rb",
     "samples/beach.png",
     "samples/egg.png",
     "samples/round.gif",
     "samples/sample.docx",
     "samples/taj.jpg",
-    "spec/argument_matchers.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/image_magick_analyser_spec.rb",
-    "spec/dragonfly/analysis/r_magick_analyser_spec.rb",
-    "spec/dragonfly/analysis/shared_analyser_spec.rb",
     "spec/dragonfly/app_spec.rb",
-    "spec/dragonfly/config/r_magick_spec.rb",
     "spec/dragonfly/configurable_spec.rb",
     "spec/dragonfly/core_ext/array_spec.rb",
     "spec/dragonfly/core_ext/hash_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/couch_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/encoding/image_magick_encoder_spec.rb",
-    "spec/dragonfly/encoding/r_magick_encoder_spec.rb",
+    "spec/dragonfly/data_storage/shared_data_store_examples.rb",
     "spec/dragonfly/function_manager_spec.rb",
-    "spec/dragonfly/generation/hash_with_css_style_keys_spec.rb",
-    "spec/dragonfly/generation/image_magick_generator_spec.rb",
-    "spec/dragonfly/generation/r_magick_generator_spec.rb",
-    "spec/dragonfly/generation/shared_generator_spec.rb",
-    "spec/dragonfly/image_magick_utils_spec.rb",
+    "spec/dragonfly/hash_with_css_style_keys_spec.rb",
+    "spec/dragonfly/image_magick/analyser_spec.rb",
+    "spec/dragonfly/image_magick/encoder_spec.rb",
+    "spec/dragonfly/image_magick/generator_spec.rb",
+    "spec/dragonfly/image_magick/processor_spec.rb",
+    "spec/dragonfly/image_magick/utils_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/processing/image_magick_processor_spec.rb",
-    "spec/dragonfly/processing/r_magick_processor_spec.rb",
-    "spec/dragonfly/processing/shared_processing_spec.rb",
     "spec/dragonfly/routed_endpoint_spec.rb",
     "spec/dragonfly/serializer_spec.rb",
+    "spec/dragonfly/server_spec.rb",
     "spec/dragonfly/simple_cache_spec.rb",
-    "spec/dragonfly/simple_endpoint_spec.rb",
     "spec/dragonfly/temp_object_spec.rb",
-    "spec/image_matchers.rb",
-    "spec/simple_matchers.rb",
+    "spec/dragonfly/url_mapper_spec.rb",
+    "spec/functional/deprecations_spec.rb",
+    "spec/functional/image_magick_app_spec.rb",
+    "spec/functional/model_urls_spec.rb",
+    "spec/functional/remote_on_the_fly_spec.rb",
+    "spec/functional/to_response_spec.rb",
     "spec/spec_helper.rb",
+    "spec/support/argument_matchers.rb",
+    "spec/support/image_matchers.rb",
+    "spec/support/simple_matchers.rb",
     "yard/handlers/configurable_attr_handler.rb",
     "yard/setup.rb",
     "yard/templates/default/fulldoc/html/css/common.css",
@@ -174,74 +179,120 @@ Gem::Specification.new do |s|
     "yard/templates/default/module/html/configuration_summary.erb",
     "yard/templates/default/module/setup.rb"
   ]
-  s.homepage = "http://github.com/markevans/dragonfly"
+  s.homepage = %q{http://github.com/markevans/dragonfly}
+  s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.24"
-  s.summary = "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.rubygems_version = %q{1.5.2}
+  s.summary = %q{Ideal gem for handling attachments in Rails, Sinatra and Rack applications.}
+  s.test_files = [
+    "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/app_spec.rb",
+    "spec/dragonfly/configurable_spec.rb",
+    "spec/dragonfly/core_ext/array_spec.rb",
+    "spec/dragonfly/core_ext/hash_spec.rb",
+    "spec/dragonfly/core_ext/string_spec.rb",
+    "spec/dragonfly/core_ext/symbol_spec.rb",
+    "spec/dragonfly/data_storage/couch_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/data_storage/shared_data_store_examples.rb",
+    "spec/dragonfly/function_manager_spec.rb",
+    "spec/dragonfly/hash_with_css_style_keys_spec.rb",
+    "spec/dragonfly/image_magick/analyser_spec.rb",
+    "spec/dragonfly/image_magick/encoder_spec.rb",
+    "spec/dragonfly/image_magick/generator_spec.rb",
+    "spec/dragonfly/image_magick/processor_spec.rb",
+    "spec/dragonfly/image_magick/utils_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/routed_endpoint_spec.rb",
+    "spec/dragonfly/serializer_spec.rb",
+    "spec/dragonfly/server_spec.rb",
+    "spec/dragonfly/simple_cache_spec.rb",
+    "spec/dragonfly/temp_object_spec.rb",
+    "spec/dragonfly/url_mapper_spec.rb",
+    "spec/functional/deprecations_spec.rb",
+    "spec/functional/image_magick_app_spec.rb",
+    "spec/functional/model_urls_spec.rb",
+    "spec/functional/remote_on_the_fly_spec.rb",
+    "spec/functional/to_response_spec.rb",
+    "spec/spec_helper.rb",
+    "spec/support/argument_matchers.rb",
+    "spec/support/image_matchers.rb",
+    "spec/support/simple_matchers.rb"
+  ]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<aws-s3>, [">= 0"])
+      s.add_runtime_dependency(%q<rack>, [">= 0"])
       s.add_development_dependency(%q<capybara>, [">= 0"])
-      s.add_development_dependency(%q<cucumber>, [">= 0"])
-      s.add_development_dependency(%q<cucumber-rails>, [">= 0"])
-      s.add_development_dependency(%q<database_cleaner>, [">= 0.5.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.4"])
-      s.add_development_dependency(%q<gherkin>, ["~> 2.11.6"])
+      s.add_development_dependency(%q<cucumber>, ["~> 0.10.0"])
+      s.add_development_dependency(%q<cucumber-rails>, ["~> 0.3.2"])
+      s.add_development_dependency(%q<database_cleaner>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_development_dependency(%q<fog>, [">= 0"])
       s.add_development_dependency(%q<mongo>, [">= 0"])
-      s.add_development_dependency(%q<nokogiri>, ["= 1.5.0.beta.2"])
-      s.add_development_dependency(%q<rack>, ["~> 1.1"])
+      s.add_development_dependency(%q<couchrest>, ["~> 1.0"])
       s.add_development_dependency(%q<rack-cache>, [">= 0"])
-      s.add_development_dependency(%q<rails>, ["= 3.0.3"])
-      s.add_development_dependency(%q<rake>, ["= 0.8.7"])
-      s.add_development_dependency(%q<rspec>, ["~> 1.3"])
+      s.add_development_dependency(%q<rails>, ["= 3.0.5"])
+      s.add_development_dependency(%q<rake>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.5"])
+      s.add_development_dependency(%q<webmock>, [">= 0"])
       s.add_development_dependency(%q<yard>, [">= 0"])
+      s.add_development_dependency(%q<bluecloth>, [">= 0"])
       s.add_development_dependency(%q<bson_ext>, [">= 0"])
-      s.add_development_dependency(%q<rmagick>, ["= 2.12.2"])
-      s.add_development_dependency(%q<sqlite3-ruby>, ["= 1.3.0"])
+      s.add_development_dependency(%q<sqlite3-ruby>, [">= 0"])
       s.add_runtime_dependency(%q<rack>, [">= 0"])
     else
-      s.add_dependency(%q<aws-s3>, [">= 0"])
+      s.add_dependency(%q<rack>, [">= 0"])
       s.add_dependency(%q<capybara>, [">= 0"])
-      s.add_dependency(%q<cucumber>, [">= 0"])
-      s.add_dependency(%q<cucumber-rails>, [">= 0"])
-      s.add_dependency(%q<database_cleaner>, [">= 0.5.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.4"])
-      s.add_dependency(%q<gherkin>, ["~> 2.11.6"])
+      s.add_dependency(%q<cucumber>, ["~> 0.10.0"])
+      s.add_dependency(%q<cucumber-rails>, ["~> 0.3.2"])
+      s.add_dependency(%q<database_cleaner>, [">= 0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_dependency(%q<fog>, [">= 0"])
       s.add_dependency(%q<mongo>, [">= 0"])
-      s.add_dependency(%q<nokogiri>, ["= 1.5.0.beta.2"])
-      s.add_dependency(%q<rack>, ["~> 1.1"])
+      s.add_dependency(%q<couchrest>, ["~> 1.0"])
       s.add_dependency(%q<rack-cache>, [">= 0"])
-      s.add_dependency(%q<rails>, ["= 3.0.3"])
-      s.add_dependency(%q<rake>, ["= 0.8.7"])
-      s.add_dependency(%q<rspec>, ["~> 1.3"])
+      s.add_dependency(%q<rails>, ["= 3.0.5"])
+      s.add_dependency(%q<rake>, [">= 0"])
+      s.add_dependency(%q<rspec>, ["~> 2.5"])
+      s.add_dependency(%q<webmock>, [">= 0"])
       s.add_dependency(%q<yard>, [">= 0"])
+      s.add_dependency(%q<bluecloth>, [">= 0"])
       s.add_dependency(%q<bson_ext>, [">= 0"])
-      s.add_dependency(%q<rmagick>, ["= 2.12.2"])
-      s.add_dependency(%q<sqlite3-ruby>, ["= 1.3.0"])
+      s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
       s.add_dependency(%q<rack>, [">= 0"])
     end
   else
-    s.add_dependency(%q<aws-s3>, [">= 0"])
+    s.add_dependency(%q<rack>, [">= 0"])
     s.add_dependency(%q<capybara>, [">= 0"])
-    s.add_dependency(%q<cucumber>, [">= 0"])
-    s.add_dependency(%q<cucumber-rails>, [">= 0"])
-    s.add_dependency(%q<database_cleaner>, [">= 0.5.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.4"])
-    s.add_dependency(%q<gherkin>, ["~> 2.11.6"])
+    s.add_dependency(%q<cucumber>, ["~> 0.10.0"])
+    s.add_dependency(%q<cucumber-rails>, ["~> 0.3.2"])
+    s.add_dependency(%q<database_cleaner>, [">= 0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+    s.add_dependency(%q<fog>, [">= 0"])
     s.add_dependency(%q<mongo>, [">= 0"])
-    s.add_dependency(%q<nokogiri>, ["= 1.5.0.beta.2"])
-    s.add_dependency(%q<rack>, ["~> 1.1"])
+    s.add_dependency(%q<couchrest>, ["~> 1.0"])
     s.add_dependency(%q<rack-cache>, [">= 0"])
-    s.add_dependency(%q<rails>, ["= 3.0.3"])
-    s.add_dependency(%q<rake>, ["= 0.8.7"])
-    s.add_dependency(%q<rspec>, ["~> 1.3"])
+    s.add_dependency(%q<rails>, ["= 3.0.5"])
+    s.add_dependency(%q<rake>, [">= 0"])
+    s.add_dependency(%q<rspec>, ["~> 2.5"])
+    s.add_dependency(%q<webmock>, [">= 0"])
     s.add_dependency(%q<yard>, [">= 0"])
+    s.add_dependency(%q<bluecloth>, [">= 0"])
     s.add_dependency(%q<bson_ext>, [">= 0"])
-    s.add_dependency(%q<rmagick>, ["= 2.12.2"])
-    s.add_dependency(%q<sqlite3-ruby>, ["= 1.3.0"])
+    s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
     s.add_dependency(%q<rack>, [">= 0"])
   end
 end