image_voodoo 0.8.9 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 525eaa36345ce66a917c101be73299b04e2800cb
-  data.tar.gz: e851fe90c983c411388d7b1e37ef0c2e323f677b
+SHA256:
+  metadata.gz: e110e54c634bb3970622f8b0e4fb180fa570e15c53b0ccf830d3ccaf1efed822
+  data.tar.gz: 34d6555550532df09c08f48d15c79d2b749573c85dc8e726bae1757b0249a189
 SHA512:
-  metadata.gz: 02453c98b8e64606ecb01834cebd6d04ba96212377308ca3f4a36f2ab91ae79db59dee0ca1b8056d912b3e66eea71da20d120fb81935d98f6d3a1550e3e57b17
-  data.tar.gz: 204639d91890c6525a6bae30fd1db9fd61f999187576e5213ac064bc1b8b29e57d3b7412b4ae691e6c1caa9922bdf0659f5535c49a0ebfed9344af5721bdb4db
+  metadata.gz: 5e4cf9fbf2a7d8045dd3a5be081ae2c1410cc71e327386f779b3f774d95fc4a1d174221e62cfc94c441e738e41e6e572e033f2c47da8e0c9759ca10cf4fcdd46
+  data.tar.gz: 50608dbcde4b2abc26877b0bafa91223e5a26f818dd398ad8b245dd630cc1ccd9fd8974cbaca0c0db63f493066fde7ba3d224464363fe4adbc9f44bb4b65ace7

data/.gitignore

@@ -1,2 +1,5 @@
 /pkg
 *~
+Gemfile.lock
+lib/image_voodoo_jars.rb
+lib/com

data/.rubocop.yml

@@ -69,17 +69,17 @@ Style/SpecialGlobalVars:
   Enabled: false
 
 # I am grouping math and using lack of whitespace for separation.
-Style/SpaceAroundOperators:
+Layout/SpaceAroundOperators:
   Enabled: false
 
 # I prefer tight assignment for opt args.
-Style/SpaceAroundEqualsInParameterDefault:
+Layout/SpaceAroundEqualsInParameterDefault:
   Enabled: false
 
 # Java methods which override or implement Java method names cannot be switched
 # to snake case.  Do we really need this as a rule anyways?  I have never seen
 # a Rubyist do this as a preferred style?
-Style/MethodName:
+Naming/MethodName:
   Enabled: false
 
 # bin/image_voodoo main options block.
@@ -113,3 +113,61 @@ Style/ParallelAssignment:
 Metrics/ParameterLists:
   Exclude:
     - 'lib/image_voodoo/awt/shapes.rb'
+
+# This is complaining that 'x' and 'y' are bad names because they are less
+# than 3 chars.  Silly rule even if I appreciate what it is trying to
+# accomplish. Interestingly, in image_voodoo I do use h for height and
+# w for width.  Those probably could be written out but they are so common
+# I am basically opting for short-hand.  This is something I rarely do except
+# domain-driven code like this (x,y,h,w).
+Naming/UncommunicativeMethodParamName:
+  Enabled: false
+
+# This represents one of those frustrating dogmatic rules where if I followed
+# this advice I would then violate the column length rule.  I specifically
+# use traditional if indented block in cases where if_mod doesn't fit.
+# Gramatically, if_mod can be across two lines but I hate how that looks. The
+# second solution of logical &&/|| change for a raise is alien to for all but
+# assignment.
+Style/IfUnlessModifier:
+  Enabled: false
+
+# What the hell.  Really telling people that encoding: utf-8 should not happen
+# because there are no multi-byte utf-8 characters in it?  Why add this noise?
+Style/Encoding:
+  Enabled: false
+
+# FIXME:
+# This is an unknown error which I should figure out.  It must be some
+# StandardError (which is what nothing explicit means) but I should actually
+# be more explicit here.
+Style/RescueStandardError:
+  Exclude:
+    - 'lib/image_voodoo.rb'
+
+
+# This was complaining metadata_impl should use @metadata_impl instead of
+# @metadata.  I disagree and am unsure why I need to follow this programs
+# opinion on what a good name is?  What is commentable is if I change the
+# variable name to @gorgon it still tells me I need to use @metadata_impl.
+# So if I conditionally add any state in any method it will tell me I am
+# memoizing and have to use same ivar as the name of the method?  Is it more
+# sophisticated than that?  Should I have spent 2-3 minutes trying to figure
+# out how this rule was implemented? :)
+Naming/MemoizedInstanceVariableName:
+  Enabled: false
+
+# I have two modes of use for private.  If it is a small number of individual
+# methods I am explicit and inline the private.  If it is a large number of
+# methods especially when the name is fairly obvious that those will be private
+# (like render_impl) then I use block private.  Not sure telling me I can only
+# use a single style is very useful.
+Style/AccessModifierDeclarations:
+  Enabled: false
+
+# I feel for the tiny amount of generation here a better name would not help
+# me understand it better.  This is one of those naming rules I feel is
+# probably helpful a minority of the time.  Also I have never been confused
+# by what a heredoc text represents because of my heredoc terminator?
+Naming/HeredocDelimiterNaming:
+  Enabled: false

data/.travis.yml

@@ -3,7 +3,15 @@ language: ruby
 sudo: false
 
 rvm:
-  - jruby-19mode
+  - jruby-head
+
+before_install:
+  - mkdir rvm_tmp
+  - cd rvm_tmp
 
 before_script:
-  - git clone https://github.com/drewnoakes/metadata-extractor-images.git ../metadata-extractor-images
+  - cd ..
+  - git clone --depth 1 https://github.com/drewnoakes/metadata-extractor-images.git ../metadata-extractor-images
+
+install: JRUBY_OPTS=--dev jruby --dev -S bundle install --jobs=3 --retry=3
+

data/Gemfile

@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+
+gemspec

data/Jars.lock

@@ -0,0 +1,3 @@
+org.yaml:snakeyaml:1.23:compile:
+com.drewnoakes:metadata-extractor:2.11.0:compile:
+com.adobe.xmp:xmpcore:5.1.3:compile:

data/Rakefile

@@ -1,11 +1,19 @@
 require 'bundler'
 require 'rake/testtask'
+require 'jars/installer'
 Bundler::GemHelper.install_tasks
+Bundler.setup
 
-task :default => :test
+task :default => [:vendor_jars, :test]
+
+desc 'Vendor Jars'
+task :vendor_jars do
+  test_file = File.expand_path File.join('lib', 'image_voodoo_jars.rb'), __dir__
+  Jars::Installer.vendor_jars! unless File.exist? test_file
+end
 
 desc 'Run tests'
-task :test do
+task :test => :vendor_jars do
   Rake::TestTask.new do |t|
     t.libs << 'lib:vendor'
     t.test_files = FileList['test/test*.rb']

data/bin/image_voodoo

@@ -106,7 +106,7 @@ opts = OptionParser.new do |o|
   end
 
   o.on('--pop', 'Revert back to the previous image') do
-    actions << ->() { images.pop || original_image }
+    actions << -> { images.pop || original_image }
   end
 
   o.on('-f', '--format', 'Print the image format') do

data/image_voodoo.gemspec

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 
-$LOAD_PATH.push File.expand_path('../lib', __FILE__)
+$LOAD_PATH.push File.expand_path('lib', __dir__)
 require 'image_voodoo/version'
 
 Gem::Specification.new do |s|
@@ -20,4 +20,11 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   s.require_paths = %w[lib vendor]
   s.has_rdoc      = true
+
+  s.add_development_dependency 'jar-dependencies'
+  s.add_development_dependency 'rake'
+  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_voodoo.rb

@@ -31,7 +31,7 @@ end
 # img = ImageVoodoo.with_image(ARGV[0])
 # negative_img = img.negative
 class ImageVoodoo
-  attr_accessor :quality
+  attr_writer :quality # used by quality(value)
 
   include Java
 
@@ -95,12 +95,12 @@ 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.
   def cropped_thumbnail(size)
-    l, t, r, b = calculate_thumbnail_dimentions
+    l, t, r, b = calculate_thumbnail_dimensions
     target = with_crop(l, t, r, b).thumbnail(size)
     block_given? ? yield(target) : target
   end
 
-  def calculate_thumbnail_dimensions
+  private def calculate_thumbnail_dimensions
     half = (width - height).abs / 2
     if width > height
       [half, 0, half + height, height]
@@ -108,7 +108,6 @@ class ImageVoodoo
       [0, half, width, half + width]
     end
   end
-  private :calculate_thumbnail_dimensions
 
   # Flips the image horizontally and yields/returns the new image.
   def flip_horizontally
@@ -157,7 +156,7 @@ class ImageVoodoo
   def resize(width, height)
     target = guard { resize_impl(width, height) }
     block_given? ? yield(target) : target
-  rescue NativeException => ne
+  rescue java.lang.Exception => ne # figure out why this is here at all?
     raise ArgumentError, ne.message
   end
 
@@ -227,7 +226,7 @@ class ImageVoodoo
   # support it.  Otherwise, this method will detect that the method is
   # missing.
   def self.guard(&block)
-    return block.call
+    block.call
   rescue NoMethodError => e
     "Unimplemented Feature: #{e}"
   end

data/lib/image_voodoo/awt.rb

@@ -180,8 +180,8 @@ class ImageVoodoo
 
   # Converts a RGB hex value into a java.awt.Color object or dies trying
   # with an ArgumentError.
-  def hex_to_color(rgb='00000')
-    rgb = '000000' unless rgb
+  def hex_to_color(rgb='000000')
+    rgb ||= '000000'
     raise ArgumentError, 'hex rrggbb needed' if rgb !~ /[[:xdigit:]]{6,6}/
     Color.new(rgb[0, 2].to_i(16), rgb[2, 2].to_i(16), rgb[4, 2].to_i(16))
   end
@@ -248,9 +248,10 @@ class ImageVoodoo
     when 2 then flip_horizontally
     when 3 then rotate(180)
     when 4 then flip_vertically
-    when 5 then flip_horizontally && rotate(270)
+    when 5 then flip_horizontally && rotate(90)
     when 6 then rotate(90)
     when 7 then flip_horizontally && rotate(270)
+    when 8 then rotate(270)
     else self
     end
   end
@@ -290,7 +291,7 @@ class ImageVoodoo
   def rotate_impl(radians)
     new_width, new_height = rotate_new_dimensions(radians)
     paint_new_buffered_image(new_width, new_height) do |g|
-      g.jtranslate (new_width - width) / 2, (new_height - height) / 2
+      g.translate (new_width - width) / 2, (new_height - height) / 2
       g.rotate radians, width / 2, height / 2
       g.draw_this_image @src
     end

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

@@ -6,10 +6,6 @@ class ImageVoodoo
 
   # Re-open to add convenience methods.
   class Graphics2D
-    def jtranslate(x, y)
-      java_send :translate, [::Java.int, ::Java.int], x, y
-    end
-
     def draw_this_image(image)
       draw_image image, 0, 0, nil
     end

data/lib/image_voodoo/metadata.rb

@@ -1,5 +1,5 @@
-require_relative '../../vendor/xmpcore-5.1.2.jar'
-require_relative '../../vendor/metadata-extractor-2.7.0.jar'
+require 'image_voodoo_jars'
+require 'stringio'
 
 class ImageVoodoo
   # Metadata contained within the image.
@@ -46,6 +46,18 @@ class ImageVoodoo
     def width
       self['Exif Sub IFD']['Exif Image Width']
     end
+
+    def to_s
+      out = StringIO.new
+      out.puts "[{dir name}] - {tag name} = {tag descr}"
+      out.puts "---------------------------------------"
+      @metadata.directories.each do |directory|
+        directory.tags.each do |tag|
+          out.puts "[#{directory.name}] - #{tag.tag_name} = #{tag.description}"
+        end
+      end
+      out.string
+    end
   end
 
   # All metadata are contained within Directories.  An image may have n
@@ -54,7 +66,8 @@ class ImageVoodoo
   # directory.
   class Directory
     def initialize(metadata)
-      @directory = metadata.get_directory self.class.directory_class.java_class
+      jclass = self.class.directory_class.java_class
+      @directory = metadata.get_first_directory_of_type jclass
     end
 
     ##

data/lib/image_voodoo/version.rb

@@ -1,3 +1,3 @@
 class ImageVoodoo
-  VERSION = '0.8.9'.freeze
+  VERSION = '0.9.0'.freeze
 end

data/test/test_image_voodoo.rb

@@ -24,7 +24,7 @@ class TestImageVoodoo < Test::Unit::TestCase
   def lower_right
     [10, 10]
   end
-  
+
   def upper_left
     [0, 0]
   end

data/test/test_metadata.rb

@@ -13,8 +13,8 @@ if !File.exist? IMAGE_DIR
 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 = 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
 
@@ -53,5 +53,11 @@ else
         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
 end

metadata

@@ -1,15 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: image_voodoo
 version: !ruby/object:Gem::Version
-  version: 0.8.9
+  version: 0.9.0
 platform: ruby
 authors:
 - Thomas E. Enebo, Charles Nutter, Nick Sieger
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-07-06 00:00:00.000000000 Z
-dependencies: []
+date: 2019-02-26 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: 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:
@@ -22,7 +78,9 @@ files:
 - ".hgtags"
 - ".rubocop.yml"
 - ".travis.yml"
+- Gemfile
 - History.txt
+- Jars.lock
 - LICENSE-2.0.txt
 - LICENSE.txt
 - Manifest.txt
@@ -56,12 +114,10 @@ files:
 - 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: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -76,10 +132,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-requirements: []
+requirements:
+- jar com.drewnoakes, metadata-extractor, 2.11.0
 rubyforge_project: image_voodoo
-rubygems_version: 2.5.2
-signing_key: 
+rubygems_version: 2.7.6
+signing_key:
 specification_version: 4
 summary: Image manipulation in JRuby with ImageScience compatible API
 test_files: