image_voodoo 0.8.7 → 0.8.8

data/lib/image_voodoo/version.rb

@@ -1,3 +1,3 @@
 class ImageVoodoo
-  VERSION = "0.8.7"
+  VERSION = "0.8.8"
 end

data/test/test_metadata.rb

@@ -0,0 +1,50 @@
+require 'test/unit/testcase'
+require 'test/unit' if $0 == __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"
+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"
+    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
+      end
+    end
+
+    def test_metadata_from_inputstream
+      ImageVoodoo.with_bytes File.read(@path) do |img|
+        assert_equal(6, img.metadata[:IFD0][:Orientation])
+      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])
+      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'])
+      end
+    end
+  end
+end

data/tools/gen.rb

@@ -0,0 +1,61 @@
+# 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
+
+def normalize_directory_name(path)
+  path.gsub('/', '.')
+end
+
+def normalize_tag_name(capname)
+  name = capname.split('_').map {|e| e.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(' ')
+end
+
+io = $stdin
+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
+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 = {"
+  tag_names.each do |name, original_name|
+    puts "    '#{name}' => ['#{original_name}', :get_string],"
+  end
+  puts "  }"
+  puts "end"
+  puts ""
+end
+
+puts ""
+puts "DIRECTORY_MAP = {"
+directories.each do |directory, _|
+  class_name = directory.split('.')[-1]
+  puts "  '#{humanize_directory_name(class_name)}' => #{class_name},"
+end
+puts "}"
+  
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: image_voodoo
 version: !ruby/object:Gem::Version
-  version: 0.8.7
+  version: 0.8.8
 platform: ruby
 authors:
 - Thomas E. Enebo, Charles Nutter, Nick Sieger
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-10-30 00:00:00.000000000 Z
+date: 2015-02-13 00:00:00.000000000 Z
 dependencies: []
 description: Image manipulation in JRuby with ImageScience compatible API
 email: tom.enebo@gmail.com
@@ -20,9 +20,12 @@ files:
 - ".gitignore"
 - ".hgignore"
 - ".hgtags"
+- ".travis.yml"
 - History.txt
+- LICENSE-2.0.txt
 - LICENSE.txt
 - Manifest.txt
+- README.exif
 - README.md
 - Rakefile
 - bin/image_voodoo
@@ -32,6 +35,7 @@ files:
 - lib/image_voodoo/awt.rb
 - lib/image_voodoo/awt/shapes.rb
 - lib/image_voodoo/gae.rb
+- lib/image_voodoo/metadata.rb
 - lib/image_voodoo/version.rb
 - samples/bench.rb
 - samples/checkerboard.jpg
@@ -43,7 +47,11 @@ files:
 - test/pix.png
 - test/pix_cmyk.jpg
 - test/test_image_science.rb
+- test/test_metadata.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: {}
@@ -64,7 +72,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: image_voodoo
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key:
 specification_version: 4
 summary: Image manipulation in JRuby with ImageScience compatible API
@@ -72,3 +80,5 @@ test_files:
 - test/pix.png
 - test/pix_cmyk.jpg
 - test/test_image_science.rb
+- test/test_metadata.rb
+has_rdoc: true