image_voodoo 0.8.8 → 0.9.2

data/test/test_image_voodoo.rb

@@ -0,0 +1,84 @@
+# frozen_string_literal: true
+
+require 'test/unit/testcase'
+require 'test/unit' if $PROGRAM_NAME == __FILE__
+require 'image_voodoo'
+
+# Depends on a small portion of awt/shapes working properly
+class TestImageVoodoo < Test::Unit::TestCase
+  # 04
+  # b8
+  def make_square
+    image = ImageVoodoo.new_image 20, 20, "test.gif"
+    image.square(*upper_left, 10, '000000')
+    image.square(10, 0, 10, '444444')
+    image.square(0, 10, 10, '888888')
+    image.square(*lower_right, 10, 'bb0000')
+  end
+
+  def assert_color(color, red, green, blue, alpha=nil)
+    assert_equal(red, color.red)
+    assert_equal(green, color.green)
+    assert_equal(blue, color.blue)
+    assert_equal(alpha, color.alpha) if alpha
+  end
+
+  def lower_right
+    [10, 10]
+  end
+
+  def upper_left
+    [0, 0]
+  end
+
+  # TODO: Don't fully know how to predict pixel values for adjust_brightness.
+
+  def test_alpha
+    image = make_square.alpha('000000')
+    assert_equal(0xff, image.color_at(*upper_left).alpha)
+  end
+
+  # 04 -> 40
+  # 8b    b8
+  def test_flip_horizontally
+    image = make_square.flip_horizontally
+    assert_color(image.color_at(*upper_left), 0x44, 0x44, 0x44)
+  end
+
+  # 04 -> 8b
+  # 8b    04
+  def test_flip_vertically
+    image = make_square.flip_vertically
+    assert_color(image.color_at(*upper_left), 0x88, 0x88, 0x88)
+  end
+
+  def test_greyscale
+    image = make_square.greyscale
+    assert_color(image.color_at(*lower_right), 0x5d, 0x5d, 0x5d)
+  end
+
+  # 04 -0-> 04 -90-> 80 -180-> 4b -270-> b8
+  # 8b      8b       b4        08        40
+  def test_rotate
+    image = make_square
+    assert_color(image.color_at(*upper_left), 0x00, 0x00, 0x00)
+    image = image.rotate(90)
+    assert_color(image.color_at(*upper_left), 0x88, 0x88, 0x88)
+    image = image.rotate(180)
+    assert_color(image.color_at(*upper_left), 0x44, 0x44, 0x44)
+    image = image.rotate(270)
+    assert_color(image.color_at(*upper_left), 0xbb, 0x00, 0x00)
+  end
+
+  # 04  -(-90)-> 4b -(-180)-> 80 -(-270)-> b8
+  # 8b           08           b4           40
+  def test_rotate_negative
+    image = make_square
+    image = image.rotate(-90)
+    assert_color(image.color_at(*upper_left), 0x44, 0x44, 0x44)
+    image = image.rotate(-180)
+    assert_color(image.color_at(*upper_left), 0x88, 0x88, 0x88)
+    image = image.rotate(-270)
+    assert_color(image.color_at(*upper_left), 0xbb, 0x00, 0x00)
+  end
+end

data/test/test_metadata.rb

@@ -1,49 +1,64 @@
+# frozen_string_literal: true
+
 require 'test/unit/testcase'
-require 'test/unit' if $0 == __FILE__
+require 'test/unit' if $PROGRAM_NAME == __FILE__
 require 'image_voodoo'
 
 IMAGE_DIR = File.join File.dirname(__FILE__), '..', '..', 'metadata-extractor-images'
 
 # FIXME: If we end up running on travis or other tool this should be ignored
 # subdir to this project and probably clone repo into that subdir
-unless File.exist? IMAGE_DIR
-  puts "To run this test you must clone: https://github.com/drewnoakes/metadata-extractor-images.git into a sibling directory to image_voodoo"
+if !File.exist? IMAGE_DIR
+  puts 'To run this test you must clone:'
+  puts 'https://github.com/drewnoakes/metadata-extractor-images.git'
+  puts 'into a sibling directory to image_voodoo'
 else
   class TestImageVoodooMetadata < Test::Unit::TestCase
     def setup
-      @path = File.join IMAGE_DIR, "Apple iPhone 4S.jpg"
-      @path_gps = File.join IMAGE_DIR, "Apple iPhone 4.jpg"
-      @path_no_exif = File.join File.dirname(__FILE__), "pix.png"
+      @path = File.join IMAGE_DIR, 'jpg', 'Apple iPhone 4S.jpg'
+      @path_gps = File.join IMAGE_DIR, 'jpg', 'Apple iPhone 4.jpg'
+      @path_no_exif = File.join File.dirname(__FILE__), 'pix.png'
+    end
+
+    def assert_orientation(expected, metadata)
+      assert_equal expected, metadata[:IFD0][:Orientation]
     end
+
     def test_metadata_from_file
       ImageVoodoo.with_image @path do |img|
-        assert img.metadata[:IFD0].exists?
-        assert_equal 6, img.metadata[:IFD0][:Orientation]
-        assert_equal 6, img.metadata.orientation
-        assert_equal 3264, img.metadata.width
-        assert_equal 2448, img.metadata.height
-        assert_equal "Apple", img.metadata.make
-        assert_equal "iPhone 4S", img.metadata.model
+        metadata = img.metadata
+        assert_orientation 6, metadata
+        assert_equal 6, metadata.orientation
+        assert_equal 3264, metadata.width
+        assert_equal 2448, metadata.height
+        assert_equal 'Apple', metadata.make
+        assert_equal 'iPhone 4S', metadata.model
       end
     end
 
     def test_metadata_from_inputstream
       ImageVoodoo.with_bytes File.read(@path) do |img|
-        assert_equal(6, img.metadata[:IFD0][:Orientation])
+        assert_orientation 6, img.metadata
       end
     end
 
     def test_metadata_no_ifd0
       ImageVoodoo.with_image @path_no_exif do |img|
         assert !img.metadata[:IFD0].exists?
-        assert_equal(nil, img.metadata[:IFD0][:Orientation])
+        assert_orientation nil, img.metadata
       end
     end
 
     def test_metadata_gps
       ImageVoodoo.with_image @path_gps do |img|
         assert img.metadata[:Gps].exists?
-        assert_equal("N", img.metadata[:Gps]['Latitude Ref'])
+        assert_equal('N', img.metadata[:Gps]['Latitude Ref'])
+      end
+    end
+
+    def test_metadata_to_s
+      ImageVoodoo.with_image @path do |img|
+        assert img.metadata.to_s =~ /Make = Apple/
       end
     end
   end

data/test/test_shapes.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'test/unit/testcase'
+require 'test/unit' if $PROGRAM_NAME == __FILE__
+require 'image_voodoo'
+
+class TestShapes < Test::Unit::TestCase
+  def test_new_image
+    image = ImageVoodoo.new_image 10, 20, "test.gif"
+    assert_equal 10, image.width
+    assert_equal 20, image.height
+    assert_equal "gif", image.format
+  end
+
+  def test_square
+    image = ImageVoodoo.new_image 10, 10, "test.gif"
+    image.square 0, 0, 10, 'ff9900'
+    color = image.color_at(0, 0)
+    assert_equal(0xff, color.red)
+    assert_equal(0x99, color.green)
+    assert_equal(0x00, color.blue)
+  end
+end

data/tools/gen.rb

@@ -1,23 +1,29 @@
+# frozen_string_literal: true
+
 # Used to generate part of metadata.rb.  Unfortunately, I am unable to fill
 # in appropriate access methods so I generate with get_string and then manually
 # update.  In future versions I will just run this twice with old and new src
 # and manually splice in new data (or fixes).
-# 
+#
 # % find ../metadata-extractor/Source/ -name '*Directory.java' | xargs grep TAG_ | grep 'public static final' | ruby tools/gen.rb
 
+# FIXME: I made style tweaks and removed redundant data manually in generated
+#   source.  I should update this tool to do all that.
+# FIXME: I should add a generated comment in metadata generated file.
+
 def normalize_directory_name(path)
-  path.gsub('/', '.')
+  path.tr('/', '.')
 end
 
 def normalize_tag_name(capname)
-  name = capname.split('_').map {|e| e.capitalize }.join(' ')
+  name = capname.split('_').map(&:capitalize).join(' ')
   [name, "TAG_#{capname}"]
 end
 
 # 'ExifSubIFDDirectory' => 'Exif Sub IFD0'
 def humanize_directory_name(s)
   s = s.gsub('Directory', '')
-  s.split(/([A-Z]+[a-z]+)/).map {|a| a == "" ? nil : a }.compact.join(' ')
+  s.split(/([A-Z]+[a-z]+)/).map { |a| a == '' ? nil : a }.compact.join(' ')
 end
 
 io = $stdin
@@ -25,37 +31,38 @@ directories = {}
 
 io.readlines.each do |line|
   #  .../IptcDirectory.java: public static final int TAG_BY_LINE = 80;
-  if %r{Source/[/]?(?<directory_name>.*).java:.*TAG_(?<tag_name>[\S]+)} =~ line
-    directory_name = normalize_directory_name directory_name
-    directories[directory_name] ||= []
-    directories[directory_name] << normalize_tag_name(tag_name)
-  end
+  next if %r{Source/[/]?(?<dir_name>.*).java:.*TAG_(?<tag_name>[\S]+)} !~ line
+
+  directory_name = normalize_directory_name dir_name
+  directories[directory_name] ||= []
+  directories[directory_name] << normalize_tag_name(tag_name)
 end
 
 directories.each do |directory, tag_names|
   class_name = directory.split('.')[-1]
-  puts "class #{class_name} < Directory"
-  puts "  java_import #{directory}"
-  puts ""
-  puts "  def self.directory_class"
-  puts "    #{directory}"
-  puts "  end"
-  puts ""
-  puts "  TAGS = {"
+  puts <<"EOS"
+  # GENERATED
+  class #{class_name} < Directory
+    java_import #{directory}
+
+    def self.directory_class
+      #{directory}
+    end"
+
+    TAGS = {
+EOS
   tag_names.each do |name, original_name|
-    puts "    '#{name}' => ['#{original_name}', :get_string],"
+    puts "'#{name}' => ['#{original_name}', :get_string],"
   end
-  puts "  }"
-  puts "end"
-  puts ""
+  puts <<EOS
+    }.freeze
+  end
+EOS
 end
 
-puts ""
-puts "DIRECTORY_MAP = {"
+puts 'DIRECTORY_MAP = {'
 directories.each do |directory, _|
   class_name = directory.split('.')[-1]
-  puts "  '#{humanize_directory_name(class_name)}' => #{class_name},"
+  puts "'#{humanize_directory_name(class_name)}' => #{class_name},"
 end
-puts "}"
-  
-
+puts '}.freeze'

metadata

@@ -1,15 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: image_voodoo
 version: !ruby/object:Gem::Version
-  version: 0.8.8
+  version: 0.9.2
 platform: ruby
 authors:
 - Thomas E. Enebo, Charles Nutter, Nick Sieger
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-02-13 00:00:00.000000000 Z
-dependencies: []
+date: 2021-10-12 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  name: jar-dependencies
+  prerelease: false
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  name: rake
+  prerelease: false
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  name: rubocop
+  prerelease: false
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  name: ruby-maven
+  prerelease: false
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  name: test-unit
+  prerelease: false
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Image manipulation in JRuby with ImageScience compatible API
 email: tom.enebo@gmail.com
 executables:
@@ -20,8 +90,11 @@ files:
 - ".gitignore"
 - ".hgignore"
 - ".hgtags"
+- ".rubocop.yml"
 - ".travis.yml"
+- Gemfile
 - History.txt
+- Jars.lock
 - LICENSE-2.0.txt
 - LICENSE.txt
 - Manifest.txt
@@ -33,25 +106,28 @@ files:
 - lib/image_science.rb
 - lib/image_voodoo.rb
 - lib/image_voodoo/awt.rb
+- lib/image_voodoo/awt/core_ext/buffered_image.rb
+- lib/image_voodoo/awt/core_ext/graphics2d.rb
 - lib/image_voodoo/awt/shapes.rb
 - lib/image_voodoo/gae.rb
 - lib/image_voodoo/metadata.rb
+- lib/image_voodoo/needs_head.rb
 - lib/image_voodoo/version.rb
 - samples/bench.rb
 - samples/checkerboard.jpg
 - samples/file_greyscale.rb
 - samples/file_thumbnail.rb
 - samples/file_view.rb
-- samples/in-memory.rb
+- samples/in_memory.rb
 - samples/lossy.rb
 - test/pix.png
 - test/pix_cmyk.jpg
 - test/test_image_science.rb
+- test/test_image_voodoo.rb
 - test/test_metadata.rb
+- test/test_shapes.rb
 - tools/gen.rb
 - vendor/CMYKDemo.jar
-- vendor/metadata-extractor-2.7.0.jar
-- vendor/xmpcore-5.1.2.jar
 homepage: http://github.com/jruby/image_voodoo
 licenses: []
 metadata: {}
@@ -70,9 +146,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-requirements: []
-rubyforge_project: image_voodoo
-rubygems_version: 2.4.5
+requirements:
+- jar com.drewnoakes, metadata-extractor, 2.11.0
+rubygems_version: 3.2.14
 signing_key:
 specification_version: 4
 summary: Image manipulation in JRuby with ImageScience compatible API
@@ -80,5 +156,6 @@ test_files:
 - test/pix.png
 - test/pix_cmyk.jpg
 - test/test_image_science.rb
+- test/test_image_voodoo.rb
 - test/test_metadata.rb
-has_rdoc: true
+- test/test_shapes.rb