dimension 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 144828daa18cf773b80abb57606d047917fea1f7
-  data.tar.gz: a4310e48fc02af5b1899c2bdb6822e51c3ff35e3
+  metadata.gz: 193039197b19c73705300522aaf23f6ae3b07aee
+  data.tar.gz: c741743c6dfd4ab233832a46cc97e2b77f8b3901
 SHA512:
-  metadata.gz: 6eddc9393524c095d2a7a9a6f9af0a05b741bff3147d2b346738364109f985716359a23b5436b6fe7b42ac19abc60f1c34269f376afaa5675d7deadfc68e036f
-  data.tar.gz: af4ac2e3807547a92113983ceada7d5f51c0e8b18d09b7b0650cb32844a33bff8a31fbe792a759043646052b6019fd8f1d197e27eddd28b74eff8e6eaabeee96
+  metadata.gz: 6660d273e74e9772aac18cf4d29c585b517ec4e117f933015c5d0b81c82f9986af371c1c8d10c9c25cced1624db8ea2eeae519d5694ea6b50d0d47ababab371b
+  data.tar.gz: a3b939d1c3d5d10b022d71cbfc1ab04549e278ba396b9424448e058e77a5a69f814d5e1920b7e77634f6a5cb524a8a62c40615a80727e4a00943cbf5489e8228

data/README.md

@@ -5,7 +5,7 @@ Fast, simplified image resizing for Ruby. No ImageMagick.
 
 ``` rb
   require 'dimension'
-   
+
   thumb = Dimension.open('tux.png')
   thumb.generate('100x100') # => { :width => 100, :height => 100 }
   thumb.save('resized.png')
@@ -33,7 +33,7 @@ You can also pass a block, which will ensure the original image is closed after
 ``` rb
   get '/resize/:file' do
     thumb = Dimension.open(params[:file])
-    thumb.generate('200x300#') do
+    thumb.generate('200x300@') do
       thumb.to_response
     end
   end

data/examples/sinatra.rb

@@ -3,11 +3,27 @@ ROOT = File.expand_path(File.dirname(__FILE__))
 require 'sinatra'
 require ROOT + '/../lib/dimension'
 
+if processor = ARGV[0]
+  puts "Using #{processor} as processor"
+  Dimension.processor = processor
+end
+
+geometries = [
+  '200x200',
+  '300x200!',
+  '200x300#',
+  '20x50:ne'
+]
+
 get '/' do
   images = Dir.glob(File.join(ROOT, 'assets') + '/*')
+  index = 0
   links = images.map do |i|
     name = File.basename(i)
-    "<a href='/images/#{name}'>#{name}</a>"
+    geom = geometries[index]
+    index += 1
+    index = 0 unless geometries[index]
+    "<a href='/images/#{name}?geometry=#{geom}'>#{name}</a>"
   end
   '<ul><li>' + links.join('</li><li>') + '</li></ul>'
 end

data/lib/dimension.rb

@@ -6,6 +6,7 @@ module Dimension
   ROOT = File.expand_path(File.dirname(__FILE__))
 
   PROCESSORS = {
+    'vips' => 'VipsProcessor',
     'imlib2' => 'Imlib2Processor',
     'image_magick' => 'ImageMagickProcessor'
   }
@@ -27,14 +28,23 @@ module Dimension
 
 end
 
-begin
-  require 'imlib2'
-  Dimension.processor = 'imlib2'
-rescue LoadError
-  out = `which convert`
-  if $?.success?
-    Dimension.processor = 'image_magick'
-  else
-    puts "No available processors found. Please install ruby-imlib2 or ImageMagick."
+def load_processor(name)
+  # puts "Loading #{name}"
+  require name
+  Dimension.processor = name
+  true
+rescue LoadError => e
+  # puts "#{name} not found."
+  nil
+end
+
+unless load_processor 'vips'
+  unless load_processor 'imlib2'
+    out = `which convert`
+    if $?.success?
+      Dimension.processor = 'image_magick'
+    else
+      puts "No available processors found. Please install ruby-vips, ruby-imlib2 or ImageMagick."
+    end
   end
 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
@@ -46,13 +46,14 @@ class Image
   end
 
   def generate!(geometry, output_file = nil)
+    @geometry_string = geometry # for saving as [file]-[geometry].[ext]
     resize_to(geometry)
     save(output_file) && self
   end
 
   def resize_to(geometry)
     case geometry
-      when RESIZE_GEOMETRY 
+      when RESIZE_GEOMETRY
         log "Resize -- #{$1}x#{$2}"
         resize($1, $2)
       when CROPPED_RESIZE_GEOMETRY
@@ -71,7 +72,6 @@ class Image
 
   def save(out_file)
     new_geometry = get_new_geometry
-
     path = @path
 
     if out_file and File.directory?(out_file)
@@ -80,7 +80,7 @@ class Image
     end
 
     if out_file.nil?
-      out_file = File.join(path, @name.sub(File.extname(file), '-' + new_geometry.join('x') + File.extname(file)))
+      out_file = File.join(path, @name.sub(File.extname(file), '-' + @geometry_string + File.extname(file)))
     end
 
     log "Writing file: #{out_file}"
@@ -98,6 +98,17 @@ class Image
     to_response
   end
 
+  def to_rgba
+    bytes = image_data.bytes
+    (1..bytes.length).step(4).map { |i| bytes[i..i+2] << bytes[i-1] }.flatten
+  end
+
+  # transforms data (RGBA buffer) into a array of RGB values
+  def to_rgb
+    bytes = image_data.bytes
+    (1..bytes.length).step(4).map { |i| [bytes[i-1],bytes[i],bytes[i+1]] }.flatten
+  end
+
   def inspect
     geometry = get_new_geometry
     "#<Dimension::Image:#{object_id} @width=#{geometry[0]}, @height=#{geometry[1]}>"

data/lib/dimension/processors/image_magick.rb

@@ -9,13 +9,14 @@ module ImageMagickProcessor
   end
 
   def image_data
-    IO.read(@temp_file)
+    @current_path = path if @current_path.nil?
+    IO.read(@current_path)
   end
 
   def save_as(new_file_path)
     return if new_file_path == @temp_file
     FileUtils.mv(@temp_file, new_file_path)
-    @temp_file = new_file_path # otherwise we'd get a ENOENT error when reading its data
+    @current_path = new_file_path
   end
 
   def get_new_geometry

data/lib/dimension/processors/imlib2.rb

@@ -16,17 +16,6 @@ module Imlib2Processor
     File.extname(file).sub('.', '')
   end
 
-  def to_rgba
-    bytes = data.bytes
-    (1..bytes.length).step(4).map { |i| bytes[i..i+2] << bytes[i-1] }.flatten
-  end
-
-  # transforms data (RGBA buffer) into a array of RGB values
-  def to_rgb
-    bytes = data.bytes
-    (1..bytes.length).step(4).map { |i| [bytes[i-1],bytes[i],bytes[i+1]] }.flatten
-  end
-
   def image_data
     unless @temp_file
       @temp_file = "/tmp/#{$$}.#{File.basename(file)}"

data/lib/dimension/processors/vips.rb

@@ -0,0 +1,142 @@
+# from examples at
+# - https://github.com/eltiare/carrierwave-vips/blob/master/lib/carrierwave/vips.rb
+# - https://github.com/jcupitt/ruby-vips/tree/master/examples
+
+require 'vips'
+
+module VipsProcessor
+
+  FORMAT_OPTS = {
+    'jpeg' => { :quality => 0.9 },
+    'png'  => { :compression => 6, :interlace => false }
+  }
+
+  SHARPEN_MASK = begin
+    conv_mask = [
+      [ -1, -1, -1 ],
+      [ -1, 24, -1 ],
+      [ -1, -1, -1 ]
+    ]
+    ::VIPS::Mask.new conv_mask, 16
+  end
+
+  def image
+    @image ||= if format == 'jpeg'
+        VIPS::Image.jpeg(@file, :sequential => true)
+      elsif format == 'png'
+        VIPS::Image.png(@file, :sequential => true)
+      else
+        VIPS::Image.new(@file)
+      end
+  end
+
+  def geometry
+    [image.x_size, image.y_size]
+  end
+
+  def format
+    file[/.png$/] ? 'png' : file[/jpe?g$/] ? 'jpeg' : File.extname(file).sub('.', '')
+  end
+
+  def image_data
+    writer.to_memory
+  end
+
+  def save_as(new_file_path)
+    save(new_file_path)
+  end
+
+  def save!
+    save(file)
+  end
+
+  def close
+    log "Closing image and cutting thread..."
+    @image = nil
+    VIPS::thread_shutdown
+    # image.delete!(true) # free image, and de-cache it too
+  end
+
+  def get_new_geometry
+    geometry
+  end
+
+  private
+
+  def resize(width, height, min_or_max = :min)
+    ratio = get_ratio(width, height, min_or_max)
+    if ratio == 1
+      return log "Same ratio as original."
+    end
+    if ratio > 1
+      @image = image.affinei_resize :nearest, ratio
+    else
+      if ratio <= 0.5
+        factor = (1.0 / ratio).floor
+        @image = image.shrink(factor)
+        @image = image.tile_cache(image.x_size, 1, 30)
+        ratio = get_ratio(width, height, min_or_max)
+      end
+      @image = image.affinei_resize :bicubic, ratio
+      @image = image.conv SHARPEN_MASK
+    end
+  end
+
+  def resize_and_crop(new_width, new_height, gravity)
+    resize(new_width, new_height, :max)
+
+    if image.x_size > new_width.to_i
+      top = 0
+      left = (image.x_size - new_width.to_i) / 2
+    elsif image.y_size > new_height.to_i
+      left = 0
+      top = (image.y_size - new_height.to_i) / 2
+    else
+      left = 0
+      top = 0
+    end
+
+    @image = image.extract_area(left, top, new_width.to_i, new_height.to_i)
+  end
+
+  def crop(width, height, x, y, gravity)
+    raise "TODO"
+  end
+
+  def crop_scaled(x, y, new_w, new_h)
+    raise "TODO"
+  end
+
+  def get_ratio(width, height, min_or_max = :min)
+    width_ratio  = width.to_f / image.x_size
+    height_ratio = height.to_f / image.y_size
+    if height.nil?
+      width_ratio
+    elsif width.nil?
+      height_ratio
+    else
+      [width_ratio, height_ratio].send(min_or_max)
+    end
+  end
+
+  def write(filename, strip = false)
+    if strip
+      writer.remove_exif
+      writer.remove_icc
+    end
+    writer.write(filename)
+  end
+
+  def writer
+    @writer ||= writer_class.send(:new, @image, FORMAT_OPTS[format] || {})
+  end
+
+  def writer_class
+    case format
+      when 'jpeg' then VIPS::JPEGWriter
+      when 'png' then VIPS::PNGWriter
+      else VIPS::Writer
+    end
+  end
+
+end

data/lib/dimension/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dimension
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Tomás Pollak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-04 00:00:00.000000000 Z
+date: 2015-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack-throttle
@@ -49,6 +49,7 @@ files:
 - lib/dimension/middleware.rb
 - lib/dimension/processors/image_magick.rb
 - lib/dimension/processors/imlib2.rb
+- lib/dimension/processors/vips.rb
 - lib/dimension/version.rb
 homepage: https://github.com/tomas/dimension
 licenses: []