enhance 0.0.7 → 0.0.8

data/README.md

@@ -0,0 +1,44 @@
+Enhance!
+========
+
+> "Enhance!" - Horatio Caine, CSI
+
+[Watch this, it's awesome](http://www.youtube.com/watch?v=Vxq9yj2pVWk)
+
+Enhance! is a Rack middleware that resizes your images on-the-fly using ImageMagick.
+
+
+Rails
+-----
+
+In your application.rb file
+
+    config.middleware.use "Enhance::Enhancer", Rails.root, :routes => [:attachments, :images]
+    
+
+Config Options
+--------------
+
+    Enhance::Enhancer.new next_in_chain, root, options
+    
+* next_in_chain: Next Rack Application to use
+* root: Where the paths are constructed from
+* options: described next
+
+Options
+-------
+
+* extensions: list of supported extensions | [jpg, png, jpeg, gif]
+* routes: list of matched routes | images
+* quality: quality of output images | 100
+* folders: list of folders to look in | ["public"]
+* command_path: path for imagemagick if not in PATH | Paperclip config if available
+* cache: folder in which to cache enhanced images | "#{root}/tmp/enhanced"
+* max_side: maximum size of the enhanced image | 1024
+* file_root: root of the server if not the same as root | root
+
+
+Future changes
+--------------
+
+* I'll probably redo the config to use a block instead of a hash.

data/lib/enhance/enhancer.rb

@@ -1,17 +1,26 @@
-
+require 'cgi'
 class Enhance::Enhancer
   
   Geometry =  /^(?<geometry>(?<width>\d+)?x?(?<height>\d+)?([\>\<\@\%^!])?)(?<filter>sample)?$/
   
+  ## Options
+  # extensions : list of supported extensions
+  # routes : list of matched routes
+  # folders : list of folders to look in
+  # quality : quality of output images
+  # command_path : path for imagemagick if not in PATH
+  # cache : folder in which to cache enhanced images
+  # max_side : maximum size of the enhanced image
+  # file_root : root of the server if not the same as root
   def initialize app, root, options = {}
     @app = app
-    @extensions = options[:extensions] || %w( jpg png jpeg gif )
+    @extensions = [options[:extensions]].flatten || %w( jpg png jpeg gif )
     @routes = options[:routes] || %w( images )
-    @folders = options[:folders] || [File.join(root, "public")]
+    @folders = [options[:folders]].flatten || [File.join(root, "public")]
     @quality = options[:quality] || 100
     @command_path = options[:convert_path] || "#{Paperclip.options[:command_path] if defined?(Paperclip)}"
-    @command_path += "/" unless @command_path.blank?
-    @cache = options[:cache] || File.join(root, "tmp")
+    @command_path += "/" unless @command_path.empty?
+    @cache = options[:cache] || File.join(root, "tmp", "enhanced")
     @max_side = options[:max_side] || 1024
     @file_root = (options[:file_root] || root).to_s
     @server = Rack::File.new(@file_root)
@@ -32,7 +41,8 @@ class Enhance::Enhancer
       File.exists?(f) ? f : nil
     end
     
-    if request && (filename = convert(request, matches['filename'], CGI.unescape(matches['geometry']))) && filename.gsub!(@file_root, '')
+    
+    if request && (filename = convert(request, matches['filename'], CGI.unescape(matches['geometry']))) && filename.gsub!(/^#{@file_root}/, '')
       env["PATH_INFO"] = filename
       @server.call env
     else

data/lib/enhance/urlhelper.rb

@@ -4,4 +4,4 @@ module ActionView::Helpers::UrlHelper
     [[matches['url'], geometry].compact.join("/"), matches['get']].compact.reject(&:empty?).join("?")
   end
   alias_method :enhance!, :enhance
-end
+end if defined? ActionView

data/lib/enhance/version.rb

@@ -1,3 +1,3 @@
 module Enhance
-  VERSION = '0.0.7'
+  VERSION = '0.0.8'
 end

data/test/test.rb

@@ -0,0 +1,70 @@
+require 'rack/test'
+require 'test/unit'
+
+require File.expand_path('../../lib/enhance.rb', __FILE__)
+
+class FourOhFourApp
+  
+  def call env
+    [404, [], ["Not found"]]
+  end
+  
+end
+
+class EnhanceTest < Test::Unit::TestCase
+  include Rack::Test::Methods
+  
+  def app
+    Enhance::Enhancer.new( FourOhFourApp.new, File.dirname(__FILE__), 
+      :cache => File.join(File.dirname(__FILE__), "tmp"),
+      :folders => File.dirname(__FILE__)
+    )
+  end
+  
+  def test_404
+    get "/images/unknown.jpeg"
+    assert last_response.not_found?
+  end
+  
+  def test_image_width_unconstrained
+    get "/images/test.jpg/200x"
+    assert_size 200, nil
+  end
+  
+  def test_image_height_unconstrained
+    get "/images/test.jpg/x200"
+    assert_size nil, 200
+  end
+  
+  def test_image_force_square
+    get "/images/test.jpg/200x200!"
+    assert_size 200, 200
+  end
+  
+  def test_image_larger_than_nature
+    get "/images/test.jpg/1000"
+    assert_size 1000, nil
+  end
+  
+  def test_image_larger_constrained
+    get "/images/test.jpg/1000%3E" #1000<
+    assert_size 800, nil
+  end
+  
+  def test_image_oversize
+    get "/images/test.jpg/2000"
+    assert_size 2000, nil, :<
+  end
+  
+  def assert_size width, height, comparator = :==
+    dump = File.join(File.dirname(__FILE__), "results", "dump.jpg")
+    File.open(dump, "wb") do |f|
+      f.write last_response.body
+    end
+    identify = `identify #{dump}`.match /\s(?<width>[0-9]+)x(?<height>[0-9]+)/
+    
+    assert identify[:width].to_i.send(comparator, width) if width
+    assert identify[:height].to_i.send(comparator, height) if height
+  end
+  
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enhance
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-08-26 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &2169505760 !ruby/object:Gem::Requirement
+  requirement: &2160890120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2169505760
+  version_requirements: *2160890120
 - !ruby/object:Gem::Dependency
   name: utilities
-  requirement: &2169505280 !ruby/object:Gem::Requirement
+  requirement: &2160889660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2169505280
+  version_requirements: *2160889660
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &2169504820 !ruby/object:Gem::Requirement
+  requirement: &2160889180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,19 +43,22 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2169504820
+  version_requirements: *2160889180
 description: Middleware to "enhance" and resize images on the fly.
 email: gmalette@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- README
+- README.md
 - enhance.gemspec
 - lib/enhance.rb
 - lib/enhance/enhancer.rb
 - lib/enhance/urlhelper.rb
 - lib/enhance/version.rb
+- test/images/test.jpg
+- test/results/.gitkeep
+- test/test.rb
 homepage: ''
 licenses: []
 post_install_message: 
@@ -80,4 +83,7 @@ rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Image resizing on the fly
-test_files: []
+test_files:
+- test/images/test.jpg
+- test/results/.gitkeep
+- test/test.rb