image_voodoo 0.8.8 → 0.8.9

data/tools/gen.rb

@@ -2,22 +2,26 @@
 # 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 +29,37 @@ 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 <<EOS
+    }.freeze
   end
-  puts "  }"
-  puts "end"
-  puts ""
+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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: image_voodoo
 version: !ruby/object:Gem::Version
-  version: 0.8.8
+  version: 0.8.9
 platform: ruby
 authors:
 - Thomas E. Enebo, Charles Nutter, Nick Sieger
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-13 00:00:00.000000000 Z
+date: 2017-07-06 00:00:00.000000000 Z
 dependencies: []
 description: Image manipulation in JRuby with ImageScience compatible API
 email: tom.enebo@gmail.com
@@ -20,6 +20,7 @@ files:
 - ".gitignore"
 - ".hgignore"
 - ".hgtags"
+- ".rubocop.yml"
 - ".travis.yml"
 - History.txt
 - LICENSE-2.0.txt
@@ -33,21 +34,26 @@ 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
@@ -55,7 +61,7 @@ files:
 homepage: http://github.com/jruby/image_voodoo
 licenses: []
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -72,13 +78,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: image_voodoo
-rubygems_version: 2.4.5
-signing_key:
+rubygems_version: 2.5.2
+signing_key: 
 specification_version: 4
 summary: Image manipulation in JRuby with ImageScience compatible API
 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