enhance 0.0.6 → 0.0.7

data/lib/enhance/enhancer.rb

@@ -1,9 +1,11 @@
 
 class Enhance::Enhancer
   
+  Geometry =  /^(?<geometry>(?<width>\d+)?x?(?<height>\d+)?([\>\<\@\%^!])?)(?<filter>sample)?$/
+  
   def initialize app, root, options = {}
     @app = app
-    @extensions = options[:extensions] || %w( jpg png )
+    @extensions = options[:extensions] || %w( jpg png jpeg gif )
     @routes = options[:routes] || %w( images )
     @folders = options[:folders] || [File.join(root, "public")]
     @quality = options[:quality] || 100
@@ -25,7 +27,10 @@ class Enhance::Enhancer
   end
   
   def _call env, matches
-    request = @folders.collect_first{|f| File.join(f, matches['filename']) if File.exists?(File.join(f, matches['filename']))}
+    request = @folders.collect_first do |f| 
+      f = File.join(f, matches['filename'])
+      File.exists?(f) ? f : nil
+    end
     
     if request && (filename = convert(request, matches['filename'], CGI.unescape(matches['geometry']))) && filename.gsub!(@file_root, '')
       env["PATH_INFO"] = filename
@@ -38,7 +43,7 @@ class Enhance::Enhancer
   # Finds the image and resizes it if needs be
   def convert path, filename, geometry
     # Extract the width and height
-    if sizes = geometry.match(/^(?<width>\d+)?x?(?<height>\d+)?([\>\<\@\%^!])?$/)
+    if sizes = geometry.match(Geometry)
       w, h = sizes['width'], sizes['height']
       ow, oh = original_size path
       
@@ -58,7 +63,15 @@ class Enhance::Enhancer
   def resize source, destination, geometry  
     FileUtils.mkdir_p File.dirname(destination)
     
-    `#{@command_path}convert \"#{source}\" -resize \"#{geometry}\" -quality #{@quality} \"#{destination}\"` unless File.exists? destination
+    match = geometry.match Geometry
+    
+    method = match['filter'] || 'resize'
+    
+    unless File.exists?(destination) && File.mtime(destination) > File.mtime(source)
+      command = "#{@command_path}convert \"#{source}\" -#{method} \"#{match['geometry']}\" -quality #{@quality} \"#{destination}\""
+      puts command
+      `#{command}`
+    end
     
     destination
   end

data/lib/enhance/version.rb

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

metadata

@@ -1,113 +1,83 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: enhance
-version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 6
-  version: 0.0.6
+version: !ruby/object:Gem::Version
+  version: 0.0.7
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Guillaume Malette
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-26 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-08-26 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rack
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2169505760 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: utilities
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2169505760
+- !ruby/object:Gem::Dependency
+  name: utilities
+  requirement: &2169505280 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rack-test
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2169505280
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: &2169504820 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: *2169504820
 description: Middleware to "enhance" and resize images on the fly.
 email: gmalette@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - README
 - enhance.gemspec
 - lib/enhance.rb
 - lib/enhance/enhancer.rb
 - lib/enhance/urlhelper.rb
 - lib/enhance/version.rb
-has_rdoc: true
-homepage: ""
+homepage: ''
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Image resizing on the fly
 test_files: []
-