dragonfly 0.9.12 → 0.9.13

data/Gemfile

@@ -1,21 +1,21 @@
 source :rubygems
 
 gem "rack"
+gem "multi_json", "~> 1.0"
 
 # These gems are needed for development and testing
 group :development, :test, :cucumber do
   gem 'capybara'
-  gem 'cucumber', '~>0.10.0'
-  gem 'cucumber-rails', '~>0.5.2'
+  gem 'cucumber', '~>1.2.1'
+  gem 'cucumber-rails', "~> 1.3.0"
   gem 'database_cleaner'
-  gem 'jeweler', '~> 1.5.2'
+  gem 'jeweler', '>= 1.5.2'
   gem 'fog'
   gem 'github-markup'
   gem 'mongo'
   gem 'couchrest', '~> 1.0'
   gem 'rack-cache'
-  gem 'rails', '~>3.1.0', :require => nil
-  gem 'redcarpet', '~>1.0'
+  gem 'rails', '~>3.2.0', :require => nil
   gem 'rspec', '~> 2.5'
   gem 'webmock'
   gem 'yard'
@@ -24,8 +24,9 @@ group :development, :test, :cucumber do
     gem "activerecord-jdbcsqlite3-adapter"
     gem "jruby-openssl"
   else
+    gem 'redcarpet', '~>1.0'
     gem 'bluecloth'
     gem 'bson_ext'
-    gem 'sqlite3-ruby'
+    gem 'sqlite3'
   end
 end

data/History.md

@@ -1,3 +1,9 @@
+0.9.13 (2013-01-30)
+===================
+Changes
+-------
+- URLS are encoded/decoded with JSON, not with Marshal
+
 0.9.12 (2012-04-08)
 ===================
 Features

data/README.md

@@ -13,7 +13,7 @@ For the lazy Rails user...
 
 ```ruby
 gem 'rack-cache', :require => 'rack/cache'
-gem 'dragonfly', '~>0.9.12'
+gem 'dragonfly', '~>0.9.13'
 ```
 
 **Initializer** (e.g. config/initializers/dragonfly.rb):

data/VERSION

@@ -1 +1 @@
-0.9.12
+0.9.13

data/dragonfly.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "dragonfly"
-  s.version = "0.9.12"
+  s.version = "0.9.13"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mark Evans"]
-  s.date = "2012-04-08"
+  s.date = "2013-01-30"
   s.description = "Dragonfly is a framework that enables on-the-fly processing for any content type.\n  It is especially suited to image handling. Its uses range from image thumbnails to standard attachments to on-demand text generation."
   s.email = "mark@new-bamboo.co.uk"
   s.extra_rdoc_files = [
@@ -65,6 +65,7 @@ Gem::Specification.new do |s|
     "fixtures/rails/files/features/manage_album_images.feature",
     "fixtures/rails/files/features/step_definitions/helper_steps.rb",
     "fixtures/rails/files/features/step_definitions/image_steps.rb",
+    "fixtures/rails/files/features/step_definitions/web_steps.rb",
     "fixtures/rails/files/features/support/paths.rb",
     "fixtures/rails/files/features/text_images.feature",
     "fixtures/rails/template.rb",
@@ -126,6 +127,7 @@ Gem::Specification.new do |s|
     "lib/dragonfly/temp_object.rb",
     "lib/dragonfly/url_attributes.rb",
     "lib/dragonfly/url_mapper.rb",
+    "lib/dragonfly/utils.rb",
     "samples/DSC02119.JPG",
     "samples/a.jp2",
     "samples/beach.jpg",
@@ -192,120 +194,76 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/markevans/dragonfly"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.11"
+  s.rubygems_version = "1.8.24"
   s.summary = "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/cookie_monster_spec.rb",
-    "spec/dragonfly/core_ext/array_spec.rb",
-    "spec/dragonfly/core_ext/hash_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/has_filename_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/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/shell_spec.rb",
-    "spec/dragonfly/simple_cache_spec.rb",
-    "spec/dragonfly/temp_object_spec.rb",
-    "spec/dragonfly/url_attributes.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/shell_commands_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_runtime_dependency(%q<rack>, [">= 0"])
+      s.add_runtime_dependency(%q<multi_json>, ["~> 1.0"])
       s.add_development_dependency(%q<capybara>, [">= 0"])
-      s.add_development_dependency(%q<cucumber>, ["~> 0.10.0"])
-      s.add_development_dependency(%q<cucumber-rails>, ["~> 0.5.2"])
+      s.add_development_dependency(%q<cucumber>, ["~> 1.2.1"])
+      s.add_development_dependency(%q<cucumber-rails>, ["~> 1.3.0"])
       s.add_development_dependency(%q<database_cleaner>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_development_dependency(%q<jeweler>, [">= 1.5.2"])
       s.add_development_dependency(%q<fog>, [">= 0"])
       s.add_development_dependency(%q<github-markup>, [">= 0"])
       s.add_development_dependency(%q<mongo>, [">= 0"])
       s.add_development_dependency(%q<couchrest>, ["~> 1.0"])
       s.add_development_dependency(%q<rack-cache>, [">= 0"])
-      s.add_development_dependency(%q<rails>, ["~> 3.1.0"])
-      s.add_development_dependency(%q<redcarpet>, ["~> 1.0"])
+      s.add_development_dependency(%q<rails>, ["~> 3.2.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<redcarpet>, ["~> 1.0"])
       s.add_development_dependency(%q<bluecloth>, [">= 0"])
       s.add_development_dependency(%q<bson_ext>, [">= 0"])
-      s.add_development_dependency(%q<sqlite3-ruby>, [">= 0"])
+      s.add_development_dependency(%q<sqlite3>, [">= 0"])
     else
       s.add_dependency(%q<rack>, [">= 0"])
+      s.add_dependency(%q<multi_json>, ["~> 1.0"])
       s.add_dependency(%q<capybara>, [">= 0"])
-      s.add_dependency(%q<cucumber>, ["~> 0.10.0"])
-      s.add_dependency(%q<cucumber-rails>, ["~> 0.5.2"])
+      s.add_dependency(%q<cucumber>, ["~> 1.2.1"])
+      s.add_dependency(%q<cucumber-rails>, ["~> 1.3.0"])
       s.add_dependency(%q<database_cleaner>, [">= 0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_dependency(%q<jeweler>, [">= 1.5.2"])
       s.add_dependency(%q<fog>, [">= 0"])
       s.add_dependency(%q<github-markup>, [">= 0"])
       s.add_dependency(%q<mongo>, [">= 0"])
       s.add_dependency(%q<couchrest>, ["~> 1.0"])
       s.add_dependency(%q<rack-cache>, [">= 0"])
-      s.add_dependency(%q<rails>, ["~> 3.1.0"])
-      s.add_dependency(%q<redcarpet>, ["~> 1.0"])
+      s.add_dependency(%q<rails>, ["~> 3.2.0"])
       s.add_dependency(%q<rspec>, ["~> 2.5"])
       s.add_dependency(%q<webmock>, [">= 0"])
       s.add_dependency(%q<yard>, [">= 0"])
+      s.add_dependency(%q<redcarpet>, ["~> 1.0"])
       s.add_dependency(%q<bluecloth>, [">= 0"])
       s.add_dependency(%q<bson_ext>, [">= 0"])
-      s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
+      s.add_dependency(%q<sqlite3>, [">= 0"])
     end
   else
     s.add_dependency(%q<rack>, [">= 0"])
+    s.add_dependency(%q<multi_json>, ["~> 1.0"])
     s.add_dependency(%q<capybara>, [">= 0"])
-    s.add_dependency(%q<cucumber>, ["~> 0.10.0"])
-    s.add_dependency(%q<cucumber-rails>, ["~> 0.5.2"])
+    s.add_dependency(%q<cucumber>, ["~> 1.2.1"])
+    s.add_dependency(%q<cucumber-rails>, ["~> 1.3.0"])
     s.add_dependency(%q<database_cleaner>, [">= 0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+    s.add_dependency(%q<jeweler>, [">= 1.5.2"])
     s.add_dependency(%q<fog>, [">= 0"])
     s.add_dependency(%q<github-markup>, [">= 0"])
     s.add_dependency(%q<mongo>, [">= 0"])
     s.add_dependency(%q<couchrest>, ["~> 1.0"])
     s.add_dependency(%q<rack-cache>, [">= 0"])
-    s.add_dependency(%q<rails>, ["~> 3.1.0"])
-    s.add_dependency(%q<redcarpet>, ["~> 1.0"])
+    s.add_dependency(%q<rails>, ["~> 3.2.0"])
     s.add_dependency(%q<rspec>, ["~> 2.5"])
     s.add_dependency(%q<webmock>, [">= 0"])
     s.add_dependency(%q<yard>, [">= 0"])
+    s.add_dependency(%q<redcarpet>, ["~> 1.0"])
     s.add_dependency(%q<bluecloth>, [">= 0"])
     s.add_dependency(%q<bson_ext>, [">= 0"])
-    s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
+    s.add_dependency(%q<sqlite3>, [">= 0"])
   end
 end
 

data/extra_docs/Rails3.md

@@ -35,7 +35,7 @@ application.rb:
 Gemfile
 -------
 
-    gem 'dragonfly', '~>0.9.12'
+    gem 'dragonfly', '~>0.9.13'
     gem 'rack-cache', :require => 'rack/cache'
 
 Capistrano

data/features/no_processing.feature

@@ -10,5 +10,5 @@ Feature: winner uses dragonfly to serve different kinds of files
     Given a stored file "sample.docx"
     When I go to the url for "sample.docx"
     Then the response should be OK
-    And the response should have mime-type 'application/zip'
+    And the response should have mime-type 'application/vnd.openxmlformats-officedocument.wordprocessingml.document'
     And the response should have the same content as the file "sample.docx"

data/fixtures/rails/files/app/models/album.rb

@@ -1,4 +1,5 @@
 class Album < ActiveRecord::Base
+  attr_accessible :name, :retained_cover_image, :cover_image
   validates_property :format, :of => :cover_image, :in => [:jpg, :png, :gif]
   validates_length_of :name, :in => 0..5
   image_accessor :cover_image

data/fixtures/rails/files/features/step_definitions/web_steps.rb

@@ -0,0 +1,189 @@
+require 'uri'
+require 'cgi'
+require File.expand_path(File.join(File.dirname(__FILE__), "..", "support", "paths"))
+
+module WithinHelpers
+  def with_scope(locator)
+    locator ? within(*selector_for(locator)) { yield } : yield
+  end
+end
+World(WithinHelpers)
+
+# Single-line step scoper
+When /^(.*) within (.*[^:])$/ do |step, parent|
+  with_scope(parent) { When step }
+end
+
+# Multi-line step scoper
+When /^(.*) within (.*[^:]):$/ do |step, parent, table_or_string|
+  with_scope(parent) { When "#{step}:", table_or_string }
+end
+
+Given /^(?:|I )am on (.+)$/ do |page_name|
+  visit path_to(page_name)
+end
+
+When /^(?:|I )go to (.+)$/ do |page_name|
+  visit path_to(page_name)
+end
+
+When /^(?:|I )press "([^"]*)"$/ do |button|
+  click_button(button)
+end
+
+When /^(?:|I )follow "([^"]*)"$/ do |link|
+  click_link(link)
+end
+
+When /^(?:|I )fill in "([^"]*)" with "([^"]*)"$/ do |field, value|
+  fill_in(field, :with => value)
+end
+
+When /^(?:|I )fill in "([^"]*)" for "([^"]*)"$/ do |value, field|
+  fill_in(field, :with => value)
+end
+
+# Use this to fill in an entire form with data from a table. Example:
+#
+#   When I fill in the following:
+#     | Account Number | 5002       |
+#     | Expiry date    | 2009-11-01 |
+#     | Note           | Nice guy   |
+#     | Wants Email?   |            |
+#
+# TODO: Add support for checkbox, select og option
+# based on naming conventions.
+#
+When /^(?:|I )fill in the following:$/ do |fields|
+  fields.rows_hash.each do |name, value|
+    When %{I fill in "#{name}" with "#{value}"}
+  end
+end
+
+When /^(?:|I )select "([^"]*)" from "([^"]*)"$/ do |value, field|
+  select(value, :from => field)
+end
+
+When /^(?:|I )check "([^"]*)"$/ do |field|
+  check(field)
+end
+
+When /^(?:|I )uncheck "([^"]*)"$/ do |field|
+  uncheck(field)
+end
+
+When /^(?:|I )choose "([^"]*)"$/ do |field|
+  choose(field)
+end
+
+When /^(?:|I )attach the file "([^"]*)" to "([^"]*)"$/ do |path, field|
+  attach_file(field, File.expand_path(path))
+end
+
+Then /^(?:|I )should see "([^"]*)"$/ do |text|
+  if page.respond_to? :should
+    page.should have_content(text)
+  else
+    assert page.has_content?(text)
+  end
+end
+
+Then /^(?:|I )should see \/([^\/]*)\/$/ do |regexp|
+  regexp = Regexp.new(regexp)
+
+  if page.respond_to? :should
+    page.should have_xpath('//*', :text => regexp)
+  else
+    assert page.has_xpath?('//*', :text => regexp)
+  end
+end
+
+Then /^(?:|I )should not see "([^"]*)"$/ do |text|
+  if page.respond_to? :should
+    page.should have_no_content(text)
+  else
+    assert page.has_no_content?(text)
+  end
+end
+
+Then /^(?:|I )should not see \/([^\/]*)\/$/ do |regexp|
+  regexp = Regexp.new(regexp)
+
+  if page.respond_to? :should
+    page.should have_no_xpath('//*', :text => regexp)
+  else
+    assert page.has_no_xpath?('//*', :text => regexp)
+  end
+end
+
+Then /^the "([^"]*)" field(?: within (.*))? should contain "([^"]*)"$/ do |field, parent, value|
+  with_scope(parent) do
+    field = find_field(field)
+    field_value = (field.tag_name == 'textarea') ? field.text : field.value
+    if field_value.respond_to? :should
+      field_value.should =~ /#{value}/
+    else
+      assert_match(/#{value}/, field_value)
+    end
+  end
+end
+
+Then /^the "([^"]*)" field(?: within (.*))? should not contain "([^"]*)"$/ do |field, parent, value|
+  with_scope(parent) do
+    field = find_field(field)
+    field_value = (field.tag_name == 'textarea') ? field.text : field.value
+    if field_value.respond_to? :should_not
+      field_value.should_not =~ /#{value}/
+    else
+      assert_no_match(/#{value}/, field_value)
+    end
+  end
+end
+
+Then /^the "([^"]*)" checkbox(?: within (.*))? should be checked$/ do |label, parent|
+  with_scope(parent) do
+    field_checked = find_field(label)['checked']
+    if field_checked.respond_to? :should
+      field_checked.should be_true
+    else
+      assert field_checked
+    end
+  end
+end
+
+Then /^the "([^"]*)" checkbox(?: within (.*))? should not be checked$/ do |label, parent|
+  with_scope(parent) do
+    field_checked = find_field(label)['checked']
+    if field_checked.respond_to? :should
+      field_checked.should be_false
+    else
+      assert !field_checked
+    end
+  end
+end
+ 
+Then /^(?:|I )should be on (.+)$/ do |page_name|
+  current_path = URI.parse(current_url).path
+  if current_path.respond_to? :should
+    current_path.should == path_to(page_name)
+  else
+    assert_equal path_to(page_name), current_path
+  end
+end
+
+Then /^(?:|I )should have the following query string:$/ do |expected_pairs|
+  query = URI.parse(current_url).query
+  actual_params = query ? CGI.parse(query) : {}
+  expected_params = {}
+  expected_pairs.rows_hash.each_pair{|k,v| expected_params[k] = v.split(',')} 
+  
+  if actual_params.respond_to? :should
+    actual_params.should == expected_params
+  else
+    assert_equal expected_params, actual_params
+  end
+end
+
+Then /^show me the page$/ do
+  save_and_open_page
+end