dimension 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e101e16b7d5ceb6fb18b6d2e82bf856a66383daa
-  data.tar.gz: 14510358ffbdbd31f7bce572bf006019d921b763
+  metadata.gz: 6cf302e4bb1fc448c02a78c5c8301b16f3f3b3e8
+  data.tar.gz: c6f093638b2ac08b6cf18f23b37ca6c8bdceaf3b
 SHA512:
-  metadata.gz: f72131f1f58b51b054357ad5e11947f7828b9a04dd2f1c9183db84e134197c372bfce11c4fc816d27f4b89a211d4102a8cd47f12b1d27e20bbe87d5f3d641805
-  data.tar.gz: 518fb7db8cf2b3befbc595fe754c60b56a7e15916d200d7d76ab221f4b691c0b8624731174f92592d8fe285112b30652868f7520c767fc234b937f1366a2e705
+  metadata.gz: 88bae316d7293757aa1699835e5d685c564315ca513ccafa9ffabb1384605b0f34807f06cfca5758ba7363eba75bc4c425205ecde4be738bcca6766652e5f25a
+  data.tar.gz: e511c93b2e6e4cc5dce4e8858498508eb6d8f82be4acd278f92996e0dad154e009d6520c5cbc42466c65b5323b3c75dbdc1805d253386f77f5c21eefcb25ed45

data/README.md

@@ -1,12 +1,12 @@
-Resizer
-=======
+Dimension
+=========
 
 Fast, simplified image resizing for Ruby. No ImageMagick.
 
 ``` rb
-  require 'resizer'
+  require 'Dimension'
    
-  thumb = Resizer.open('tux.png')
+  thumb = Dimension.open('tux.png')
   thumb.generate('100x100') # => { :width => 100, :height => 100 }
   thumb.save('resized.png')
 ```
@@ -14,7 +14,7 @@ Fast, simplified image resizing for Ruby. No ImageMagick.
 Or generate and write file automatically.
 
 ``` rb
-  thumb = Resizer.new('tux.png')
+  thumb = Dimension.new('tux.png')
   thumb.generate!('100x300!') # will write file as 'tux-100x300.png'
 ```
 
@@ -23,7 +23,7 @@ Or generate and write file automatically.
 Yes sir, we have it.
 
 ``` rb
-  thumb = Resizer.open(params[:file])
+  thumb = Dimension.open(params[:file])
   thumb.generate('200x300#')
   thumb.image_data
 ```
@@ -32,11 +32,10 @@ You can also pass a block, which will ensure the original image is closed after
 
 ``` rb
   get '/resize/:file' do
-    thumb = Resizer.open(params[:file])
-    thumb.generate('200x300#') do |res|
-      @out = thumb.to_response
+    thumb = Dimension.open(params[:file])
+    thumb.generate('200x300#') do
+      thumb.to_response
     end
-    @out.to_response
   end
 ```
 
@@ -44,6 +43,11 @@ You can also pass a block, which will ensure the original image is closed after
 
 This is taken directly from the excellent Dragonfly gem. 
 
+Author
+======
+
+Written by Tomás Pollak.
+
 Copyright
 =========
 

data/benchmark.rb

@@ -1,4 +1,4 @@
-require './lib/resizer'
+require './lib/dimension'
 require 'benchmark'
 
 file = ARGV[0] or abort('File needed')
@@ -10,8 +10,8 @@ puts "Processing #{file}"
 Benchmark.bm do |x|
 
   x.report do
-    Resizer.processor = 'imlib2'
-    a = Resizer.open(file)
+    Dimension.processor = 'imlib2'
+    a = Dimension.open(file)
     res = a.generate!(geometry)
     puts res.inspect
   end
@@ -19,8 +19,8 @@ Benchmark.bm do |x|
   sleep 1
 
   x.report do
-    Resizer.processor = 'image_magick'
-    b = Resizer.open(file)
+    Dimension.processor = 'image_magick'
+    b = Dimension.open(file)
     res = b.generate!(geometry)
     puts res.inspect
   end

data/examples/middleware.rb

@@ -0,0 +1,26 @@
+ROOT = File.expand_path(File.dirname(__FILE__))
+
+require 'thin'
+require 'rack/builder'
+require 'rack/static'
+
+require ROOT + '/../lib/dimension'
+require ROOT + '/../lib/dimension/middleware'
+
+app = Rack::Builder.new do
+
+  root = File.join(ROOT, 'assets')
+
+  use Dimension::Middleware, { :root => root }
+
+  use Rack::Static,
+    :urls => ['/'],
+    :root => root
+
+  run lambda { |env|
+    [ 200, { 'Content-Type'  => 'text/html'}, ['Not Found.'] ]
+  }
+
+end.to_app
+
+Thin::Server.start('0.0.0.0', 4567, app)

data/examples/sinatra.rb

@@ -1,7 +1,7 @@
 ROOT = File.expand_path(File.dirname(__FILE__))
 
 require 'sinatra'
-require ROOT + '/../lib/resizer'
+require ROOT + '/../lib/dimension'
 
 get '/' do
   images = Dir.glob(File.join(ROOT, 'assets') + '/*')
@@ -21,7 +21,7 @@ get '/images/:file' do
   end
 
   begin
-    thumb = Resizer.open(file)
+    thumb = Dimension.open(file)
   rescue => e
     return e.message
   end

data/lib/dimension/image.rb

@@ -18,7 +18,7 @@ class Image
 
   # Geometry string patterns
   RESIZE_GEOMETRY         = /^(\d+)?x(\d+)?[><%^!]?$|^\d+@$/ # e.g. '300x200!'
-  CROPPED_RESIZE_GEOMETRY = /^(\d+)x(\d+)#(\w{1,2})?$/ # e.g. '20x50#ne'
+  CROPPED_RESIZE_GEOMETRY = /^(\d+)x(\d+)[:|#](\w{1,2})?$/ # e.g. '20x50:ne'
   CROP_GEOMETRY           = /^(\d+)x(\d+)([+-]\d+)?([+-]\d+)?(\w{1,2})?$/ # e.g. '30x30+10+10'
 
   attr_reader :file
@@ -52,7 +52,7 @@ class Image
 
   def resize_to(geometry)
     case geometry
-      when RESIZE_GEOMETRY
+      when RESIZE_GEOMETRY 
         log "Resize -- #{$1}x#{$2}"
         resize($1, $2)
       when CROPPED_RESIZE_GEOMETRY

data/lib/dimension/middleware.rb

@@ -0,0 +1,35 @@
+module Dimension
+
+  class Middleware
+  
+    FORMATS = ['.jpg', '.png', '.gif', '.jpeg']
+  
+    def initialize(app, opts = {})
+      @app  = app
+      @root = File.expand_path(opts[:root] || Dir.pwd())
+    end
+  
+    def call(env)
+      url      = env['PATH_INFO']
+      query    = env['QUERY_STRING']
+      geometry = query && query[/geometry=([^\&|$]+)/, 1]
+    
+      if geometry and ext = File.extname(url) and ext != '' and FORMATS.include?(ext.downcase)
+        file = File.join(@root, url)
+        # puts 'Processing image: ' + file
+      
+        image = Dimension.open(file)
+        image.generate(geometry) do
+          image.to_response
+        end
+      end
+
+      @app.call(env)
+    rescue ArgumentError => e # Dimension::Error
+      # puts "Error processing image: #{e.message}"
+      @app.call(env)
+    end
+  
+  end
+
+end

data/lib/dimension/processors/imlib2.rb

@@ -86,7 +86,7 @@ module Imlib2Processor
   end
 
   def crop(width, height, x, y, gravity)
-    rect = [x || 0, y || 0, width.to_i, height.to_i]
+    rect = [(x || 0).to_i, (y || 0).to_i, width.to_i, height.to_i]
     image.crop!(rect)
   end
 
@@ -119,7 +119,7 @@ module Imlib2Processor
   end
 
   def get_resize_geometry(w, h, to_longer = true)
-    if to_longer
+    if to_longer or h.nil?
       if image.w < image.h
         new_h = ((w.to_f / image.w) * image.h).round
         return w.to_i, new_h

data/lib/dimension/version.rb

@@ -1,7 +1,7 @@
 module Dimension
   MAJOR = 0
   MINOR = 0
-  PATCH = 3
+  PATCH = 4
 
   VERSION = [MAJOR, MINOR, PATCH].join('.')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dimension
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Tomás Pollak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-09 00:00:00.000000000 Z
+date: 2014-04-10 00:00:00.000000000 Z
 dependencies: []
 description: Yes, there are other graphic libraries besides ImageMagick.
 email:
@@ -28,9 +28,11 @@ files:
 - examples/assets/chair.jpg
 - examples/assets/the-two-towers.png
 - examples/assets/window.jpg
+- examples/middleware.rb
 - examples/sinatra.rb
 - lib/dimension.rb
 - lib/dimension/image.rb
+- lib/dimension/middleware.rb
 - lib/dimension/processors/image_magick.rb
 - lib/dimension/processors/imlib2.rb
 - lib/dimension/version.rb
@@ -58,4 +60,3 @@ signing_key:
 specification_version: 4
 summary: Native, in-process image resizing in Ruby.
 test_files: []
-has_rdoc: