dragonfly 0.4.4 → 0.5.0

data/.gitignore

@@ -6,3 +6,4 @@ pkg
 .yardoc
 doc
 tmp
+fixtures/*/tmp_app

data/History.txt

@@ -1,3 +1,11 @@
+0.5.0 (2010-02-20)
+==================
+
+Added support
+-------------
+- support for Rails 3
+
+
 0.4.4 (2010-02-16)
 ==================
 

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 Mark Evans
+Copyright (c) 2009-2010 Mark Evans
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -4,28 +4,42 @@ 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.
 
-For the lazy rails user
+For the lazy Rails user
 -----------------------
 To use simply for image thumbnails etc. in Rails...
 
-environment.rb:
+**environment.rb** (Rails 2.3 only):
 
     config.gem 'rmagick',    :lib => 'RMagick'
     config.gem 'rack-cache', :lib => 'rack/cache'
-    config.gem 'dragonfly',  :lib => 'dragonfly/rails/images', :source => 'http://gemcutter.org'
+    config.gem 'dragonfly'
 
-Migration:
+**Gemfile** (Rails 3 only):
+
+    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.
+
+**Initializer** (e.g. config/initializers/dragonfly.rb):
+
+    require 'dragonfly/rails/images'
+
+**Migration**:
 
     add_column :albums, :cover_image_uid, :string
 
-Model:
+**Model**:
 
     class Album < ActiveRecord::Base
       image_accessor :cover_image            # Defines reader/writer for cover_image
       # ...
     end
 
-View (for uploading via a file field):
+**View** (for uploading via a file field):
 
     <% form_for @album, :html => {:multipart => true} do |f| %>
       ...
@@ -34,7 +48,7 @@ View (for uploading via a file field):
     <% end %>
 
 
-View (to display):
+**View** (to display):
 
     <%= image_tag @album.cover_image.url(:gif) %>
     <%= image_tag @album.cover_image.url('400x200') %>
@@ -67,4 +81,4 @@ Credits
 Copyright
 ========
 
-Copyright (c) 2009 Mark Evans. See LICENSE for details.
+Copyright (c) 2009-2010 Mark Evans. See LICENSE for details.

data/Rakefile

@@ -16,8 +16,10 @@ begin
     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
@@ -70,4 +72,33 @@ rescue LoadError
   puts "Cucumber is not available. To run features, install it with: (sudo) gem install cucumber"
 end
 
-task :default => [:spec, :features]
+begin
+  require 'ginger'
+rescue LoadError
+  puts "To run 'rake', to test everything, you need the Ginger gem. Install it with: (sudo) gem install ginger"
+end
+task :default do
+  system 'ginger spec && rake features'
+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
+
+end

data/VERSION

@@ -1 +1 @@
-0.4.4
+0.5.0

data/dragonfly.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dragonfly}
-  s.version = "0.4.4"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mark Evans"]
-  s.date = %q{2010-02-16}
+  s.date = %q{2010-02-20}
   s.email = %q{mark@new-bamboo.co.uk}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -39,9 +39,23 @@ Gem::Specification.new do |s|
      "extra_docs/UsingWithRails.md",
      "features/images.feature",
      "features/no_processing.feature",
+     "features/rails_2.3.5.feature",
+     "features/rails_3.0.0.beta.feature",
      "features/steps/common_steps.rb",
      "features/steps/dragonfly_steps.rb",
+     "features/steps/rails_steps.rb",
      "features/support/env.rb",
+     "fixtures/dragonfly_setup.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/aaa_dragonfly_load_path.rb",
+     "fixtures/files/features/manage_album_images.feature",
+     "fixtures/files/features/step_definitions/album_steps.rb",
+     "fixtures/files/features/support/paths.rb",
+     "fixtures/rails",
+     "fixtures/rails_2.3.5/template.rb",
+     "fixtures/rails_3.0.0.beta/template.rb",
      "generators/dragonfly_app/USAGE",
      "generators/dragonfly_app/dragonfly_app_generator.rb",
      "generators/dragonfly_app/templates/initializer.erb",
@@ -115,6 +129,7 @@ Gem::Specification.new do |s|
      "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",
@@ -157,6 +172,7 @@ Gem::Specification.new do |s|
      "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"
@@ -174,8 +190,10 @@ Gem::Specification.new do |s|
       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"])
@@ -184,8 +202,10 @@ Gem::Specification.new do |s|
       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"])
@@ -195,8 +215,10 @@ Gem::Specification.new do |s|
     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
 

data/extra_docs/Processing.md

@@ -43,6 +43,8 @@ Each method takes the temp_object, and the (optional) processing options hash as
 
     end
 
+    app = Dragonfly::App[:images]
+    
     app.register_processor(MyProcessor)
     
     temp_object = app.create_object(File.new('path/to/image.png'))
@@ -56,3 +58,41 @@ As with analysers and encoders, if the processor is {Dragonfly::Configurable con
     app.register_processor(MyProcessor) do |p|
       p.some_attribute = 'hello'
     end
+
+To get the url for content processed by your custom processor, the long way is using something like:
+
+    app.url_for('some_uid',
+      :processing_method => :black_and_white,
+      :processing_options => {:size => '30x30'},
+      :format => :png
+    )
+
+or if using an activerecord model,
+
+    my_model.preview_image.url('some_uid',
+      :processing_method => :black_and_white,
+      :processing_options => {:size => '30x30'},
+      :format => :png
+    )
+
+However, this could soon get tedious if using more than once, so the best thing is to register a shortcut for it.
+So in your configuration of the Dragonfly app (or in an initializer if using 'dragonfly/rails/images') you
+could do something like:
+
+    Dragonfly::App[:images].parameters.add_shortcut(/^bw-(\d*x\d*)$/) do |string, match_data|
+      {
+        :processing_method => :black_and_white,
+        :processing_options => {:size => match_data[1]},
+        :format => :png
+      }
+    end
+    
+Now you can get urls by using the shortcut:
+
+    app.url_for('some_uid', 'bw-30x30')
+
+or with activerecord:
+
+    my_model.preview_image.url('bw-30x30')
+
+For more information about shortcuts, see {file:Shortcuts}.

data/extra_docs/UsingWithRails.md

@@ -1,64 +1,40 @@
 Using With Rails
 ================
 
+Dragonfly works with both Rails 2.3 and Rails 3.
+
 The main way to use Dragonfly with Rails is as a {Dragonfly::Middleware middleware}.
 
+1. The initializer
+------------------
+
 The quick way
 -------------
-In environment.rb:
+There is a ready-made file which sets up Dragonfly for image processing for your rails app.
+If image resizing, etc. is all you want to do, then put this in an initializer, e.g config/initializers/dragonfly.rb:
 
-    config.gem 'rmagick',    :lib => 'RMagick'
-    config.gem 'rack-cache', :lib => 'rack/cache'
-    config.gem 'dragonfly',  :lib => 'dragonfly/rails/images', :source => 'http://gemcutter.org'
+    require 'dragonfly/rails/images'
 
-The required file 'dragonfly/rails/images.rb' initializes a dragonfly app, configures it to use rmagick processing, encoding, etc.,
+This file initializes a dragonfly app, configures it to use rmagick processing, encoding, etc.,
 registers the app so that you can use ActiveRecord accessors, and inserts it into the Rails middleware stack.
 
-Because in this case it's configured to use {http://tomayko.com/src/rack-cache/ rack-cache} and {http://rmagick.rubyforge.org/ rmagick},
-you should include the first two lines above.
-
-To see what you can do with the active record accessors, see {file:ActiveRecord}.
-
-The more explicit way - using an initializer
---------------------------------------------
-If you want more control over the configuration, you can do what the file 'dragonfly/rails/images' does yourself,
-in an initializer.
-
-In that case in environment.rb we only need:
-
-    config.gem 'rmagick',    :lib => 'RMagick'                 # if used
-    config.gem 'rack-cache', :lib => 'rack/cache'              # if used
-    config.gem 'dragonfly',  :source => 'http://gemcutter.org'
-
-The easiest way to create the initializer is using the supplied generator
-(which will be visible if you have the dragonfly gem installed).
-
-    ./script/generate dragonfly_app images
-    
-The argument 'images' could be anything - it is an arbitrary app name.
-
-This creates an initializer 'dragonfly_images' which does the following:
-
-1. Creates and configures a dragonfly app
-2. Registers the app for use with ActiveRecord - see {file:ActiveRecord}
-3. Inserts the app into the Rails middleware stack
-
-For reference, the contents of an example initializer are shown below.
-You could just copy and paste this yourself into an initializer if you prefer,
-but make sure to change the 'secret' configuration option, so as to protect your app from Denial-of-Service attacks (see {file:GettingStarted}).
+The more explicit way
+---------------------
+If you want to set up and configure the Dragonfly app yourself, then you can put something like the code below in an initializer and
+modify accordingly:
 
     require 'dragonfly'
 
-    # Configuration
+    # Set up and configure the dragonfly app
     app = Dragonfly::App[:images]
     app.configure_with(Dragonfly::RMagickConfiguration)
     app.configure do |c|
-      c.log = RAILS_DEFAULT_LOGGER
+      c.log = Rails.logger
       c.datastore.configure do |d|
         d.root_path = "#{Rails.root}/public/system/dragonfly/#{Rails.env}"
       end
       c.url_handler.configure do |u|
-        u.secret = 'fed49e269eebed54cc85b28a6c51cba6a543e7b5'
+        u.secret = 'insert some secret here to protect from DOS attacks!'
         u.path_prefix = '/media'
       end
     end
@@ -70,18 +46,48 @@ but make sure to change the 'secret' configuration option, so as to protect your
     ActiveRecord::Base.extend Dragonfly::ActiveRecordExtensions
     ActiveRecord::Base.register_dragonfly_app(:image, Dragonfly::App[:images])
 
-    # Add the Dragonfly App to the middleware stack
-    ActionController::Dispatcher.middleware.insert_after ActionController::Failsafe, Dragonfly::Middleware, :images
+    ### Insert the middleware ###
+    # Where the middleware is depends on the version of Rails
+    middleware = Rails.respond_to?(:application) ? Rails.application.middleware : ActionController::Dispatcher.middleware
+    middleware.insert_after Rack::Lock, Dragonfly::Middleware, :images
 
-    # # UNCOMMENT THIS IF YOU WANT TO CACHE REQUESTS WITH Rack::Cache, and add the line
-    # #   config.gem 'rack-cache', :lib => 'rack/cache'
-    # # to environment.rb
+    # # UNCOMMENT THIS IF YOU WANT TO CACHE REQUESTS WITH Rack::Cache
     # require 'rack/cache'
-    # ActionController::Dispatcher.middleware.insert_before Dragonfly::Middleware, Rack::Cache, {
+    # middleware.insert_before Dragonfly::Middleware, Rack::Cache, {
     #   :verbose     => true,
     #   :metastore   => "file:#{Rails.root}/tmp/dragonfly/cache/meta",
     #   :entitystore => "file:#{Rails.root}/tmp/dragonfly/cache/body"
     # }
 
+If you can't be bothered to copy and paste, then there's actually a generator for Rails 2.3 (not Rails 3 yet) that will do something like the above for you:
+
+    ./script/generate dragonfly_app images
+
+2. Gem dependencies
+-------------------
+
+Tell Rails about the gem dependencies in the usual way:
+
+For Rails 2.3 add this to config/environment.rb:
+
+    config.gem 'rmagick',    :lib => 'RMagick'      # only if used
+    config.gem 'rack-cache', :lib => 'rack/cache'   # only if used
+    config.gem 'dragonfly'
+
+For Rails 3 add it to the Gemfile, e.g.:
+
+    gem 'rmagick',    :require => 'RMagick'         # only if used
+    gem 'rack-cache', :require => 'rack/cache'      # only if used
+    gem 'dragonfly'
+
+You only need the lines above for {http://tomayko.com/src/rack-cache/ rack-cache} and
+{http://rmagick.rubyforge.org/ rmagick} if you've used the file 'dragonfly/rails/images', or manually used them yourself.
+
+3. Use it!
+----------
+
+Now that you have a parasitic Dragonfly app living inside your Rails app, you can upload media to your models, display/play around with them, etc.
 
 To see what you can do with the active record accessors, see {file:ActiveRecord}.
+
+For more info about general Dragonfly setup, including avoiding denial-of-service attacks, see {file:GettingStarted}.

data/features/rails_2.3.5.feature

@@ -0,0 +1,14 @@
+Feature: champion uses dragonfly in his Rails 2.3.5 application
+  In order to be a champion
+  A user uses dragonfly in his Rails 2.3.5 application
+
+  Background:
+    Given a Rails 2.3.5 application set up for using dragonfly
+
+  Scenario: Set up dragonfly using the generator
+    When I use the Rails 2.3.5 generator to set up dragonfly
+    Then the cucumber features in my Rails 2.3.5 app should pass
+
+  Scenario: Set up dragonfly using the provided initializer
+    When I use the provided 2.3.5 initializer
+    Then the cucumber features in my Rails 2.3.5 app should pass

data/features/rails_3.0.0.beta.feature

@@ -0,0 +1,15 @@
+Feature: champion uses dragonfly in his Rails 3.0.0.beta application
+  In order to be a champion
+  A user uses dragonfly in his Rails 3.0.0.beta application
+
+  Background:
+    Given PENDING: Neither cucumber generators nor Rails templates seem to be working properly yet for Rails 3
+    Given a Rails 3.0.0.beta application set up for using dragonfly
+
+  Scenario: Set up dragonfly using the generator
+    When I use the Rails 3.0.0.beta generator to set up dragonfly
+    Then the cucumber features in my Rails 3.0.0.beta app should pass
+
+  Scenario: Set up dragonfly using bundler require
+    When I use the provided 3.0.0.beta initializer
+    Then the cucumber features in my Rails 3.0.0.beta app should pass

data/features/steps/rails_steps.rb

@@ -0,0 +1,38 @@
+RAILS_APP_NAME = 'tmp_app'
+FIXTURES_PATH = File.expand_path(File.dirname(__FILE__) + "/../../fixtures")
+
+def fixture_path(version)
+  "#{FIXTURES_PATH}/rails_#{version}"
+end
+
+def app_path(version)
+  "#{fixture_path(version)}/#{RAILS_APP_NAME}"
+end
+
+##############################################################################
+
+Given /^a Rails (.+) application set up for using dragonfly$/ do |version|
+  raise "Problem setting up Rails app" unless `
+    cd #{fixture_path(version)} &&
+    rm -rf #{RAILS_APP_NAME} &&
+    ../rails _#{version}_ #{RAILS_APP_NAME} -m template.rb`
+end
+
+When /^I use the Rails (.+) generator to set up dragonfly$/ do |version|
+  raise "Problem using the generator" unless `
+    cd #{fixture_path(version)}/#{RAILS_APP_NAME} &&
+    ./script/generate dragonfly_app images`
+end
+
+When /^I use the provided (.+) initializer$/ do |version|
+  FileUtils.cp("#{FIXTURES_PATH}/dragonfly_setup.rb", "#{app_path(version)}/config/initializers")
+end
+
+Then /^the cucumber features in my Rails (.+) app should pass$/ do |version|
+  puts "\n*** RUNNING FEATURES IN THE RAILS APP... ***\n"
+  path = File.join(fixture_path(version), RAILS_APP_NAME)
+  `cd #{path} && RAILS_ENV=cucumber rake db:migrate`
+  features_passed = system "cd #{path} && cucumber features"
+  puts "\n*** FINISHED RUNNING FEATURES IN THE RAILS APP ***\n"
+  raise "Features failed" unless features_passed
+end

data/fixtures/dragonfly_setup.rb

@@ -0,0 +1 @@
+require 'dragonfly/rails/images'

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

@@ -0,0 +1,3 @@
+class Album < ActiveRecord::Base
+  image_accessor :cover_image
+end

data/fixtures/files/app/views/albums/new.html.erb

@@ -0,0 +1,4 @@
+<% form_for @album, :html => {:multipart => true} do |f| %>
+    <%= f.file_field :cover_image %>
+    <%= f.submit 'Create' %>
+<% end %>

data/fixtures/files/app/views/albums/show.html.erb

@@ -0,0 +1,3 @@
+Look at this cover image!
+<%= image_tag @album.cover_image.url('200x100!') %>
+<%= link_to 'Index', albums_path %>

data/fixtures/files/config/initializers/aaa_dragonfly_load_path.rb

@@ -0,0 +1,3 @@
+# This is a hack to get the generated rails apps to use the version of dragonfly being worked on.
+$:.unshift(File.expand_path(File.dirname(__FILE__)+'/../../../../../lib'))
+

data/fixtures/files/features/manage_album_images.feature

@@ -0,0 +1,12 @@
+Feature: champion adds cover images to his albums
+  In order to be a champion
+  A user adds an image to his album
+
+  Scenario: Add and view image
+    When I go to the new album page
+    And I attach the file "../../../samples/beach.png" to "album[cover_image]"
+    And I press "Create"
+    Then I should see "successfully created"
+    And I should see "Look at this cover image!"
+    When I look at the generated beach image
+    And I should see a JPEG image of size 200x100

data/fixtures/files/features/step_definitions/album_steps.rb

@@ -0,0 +1,14 @@
+When /^I look at the generated (.+) image$/ do |image_name|
+  page.body =~ /src="(.+?#{image_name}.+?)"/
+  url = $1
+  visit(url)
+end
+
+Then /^I should see a (.+) image of size (.+)$/ do |format, size|
+  tempfile = Tempfile.new('wicked')
+  tempfile.write page.body
+  tempfile.close
+  output = `identify #{tempfile.path}`.split(' ')
+  output[1].should == 'JPEG'
+  output[2].should == '200x100'
+end

data/fixtures/files/features/support/paths.rb

@@ -0,0 +1,13 @@
+module NavigationHelpers
+  def path_to(page_name)
+    case page_name
+    when "the new album page"
+      '/albums/new'
+    else
+      raise "Can't find mapping from \"#{page_name}\" to a path.\n" +
+        "Now, go and add a mapping in #{__FILE__}"
+    end
+  end
+end
+
+World(NavigationHelpers)

data/fixtures/rails

@@ -0,0 +1,22 @@
+#!/usr/bin/env ruby
+# I'm using this file because at the time of writing, the Rails 3 exec file
+# doesn't allow for running older versions side by side
+
+require 'rubygems'
+
+version = ">= 0"
+
+if ARGV.first =~ /^_(.*)_$/ and Gem::Version.correct? $1 then
+  version = $1
+  ARGV.shift
+end
+
+if version =~ /^3|[^.]3/
+  # Rails 3...
+  gem 'railties', version
+  load Gem.bin_path('railties', 'rails', version)
+else
+  # ... pre Rails 3
+  gem 'rails', version
+  load Gem.bin_path('rails', 'rails', version)
+end

data/fixtures/rails_2.3.5/template.rb

@@ -0,0 +1,13 @@
+generate 'scaffold albums cover_image_uid:string'
+rake 'db:migrate'
+
+# Set up webrat and cucumber
+gem 'cucumber'
+generate 'cucumber'
+
+gem 'rack-cache', :lib => 'rack/cache'
+gem 'rmagick', :lib => 'RMagick'
+
+# Copy over all files from the template dir
+files_dir = File.expand_path(File.dirname(__FILE__) + '/../../files')
+run "cp -r #{files_dir}/** ."

data/fixtures/rails_3.0.0.beta/template.rb

@@ -0,0 +1,13 @@
+run "script/rails generate scaffold albums cover_image_uid:string"
+rake 'db:migrate'
+
+# Cucumber generator doesn't seem to be working yet...
+# gem 'cucumber'
+# run 'script/rails generate cucumber:skeleton'
+gem 'rack-cache', :require => 'rack/cache'
+run 'echo "" >> Gemfile' # Annoyingly the generators don't insert line-breaks yet
+gem 'rmagick', :require => 'RMagick'
+
+# # Copy over all files from the template dir
+files_dir = File.expand_path(File.dirname(__FILE__) + '/../../files')
+run "cp -r #{files_dir}/** ."

data/generators/dragonfly_app/templates/initializer.erb

@@ -4,7 +4,7 @@ require 'dragonfly'
 app = Dragonfly::App[:<%= app_name %>]
 app.configure_with(Dragonfly::RMagickConfiguration)
 app.configure do |c|
-  c.log = RAILS_DEFAULT_LOGGER
+  c.log = Rails.logger
   c.datastore.configure do |d|
     d.root_path = "#{Rails.root}/public/system/dragonfly/#{Rails.env}"
   end

data/lib/dragonfly/active_record_extensions/class_methods.rb

@@ -10,8 +10,9 @@ module Dragonfly
           # Defines e.g. 'image_accessor' for any activerecord class body
           define_method "#{accessor_prefix}_accessor" do |attribute|
       
-            before_save :save_attached_files unless before_save_callback_chain.find(:save_attached_files)
-            before_destroy :destroy_attached_files unless before_destroy_callback_chain.find(:destroy_attached_files)
+            # Prior to activerecord 3, adding before callbacks more than once does add it more than once
+            before_save :save_attachments unless respond_to?(:before_save_callback_chain) && before_save_callback_chain.find(:save_attachments)
+            before_destroy :destroy_attachments unless respond_to?(:before_destroy_callback_chain) && before_destroy_callback_chain.find(:destroy_attachments)
       
             # Register the new attribute
             dragonfly_apps_for_attributes[attribute] = app

data/lib/dragonfly/active_record_extensions/instance_methods.rb

@@ -11,13 +11,13 @@ module Dragonfly
 
       private
       
-      def save_attached_files
+      def save_attachments
         attachments.each do |attribute, attachment|
           attachment.save!
         end
       end
       
-      def destroy_attached_files
+      def destroy_attachments
         attachments.each do |attribute, attachment|
           attachment.destroy!
         end

data/lib/dragonfly/rails/images.rb

@@ -6,7 +6,7 @@ require 'rack/cache'
 app = Dragonfly::App[:images]
 app.configure_with(Dragonfly::RMagickConfiguration)
 app.configure do |c|
-  c.log = RAILS_DEFAULT_LOGGER
+  c.log = Rails.logger
   c.datastore.configure do |d|
     d.root_path = "#{Rails.root}/public/system/dragonfly/#{Rails.env}"
   end
@@ -21,8 +21,10 @@ ActiveRecord::Base.extend Dragonfly::ActiveRecordExtensions
 ActiveRecord::Base.register_dragonfly_app(:image, app)
 
 ### Insert the middleware ###
-ActionController::Dispatcher.middleware.insert_after ActionController::Failsafe, Dragonfly::Middleware, :images
-ActionController::Dispatcher.middleware.insert_before Dragonfly::Middleware, Rack::Cache, {
+# Where the middleware is depends on the version of Rails
+middleware = Rails.respond_to?(:application) ? Rails.application.middleware : ActionController::Dispatcher.middleware
+middleware.insert_after Rack::Lock, Dragonfly::Middleware, :images
+middleware.insert_before Dragonfly::Middleware, Rack::Cache, {
   :verbose     => true,
   :metastore   => "file:#{Rails.root}/tmp/dragonfly/cache/meta",
   :entitystore => "file:#{Rails.root}/tmp/dragonfly/cache/body"

data/spec/dragonfly/active_record_extensions/spec_helper.rb

@@ -1,5 +1,6 @@
 require File.dirname(__FILE__) + '/../../spec_helper'
 
+require 'ginger'
 require 'active_record'
 
 DB_FILE = File.expand_path(File.dirname(__FILE__)+'/db.sqlite3')

data/spec/ginger_scenarios.rb

@@ -0,0 +1,13 @@
+require 'ginger'
+
+Ginger.configure do |config|
+  config.aliases["active_record"] = "activerecord" # Because the gem name is 'activerecord', but the require is 'active_record'
+  
+  activerecord_2_3_5 = Ginger::Scenario.new("ActiveRecord 2.3.5")
+  activerecord_2_3_5[/^active_?record$/] = "2.3.5"
+  
+  activerecord_3_0_0 = Ginger::Scenario.new("ActiveRecord 3.0.0 beta")
+  activerecord_3_0_0[/^active_?record$/] = "3.0.0.beta"
+  
+  config.scenarios << activerecord_2_3_5 << activerecord_3_0_0
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dragonfly
 version: !ruby/object:Gem::Version 
-  version: 0.4.4
+  version: 0.5.0
 platform: ruby
 authors: 
 - Mark Evans
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-16 00:00:00 +00:00
+date: 2010-02-20 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -82,6 +82,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: cucumber-rails
+  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
@@ -102,6 +112,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: ginger
+  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: []
@@ -135,9 +155,23 @@ files:
 - extra_docs/UsingWithRails.md
 - features/images.feature
 - features/no_processing.feature
+- features/rails_2.3.5.feature
+- features/rails_3.0.0.beta.feature
 - features/steps/common_steps.rb
 - features/steps/dragonfly_steps.rb
+- features/steps/rails_steps.rb
 - features/support/env.rb
+- fixtures/dragonfly_setup.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/aaa_dragonfly_load_path.rb
+- fixtures/files/features/manage_album_images.feature
+- fixtures/files/features/step_definitions/album_steps.rb
+- fixtures/files/features/support/paths.rb
+- fixtures/rails
+- fixtures/rails_2.3.5/template.rb
+- fixtures/rails_3.0.0.beta/template.rb
 - generators/dragonfly_app/USAGE
 - generators/dragonfly_app/dragonfly_app_generator.rb
 - generators/dragonfly_app/templates/initializer.erb
@@ -211,6 +245,7 @@ files:
 - 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
@@ -275,6 +310,7 @@ test_files:
 - 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