dragonfly 0.5.7 → 0.6.0

data/spec/dragonfly_spec.rb

@@ -1,4 +1,16 @@
 require File.dirname(__FILE__) + '/spec_helper'
 
 describe "Dragonfly" do
+  
+  it "should return RMagickConfiguration as Config::RMagickImages, with a deprecation warning" do
+    Dragonfly.should_receive(:puts).with(string_matching(/WARNING/))
+    Dragonfly::RMagickConfiguration.should == Dragonfly::Config::RMagickImages
+  end
+  
+  it "should raise an error for other undefined constants" do
+    lambda{
+      Dragonfly::Eggheads
+    }.should raise_error(NameError)
+  end
+  
 end

data/spec/ginger_scenarios.rb

@@ -6,8 +6,8 @@ Ginger.configure do |config|
   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"
+  activerecord_3_0_0 = Ginger::Scenario.new("ActiveRecord 3.0.0 beta3")
+  activerecord_3_0_0[/^active_?record$/] = "3.0.0.beta3"
   
   config.scenarios << activerecord_2_3_5 << activerecord_3_0_0
 end

data/spec/image_matchers.rb

@@ -23,11 +23,11 @@ def image_properties(image)
 end
 
 def have_width(width)
-  simple_matcher("have width #{width}"){|given| image_properties(given)[:width].to_i.should == width }
+  simple_matcher("have width #{width}"){|given| width.should === image_properties(given)[:width].to_i }
 end
 
 def have_height(height)
-  simple_matcher("have height #{height}"){|given| image_properties(given)[:height].to_i.should == height }
+  simple_matcher("have height #{height}"){|given| height.should === image_properties(given)[:height].to_i }
 end
 
 def have_format(format)

data/yard/setup.rb

@@ -1,5 +1,15 @@
-YARD::Templates::Engine.register_template_path(File.dirname(__FILE__) + '/templates')
-Dir[File.dirname(__FILE__) + '/handlers/*.rb'].each do |file|
+this_dir = File.dirname(__FILE__)
+
+YARD::Templates::Engine.register_template_path(this_dir + '/templates')
+Dir[this_dir + '/handlers/*.rb'].each do |file|
   require File.expand_path(file)
 end
 YARD::Parser::SourceParser.parser_type = :ruby18
+
+version = ENV['DRAGONFLY_VERSION']
+DRAGONFLY_VERSION = if version
+  puts "Setting the version in the docs to #{version}"
+  version
+else
+  File.read(this_dir + '/../VERSION').strip
+end

data/yard/templates/default/fulldoc/html/css/common.css

@@ -79,10 +79,9 @@ ul.main_files li a {
 #header #logo {
   float:left;
   width:50%;
-  font-size: 24px;
+  font-size: 32px;
   letter-spacing: -1px;
   margin-top: 20px;
-  text-transform: uppercase;
 }
 #header #search {
   position:static;

data/yard/templates/default/layout/html/layout.erb

@@ -11,7 +11,7 @@
     
     <div id="header" class="clearfix">
       <%#= erb(:breadcrumb) %>
-      <div id="logo">Dragonfly Documentation</div>
+      <div id="logo">DRAGONFLY (v <%= DRAGONFLY_VERSION %>)</div>
       <%= erb(:search) %>
     </div>
     
@@ -36,7 +36,8 @@
             ['Encoding', 'Encoding'],
             ['Shortcuts', 'Shortcuts for processing and encoding'],
             ['MimeTypes', 'Mime Types'],
-            ['ExampleUseCases', 'Example use cases']
+            ['ExampleUseCases', 'Example use cases'],
+            ['History', 'History'],
           ].map{|(file, text)|
             "<li>#{link_file(file, text)}</li>"
           }.join

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 5
-  - 7
-  version: 0.5.7
+  - 6
+  - 0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Mark Evans
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-18 00:00:00 +01:00
+date: 2010-05-11 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -161,7 +161,7 @@ extra_rdoc_files:
 files: 
 - .gitignore
 - .yardopts
-- History.txt
+- History.md
 - LICENSE
 - README.md
 - Rakefile
@@ -184,25 +184,20 @@ files:
 - features/images.feature
 - features/no_processing.feature
 - features/rails_2.3.5.feature
-- features/rails_3.0.0.beta.feature
+- features/rails_3.0.0.beta3.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/config/initializers/dragonfly.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
+- fixtures/rails_3.0.0.beta3/template.rb
 - irbrc.rb
 - lib/dragonfly.rb
 - lib/dragonfly/active_record_extensions.rb
@@ -215,6 +210,12 @@ files:
 - 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/configurable.rb
 - lib/dragonfly/core_ext/object.rb
 - lib/dragonfly/core_ext/string.rb
@@ -236,8 +237,8 @@ files:
 - 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/r_magick_configuration.rb
 - lib/dragonfly/rails/images.rb
 - lib/dragonfly/temp_object.rb
 - lib/dragonfly/url_handler.rb
@@ -248,7 +249,6 @@ files:
 - samples/taj.jpg
 - spec/argument_matchers.rb
 - spec/dragonfly/active_record_extensions/attachment_spec.rb
-- spec/dragonfly/active_record_extensions/initializer.rb
 - spec/dragonfly/active_record_extensions/migration.rb
 - spec/dragonfly/active_record_extensions/model_spec.rb
 - spec/dragonfly/active_record_extensions/models.rb
@@ -256,6 +256,7 @@ files:
 - 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
@@ -268,7 +269,8 @@ files:
 - spec/dragonfly/extended_temp_object_spec.rb
 - spec/dragonfly/middleware_spec.rb
 - spec/dragonfly/parameters_spec.rb
-- spec/dragonfly/processing/rmagick_processor_spec.rb
+- spec/dragonfly/processing/r_magick_processor_spec.rb
+- spec/dragonfly/processing/r_magick_text_processor_spec.rb
 - spec/dragonfly/temp_object_spec.rb
 - spec/dragonfly/url_handler_spec.rb
 - spec/dragonfly_spec.rb
@@ -315,7 +317,6 @@ summary: Dragonfly is an on-the-fly Rack processing/encoding framework. It inclu
 test_files: 
 - spec/argument_matchers.rb
 - spec/dragonfly/active_record_extensions/attachment_spec.rb
-- spec/dragonfly/active_record_extensions/initializer.rb
 - spec/dragonfly/active_record_extensions/migration.rb
 - spec/dragonfly/active_record_extensions/model_spec.rb
 - spec/dragonfly/active_record_extensions/models.rb
@@ -323,6 +324,7 @@ test_files:
 - 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
@@ -335,7 +337,8 @@ test_files:
 - spec/dragonfly/extended_temp_object_spec.rb
 - spec/dragonfly/middleware_spec.rb
 - spec/dragonfly/parameters_spec.rb
-- spec/dragonfly/processing/rmagick_processor_spec.rb
+- spec/dragonfly/processing/r_magick_processor_spec.rb
+- spec/dragonfly/processing/r_magick_text_processor_spec.rb
 - spec/dragonfly/temp_object_spec.rb
 - spec/dragonfly/url_handler_spec.rb
 - spec/dragonfly_spec.rb

data/History.txt

@@ -1,75 +0,0 @@
-0.5.6 (2010-04-13)
-==================
-
-Fixes
---------
-- Wasn't working properly with Single-Table Inheritance
-
-0.5.5 (2010-04-13)
-==================
-
-Fixes
---------
-- Rails 3 has changed 'metaclass' -> 'singleton_class' so adapt accordingly
-
-0.5.4 (2010-04-12)
-==================
-
-Features
---------
-- Allow setting the uid manually
-
-Fixes
------
-- Assigning an accessor to nil wasn't working properly
-
-
-0.5.3 (2010-03-27)
-==================
-
-Fixes
------
-- Assigning an accessor to nil wasn't working properly
-
-
-0.5.2 (2010-03-04)
-==================
-
-Features
---------
-- Added 'registered mime-types'
-- Enhanced docs
-
-Fixes
------
-- RMagickEncoder only encodes if not already in that format
-
-
-0.5.1 (2010-02-20)
-==================
-
-Fixes
------
-- Fixed 'broken pipe' errors in FileCommandAnalyser due to outputting loads of stuff to the command line stdin
-
-0.5.0 (2010-02-20)
-==================
-
-Added support
--------------
-- support for Rails 3
-
-
-0.4.4 (2010-02-16)
-==================
-
-Better late than never to start logging change history...
-
-New features
-------------
-- added aspect_ratio to rmagick_analyser
-
-Added support
--------------
-- support for ruby 1.9
-- added development dependencies to gemspec for easier setting up

data/features/rails_3.0.0.beta.feature

@@ -1,15 +0,0 @@
-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/fixtures/dragonfly_setup.rb

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

data/fixtures/rails

@@ -1,22 +0,0 @@
-#!/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_3.0.0.beta/template.rb

@@ -1,13 +0,0 @@
-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/USAGE

@@ -1,16 +0,0 @@
-------------------------------------------------------------------------
-
-Example:
-
-    ./script/generate dragonfly_app images
-    
-This will create an initializer called dragonfly_images, which will:
-- create and configure a dragonfly app for serving images
-- add the app to the middleware stack
-- extend activerecord, so you can do things like
-
-    image_accessor :preview_image
-    
-  in your models.
-
-------------------------------------------------------------------------

data/generators/dragonfly_app/dragonfly_app_generator.rb

@@ -1,24 +0,0 @@
-require 'digest/sha1'
-
-class DragonflyAppGenerator < Rails::Generator::NamedBase
- 
-  def manifest
-    app_name = plural_name
-    
-    record do |m|
-      m.template(
-        'initializer.erb',
-        File.join('config', 'initializers', "dragonfly_#{app_name}.rb"),
-        :assigns => {
-          :app_name => app_name,
-          :accessor_prefix => singular_name.singularize,
-          :path_prefix => 'media',
-          :random_secret => Digest::SHA1.hexdigest(Time.now.to_s)
-        },
-        :collision => :ask
-      )
-      
-    end
-  end
-
-end

data/generators/dragonfly_app/templates/initializer.erb

@@ -1,35 +0,0 @@
-require 'dragonfly'
-
-# Configuration
-app = Dragonfly::App[:<%= app_name %>]
-app.configure_with(Dragonfly::RMagickConfiguration)
-app.configure do |c|
-  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 = '<%= random_secret %>'
-    u.path_prefix = '/<%= path_prefix %>'
-  end
-end
-
-# Extend ActiveRecord
-# This allows you to use e.g.
-#   <%= accessor_prefix %>_accessor :my_attribute
-# in your models.
-ActiveRecord::Base.extend Dragonfly::ActiveRecordExtensions
-ActiveRecord::Base.register_dragonfly_app(:<%= accessor_prefix %>, Dragonfly::App[:<%= app_name %>])
-
-# Add the Dragonfly App to the middleware stack
-ActionController::Dispatcher.middleware.insert_after ActionController::Failsafe, Dragonfly::Middleware, :<%= app_name %>
-
-# # 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
-# require 'rack/cache'
-# ActionController::Dispatcher.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/lib/dragonfly/r_magick_configuration.rb

@@ -1,67 +0,0 @@
-module Dragonfly
-  
-  # RMagickConfiguration is a saved configuration for Dragonfly apps, which does the following:
-  # - registers an rmagick analyser
-  # - registers an rmagick processor
-  # - registers an rmagick encoder
-  # - adds parameter shortcuts like '280x140!', etc.
-  # Look at the source code for apply_configuration to see exactly how it configures the app.
-  module RMagickConfiguration
-    
-    def self.apply_configuration(app)
-      app.configure do |c|
-        c.register_analyser(Analysis::FileCommandAnalyser)
-        c.register_analyser(Analysis::RMagickAnalyser)
-        c.register_processor(Processing::RMagickProcessor)
-        c.register_encoder(Encoding::RMagickEncoder)
-        c.parameters.configure do |p|
-          p.default_format = :jpg
-          # Standard resizing like '30x40!', etc.
-          p.add_shortcut(Symbol) do |format|
-            {:format => format}
-          end
-          p.add_shortcut(/^\d*x\d*[><%^!]?$|^\d+@$/) do |geometry, match_data|
-            {
-              :processing_method => :resize,
-              :processing_options => {:geometry => geometry}
-            }
-          end
-          # Cropped resizing like '20x50#ne'
-          p.add_shortcut(/^(\d+)x(\d+)#(\w{1,2})?/) do |geometry, match_data|
-            {
-              :processing_method => :resize_and_crop,
-              :processing_options => {:width => match_data[1], :height => match_data[2], :gravity => match_data[3]}
-            }
-          end
-          # Cropping like '30x30+10+10ne'
-          p.add_shortcut(/^(\d+)x(\d+)([+-]\d+)([+-]\d+)(\w{1,2})?/) do |geometry, match_data|
-            {
-              :processing_method => :crop,
-              :processing_options => {
-                :width => match_data[1],
-                :height => match_data[2],
-                :x => match_data[3],
-                :y => match_data[4],
-                :gravity => match_data[5]
-              }
-            }
-          end
-          p.add_shortcut(/^\d*x/, Symbol) do |geometry, format|
-            p.hash_from_shortcut(geometry).merge(:format => format)
-          end
-          p.add_shortcut(:rotate, Numeric) do |_, amount|
-            {
-              :processing_method => :rotate,
-              :processing_options => {:amount => amount, :background_colour => '#0000'}
-            }
-          end
-          p.add_shortcut(:rotate, Numeric, Symbol) do |a, b, format|
-            p.hash_from_shortcut(a,b).merge(:format => format)
-          end
-        end
-      end
-    
-    end
-    
-  end  
-end