image_voodoo 0.8.4 → 0.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 154df8437b68b194e1d1493c6bf592511702f246
-  data.tar.gz: 1ac972b37e7af0729453effebe9afeb3cddf9be6
+  metadata.gz: a9c58e8e0f8b9c9388e30b313dc18e6cc3b9bea0
+  data.tar.gz: bcf41a5a7f38c576b3c95323ca0e486e3288223a
 SHA512:
-  metadata.gz: f131451e413fd9cbcd1a6d326c5931865034cfc010f470a3cb83b4d0d79e9e2137d350ea2bc11a041bec27299ac5eb8c877a0bfdd503c5aa1d7d9b0c56f47879
-  data.tar.gz: 33c22b496910d12e4d6caf5bfcbecbb4a433dc52d2ff991e14ae76f9cc9ef124489cbc61f70a30755238fda3cccd45415c1d8b9e44d6ebd26ef38ba88214b10e
+  metadata.gz: 0e6ea0d28e142e9092454ea8e40ab5d87c8a099924611423660e8c496802854df38c5c7b403512d20a9039a6addd14178f0076819af09b1e59cdfafd6dbabe77
+  data.tar.gz: dee71d6424b06ae4fd2f19557ad4374eb8edc6763c7425a47c9b347d742c8c16dd6b421309310942c40d6def9c6ab208c5099e03cd1759ce467ccec314a8e01c

data/History.txt

@@ -19,7 +19,7 @@
 
 == 0.7
 
-- add alias for image science method with_image_from_memory to our existing 
+- add alias for image science method with_image_from_memory to our existing
   with_bytes
 
 == 0.6

data/bin/image_voodoo

@@ -103,6 +103,10 @@ opts = OptionParser.new do |opts|
     actions << lambda {|img| img.resize(width,height) }
   end
 
+  opts.on("-f", "--format", "Print the image format") do
+    actions << lambda {|img| puts img.format; img }
+  end
+
   opts.on_tail("-h", "--help", "Show this message") do
     puts opts
     exit 0

data/lib/image_voodoo.rb

@@ -3,8 +3,8 @@
 # = ImageVoodoo
 # == Description
 #
-# ImageVoodoo is an ImageScience-API-compatible image manipulation library for 
-# JRuby.  
+# ImageVoodoo is an ImageScience-API-compatible image manipulation library for
+# JRuby.
 #
 # == Examples
 #
@@ -27,7 +27,7 @@
 #
 class ImageVoodoo
   attr_accessor :quality
-  
+
   include Java
 
   JFile = java.io.File
@@ -44,8 +44,9 @@ class ImageVoodoo
      require 'image_voodoo/awt'
   end
 
-  def initialize(src)
+  def initialize(src, format=nil)
     @src = src
+    @format = format
     @quality = nil # nil means no specific quality ever specified
   end
 
@@ -58,10 +59,10 @@ class ImageVoodoo
     image = guard { adjust_brightness_impl(scale, offset) }
     block_given? ? yield(image) : image
   end
-  
+
   ##
   #
-  # Converts rgb hex color value to an alpha value an yields/returns the new 
+  # Converts rgb hex color value to an alpha value an yields/returns the new
   # image.
   #
   def alpha(rgb)
@@ -70,12 +71,12 @@ class ImageVoodoo
   end
 
   ##
-  # 
+  #
   # Get current image bytes as a String using provided format. Format parameter
   # is the informal name of an image type - for instance,
   # "bmp" or "jpg". If the backend is AWT the types available are listed in
   # javax.imageio.ImageIO.getWriterFormatNames()
-  # 
+  #
   def bytes(format)
     java_bytes = guard { bytes_impl(format) }
     String.from_java_bytes java_bytes
@@ -83,8 +84,8 @@ class ImageVoodoo
 
   ##
   #
-  # Creates a square thumbnail of the image cropping the longest edge to 
-  # match the shortest edge, resizes to size, and yields/returns the new image. 
+  # Creates a square thumbnail of the image cropping the longest edge to
+  # match the shortest edge, resizes to size, and yields/returns the new image.
   #
   def cropped_thumbnail(size)
     l, t, r, b, half = 0, 0, width, height, (width - height).abs / 2
@@ -114,7 +115,7 @@ class ImageVoodoo
   end
 
   ##
-  # 
+  #
   # Creates a grayscale version of image and yields/returns the new image.
   #
   def greyscale
@@ -124,7 +125,7 @@ class ImageVoodoo
   alias_method :grayscale, :greyscale
 
   ##
-  # 
+  #
   # Creates a negative and yields/returns the new image.
   #
   def negative
@@ -149,7 +150,7 @@ class ImageVoodoo
 
   ##
   #
-  # Resizes the image to width and height and yields/returns the new image. 
+  # Resizes the image to width and height and yields/returns the new image.
   #
   def resize(width, height)
     target = guard { resize_impl(width, height) }
@@ -159,9 +160,9 @@ class ImageVoodoo
   end
 
   ##
-  # 
-  # Saves the image out to path. Changing the file extension will convert 
-  # the file type to the appropriate format. 
+  #
+  # Saves the image out to path. Changing the file extension will convert
+  # the file type to the appropriate format.
   #
   def save(file)
     format = File.extname(file)
@@ -184,8 +185,8 @@ class ImageVoodoo
 
   ##
   #
-  # Creates a proportional thumbnail of the image scaled so its longest 
-  # edge is resized to size and yields/returns the new image. 
+  # Creates a proportional thumbnail of the image scaled so its longest
+  # edge is resized to size and yields/returns the new image.
   #
   def thumbnail(size)
     target = scale(size.to_f / (width > height ? width : height))
@@ -194,8 +195,8 @@ class ImageVoodoo
 
   ##
   #
-  # Crops an image to left, top, right, and bottom and then yields/returns the 
-  # new image. 
+  # Crops an image to left, top, right, and bottom and then yields/returns the
+  # new image.
   #
   def with_crop(left, top, right, bottom)
     image = guard { with_crop_impl(left, top, right, bottom) }
@@ -203,7 +204,7 @@ class ImageVoodoo
   end
 
   ##
-  # 
+  #
   # A top-level image loader opens path and then yields/returns the image.
   #
   def self.with_image(path)
@@ -213,7 +214,7 @@ class ImageVoodoo
   end
 
   ##
-  # 
+  #
   # A top-level image loader reads bytes and then yields/returns the image.
   #
   def self.with_bytes(bytes)
@@ -229,7 +230,7 @@ class ImageVoodoo
   ##
   #
   # *_impl providers only need provide the implementation if it can
-  # support it.  Otherwise, this method will detect that the method is 
+  # support it.  Otherwise, this method will detect that the method is
   # missing.
   #
   def self.guard(&block)
@@ -245,7 +246,7 @@ class ImageVoodoo
 
   ##
   #
-  # Returns the height of the image, in pixels. 
+  # Returns the height of the image, in pixels.
   #
   def height
     @src.height
@@ -253,7 +254,7 @@ class ImageVoodoo
 
   ##
   #
-  # Returns the width of the image, in pixels. 
+  # Returns the width of the image, in pixels.
   #
   def width
     @src.width
@@ -268,4 +269,16 @@ class ImageVoodoo
   def to_java
     @src
   end
+
+  ##
+  #
+  # Returns detected image format from binary representation of input data
+  # as upper case string. Eg. JPEG, BMP, PNG. For GWT image representation
+  # compatibility method name is :format. It also accepts block and returns
+  # format as first block argument. When format not detected or not set it
+  # returns nil
+  #
+  def format
+    @format && block_given? ? yield(@format) : @format
+  end
 end

data/lib/image_voodoo/awt.rb

@@ -16,16 +16,16 @@ class ImageVoodoo
   java_import javax.imageio.ImageIO
   java_import javax.imageio.IIOImage
   java_import javax.imageio.ImageWriteParam
-  java_import javax.imageio.stream.FileImageOutputStream  
+  java_import javax.imageio.stream.FileImageOutputStream
   java_import javax.swing.JFrame
 
   # FIXME: Move and rewrite in terms of new shape
   ##
   #
-  # *AWT* (experimental) Add a border to the image and yield/return a new 
+  # *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) 
+  #   - color: Which color is the border (in rrggbb hex value)
   #   - style: etched, raised, plain (default: plain)
   #
   def add_border(options = {})
@@ -48,7 +48,7 @@ class ImageVoodoo
   end
 
   ##
-  # 
+  #
   # A simple swing wrapper around an image voodoo object.
   #
   class JImagePanel < javax.swing.JPanel
@@ -71,7 +71,7 @@ class ImageVoodoo
     end
   end
 
-  ImageVoodoo::JImagePanel.__persistent__ = true 
+  ImageVoodoo::JImagePanel.__persistent__ = true
 
   # Internal class for closing preview window
   class WindowClosed
@@ -96,11 +96,11 @@ class ImageVoodoo
 
   ##
   # *AWT* paint/render to the source
-  # 
+  #
   def paint(src=dup_src)
     yield src.graphics
     src.graphics.dispose
-    ImageVoodoo.new src
+    ImageVoodoo.new(src, @format)
   end
 
   ##
@@ -115,7 +115,7 @@ class ImageVoodoo
     tracker = java.awt.MediaTracker.new(java.awt.Label.new(""))
     tracker.addImage(image, 0);
     tracker.waitForID(0)
-    target = paint(BufferedImage.new(image.width, image.height, RGB)) do |g| 
+    target = paint(BufferedImage.new(image.width, image.height, RGB)) do |g|
       g.draw_image image, 0, 0, nil
     end
     block_given? ? yield(target) : target
@@ -140,12 +140,21 @@ class ImageVoodoo
   SCALE_SMOOTH = java.awt.Image::SCALE_SMOOTH
 
   def self.with_image_impl(file)
+    format = detect_format_from_input(file)
     buffered_image = ImageIO.read(file)
-    buffered_image ? ImageVoodoo.new(buffered_image) : nil
+    buffered_image ? ImageVoodoo.new(buffered_image, format) : nil
+  end
+
+  def self.detect_format_from_input(input)
+    stream = ImageIO.createImageInputStream(input)
+    readers = ImageIO.getImageReaders(stream)
+    readers.has_next ? readers.next.format_name.upcase : nil
   end
 
   def self.with_bytes_impl(bytes)
-    ImageVoodoo.new ImageIO.read(ByteArrayInputStream.new(bytes))
+    input_stream = ByteArrayInputStream.new(bytes)
+    format = detect_format_from_input(input_stream)
+    ImageVoodoo.new(ImageIO.read(input_stream), format)
   end
 
   #
@@ -158,7 +167,7 @@ class ImageVoodoo
     java.awt.Color.new(rgb[0,2].to_i(16), rgb[2,2].to_i(16), rgb[4,2].to_i(16))
   end
 
-  # 
+  #
   # Determines the best colorspace for a new image based on whether the
   # existing image contains an alpha channel or not.
   #
@@ -166,7 +175,7 @@ class ImageVoodoo
     @src.color_model.has_alpha ? ARGB : RGB
   end
 
-  # 
+  #
   # Make a duplicate of the underlying Java src image
   #
   def dup_src
@@ -238,7 +247,7 @@ class ImageVoodoo
   end
 
   def with_crop_impl(left, top, right, bottom)
-    ImageVoodoo.new @src.get_subimage(left, top, right-left, bottom-top)
+    ImageVoodoo.new(@src.get_subimage(left, top, right-left, bottom-top), @format)
   end
 
   def write_new_image(format, stream)

data/lib/image_voodoo/awt/shapes.rb

@@ -6,7 +6,7 @@ class ImageVoodoo
     def square(x, y, dim, rgb, fill=true)
       square_rounded(x, y, dim, rgb, 0, fill)
     end
-    
+
     ##
     # *AWT* Draw a rectangle
     #
@@ -35,7 +35,7 @@ class ImageVoodoo
     end
 
     def as_color(color)
-      paint do |g| 
+      paint do |g|
         old_color = g.color
         g.color = color
         yield g

data/lib/image_voodoo/gae.rb

@@ -21,7 +21,7 @@ class ImageVoodoo
   #++
 
   private
-  
+
   def flip_horizontally_impl
     transform(ImagesServiceFactory.make_horizontal_flip)
   end
@@ -40,14 +40,15 @@ class ImageVoodoo
   end
 
   def self.with_bytes_impl(bytes)
-    ImageVoodoo.new ImageServicesFactory.make_image(bytes)
+    image = ImageServicesFactory.make_image(bytes)
+    ImageVoodoo.new image, image.format.to_s.upcase
   end
 
   def from_java_bytes
     String.from_java_bytes @src.image_data
   end
 
-  # 
+  #
   # Make a duplicate of the underlying src image
   #
   def dup_src

data/lib/image_voodoo/version.rb

@@ -1,3 +1,3 @@
 class ImageVoodoo
-  VERSION = "0.8.4"
+  VERSION = "0.8.5"
 end

data/test/test_image_science.rb

@@ -130,4 +130,23 @@ class TestImageScience < Test::Unit::TestCase
 
     deny File.exists?(@tmppath)
   end
+
+  def test_image_format_retrieval
+    ImageScience.with_image @path do |img|
+      assert_equal 'PNG', img.format
+    end
+  end
+
+  def test_image_format_retrieval_from_bytes
+    ImageScience.with_image @path do |img|
+      bytes_string = img.bytes('JPEG')
+      image = ImageScience.with_bytes(bytes_string)
+      assert_equal 'JPEG', image.format
+    end
+  end
+
+  def test_image_format_retrieval_fail_when_invalid_bytes
+    image = ImageScience.with_bytes("some invalid image bytes")
+    assert_equal nil, image.format
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: image_voodoo
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.8.5
 platform: ruby
 authors:
 - Thomas E. Enebo, Charles Nutter, Nick Sieger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-16 00:00:00.000000000 Z
+date: 2014-08-26 00:00:00.000000000 Z
 dependencies: []
 description: Image manipulation in JRuby with ImageScience compatible API
 email: tom.enebo@gmail.com