image_voodoo 0.8.7 → 0.9.1

data/bin/image_voodoo

@@ -1,86 +1,100 @@
+# frozen_string_literal: true
+
 #!/usr/bin/env ruby
 
 require 'optparse'
 
+headless = true
 actions = []
 images = []
 original_image = nil
 
-opts = OptionParser.new do |opts|
-  opts.banner = "Usage: image_voodoo [actions] image_file"
-  opts.separator "Perform some actions on a source image."
-
-  opts.separator ""
-  opts.separator "Actions are meant to be chained. Examples:"
-  opts.separator "  # Print the dimensions"
-  opts.separator "  image_voodoo --dim small.jpg"
-  opts.separator ""
-  opts.separator "  # Convert to a thumbnail, preview, and then save the result"
-  opts.separator "  image_voodoo --thumbnail 50 --preview --save thumb.png large.jpg"
-  opts.separator ""
-  opts.separator "  # Convert source to 3 thumbnails, showing dimensions and"
-  opts.separator "  # previewing along the way"
-  opts.separator "  image_voodoo --dim --resize 50x50 --dim --preview --save t1.jpg"
-  opts.separator "    --pop --resize 40x40 --dim --preview --save t2.jpg"
-  opts.separator "    --pop --resize 30x30 --dim --preview --save t3.jpg image.jpg"
-
-  opts.separator ""
-  opts.separator "Actions:"
-
-  opts.on("-a", "--alpha color_value", "Make color transparent in image") do |c|
-    if c !~ /[[:xdigit:]]{6,6}/
-      opts.usage "color_value is rrggbb in hexidecimal format"
-    end
-    actions << lambda {|img| img.alpha(c) }
+opts = OptionParser.new do |o|
+  o.banner = 'Usage: image_voodoo [actions] image_file'
+  o.separator 'Perform actions/transformations on an image.'
+  o.separator ''
+  o.separator 'Examples:'
+  o.separator '  image_voodoo --dim small.jpg     # Print the dimensions'
+  o.separator ''
+  o.separator '  # Make a thumbnail, preview it, and then save it.'
+  o.separator '  image_voodoo --thumbnail 50 --preview --save thumb.png large.jpg'
+  o.separator ''
+  o.separator '  # Make 2 thumbnails, showing dimensions and previewing them'
+  o.separator '  image_voodoo --dim --resize 50x50 --dim --preview --save t1.jpg'
+  o.separator '    --pop --resize 40x40 --dim --preview --save t2.jpg image.jpg'
+  o.separator ''
+  o.separator 'Actions:'
+
+  o.on('-a', '--alpha rrggbb', 'Make color transparent in image') do |c|
+    o.usage 'rrggbb is in hexidecimal format' if c !~ /[[:xdigit:]]{6,6}/
+    actions << ->(img) { img.alpha(c) }
+  end
+
+  o.on('-b', '--brightness SCALE,OFFSET', 'Adjust brightness') do |args|
+    scale, offset = args.split(/,/).map(&:to_f)
+    o.usage 'You need to specify proper scale and offset' unless scale && offset
+    actions << ->(img) { img.adjust_brightness(scale, offset) }
+  end
+
+  o.on('-B', '--border WIDTH,COLOR,STYLE', 'Add a simple border') do |args|
+    width, color, style = args.split(/,/)
+    options = { width: width, color: color, style: style }
+    actions << ->(img) { img.add_border(options) }
   end
 
-  opts.on("-b", "--brightness SCALE,OFFSET", "Adjust brightness") do |args|
-    scale, offset = args.split(/,/).map {|v| v.to_f}
-    opts.usage "You need to specify proper scale and offset" unless scale && offset
-    actions << lambda {|img| img.adjust_brightness(scale, offset) }
+  o.on('-d', '--dimensions', 'Print the image dimensions') do
+    actions << ->(img) { img.tap { puts "#{img.width}x#{img.height}" } }
   end
 
-  opts.on("-B", "--border WIDTH,COLOR,STYLE", "Add a simple border") do |args|
-    width, color, style = args.split(/,/)
-    options = {:width => width, :color => color, :style => style }
+  o.on('-g', '--greyscale', 'Convert image to greyscale') do
+    actions << ->(img) { img.greyscale }
+  end
 
-    actions << lambda {|img| img.add_border(options) }
+  o.on('-h', '--flip_horizontally') do
+    actions << ->(img) { img.flip_horizontally }
   end
 
-  opts.on("-d", "--dimensions", "Print the image dimensions") do
-    actions << lambda {|img| puts "#{img.width}x#{img.height}"; img }
+  o.on('-m', '--metadata') do
+    actions << ->(img) { img.tap { puts img.metadata } }
   end
 
-  opts.on("-g", "--greyscale", "Convert image to greyscale") do
-    actions << lambda {|img| img.greyscale }
+  o.on('-n', '--negative', 'Make a negative out of the image') do
+    actions << ->(img) { img.negative }
   end
 
-  opts.on("-h", "--flip_horizontally") do
-    actions << lambda {|img| img.flip_horizontally }
+  o.on('-o', '--orient', 'Rotate image to orient it based on metadata') do
+    actions << ->(img) { img.correct_orientation }
   end
 
-  opts.on("-n", "--negative", "Make a negative out of the image") do
-    actions << lambda {|img| img.negative }
+  o.on('-q', '--quality 0..1', Float, 'Set % of quality for lossy compression') do |quality|
+    actions << ->(img) { img.quality(quality) }
   end
 
-  opts.on("-q", "--quality 0..1", Float, "Set % of quality for lossy compression") do |quality|
-    actions << lambda {|img| img.quality(quality) }
+  o.on('-R', '--rotate 0..360', Float, 'Set angle to rotate image') do |angle|
+    actions << ->(img) { img.rotate(angle.to_f) }
   end
 
-  opts.on("-s", "--save FILENAME", "Save the results to a new file") do |f|
-    actions << lambda {|img| img.save(f); img }
+  o.on('-r', '--resize WIDTHxHEIGHT', 'Make a new resized image') do |dim|
+    width, height = dim.split(/x/i).map(&:to_i)
+    o.usage 'You need to specify proper dimensions' unless width && width > 0 && height && height > 0
+    actions << ->(img) { img.resize(width, height) }
   end
 
-  opts.on("-t", "--thumbnail SIZE", Integer, "Create a thumbnail of the given size") do |size|
-    actions << lambda {|img| img.thumbnail(size) }
+  o.on('-s', '--save FILENAME', 'Save the results to a new file') do |f|
+    actions << ->(img) { img.tap { img.save(f) } }
   end
 
-  opts.on("-v", "--flip_vertically") do
-    actions << lambda {|img| img.flip_vertically }
+  o.on('-t', '--thumbnail SIZE', Integer, 'Create a thumbnail of the given size') do |size|
+    actions << ->(img) { img.thumbnail(size) }
   end
 
-  opts.on("-p", "--preview", "Preview the image. Close the frame window",
-    "to continue, or quit the application to", "abort the action pipeline") do
+  o.on('-v', '--flip_vertically') { actions << ->(img) { img.flip_vertically } }
+
+  o.on('-p', '--preview',
+       'Preview the image. Close the frame window',
+       'to continue, or quit the application to',
+       'abort the action pipeline') do
+    headless = false
     actions << lambda do |img|
       done = false
       img.preview { done = true }
@@ -89,38 +103,33 @@ opts = OptionParser.new do |opts|
     end
   end
 
-  opts.on("--push", "Save the current image to be popped later") do
-    actions << lambda {|img| images << img; img }
+  o.on('--push', 'Save the current image to be popped later') do
+    actions << ->(img) { img.tap { images << img } }
   end
 
-  opts.on("--pop", "Revert back to the previous saved image", "or the original source image") do
-    actions << lambda {|img| images.pop || original_image }
+  o.on('--pop', 'Revert back to the previous image') do
+    actions << -> { images.pop || original_image }
   end
 
-  opts.on("-r", "--resize WIDTHxHEIGHT", "Create a new image with the specified", "dimensions") do |dim|
-    width, height = dim.split(/x/i).map {|v| v.to_i}
-    opts.usage "You need to specify proper dimensions" unless width && width > 0 && height && height > 0
-    actions << lambda {|img| img.resize(width,height) }
+  o.on('-f', '--format', 'Print the image format') do
+    actions << ->(img) { img.tap { img.format } }
   end
 
-  opts.on("-f", "--format", "Print the image format") do
-    actions << lambda {|img| puts img.format; img }
-  end
+  o.on_tail('-h', '--help', 'Show this message') { o.usage }
 
-  opts.on_tail("-h", "--help", "Show this message") do
-    puts opts
-    exit 0
-  end
-
-  def opts.usage(msg)
-    puts msg
+  def o.usage(msg=nil)
+    puts msg if msg
     puts self
     exit 1
   end
 end
 opts.parse!(ARGV)
-opts.usage("You need to supply a source image filename.") unless ARGV.first
-opts.usage("You need to supply one or more actions.") unless actions.size > 0
+opts.usage('You need to supply a source image filename.') unless ARGV.first
+opts.usage('You need to supply one or more actions.') if actions.empty?
+
+# For this binstub we only want to load non-headless if we are using
+# the preview feature. top of See lib/image_voodoo.rb for more info...
+require 'image_voodoo/needs_head' unless headless
 
 require 'image_voodoo'
 file_name = ARGV.first

data/image_voodoo.gemspec

@@ -1,6 +1,8 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "image_voodoo/version"
+# frozen_string_literal: true
+
+$LOAD_PATH.push File.expand_path('lib', __dir__)
+require 'image_voodoo/version'
 
 Gem::Specification.new do |s|
   s.name        = 'image_voodoo'
@@ -12,11 +14,16 @@ Gem::Specification.new do |s|
   s.summary     = 'Image manipulation in JRuby with ImageScience compatible API'
   s.description = 'Image manipulation in JRuby with ImageScience compatible API'
 
-  s.rubyforge_project = "image_voodoo"
-
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib", "vendor"]
-  s.has_rdoc      = true
+  s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
+  s.require_paths = %w[lib vendor]
+
+  s.add_development_dependency 'jar-dependencies'
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'rubocop'
+  s.add_development_dependency 'ruby-maven'
+  s.add_development_dependency 'test-unit'
+
+  s.requirements << 'jar com.drewnoakes, metadata-extractor, 2.11.0'
 end

data/lib/image_science.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'image_voodoo'
 # HA HA...let the pin-pricking begin
-ImageScience = ImageVoodoo
+ImageScience = ImageVoodoo

data/lib/image_voodoo/awt/core_ext/buffered_image.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'java'
+
+# Hide in ImageVoodoo so awt.rb can see this and we will not polute global
+class ImageVoodoo
+  java_import java.awt.image.BufferedImage
+
+  # Re-open to add convenience methods.
+  class BufferedImage
+    def each
+      height.times { |j| width.times { |i| yield i, j } }
+    end
+  end
+end

data/lib/image_voodoo/awt/core_ext/graphics2d.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'java'
+
+# Hide in ImageVoodoo so awt.rb can see this and we will not polute global
+class ImageVoodoo
+  java_import java.awt.Graphics2D
+
+  # Re-open to add convenience methods.
+  class Graphics2D
+    def draw_this_image(image)
+      draw_image image, 0, 0, nil
+    end
+  end
+end

data/lib/image_voodoo/awt/shapes.rb

@@ -1,5 +1,44 @@
+# frozen_string_literal: true
+
 class ImageVoodoo
+  # (Experimental) An attempt at some primitive drawing in images.
   module Shapes
+    # FIXME: if image has alpha values the border shows through since it is
+    #   a solid fill.
+    ##
+    # *AWT* (experimental) Add a border to the image and yield/return a new
+    # image.  The following options are supported:
+    #   - width: How thick is the border (default: 3)
+    #   - color: Which color is the border (in rrggbb hex value)
+    #   - style: etched, raised, plain (default: plain)
+    #
+    def add_border(options = {})
+      border_width = options[:width].to_i || 2
+      new_width, new_height = width + 2*border_width, height + 2*border_width
+      target = paint(BufferedImage.new(new_width, new_height, color_type)) do |g|
+        paint_border(g, new_width, new_height, options)
+        g.draw_image(@src, nil, border_width, border_width)
+      end
+      block_given? ? yield(target) : target
+    end
+
+    def paint_border(g, new_width, new_height, options)
+      g.color = hex_to_color(options[:color])
+      fill_method, *args = border_style(options)
+      g.send fill_method, 0, 0, new_width, new_height, *args
+    end
+
+    def border_style(options)
+      case (options[:style] || "").to_s
+      when "raised" then
+        [:fill3DRect, true]
+      when "etched" then
+        [:fill3DRect, false]
+      else
+        [:fill_rect]
+      end
+    end
+
     ##
     # *AWT* Draw a square
     #
@@ -18,14 +57,14 @@ class ImageVoodoo
     # *AWT* Draw a rounded square
     #
     def square_rounded(x, y, dim, rgb, arc_width=0, fill=true)
-      rect_rounded(x,y, dim, dim, rgb, arc_width, arc_width, fill)
+      rect_rounded(x, y, dim, dim, rgb, arc_width, arc_width, fill)
     end
 
     ##
     # *AWT* Draw a rounded rectangle
     #
     def rect_rounded(x, y, width, height, rgb, arc_width=0, arc_height=0, fill=true)
-      as_color(ImageVoodoo.hex_to_color(rgb)) do |g|
+      as_color(hex_to_color(rgb)) do |g|
         if fill
           g.fill_round_rect x, y, width, height, arc_width, arc_height
         else
@@ -44,4 +83,3 @@ class ImageVoodoo
     end
   end
 end
-