rmagick4j 0.3.9-java → 0.4.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9fe85a77a4fd7dbca1d624dc8bcb95da616a9a8
-  data.tar.gz: afe8cb688221536949ff56d56ba3e6431dbc9e61
+  metadata.gz: 261c553cd6da94aab725fd8b796c1c53c5c17ec2
+  data.tar.gz: 9908c2eba3eb500bc6f7b23a27ba53f5cefb5c0d
 SHA512:
-  metadata.gz: 7181ab773dd7a4faf83bdbe39c9f80339a153aaa15329c765a83ca824fc4658b82fae6c8f00f289ee5a0d42cea27e07af1a9c094b8c9ff8a18f2c7997ffc23f3
-  data.tar.gz: c450e9072b1df82bc954cb6b80a60e60be0751760a075b44f2c566881c3f7ac00fcebad868b9b80938a797ffc38f5d1257f203241c0e1f9acc6357dbca2e842a
+  metadata.gz: 060645ff73fcc7c1cd4fdac16d06170b14ec39d2d777fa732931800d888ba1186783364f488681e154337a51d2575ff103ab0703e73f4c3d75b4d0bec6fe5be4
+  data.tar.gz: 6f8f55915fb0fd301589187c30c7ca53d546bdfbf6f6bfd9cb7f2ddaa647d815af7f6efaf65035e06562e556678a9b7200d0199b81a8e5c84e551be9e25035e9

data/History.txt

@@ -1,3 +1,7 @@
+== 0.4.0 2016-05-28
+
+- Added support for Ruby 2.3.1 through JRuby 9.1.x
+
 == 0.3.5
 
 - Implemented Draw primitives (affice, arc, pattern, path)
@@ -81,4 +85,4 @@ But it's still progress, and I'm actually reading the pick axe (v2 - I'd looked
 
 Maybe by m2 or m3 (or sometime), I could try to find a real app using RMagick and try to make it work with my version. For the next moment, though, I'll probably try tackling page 2 or 3 of the "portfolio" samples at the RMagick web site. And eventually go into class by class and method by method depth. Or something. I'm just trying to work with tracer bullets for now.
 
-And I might rename the project to "rmagick4j" or "rmagick-jruby" or something at some point. Not sure what's best, so I'm sticking with "jr" for now. And that's an accurate representation for now, anyway.
+And I might rename the project to "rmagick4j" or "rmagick-jruby" or something at some point. Not sure what's best, so I'm sticking with "jr" for now. And that's an accurate representation for now, anyway.

data/{LICENSE.txt → LICENSE.md}

@@ -1,12 +1,7 @@
-The file observer.rb comes from JRuby's distribution of standard Ruby libraries. The file jruby.jar also comes from the JRuby project.
+## The MIT license
 
-RMagick.rb, clown.jpg, most of rmagick.gemspec, and the contents of rvg come from the RMagick project. Much of the content of the test demos (currently in "RMagickTestSuite.rb") come from the RMagick web site.
-
-See these respective projects for the licenses and ownership of these files.
-
-Other files lies under MIT license.
-
-Copyright (c) 2010 Tom Palmer, Sergio Arbeo, Patrick Hurley, Karl Palmskog
+Copyright (c) 2010 Tom Palmer, Sergio Arbeo, Patrick Hurley, Karl Palmskog,
+Uwe Kubosch
 
 Permission is hereby granted, free of charge, to any
 person obtaining a copy of this software and associated
@@ -29,3 +24,16 @@ OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
 OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
 OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+## 3rd party files
+
+The file observer.rb comes from JRuby's distribution of standard Ruby libraries.
+The file jruby.jar also comes from the JRuby project.
+
+RMagick.rb, clown.jpg, and the contents of rvg come from the RMagick project.
+Much of the content of the test demos (currently in "RMagickTestSuite.rb") come
+from the RMagick web site.
+
+See these respective projects for the licenses and ownership of these files.
+
+Other files lie under the MIT license.

data/README.md

@@ -0,0 +1,38 @@
+[![Gem Version](https://badge.fury.io/rb/rmagick4j.svg)](https://badge.fury.io/rb/rmagick4j)
+[![Build Status](https://travis-ci.org/Serabe/RMagick4J.svg?branch=master)](https://travis-ci.org/Serabe/RMagick4J)
+
+RMagick4J
+=========
+
+[RMagick](https://github.com/rmagick/rmagick) is a Ruby binding to ImageMagick
+and GraphicsMagick.  **RMagick4J** implements ImageMagick functionality and the
+C portions of RMagick for use with JRuby.
+
+## Authors
+
+This project was written by Thomas Palmer, Sergio Arbeo, Thomas Enebo, and
+Uwe Kubosch with lots of help from the JRuby community.
+
+## API docs
+
+You can find the generated API documentation here:
+
+http://www.rubydoc.info/gems/rmagick4j
+
+
+## License
+
+See [LICENSE.md](LICENSE.md)
+
+## Creating
+
+To create a gem you should run rake.
+The useful targets are
+
+    :clean, :compile, :gem, :release, :test (hoe has more -- see hoe docs).
+
+To create a new release, you should:
+
+* Add new version entry to History.txt
+* Update lib/rmagick4j/version.rb to contain new version
+* rake release

data/Rakefile

@@ -2,9 +2,32 @@ require 'rake'
 require 'rake/testtask'
 require 'bundler/gem_tasks'
 
-task :default => [:test, :gruff_test, :gem]
+BUILD_FILE = File.join(File.dirname(__FILE__), 'Magick4J', 'build.xml')
+JAR_SRC_FILE = File.join(File.dirname(__FILE__), 'Magick4J', 'dist', 'Magick4J.jar')
+JAR_DEST_FILE = File.join(File.dirname(__FILE__), 'lib', 'magick4j.jar')
+
+task :default => [:compile, :move, :test, :gem, :clean]
 task :gem => :build
 
+task :compile do
+  `ant -f #{BUILD_FILE} jar`
+  puts 'Compiled magick4j.jar'
+end
+
+task :clean do
+  `ant -f #{BUILD_FILE} clean`
+end
+
+task :move do
+  rm_f(JAR_DEST_FILE)
+  mv(JAR_SRC_FILE, JAR_DEST_FILE)
+  puts 'Moved jar file to lib folder.'
+end
+
+task :work do
+  puts `git diff --shortstat 538db96f13ba63fc057b81f9f710554d8f48d84b..HEAD`
+end
+
 jar_file = File.join(%w(lib magick4j.jar))
 
 desc 'Clean up any generated file.'
@@ -12,12 +35,16 @@ task :clean do
   rm_rf 'pkg'
 end
 
+task :test => [:compile, :move, :eyetests, :gruff_test]
+
+Rake::TestTask.new :eyetests do |t|
+  t.libs << 'test'
+  t.test_files = FileList['test/eyetests/tests/**/*.rb']
+end
+
 desc 'Run gruff unit tests.'
-task :gruff_test do
-  FileList['test/gruff_tests/test/test_*.rb'].each do |file|
-    puts `ruby #{file}`
-    puts ''
-  end
+Rake::TestTask.new :gruff_test do |t|
+  t.test_files = FileList['test/gruff_tests/test/test_*.rb']
 end
 
 desc 'Run a live sample using RMagick4j.'

data/lib/rmagick4j/draw.rb

@@ -3,7 +3,7 @@ module Magick
   class Draw
 
     def annotate(img, width, height, x, y, text, &add)
-      instance_eval &add if add
+      instance_eval(&add) if add
       text = parse_string(text)
       @draw.annotate(img._image, width, height, x, y, text)
       self

data/lib/rmagick4j/image.rb

@@ -282,6 +282,10 @@ module Magick
       @image.storePixels(x,y,columns,rows,pixels.to_java)
     end
 
+    def thumbnail(scale)
+      resize(scale)
+    end
+
     def to_blob(&add)
       info = Info.new(&add)
       @image.setFormat(info.format) if info.format
@@ -334,7 +338,7 @@ module Magick
 
       def initialize(&add)
         @info = Magick4J.ImageInfo.new
-        instance_eval &add if add
+        instance_eval(&add) if add
       end
 
       def size= size

data/lib/rmagick4j/pixel.rb

@@ -131,7 +131,7 @@ module Magick
         hue, saturation = 0.0, 0.0
       else
         saturation =  if lightness <0.5
-                        delta /(min+max)
+                        delta / (min+max)
                       else
                         delta / (2.0-(min+max))
                       end

data/lib/rmagick4j/version.rb

@@ -1,5 +1,5 @@
 module RMagick4J
   module Version
-    VERSION = '0.3.9'
+    VERSION = '0.4.0'
   end
 end

data/test/RMagickTestSuite.rb

@@ -6,7 +6,7 @@ rescue Exception
   puts "No gems! #{$!}"
 end
 puts Time.new
-require 'RMagick'
+require 'rmagick'
 puts Time.new
 
 # TODO I know this isn't a real test, but it's what I've got for now.

data/test/eyetests/bullseye.rb

@@ -3,7 +3,7 @@ TEST_ROOT = File.expand_path(File.dirname(__FILE__))
 require 'java'
 require 'rubygems'
 
-#require 'RMagick'
+#require 'rmagick'
 require 'profligacy/swing'
 require 'profligacy/lel'
 require  TEST_ROOT + '/tests/new_image.rb'

data/test/eyetests/doc.rb

@@ -6,11 +6,11 @@ if ARGV.size == 0
   exit
 end
 
-File.makedirs ARGV[0] unless File.exists?(ARGV[0]) && File.directory?(ARGV[0])
+FileUtils.makedirs(ARGV[0]) unless File.exists?(ARGV[0]) && File.directory?(ARGV[0])
 
 IMAGE_DIR = File.join(ARGV[0], 'img')
 
-File.makedirs IMAGE_DIR unless File.exists?(IMAGE_DIR) && File.directory?(IMAGE_DIR)
+FileUtils.makedirs IMAGE_DIR unless File.exists?(IMAGE_DIR) && File.directory?(IMAGE_DIR)
 
 TESTS= Dir[File.join(File.dirname(__FILE__),'tests','*.rb')].reject{|x| x=~ /new_image.rb$/ }
 

data/test/eyetests/tests/new_image.rb

@@ -1,20 +1,21 @@
 if PLATFORM == 'java'
-  require File.join(File.dirname(__FILE__), '..', '..', '..','lib','RMagick')
+  require File.join(File.dirname(__FILE__), '..', '..', '..', 'lib', 'rmagick')
 else
-  require "rubygems"
-  require "RMagick"
+  require 'rubygems'
+  require 'rmagick'
 end
 
 class Float
-
-	def to_threshold
-		self/255 * Magick::QuantumRange
-	end
+  def to_threshold
+    self/255 * Magick::QuantumRange
+  end
 end
 
 class Magick::Image
+  OUTPUT_DIR = File.join(File.dirname(File.dirname(__FILE__)), 'examples')
+  FileUtils.makedirs OUTPUT_DIR
   alias_method :old_write, :write
-  
+
   def self.load(filename, &add)
     file = File.join(File.expand_path(File.dirname(__FILE__)), '..', '..', 'images', filename)
     self.read file, &add
@@ -26,6 +27,6 @@ class Magick::Image
     change_geometry('300x300') do |columns, rows, image|
       image.resize!(columns, rows)
     end
-    old_write File.join(ARGV[0],new_filename)
+    old_write File.join(OUTPUT_DIR, new_filename)
   end
 end

data/test/gruff_tests/test/gruff_test_case.rb

@@ -1,15 +1,19 @@
 $:.unshift(File.dirname(__FILE__) + "/../lib/")
 require 'rubygems'
 
-require 'test/unit'
+require 'minitest/autorun'
+require 'minitest/reporters'
+Minitest::Reporters.use!
 require 'gruff'
 require 'fileutils'
 # require 'test_timer'
+require 'rmagick'
 
-TEST_OUTPUT_DIR = File.dirname(__FILE__) + "/output"
+TEST_ASSETS_DIR = File.expand_path('../assets', File.dirname(__FILE__))
+TEST_OUTPUT_DIR = File.expand_path('../output', File.dirname(__FILE__))
 FileUtils.mkdir_p(TEST_OUTPUT_DIR)
 
-class GruffTestCase < Test::Unit::TestCase
+class GruffTestCase < Minitest::Test
 
   def setup
     @datasets = [
@@ -22,15 +26,15 @@ class GruffTestCase < Test::Unit::TestCase
       ]
 
     @labels = {
-        0 => '5/6', 
-        1 => '5/15', 
-        2 => '5/24', 
-        3 => '5/30', 
-        4 => '6/4', 
-        5 => '6/12', 
-        6 => '6/21', 
-        7 => '6/28', 
-      }      
+        0 => '5/6',
+        1 => '5/15',
+        2 => '5/24',
+        3 => '5/30',
+        4 => '6/4',
+        5 => '6/12',
+        6 => '6/21',
+        7 => '6/28',
+      }
   end
 
   def setup_single_dataset
@@ -39,10 +43,10 @@ class GruffTestCase < Test::Unit::TestCase
       ]
 
     @labels = {
-        0 => 'You', 
-        1 => 'Average', 
-        2 => 'Lifetime' 
-      }      
+        0 => 'You',
+        1 => 'Average',
+        2 => 'Lifetime'
+      }
   end
 
   def setup_wide_dataset
@@ -74,7 +78,7 @@ protected
     Array(sizes).each do |size|
       g = instance_eval("Gruff::#{class_name}.new #{size}")
       g.title = "#{class_name} Graph"
-      yield g      
+      yield g
       write_test_file g, "#{filename}_#{size}.png"
     end
   end
@@ -98,17 +102,17 @@ protected
       case args[0]
       when Fixnum
         size = args[0]
-        klass = eval("Gruff::#{self.class.name.gsub(/^TestGruff/, '')}") 
+        klass = eval("Gruff::#{self.class.name.gsub(/^TestGruff/, '')}")
       when String
         size = args[0]
-        klass = eval("Gruff::#{self.class.name.gsub(/^TestGruff/, '')}") 
+        klass = eval("Gruff::#{self.class.name.gsub(/^TestGruff/, '')}")
       else
         klass = args[0]
       end
     when 2
       klass, size = args[0], args[1]
     end
-    
+
     g = klass.new(size)
     g.title = "My Bar Graph"
     g.labels = @labels
@@ -121,3 +125,24 @@ protected
   end
 
 end
+
+class Magick::Image
+  class << self
+    alias_method :old_read, :read
+
+    def read(filename, *args)
+      old_read(filename.sub(/^assets/, TEST_ASSETS_DIR), *args)
+    end
+  end
+
+  alias_method :old_write, :write
+
+  def write(filename)
+    engine = (PLATFORM == 'java' ? 'jruby' : 'mri')
+    new_filename = filename.sub(/(\.[^\.]*)$/, '.' + engine + '\1')
+    # change_geometry('300x300') do |columns, rows, image|
+    #   image.resize!(columns, rows)
+    # end
+    old_write(new_filename.sub(/^test\/output/, TEST_OUTPUT_DIR))
+  end
+end

data/test/gruff_tests/test/test_accumulator_bar.rb

@@ -39,7 +39,7 @@ class TestGruffAccumulatorBar < GruffTestCase
   end
 
   def test_too_many_args
-    assert_raise(Gruff::IncorrectNumberOfDatasetsException) {
+    assert_raises(Gruff::IncorrectNumberOfDatasetsException) {
       g = Gruff::AccumulatorBar.new
       g.data 'First', [1,1,1]
       g.data 'Too Many', [1,1,1]

data/test/gruff_tests/test/test_line.rb

@@ -460,7 +460,7 @@ class TestGruffLine < GruffTestCase
     g.legend_font_size = 12
     g.marker_font_size = 16
     g.hide_dots = false
-    g.label_max_decimals = 1
+    # g.label_max_decimals = 1
 
     g.write('test/output/line_jruby_error.png')
   end

data/test/spec/draw_spec.rb

@@ -1,8 +1,8 @@
 if PLATFORM == 'java'
-  require File.join(File.dirname(__FILE__),'..','..','lib','RMagick')
+  require File.join(File.dirname(__FILE__),'..','..','lib','rmagick')
 else
   require 'rubygems'
-  require 'RMagick'
+  require 'rmagick'
 end
 
 include Magick

data/test/spec/features/support/env.rb

@@ -1,3 +1,3 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..','lib','RMagick')
+require File.join(File.dirname(__FILE__), '..', '..', '..', '..','lib','rmagick')
 
 include Magick

data/test/spec/image_spec.rb

@@ -1,8 +1,8 @@
 if PLATFORM == 'java'
-  require File.join(File.dirname(__FILE__),'..','..','lib','RMagick')
+  require File.join(File.dirname(__FILE__),'..','..','lib','rmagick')
 else
   require 'rubygems'
-  require 'RMagick'
+  require 'rmagick'
 end
 require File.join(File.dirname(__FILE__),"image_constants.rb")
 

data/test/spec/pixel_spec.rb

@@ -1,8 +1,8 @@
 if PLATFORM == 'java'
-  require File.join(File.dirname(__FILE__),'..','..','lib','RMagick')
+  require File.join(File.dirname(__FILE__),'..','..','lib','rmagick')
 else
   require 'rubygems'
-  require 'RMagick'
+  require 'rmagick'
 end
 
 include Magick

metadata

@@ -1,35 +1,91 @@
 --- !ruby/object:Gem::Specification
 name: rmagick4j
 version: !ruby/object:Gem::Version
-  version: 0.3.9
+  version: 0.4.0
 platform: java
 authors:
 - Thomas Palmer
 - Sergio Arbeo
 - Thomas Enebo
 - Uwe Kubosch
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-05-27 00:00:00.000000000 Z
+date: 2016-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+  name: ftools
+  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: gruff
+  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: minitest-reporters
+  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: profligacy
+  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'
-description: 'RMagick is a Ruby binding to ImageMagick and GraphicsMagick. RMagick4J
-  implements ImageMagick functionality and the C portions of RMagick for use with
-  JRuby. '
+description: |-
+  RMagick4J
+  =========
 email:
 - serabe@gmail.com
 - tom.enebo@gmail.com
@@ -38,8 +94,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - History.txt
-- LICENSE.txt
-- README.txt
+- LICENSE.md
+- README.md
 - Rakefile
 - lib/magick4j.jar
 - lib/rmagick.rb
@@ -203,7 +259,7 @@ homepage: https://github.com/Serabe/RMagick4J
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -211,7 +267,10 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
+  - - "<"
+    - !ruby/object:Gem::Version
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -219,8 +278,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: jruby-extras
-rubygems_version: 2.4.6
-signing_key: 
+rubygems_version: 2.6.4
+signing_key:
 specification_version: 4
 summary: RMagick for Java
 test_files:

data/README.txt

@@ -1,25 +0,0 @@
-RMagick is a Ruby binding to ImageMagick and GraphicsMagick. RMagick4J implements ImageMagick functionality and the C portions of RMagick for use with JRuby. 
-
-== Authors
-
-This project was written by Thomas Palmer, Sergio Rodríguez Arbeo, and Thomas Enebo with lots of help from the JRuby community.
-
-== License
-
-The file observer.rb comes from JRuby's distribution of standard Ruby libraries. The file jruby.jar also comes from the JRuby project.
-
-RMagick.rb, clown.jpg, most of rmagick.gemspec, and the contents of rvg come from the RMagick project. Much of the content of the test demos (currently in "RMagickTestSuite.rb") come from the RMagick web site.
-
-See these respective projects for the licenses and ownership of these files.
-
-Other files in RMagickJr are hereby placed in the public domain.
-
-== Creating
-
-To create a gem you should run rake.  The useful targets are :clean, :compile, :gem, :release, :test (hoe has more -- see hoe docs).  In order to run rake you must have hoe installed.
-
-To create a new release, you should:
-
-* Add new version entry to History.txt
-* Update lib/rmagick4j/version.rb to contain new version
-* rake release VERSION={{{{YOUR NEW VERSION (e.g. 1.1.1)}}}}