dimension 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc25754586c8c5d89dfbccd3fb2857829212d6d4
-  data.tar.gz: b431b829734d986443b87ff284481fc203b01c48
+  metadata.gz: 934d06b88507ea43564e933aba941dcde54293b9
+  data.tar.gz: 0d3b5b21ee450cfc6e8f6799ae20d470cadacdf7
 SHA512:
-  metadata.gz: 3bf3d77624567c506045ed6f1fb64e17c56355fe6a2f14c4391ed17e7be26613c4ee8ad9a896c0acf9c31cb862594250cf71dc1bdc56e9c5d4dbf7811a82b99c
-  data.tar.gz: 64df3ce0093b0db358c2b82e4cb7d65e705b0543cefe1f8b407b0cde64c26f2f0a9cc304a91d009b51a5d95e99366846d4b4736648dd645dc7e7a8da4df9470b
+  metadata.gz: 95282e3ef84f4c5080099ee0235b58440b36f6837aecc129041ad810d08aaeb1a2fefd44fe9aecb2276550ade6228d74470e509556b38f782617625de83d21cc
+  data.tar.gz: 70c108c122b74bee2d922d1405520fb28471ce2adac8b36351b3d061729de81ccc4377855e908591efde5b2142e0b1601b0b9ed30b1c831608d82ecefd2ebd29

data/README.md

@@ -1,7 +1,6 @@
-Dimension
-=========
+# Dimension
 
-Fast, simplified image resizing for Ruby. No ImageMagick.
+Lightweight image resizing for Ruby, either with vips, imlib2 or ImageMagick.
 
 ``` rb
   require 'dimension'
@@ -18,7 +17,7 @@ Or generate and write file automatically.
   thumb.generate!('100x300!') # will write file as 'tux-100x300.png'
 ```
 
-# In memory processing
+## In memory processing
 
 Yes sir, we have it.
 
@@ -39,16 +38,49 @@ You can also pass a block, which will ensure the original image is closed after
   end
 ```
 
-# Resizing geometries
+# Installation
 
-This is taken directly from the excellent [Dragonfly gem](http://markevans.github.io/dragonfly/imagemagick/#processors). The N/S/W/E gravities are not supported, though.
+For vips backend:
 
-Author
-======
+    # install library
+    apt install libvips42
+    # then, the ruby bindings
+    gem install ruby-vips
+    # and in case you don't get a libvips.so symlink
+    sudo ln -s /usr/lib/x86_64-linux-gnu/libvips.so.42 /usr/lib/x86_64-linux-gnu/libvips.so
+
+For imlib2 backend:
+
+    # install deps
+    sudo apt install libimlib2-dev
+    # clone repo
+    git clone https://github.com/pepabo/imlib2-ruby
+    cd imlib2-ruby
+    # build/install
+    ruby extconf.rb
+    make
+    make install
+    # and clean up
+    cd ..
+    rm -Rf imlib2-ruby
+
+For ImageMagick, there's no gem required. Just make sure the binaries (identify, convert) are in place:
+
+    sudo apt install imagemagick
+
+# TODO
+
+ - [ ] Support for N/S/W/E gravities.
+ - [ ] Tests (e.g. ensure geometry calculation works equally across backends).
+
+# Related
+
+ - [Dragonfly gem](http://markevans.github.io/dragonfly). This is where the original inspiration came from.
+
+# Author
 
 Written by Tomás Pollak.
 
-Copyright
-=========
+# Copyright
 
 (c) Fork, Ltd. MIT Licensed.

data/benchmark.rb

@@ -2,27 +2,49 @@ require './lib/dimension'
 require 'benchmark'
 
 file = ARGV[0] or abort('File needed')
-geometry = ARGV[1] or abort('Geometry required: 100x100#ne')
+geometry = ARGV[1] or abort('Geometry required: 100x100')
 
-out = "#{File.basename(file)}.out#{File.extname(file)}"
+ext  = File.extname(file)
+base = File.basename(file, ext)
 puts "Processing #{file}"
 
 Benchmark.bm do |x|
 
-  x.report do
+  begin
     Dimension.processor = 'imlib2'
-    a = Dimension.open(file)
-    res = a.generate!(geometry)
-    puts res.inspect
+    x.report do
+      a = Dimension.open(file)
+      res = a.generate!(geometry, [base, '-imlib2', ext].join)
+      puts res.inspect
+    end
+  rescue LoadError
+    puts "imlib2 missing."
   end
 
   sleep 1
 
-  x.report do
+  begin
     Dimension.processor = 'image_magick'
-    b = Dimension.open(file)
-    res = b.generate!(geometry)
-    puts res.inspect
+    x.report do
+      b = Dimension.open(file)
+      res = b.generate!(geometry, [base, '-image_magick', ext].join)
+      puts res.inspect
+    end
+  rescue LoadError => e
+    puts "imagemagick missing."
+  end
+
+  sleep 1
+
+  begin
+    Dimension.processor = 'vips'
+    x.report do
+      b = Dimension.open(file)
+      res = b.generate!(geometry, [base, '-vips', ext].join)
+      puts res.inspect
+    end
+  rescue LoadError => e
+    puts "vips missing."
   end
 
 end

data/dimension.gemspec

@@ -10,10 +10,7 @@ Gem::Specification.new do |s|
   s.homepage    = "https://github.com/tomas/dimension"
   s.summary     = "Native, in-process image resizing in Ruby."
   s.description = "Yes, there are other graphic libraries besides ImageMagick."
-
   s.required_rubygems_version = ">= 1.3.6"
-  s.rubyforge_project         = "dimension"
-
   s.files        = `git ls-files`.split("\n")
   s.executables  = `git ls-files`.split("\n").map{|f| f =~ /^bin\/(.*)/ ? $1 : nil}.compact
   s.require_path = 'lib'

data/lib/dimension/image.rb

@@ -53,13 +53,13 @@ class Image
 
   def resize_to(geometry)
     case geometry
-      when RESIZE_GEOMETRY
+      when RESIZE_GEOMETRY # e.g. '300x200!'
         log "Resize -- #{$1}x#{$2}"
         resize($1, $2)
-      when CROPPED_RESIZE_GEOMETRY
+      when CROPPED_RESIZE_GEOMETRY # e.g. '20x50:ne'
         log "Resize and crop -- width: #{$1}, height: #{$2}, gravity: #{$3}"
         resize_and_crop($1, $2, $3)
-      when CROP_GEOMETRY
+      when CROP_GEOMETRY # e.g. '30x30+10+10'
         log "Crop -- width: #{$1}, height: #{$2}, x: #{$3}, y: #{$4}, gravity: #{$5}"
         crop($1, $2, $3, $4, $5)
       else

data/lib/dimension/middleware.rb

@@ -4,35 +4,35 @@ require 'rack/throttle'
 module Dimension
 
   class Middleware
-  
+
     EXCEEDED = [403, {'Content-Type' => 'text/plain'}, ['Limit Exceeded.']]
-  
+
     def initialize(app, opts = {})
       @app  = app
       @root = File.expand_path(opts[:root] || Dir.pwd())
       @save = opts[:save]
-      
+
       if opts[:throttle]
         @throttle = Rack::Throttle::Interval.new(self, :min => opts[:throttle])
       end
     end
-  
+
     def call(env)
       url      = env['PATH_INFO']
       geometry = url[/-([0-9x:-]+)\.(png|gif|jpe?g)/i, 1]
-      
+
       return @app.call(env) unless geometry
 
       resized  = File.join(@root, url)
       original = resized.sub("-#{geometry}", '')
-    
+
       if !File.exist?(resized) and File.exist?(original)
-        
+
         if @throttle
           req = Rack::Request.new(env)
           return EXCEEDED unless @throttle.allowed?(req)
         end
-        
+
         # puts 'Processing image: ' + file
         image = Dimension.open(original)
         image.generate(geometry) do
@@ -46,7 +46,7 @@ module Dimension
       # puts "Error processing image: #{e.message}"
       @app.call(env)
     end
-  
+
   end
 
 end

data/lib/dimension/processors/vips.rb

@@ -1,33 +1,31 @@
 # from examples at
-# - https://github.com/eltiare/carrierwave-vips/blob/master/lib/carrierwave/vips.rb
-# - https://github.com/jcupitt/ruby-vips/tree/master/examples
-
+# - 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 }
+    'png'  => { :compression => 8, :interlace => false }
   }
 
   SHARPEN_MASK = begin
-    conv_mask = [
+    ::Vips::Image.new_from_array [
       [ -1, -1, -1 ],
       [ -1, 24, -1 ],
       [ -1, -1, -1 ]
-    ]
-    ::VIPS::Mask.new conv_mask, 16
+    ], 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
+      Vips::Image.jpeg(@file, :sequential => true)
+    elsif format == 'png'
+      Vips::Image.png(@file, :sequential => true)
+    else
+      Vips::Image.new(@file)
+    end
   end
 
   def geometry
@@ -53,7 +51,7 @@ module VipsProcessor
   def close
     log "Closing image and cutting thread..."
     @image = nil
-    VIPS::thread_shutdown
+    Vips::thread_shutdown
     # image.delete!(true) # free image, and de-cache it too
   end
 
@@ -133,9 +131,9 @@ module VipsProcessor
 
   def writer_class
     case format
-      when 'jpeg' then VIPS::JPEGWriter
-      when 'png' then VIPS::PNGWriter
-      else VIPS::Writer
+      when 'jpeg' then Vips::JPEGWriter
+      when 'png' then Vips::PNGWriter
+      else Vips::Writer
     end
   end
 

data/lib/dimension/scanner.rb

@@ -3,7 +3,7 @@ require 'logger'
 require 'uri'
 
 module Dimension
-  
+
   class Scanner
 
     def initialize(opts = {})
@@ -11,23 +11,23 @@ module Dimension
       @root = File.expand_path(opts.delete(:root))
       @log_output = opts.delete(:log_output) || STDOUT
     end
-    
+
     def process(content)
       images = content.scan(/([a-z\-_0-9\/\:\.]*\.(jpg|jpeg|png|gif))/i)
       return [] if images.empty?
-    
+
       paths = images.map { |img| URI.parse(img[0]).path }.uniq
       paths.map do |path|
-    
+
         full = File.join(@root, path)
         if File.exist?(full)
           logger.info "Image exists in #{@root}: #{path}"
           next
         end
-    
+
         logger.info "Image not found! #{path}"
         no_extension = File.basename(path, File.extname(path))
-    
+
         if geometry = no_extension[/((\d+)?x(\d+)?.?)$/i, 1]
           original = File.join(@root, path.sub(/-?#{geometry}/, ''))
 
@@ -48,11 +48,11 @@ module Dimension
     end
 
     private
-    
+
     def logger
       Logger.new(@log_output)
     end
-  
+
     def resize_image(file, geometry, destination)
       thumb = Dimension.open(file)
       thumb.generate!(geometry, destination)

data/lib/dimension/version.rb

@@ -1,7 +1,7 @@
 module Dimension
   MAJOR = 0
-  MINOR = 3
-  PATCH = 1
+  MINOR = 4
+  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.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Tomás Pollak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-24 00:00:00.000000000 Z
+date: 2017-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack-throttle
@@ -71,10 +71,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubyforge_project: dimension
-rubygems_version: 2.2.0
+rubyforge_project: 
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Native, in-process image resizing in Ruby.
 test_files: []
-has_rdoc: