dragonfly 0.3.0 → 0.3.2

data/README.md

@@ -1,15 +1,19 @@
 Dragonfly
 ===========
 
-Dragonfly is a {http://rack.rubyforge.org Rack} framework for on-the-fly processing and encoding.
+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
 -----------------------
+To use simply for image thumbnails etc. in Rails...
 
 environment.rb:
 
-    config.gem 'dragonfly-rails', :lib => 'dragonfly/rails/images'
+    config.gem 'rmagick'
+    config.gem 'rack-cache'
+
+    config.gem 'dragonfly', :lib => 'dragonfly/rails/images'
     config.middleware.use 'Dragonfly::MiddlewareWithCache', :images
 
 Migration:
@@ -56,7 +60,7 @@ Please use the <a href="http://github.com/markevans/dragonfly/issues">github iss
 
 Suggestions/Questions
 =====================
-{http://groups.google.com/group/dragonfly-users}
+<a href="http://groups.google.com/group/dragonfly-users">Google group dragonfly-users</a>
 
 Credits
 =======

data/Rakefile

@@ -4,8 +4,8 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |s|
     s.name = "dragonfly"
-    s.summary = %Q{dragonfly is an on-the-fly processing/encoding framework written as a Rack application.
-    It includes an extension for Ruby on Rails to enable easy image handling}
+    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.email = "mark@new-bamboo.co.uk"
     s.homepage = "http://github.com/markevans/dragonfly"
     s.authors = ["Mark Evans"]
@@ -13,21 +13,6 @@ begin
     s.has_rdoc = 'yard'
   end
   Jeweler::GemcutterTasks.new
-  Jeweler::Tasks.new do |s|
-    s.name = "dragonfly-rails"
-    s.summary = %Q{dragonfly-rails has no code of its own - it simply gathers dependencies for using dragonfly in rails}
-    s.email = "mark@new-bamboo.co.uk"
-    s.homepage = "http://github.com/markevans/dragonfly"
-    s.authors = ["Mark Evans"]
-    s.files = []
-    s.test_files = []
-    s.extra_rdoc_files = []
-    s.add_dependency('dragonfly')
-    s.add_dependency('rack')
-    s.add_dependency('rack-cache')
-    s.add_dependency('rmagick')
-  end
-  Jeweler::GemcutterTasks.new
 rescue LoadError
   puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
 end

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.2

data/dragonfly.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dragonfly}
-  s.version = "0.3.0"
+  s.version = "0.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mark Evans"]
@@ -25,7 +25,6 @@ Gem::Specification.new do |s|
      "config.rb",
      "config.ru",
      "docs.watchr",
-     "dragonfly-rails.gemspec",
      "dragonfly.gemspec",
      "extra_docs/ActiveRecord.md",
      "extra_docs/Analysers.md",
@@ -121,7 +120,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.5}
-  s.summary = %q{dragonfly is an on-the-fly processing/encoding framework written as a Rack application. It includes an extension for Ruby on Rails to enable easy image handling}
+  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.test_files = [
     "spec/argument_matchers.rb",
      "spec/dragonfly/active_record_extensions/attachment_spec.rb",

data/extra_docs/UsingWithRails.md

@@ -8,16 +8,19 @@ Using as Middleware
 -------------------
 In environment.rb:
 
-    config.gem 'dragonfly-rails', :lib => 'dragonfly/rails/images'
-    config.middleware.use 'Dragonfly::MiddlewareWithCache', :images
+    config.gem 'rmagick'
+    config.gem 'rack-cache'
 
-The gem dragonfly-rails does nothing more than tie together the gem dependencies dragonfly,
-rack-cache and rmagick.
+    config.gem 'dragonfly', :lib => 'dragonfly/rails/images'
+    config.middleware.use 'Dragonfly::MiddlewareWithCache', :images
 
 The required file 'dragonfly/rails/images.rb' initializes a dragonfly app, configures it to use rmagick processing, encoding, etc.,
 and registers the app so that you can use ActiveRecord accessors.
 
-For reference, the contents are as follows:
+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.
+
+For reference, the contents of 'dragonfly/rails/images.rb' are as follows:
 
     require 'dragonfly'
 
@@ -40,7 +43,7 @@ For reference, the contents are as follows:
     ActiveRecord::Base.extend Dragonfly::ActiveRecordExtensions
     ActiveRecord::Base.register_dragonfly_app(:image, app)
 
-The second line configures rails to use a {Dragonfly::MiddlewareWithCache middleware} which uses the named app (named `:images`), and puts
+The line `config.middleware.use 'Dragonfly::MiddlewareWithCache', :images` configures rails to use a {Dragonfly::MiddlewareWithCache middleware} which uses the named app (named `:images`), and puts
 {http://tomayko.com/src/rack-cache/ Rack::Cache} in front of it for performance.
 You can pass extra arguments to this line which will go directly to configuring Rack::Cache (see its docs for how to configure it).
 The default configuration for Rack::Cache is
@@ -55,7 +58,10 @@ To see what you can do with the active record accessors, see {file:ActiveRecord}
 
 Using as a Rails Metal
 ----------------------
-The easiest way of setting up as a rails metal is using the supplied generator.
+Setting up as a Rails Metal may be preferable to using the middleware as above if you want to see the configuration
+more explicitly (and therefore have more control over it).
+
+The easiest way is using the supplied generator.
 (NB I've had a couple of problems with the generator with plural/singular names with early versions of metal in Rails 2.3 -
 this should be resolvable by making sure the metal name matches its filename).
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dragonfly
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.3.2
 platform: ruby
 authors: 
 - Mark Evans
@@ -41,7 +41,6 @@ files:
 - config.rb
 - config.ru
 - docs.watchr
-- dragonfly-rails.gemspec
 - dragonfly.gemspec
 - extra_docs/ActiveRecord.md
 - extra_docs/Analysers.md
@@ -158,7 +157,7 @@ rubyforge_project:
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
-summary: dragonfly is an on-the-fly processing/encoding framework written as a Rack application. It includes an extension for Ruby on Rails to enable easy image handling
+summary: Dragonfly is an on-the-fly Rack processing/encoding framework. It includes an extension for Ruby on Rails for easy image handling
 test_files: 
 - spec/argument_matchers.rb
 - spec/dragonfly/active_record_extensions/attachment_spec.rb

data/dragonfly-rails.gemspec

@@ -1,41 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{dragonfly-rails}
-  s.version = "0.3.0"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Mark Evans"]
-  s.date = %q{2009-12-15}
-  s.email = %q{mark@new-bamboo.co.uk}
-  s.homepage = %q{http://github.com/markevans/dragonfly}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
-  s.summary = %q{dragonfly-rails has no code of its own - it simply gathers dependencies for using dragonfly in rails}
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<dragonfly>, [">= 0"])
-      s.add_runtime_dependency(%q<rack>, [">= 0"])
-      s.add_runtime_dependency(%q<rack-cache>, [">= 0"])
-      s.add_runtime_dependency(%q<rmagick>, [">= 0"])
-    else
-      s.add_dependency(%q<dragonfly>, [">= 0"])
-      s.add_dependency(%q<rack>, [">= 0"])
-      s.add_dependency(%q<rack-cache>, [">= 0"])
-      s.add_dependency(%q<rmagick>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<dragonfly>, [">= 0"])
-    s.add_dependency(%q<rack>, [">= 0"])
-    s.add_dependency(%q<rack-cache>, [">= 0"])
-    s.add_dependency(%q<rmagick>, [">= 0"])
-  end
-end