rmagick4j 0.3.5 → 0.3.6

data/Manifest.txt

@@ -32,27 +32,37 @@ lib/rvg/units.rb
 lib/jhlabs-filters.jar
 lib/magick4j.jar
 lib/svgsalamander.jar
+test/implemented_methods.rb
+test/RMagickTestSuite.rb
 test/eyetests/bullseye.rb
 test/eyetests/tests/draw_arc_basic.rb
 test/eyetests/tests/draw_circle_affine.rb
 test/eyetests/tests/draw_circle_basic.rb
+test/eyetests/tests/draw_clip_path.rb
 test/eyetests/tests/draw_ellipse_affine.rb
 test/eyetests/tests/draw_ellipse_basic.rb
 test/eyetests/tests/draw_line_affine.rb
 test/eyetests/tests/draw_line_basic.rb
+test/eyetests/tests/draw_multiline_type_metrics.rb
 test/eyetests/tests/draw_pattern_1.rb
 test/eyetests/tests/draw_polygon_affine.rb
 test/eyetests/tests/draw_polygon_basic.rb
 test/eyetests/tests/draw_polyline_affine.rb
 test/eyetests/tests/draw_polyline_basic.rb
+test/eyetests/tests/draw_pop_push_translate.rb
 test/eyetests/tests/draw_rectangle_affine.rb
 test/eyetests/tests/draw_rectangle_basic.rb
 test/eyetests/tests/draw_rmagick_test_01.rb
 test/eyetests/tests/draw_rmagick_test_02.rb
 test/eyetests/tests/draw_rmagick_test_03.rb
 test/eyetests/tests/draw_rmagick_test_04.rb
+test/eyetests/tests/draw_rotate_01.rb
 test/eyetests/tests/draw_roundrectangle_affine.rb
 test/eyetests/tests/draw_roundrectangle_basic.rb
+test/eyetests/tests/draw_scale_01.rb
+test/eyetests/tests/draw_skewx_01.rb
+test/eyetests/tests/draw_skewy_01.rb
+test/eyetests/tests/draw_stroke_miterlimit.rb
 test/eyetests/tests/gradient_fill_horizontal_diagonal_fill.rb
 test/eyetests/tests/gradient_fill_horizontal_fill.rb
 test/eyetests/tests/gradient_fill_point_fill.rb
@@ -126,8 +136,6 @@ test/gruff_tests/test/test_side_bar.rb
 test/gruff_tests/test/test_sidestacked_bar.rb
 test/gruff_tests/test/test_spider.rb
 test/gruff_tests/test/test_stacked_bar.rb
-test/implemented_methods.rb
-test/RMagickTestSuite.rb
 test/spec/draw_spec.rb
 test/spec/image_constants.rb
 test/spec/image_spec.rb

data/Rakefile

@@ -20,7 +20,7 @@ file jar_file => :compile
 desc "Clean up any generated file."
 task :clean do
   rm_rf 'pkg'
-#  rm_rf jar_file
+  #rm_rf jar_file
 end
 
 desc "Run gruff unit tests."

data/lib/rmagick4j/draw.rb

@@ -4,9 +4,18 @@ module Magick
 
     def annotate(img, width, height, x, y, text, &add)
       instance_eval &add if add
+      text = parse_string(text)
       @draw.annotate(img._image, width, height, x, y, text)
       self
     end
+    
+    def clone
+      b = Draw.new
+      b.primitives = @primitives.clone
+      b._draw = @draw.clone
+      b.freeze if self.frozen?
+      b
+    end
 
     def draw(image)
       @draw.clone.draw(image._image, Magick4J.CommandParser.parse(@primitives))
@@ -28,18 +37,18 @@ module Magick
       @draw.font_weight = font_weight
     end
 
+    def get_multiline_type_metrics(*args)
+      raise ArgumentError.new('wrong number of arguments (#{args.length})') if not (1..2) === args.length
+      string = parse_string(args.last)
+      image = args.first._image if args.length == 2
+      type_metrics_from_java(@draw.getMultilineTypeMetrics(string, image))
+    end
+    
     def get_type_metrics(*args)
       raise ArgumentError.new('wrong number of arguments (#{args.length})') if not (1..2) === args.length
-      string = args.last
+      string = parse_string(args.last)
       image = args.first._image if args.length == 2
-      jmetrics = @draw.getTypeMetrics(string, image)
-      metrics = TypeMetric.new
-      metrics.ascent = jmetrics.getAscent
-      metrics.descent = jmetrics.getDescent
-      metrics.height = jmetrics.getHeight
-      metrics.max_advance = jmetrics.getMaxAdvance
-      metrics.width = jmetrics.getWidth
-      metrics
+      type_metrics_from_java(@draw.getTypeMetrics(string, image))
     end
 
     def font= font
@@ -58,7 +67,11 @@ module Magick
     end
 
     def inspect
-      @primitives
+      if @primitives == ''
+        '(no primitives defined)'
+      else
+        @primitives
+      end
     end
 
     def pointsize= pointsize
@@ -82,5 +95,30 @@ module Magick
       self
     end
 
+    private
+    
+    def parse_string(text)
+      text.split(/\\n/).join("\n")
+    end
+    
+    def type_metrics_from_java(jmetrics)
+      metrics = TypeMetric.new
+      metrics.ascent = jmetrics.getAscent
+      metrics.descent = jmetrics.getDescent
+      metrics.height = jmetrics.getHeight
+      metrics.max_advance = jmetrics.getMaxAdvance
+      metrics.width = jmetrics.getWidth
+      metrics
+    end
+    
+    protected
+    
+    def primitives=(value)
+      @primitives = value.to_str
+    end
+    
+    def _draw=(value)
+      @draw = value
+    end
   end
 end

data/lib/rmagick4j/version.rb

@@ -1,5 +1,5 @@
 module RMagick4J
   module Version
-    VERSION = "0.3.5"
+    VERSION = "0.3.6"
   end
 end

data/test/eyetests/tests/draw_clip_path.rb

@@ -0,0 +1,44 @@
+require File.join(File.dirname(__FILE__), 'new_image.rb')
+
+include Magick
+
+points = [145, 65, 174,151, 264,151, 192,205,
+          218,291, 145,240,  72,291,  98,205,
+           26,151, 116,151]
+
+pr = Draw.new
+
+# Define a clip-path.
+# The name of the clip-path is "example"
+pr.define_clip_path('example') do
+    pr.polygon(*points)
+end
+
+# Enable the clip-path
+pr.push
+pr.clip_path('example')
+
+pr.stroke 'none'
+
+pr.fill 'green'
+pr.circle(150, 0, 150, 150)
+
+pr.fill 'red'
+pr.circle(0, 150, 150, 150)
+
+pr.fill 'blue'
+pr.circle(300, 150, 150, 150)
+
+pr.fill 'orange'
+pr.circle(150, 300, 150, 150)
+
+pr.pop
+
+# Create a canvas to draw on, a bit bigger than the star.
+canvas = Image.new(300, 300, HatchFill.new('white', 'black'))
+
+pr.draw(canvas)
+
+canvas.write("draw_clip_path.jpg")
+
+

data/test/eyetests/tests/draw_line_basic.rb

@@ -5,6 +5,7 @@ include Magick
 draw = Draw.new
 
 draw.stroke = 'red'
+draw.stroke_linecap 'round'
 draw.stroke_width 10.0
 
 draw.line(50, 50, 50, 200)

data/test/eyetests/tests/draw_multiline_type_metrics.rb

@@ -0,0 +1,42 @@
+require File.join(File.dirname(__FILE__), 'new_image.rb')
+
+include Magick
+
+TEXT = 'get\nmultiline\ntype\nmetrics'
+
+background = Image.new(200, 200)
+gc = Draw.new
+
+# Draw the text centered on the background
+gc.annotate(background, 0, 0, 0, 0, TEXT) do
+    gc.font_family = 'Verdana'
+    gc.pointsize = 36
+    gc.gravity = CenterGravity
+    gc.stroke = 'none'
+end
+
+# Get the metrics
+metrics = gc.get_multiline_type_metrics(background, TEXT)
+
+# Compute the corners for a rectangle surrounding the text
+x = (background.columns - metrics.width) / 2
+y = (background.rows - metrics.height) / 2
+
+# Draw 2 rectangles over the text.
+gc = Draw.new
+
+gc.stroke('red')
+gc.stroke_width(5)
+gc.stroke_linejoin('round')
+gc.fill('cyan')
+gc.fill_opacity(0.10)
+gc.rectangle(x, y, x+metrics.width, y+metrics.height)
+
+gc.stroke('white')
+gc.stroke_width(1)
+gc.fill('none')
+gc.rectangle(x, y, x+metrics.width, y+metrics.height)
+gc.draw(background)
+
+
+background.write('draw_multiline_type_metrics.jpg')

data/test/eyetests/tests/draw_polygon_affine.rb

@@ -5,6 +5,7 @@ include Magick
 draw = Draw.new
 
 draw.stroke = 'blue'
+draw.stroke_linejoin 'round'
 draw.stroke_width 5.0
 draw.fill = 'red'
 

data/test/eyetests/tests/draw_pop_push_translate.rb

@@ -0,0 +1,22 @@
+require File.join(File.dirname(__FILE__), 'new_image.rb')
+
+include Magick
+
+draw = Draw.new
+
+draw.translate 100, 100
+draw.circle 100,100, 100, 50
+draw.stroke 'blue'
+draw.fill 'white'
+draw.push
+draw.circle 100,100, 100, 50
+draw.translate(-100, -100)
+draw.fill 'green'
+draw.pop
+draw.circle 100, 100, 100, 50
+
+b = Image.new(300, 300)
+
+draw.draw b
+
+b.write('draw_pop_push_translate.jpg')

data/test/eyetests/tests/draw_rotate_01.rb

@@ -0,0 +1,33 @@
+require File.join(File.dirname(__FILE__), 'new_image.rb')
+
+# Taken from RMagick documentation. Modified.
+
+imgl = Magick::Image.new(200, 200, Magick::HatchFill.new('white','lightcyan2'))
+
+gc = Magick::Draw.new
+
+# Move the origin to the center.
+gc.translate(100, 100)
+max_x = imgl.columns/2
+max_y = imgl.rows/2
+
+# Rotate 45 degrees
+gc.rotate(45)
+
+gc.stroke('red')
+gc.stroke_width(3)
+
+# Draw down-pointing arrow
+gc.line(0, -max_y,   0, max_y)
+gc.line(0,  max_y,  10, max_y-10)
+gc.line(0,  max_y, -10, max_y-10)
+
+# Draw right-pointing arrow
+gc.line(-max_x, 0, max_x,     0)
+gc.line( max_x, 0, max_x-10, -10)
+gc.line( max_x, 0, max_x-10,  10)
+
+
+gc.draw(imgl)
+
+imgl.write("draw_rotate_01.jpg")

data/test/eyetests/tests/draw_scale_01.rb

@@ -0,0 +1,33 @@
+require File.join(File.dirname(__FILE__), 'new_image.rb')
+
+# Taken from RMagick documentation. Modified.
+
+imgl = Magick::Image.new(200, 200, Magick::HatchFill.new('white','lightcyan2'))
+
+gc = Magick::Draw.new
+
+# Move the origin to the center.
+gc.translate(100, 100)
+max_x = imgl.columns/2
+max_y = imgl.rows/2
+
+# Scale by 0.5 and 1/3.
+gc.scale(0.5, 1.0/3.0)
+
+gc.stroke('red')
+gc.stroke_width(3)
+
+# Draw down-pointing arrow
+gc.line(0, -max_y,   0, max_y)
+gc.line(0,  max_y,  10, max_y-10)
+gc.line(0,  max_y, -10, max_y-10)
+
+# Draw right-pointing arrow
+gc.line(-max_x, 0, max_x,     0)
+gc.line( max_x, 0, max_x-10, -10)
+gc.line( max_x, 0, max_x-10,  10)
+
+
+gc.draw(imgl)
+
+imgl.write("draw_scale_01.jpg")

data/test/eyetests/tests/draw_skewx_01.rb

@@ -0,0 +1,34 @@
+require File.join(File.dirname(__FILE__), 'new_image.rb')
+
+# Taken from RMagick documentation. Modified.
+
+imgl = Magick::Image.new(250, 250, Magick::HatchFill.new('white','lightcyan2'))
+
+gc = Magick::Draw.new
+
+# Move the origin to the center.
+gc.translate(125, 125)
+max_x = imgl.columns/2
+max_y = imgl.rows/2 - 5
+
+# Skew x 30 degrees
+gc.skewx(30)
+
+# Draw down-pointing arrow
+gc.fill('red')
+gc.stroke('red')
+gc.stroke_width(3)
+gc.line(0, -max_y,  0, max_y)
+gc.line(0,  max_y,  7, max_y-7)
+gc.line(0,  max_y, -7, max_y-7)
+
+# Draw right-pointing arrow
+gc.stroke('gray50')
+gc.stroke_width(1)
+gc.line(-max_x, 0, max_x,    0)
+gc.line( max_x, 0, max_x-5, -5)
+gc.line( max_x, 0, max_x-5,  5)
+
+gc.draw(imgl)
+
+imgl.write("draw_skewx_01.jpg")

data/test/eyetests/tests/draw_skewy_01.rb

@@ -0,0 +1,33 @@
+require File.join(File.dirname(__FILE__), 'new_image.rb')
+
+# Taken from RMagick documentation. Modified.
+
+imgl = Magick::Image.new(300, 300, Magick::HatchFill.new('white','lightcyan2'))
+
+gc = Magick::Draw.new
+
+# Move the origin to the center.
+gc.translate(125, 125)
+max_x = imgl.columns/2
+max_y = imgl.rows/2
+
+# Skew y 30 degrees
+gc.skewy(30)
+
+# Draw down-pointing arrow
+gc.fill('gray50')
+
+gc.line(0, -max_y,   0, max_y)
+gc.line(0,  max_y,  10, max_y-10)
+gc.line(0,  max_y, -10, max_y-10)
+
+# Draw right-pointing arrow
+gc.stroke('red')
+gc.stroke_width(3)
+gc.line(-max_x+10, 0, max_x-10,   0)
+gc.line( max_x-10, 0, max_x-20, -10)
+gc.line( max_x-10, 0, max_x-20,  10)
+
+gc.draw(imgl)
+
+imgl.write("draw_skewy_01.jpg")

data/test/eyetests/tests/draw_stroke_miterlimit.rb

@@ -0,0 +1,21 @@
+require File.join(File.dirname(__FILE__), 'new_image.rb')
+
+include Magick
+
+draw = Draw.new
+
+draw.stroke = 'blue'
+draw.stroke_linejoin 'miter'
+draw.stroke_miterlimit 5.0
+draw.stroke_width 5.0
+draw.fill = 'red'
+
+points = [125,300,175,300,150,50]
+
+draw.polygon(*points)
+
+b = Image.new(300, 300, HatchFill.new('white', 'black'))
+
+draw.draw b
+
+b.write('draw_stroke_miterlimit.jpg')

data/test/eyetests/tests/gruff_line_1.rb

@@ -10,4 +10,4 @@ g.labels = {
 }
 g.data('one', 1)
 
-g.write("gruff_line_1.jpg")
+g.write("gruff_line_1.jpg")

data/test/eyetests/tests/path_espiral_01.rb

@@ -5,6 +5,7 @@ include Magick
 draw = Draw.new
 
 draw.fill 'red'
+draw.fill_rule 'nonzero'
 draw.stroke 'blue'
 draw.stroke_width(5)
 draw.path 'M153 334

data/test/eyetests/tests/path_star_01.rb

@@ -5,6 +5,9 @@ include Magick
 draw = Draw.new
 
 draw.fill 'red'
+
+draw.fill_rule 'nonzero'
+
 draw.stroke 'blue'
 draw.stroke_width(5)
 draw.path 'M100,10 L100,10 40,180 190,60 10,60 160,180 z'

data/test/gruff_tests/test/monkey_gruff.rb

@@ -4,4 +4,4 @@ module Gruff
       #do nothing
     end
   end
-end
+end

data/test/spec/draw_spec.rb

@@ -1,24 +1,42 @@
-require File.join(File.dirname(__FILE__),'..','..','lib','RMagick')
+if PLATFORM == 'java'
+  require File.join(File.dirname(__FILE__),'..','..','lib','RMagick')
+else
+  require 'rubygems'
+  require 'RMagick'
+end
 
 include Magick
 
 describe Draw do
   
-  it "should save the state when calling push and recover it after pop" do
-    a = Draw.new
-    a.line(5, 5, 10, 10)
-    b = a.clone
+  before(:each) do
+    @draw = Draw.new
+  end
+  
+  it "should clone correctly the primitives" do
+    b = @draw.clone
     b.push
-    b.stroke('blue')
-    a.inspect.should != b.inspect
-    b.pop
-    a.inspect.should == b.inspect
+    
+    @draw.inspect.should_not == b.inspect
+  end
+  
+  it "should say that has no primitives defined" do
+    @draw.inspect.should == '(no primitives defined)'
   end
   
   it "should add one line per primitive" do
-    a = Draw.new
-    a.path 'M150,150
-            l50,50'
-    a.inspect.split('\n').size.should == 1
+    @draw.path 'M150,150
+                l50,50'
+    @draw.inspect.split(/\n/).size.should == 1
+  end
+  
+  it "should have the maximum width" do
+    string = "get\nmultiline\ntype\nmetrics"
+    @draw.get_multiline_type_metrics(string).width.should == string.split(/\n/).map{|x| @draw.get_type_metrics(x).width }.max
+  end
+  
+  it "should have the correct multiline height" do
+    string = "get\nmultiline\ntype\nmetrics"
+    @draw.get_multiline_type_metrics(string).height.should == string.split(/\n/).map{|x| @draw.get_type_metrics(x).height }.inject{|memo, obj| memo + obj}
   end
-end
+end

data/test/spec/image_spec.rb

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

data/test/spec/pixel_spec.rb

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

metadata

@@ -1,29 +1,11 @@
---- !ruby/object:Gem::Specification 
-name: rmagick4j
-version: !ruby/object:Gem::Version 
-  version: 0.3.5
-platform: ruby
-authors: 
-- "Thomas Palmer, Sergio Rodr\xC3\xADguez Arbeo and Thomas Enebo"
-autorequire: 
-bindir: bin
-cert_chain: []
-
-date: 2008-07-09 00:00:00 -05:00
-default_executable: 
-dependencies: []
-
-description: RMagick is a Ruby binding to ImageMagick and GraphicsMagick. RMagick4J implements ImageMagick functionality and the C portions of RMagick for use with JRuby.
-email: serabe@gmail.com, tom.enebo@gmail.com
-executables: []
-
+--- !ruby/object:Gem::Specification
 extensions: []
-
-extra_rdoc_files: 
-- History.txt
-- Manifest.txt
-- README.txt
-- LICENSE.txt
+homepage: http://jruby-extras.rubyforge.org/rmagick4j
+executables: []
+version: !ruby/object:Gem::Version
+  version: 0.3.6
+post_install_message: 
+date: 2008-08-14 22:00:00 +00:00
 files: 
 - History.txt
 - Manifest.txt
@@ -59,27 +41,37 @@ files:
 - lib/jhlabs-filters.jar
 - lib/magick4j.jar
 - lib/svgsalamander.jar
+- test/implemented_methods.rb
+- test/RMagickTestSuite.rb
 - test/eyetests/bullseye.rb
 - test/eyetests/tests/draw_arc_basic.rb
 - test/eyetests/tests/draw_circle_affine.rb
 - test/eyetests/tests/draw_circle_basic.rb
+- test/eyetests/tests/draw_clip_path.rb
 - test/eyetests/tests/draw_ellipse_affine.rb
 - test/eyetests/tests/draw_ellipse_basic.rb
 - test/eyetests/tests/draw_line_affine.rb
 - test/eyetests/tests/draw_line_basic.rb
+- test/eyetests/tests/draw_multiline_type_metrics.rb
 - test/eyetests/tests/draw_pattern_1.rb
 - test/eyetests/tests/draw_polygon_affine.rb
 - test/eyetests/tests/draw_polygon_basic.rb
 - test/eyetests/tests/draw_polyline_affine.rb
 - test/eyetests/tests/draw_polyline_basic.rb
+- test/eyetests/tests/draw_pop_push_translate.rb
 - test/eyetests/tests/draw_rectangle_affine.rb
 - test/eyetests/tests/draw_rectangle_basic.rb
 - test/eyetests/tests/draw_rmagick_test_01.rb
 - test/eyetests/tests/draw_rmagick_test_02.rb
 - test/eyetests/tests/draw_rmagick_test_03.rb
 - test/eyetests/tests/draw_rmagick_test_04.rb
+- test/eyetests/tests/draw_rotate_01.rb
 - test/eyetests/tests/draw_roundrectangle_affine.rb
 - test/eyetests/tests/draw_roundrectangle_basic.rb
+- test/eyetests/tests/draw_scale_01.rb
+- test/eyetests/tests/draw_skewx_01.rb
+- test/eyetests/tests/draw_skewy_01.rb
+- test/eyetests/tests/draw_stroke_miterlimit.rb
 - test/eyetests/tests/gradient_fill_horizontal_diagonal_fill.rb
 - test/eyetests/tests/gradient_fill_horizontal_fill.rb
 - test/eyetests/tests/gradient_fill_point_fill.rb
@@ -153,8 +145,6 @@ files:
 - test/gruff_tests/test/test_sidestacked_bar.rb
 - test/gruff_tests/test/test_spider.rb
 - test/gruff_tests/test/test_stacked_bar.rb
-- test/implemented_methods.rb
-- test/RMagickTestSuite.rb
 - test/spec/draw_spec.rb
 - test/spec/image_constants.rb
 - test/spec/image_spec.rb
@@ -167,33 +157,33 @@ files:
 - test/spec/stories/image_filling_story.rb
 - test/images/clown.jpg
 - test/images/texture.jpg
-has_rdoc: true
-homepage: http://jruby-extras.rubyforge.org/rmagick4j
-post_install_message: 
+rubygems_version: 1.2.0
 rdoc_options: 
 - --main
 - README.txt
-require_paths: 
-- lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+signing_key: 
+cert_chain: []
+name: rmagick4j
+has_rdoc: true
+platform: ruby
+summary: RMagick for Java
+default_executable: 
+bindir: bin
+required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
-required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: !str 0
+required_ruby_version: !ruby/object:Gem::Requirement
   version: 
-requirements: []
-
-rubyforge_project: jruby-extras
-rubygems_version: 1.0.1
-signing_key: 
+  requirements: 
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: !str 0
+require_paths: 
+- lib
 specification_version: 2
-summary: RMagick for Java
 test_files: 
 - test/gruff_tests/test/test_accumulator_bar.rb
 - test/gruff_tests/test/test_area.rb
@@ -213,3 +203,18 @@ test_files:
 - test/gruff_tests/test/test_sidestacked_bar.rb
 - test/gruff_tests/test/test_spider.rb
 - test/gruff_tests/test/test_stacked_bar.rb
+dependencies: []
+description: RMagick is a Ruby binding to ImageMagick and GraphicsMagick. RMagick4J
+  implements ImageMagick functionality and the C portions of RMagick for use with
+  JRuby.
+email: serabe@gmail.com, tom.enebo@gmail.com
+authors: 
+- "Thomas Palmer, Sergio Rodr\xc3\xadguez Arbeo and Thomas Enebo"
+extra_rdoc_files: 
+- History.txt
+- Manifest.txt
+- README.txt
+- LICENSE.txt
+requirements: []
+rubyforge_project: jruby-extras
+autorequire: