RubyGems - processing - Versions diffs - 0.5.33 → 1.0.1 - Mend

processing 0.5.33 → 1.0.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (25) hide show

checksums.yaml +4 -4
data/ChangeLog.md +25 -1
data/Gemfile +1 -0
data/Gemfile.lock +2 -0
data/Rakefile +5 -5
data/VERSION +1 -1
data/lib/processing/all.rb +4 -1
data/lib/processing/context.rb +128 -0
data/lib/processing/font.rb +5 -0
data/lib/processing/graphics.rb +9 -0
data/lib/processing/graphics_context.rb +640 -42
data/lib/processing/image.rb +86 -0
data/lib/processing/shader.rb +29 -16
data/lib/processing/shape.rb +369 -28
data/lib/processing/svg.rb +248 -0
data/lib/processing/vector.rb +126 -0
data/lib/processing/window.rb +2 -0
data/processing.gemspec +4 -4
data/test/{p5.rb → browser.rb} +37 -3
data/test/helper.rb +40 -7
data/test/test_color.rb +94 -0
data/test/test_graphics_context.rb +26 -59
data/test/test_shape.rb +129 -6
data/test/test_svg.rb +257 -0
metadata +17 -12

data/test/{p5.rb → browser.rb} RENAMED Viewed

@@ -13,6 +13,30 @@ def browser(width, height, headless: true)
   hash[key] ||= Ferrum::Browser.new headless: headless, window_size: [width, height]
 end
+def get_svg_html(width, height, svg_xml)
+  <<~END
+    <html>
+      <head>
+        <style type="text/css">
+          body {margin: 0;}
+        </style>
+        <script type="text/javascript">
+          window.onload = function() {
+            let e = document.createElement("span");
+            e.id = 'completed';
+            document.body.appendChild(e);
+          }
+        </script>
+      </head>
+      <body>
+        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 #{width} #{height}">
+          #{svg_xml}
+        </svg>
+      </body>
+    </html>
+  END
+end
 def get_p5rb_html(width, height, draw_src, webgl: false)
   <<~END
     <html>
@@ -57,17 +81,17 @@ def sleep_until(try: 3, timeout: 10, &block)
       limit = now[timeout]
       try -= 1
       next if try > 0
-      raise 'Drawing timed out in p5.rb'
+      raise 'Drawing timed out in browser'
     end
     sleep 0.1
   end
 end
-def draw_p5rb(width, height, draw_src, path, headless: true, webgl: false)
+def draw_on_browser(width, height, path, html, headless: true)
   b = browser width, height, headless: headless
   unless File.exist? path
     b.reset
-    b.main_frame.content = get_p5rb_html width, height, draw_src, webgl: webgl
+    b.main_frame.content = html
     sleep_until do
       b.evaluate 'document.querySelector("#completed") != null'
     end
@@ -75,3 +99,13 @@ def draw_p5rb(width, height, draw_src, path, headless: true, webgl: false)
   end
   b.device_pixel_ratio
 end
+def draw_svg(width, height, svg_xml, path, headless: true)
+  html = get_svg_html width, height, svg_xml
+  draw_on_browser width, height, path, html, headless: headless
+end
+def draw_p5rb(width, height, draw_src, path, headless: true, webgl: false)
+  html = get_p5rb_html width, height, draw_src, webgl: webgl
+  draw_on_browser width, height, path, html, headless: headless
+end

data/test/helper.rb CHANGED Viewed

@@ -20,9 +20,11 @@ DEFAULT_DRAW_HEADER = <<~END
   strokeWeight 50
 END
+THRESHOLD_TO_BE_FIXED = 0.0
-def test_with_p5?()
-  ENV['TEST_WITH_P5'] == '1'
+def test_with_browser?()
+  (ENV['TEST_WITH_BROWSER'] || '0') != '0'
 end
 def md5(s)
@@ -107,16 +109,47 @@ def assert_equal_draw(
   assert_equal_pixels e, a, threshold: threshold
 end
+def assert_svg_draw(
+  svg_xml,
+  width: 1000, height: 1000, threshold: 0.99, label: test_label, **kwargs)
+  source = <<~END
+    background 255
+    shape Processing::SVGLoader.new(self).parse <<~SVG
+      <?xml version="1.0" encoding="UTF-8"?>
+      <svg xmlns="http://www.w3.org/2000/svg"
+        xmlns:xlink="http://www.w3.org/1999/xlink"
+        viewBox="0 0 100 100">
+        #{svg_xml}
+      </svg>
+    SVG
+  END
+  assert_draw_on_browser(
+    source, width, height, threshold, label, **kwargs
+  ) do |path|
+    draw_svg width, height, svg_xml, path, **kwargs
+  end
+end
 def assert_p5_draw(
   *sources, default_header: DEFAULT_DRAW_HEADER,
   width: 1000, height: 1000, threshold: 0.99, label: test_label, **kwargs)
-  return unless test_with_p5?
   source = [default_header, *sources].compact.join("\n")
-  path   = draw_output_path "#{label}_expected", source
+  assert_draw_on_browser(
+    source, width, height, threshold, label, **kwargs
+  ) do |path|
+    draw_p5rb width, height, source, path, **kwargs
+  end
+end
-  pd     = draw_p5rb width, height, source, path, **kwargs
+def assert_draw_on_browser(
+  source, width, height, threshold, label, **kwargs, &draw_on_browser)
+  return unless test_with_browser?
+  path   = draw_output_path "#{label}_expected", source
+  pd     = draw_on_browser.call path
   actual = test_draw source, width: width, height: height, pixelDensity: pd
   actual.save path.sub('_expected', '_actual')
@@ -136,4 +169,4 @@ def assert_p5_fill_stroke(*sources, **kwargs)
 end
-require_relative 'p5' if test_with_p5?
+require_relative 'browser' if test_with_browser?

data/test/test_color.rb ADDED Viewed

@@ -0,0 +1,94 @@
+require_relative 'helper'
+class TestColor < Test::Unit::TestCase
+  P = Processing
+  G = P::Graphics
+  def test_rgb_color()
+    g = graphics
+    g.colorMode G::RGB, 255
+    c = g.color 10, 20, 30, 40
+    assert_equal 0x280a141e, c
+    assert_equal [10, 20, 30, 40], [g.red(c), g.green(c), g.blue(c), g.alpha(c)]
+    g.colorMode G::RGB, 1.0
+    c = g.color 0.1, 0.2, 0.3, 0.4
+    assert_equal 0x6619334c, c
+    assert_in_delta 0.1, g.red(c),   1 / 256.0
+    assert_in_delta 0.2, g.green(c), 1 / 256.0
+    assert_in_delta 0.3, g.blue(c),  1 / 256.0
+    assert_in_delta 0.4, g.alpha(c), 1 / 256.0
+    g.colorMode G::RGB, 0.5
+    c = g.color 0.1, 0.2, 0.3, 0.4
+    assert_equal 0xcc336699, c
+    assert_in_delta 0.1, g.red(c),   1 / 256.0
+    assert_in_delta 0.2, g.green(c), 1 / 256.0
+    assert_in_delta 0.3, g.blue(c),  1 / 256.0
+    assert_in_delta 0.4, g.alpha(c), 1 / 256.0
+  end
+  def test_hsb_color()
+    g = graphics
+    g.colorMode G::HSB, 1.0
+    c = g.color 0.1, 0.2, 0.3, 0.4
+    assert_in_delta 0.1, g.hue(c),        1 / 256.0
+    assert_in_delta 0.2, g.saturation(c), 1 / 256.0
+    assert_in_delta 0.3, g.brightness(c), 1 / 256.0
+    assert_in_delta 0.4, g.alpha(c),      1 / 256.0
+    g.colorMode G::HSB, 0.5
+    c = g.color 0.1, 0.2, 0.3, 0.4
+    assert_in_delta 0.1, g.hue(c),        1 / 256.0
+    assert_in_delta 0.2, g.saturation(c), 1 / 256.0
+    assert_in_delta 0.3, g.brightness(c), 1 / 256.0
+    assert_in_delta 0.4, g.alpha(c),      1 / 256.0
+  end
+  def test_parse_color()
+    g = graphics
+    assert_equal 0xff010203, g.color('#010203')
+    assert_equal 0x04010203, g.color('#01020304')
+    assert_equal 0xff112233, g.color('#123')
+    assert_equal 0x44112233, g.color('#1234')
+    assert_equal 0xff0000ff, g.color('blue')
+    assert_equal 0x040000ff, g.color('blue', 4)
+  end
+  def test_color_codes()
+    g = graphics
+    assert_equal 0xffff0000, g.color(:red)
+    assert_equal 0xff008000, g.color(:GREEN)
+    assert_equal 0xff0000ff, g.color('blue')
+    assert_raise(ArgumentError) {g.color :unknown}
+  end
+  def test_default_background_color()
+    assert_p5_draw '', default_header: '', threshold: THRESHOLD_TO_BE_FIXED
+  end
+  def test_default_fill_color()
+    assert_p5_draw <<~END, default_header: nil
+      background 100
+      noStroke
+      rect 100, 100, 500, 500
+    END
+  end
+  def test_default_stroke_color()
+    assert_p5_draw <<~END, default_header: nil
+      background 100
+      noFill
+      strokeWeight 50
+      line 100, 100, 500, 500
+    END
+  end
+end# TestColor

data/test/test_graphics_context.rb CHANGED Viewed

@@ -6,51 +6,6 @@ class TestGraphicsContext < Test::Unit::TestCase
   P = Processing
   G = P::Graphics
-  THRESHOLD_TO_BE_FIXED = 0.0
-  def test_rgb_color()
-    g = graphics
-    g.colorMode G::RGB, 255
-    c = g.color 10, 20, 30, 40
-    assert_equal 0x280a141e, c
-    assert_equal [10, 20, 30, 40], [g.red(c), g.green(c), g.blue(c), g.alpha(c)]
-    g.colorMode G::RGB, 1.0
-    c = g.color 0.1, 0.2, 0.3, 0.4
-    assert_equal 0x6619334c, c
-    assert_in_delta 0.1, g.red(c),   1 / 256.0
-    assert_in_delta 0.2, g.green(c), 1 / 256.0
-    assert_in_delta 0.3, g.blue(c),  1 / 256.0
-    assert_in_delta 0.4, g.alpha(c), 1 / 256.0
-    g.colorMode G::RGB, 0.5
-    c = g.color 0.1, 0.2, 0.3, 0.4
-    assert_equal 0xcc336699, c
-    assert_in_delta 0.1, g.red(c),   1 / 256.0
-    assert_in_delta 0.2, g.green(c), 1 / 256.0
-    assert_in_delta 0.3, g.blue(c),  1 / 256.0
-    assert_in_delta 0.4, g.alpha(c), 1 / 256.0
-  end
-  def test_hsb_color()
-    g = graphics
-    g.colorMode G::HSB, 1.0
-    c = g.color 0.1, 0.2, 0.3, 0.4
-    assert_in_delta 0.1, g.hue(c),        1 / 256.0
-    assert_in_delta 0.2, g.saturation(c), 1 / 256.0
-    assert_in_delta 0.3, g.brightness(c), 1 / 256.0
-    assert_in_delta 0.4, g.alpha(c),      1 / 256.0
-    g.colorMode G::HSB, 0.5
-    c = g.color 0.1, 0.2, 0.3, 0.4
-    assert_in_delta 0.1, g.hue(c),        1 / 256.0
-    assert_in_delta 0.2, g.saturation(c), 1 / 256.0
-    assert_in_delta 0.3, g.brightness(c), 1 / 256.0
-    assert_in_delta 0.4, g.alpha(c),      1 / 256.0
-  end
   def test_colorMode()
     g = graphics
     assert_equal G::RGB, g.colorMode
@@ -81,25 +36,37 @@ class TestGraphicsContext < Test::Unit::TestCase
     assert_raise {g.blendMode LEFT}
   end
-  def test_default_background_color()
-    assert_p5_draw '', default_header: '', threshold: THRESHOLD_TO_BE_FIXED
-  end
-  def test_default_fill_color()
-    assert_p5_draw <<~END, default_header: nil
-      background 100
-      noStroke
-      rect 100, 100, 500, 500
+  def test_strokeCap()
+    header = <<~END
+      noFill
+      strokeWeight 200
     END
+    footer = <<~END
+      line 200, 200, 800, 800
+    END
+    assert_p5_draw header, '',                  footer
+    assert_p5_draw header, 'strokeCap ROUND',   footer
+    assert_p5_draw header, 'strokeCap SQUARE',  footer
+    assert_p5_draw header, 'strokeCap PROJECT', footer
   end
-  def test_default_stroke_color()
-    assert_p5_draw <<~END, default_header: nil
-      background 100
+  def test_strokeJoin()
+    header = <<~END
       noFill
-      strokeWeight 50
-      line 100, 100, 500, 500
+      strokeWeight 200
+      strokeCap SQUARE
+    END
+    footer = <<~END
+      beginShape
+      vertex 200, 200
+      vertex 800, 500
+      vertex 200, 800
+      endShape
     END
+    assert_p5_draw header, '',                 footer
+    assert_p5_draw header, 'strokeJoin MITER', footer
+    assert_p5_draw header, 'strokeJoin BEVEL', footer, threshold: THRESHOLD_TO_BE_FIXED
+    assert_p5_draw header, 'strokeJoin ROUND', footer
   end
   def test_textFont()

data/test/test_shape.rb CHANGED Viewed

@@ -366,14 +366,33 @@ class TestShape < Test::Unit::TestCase
   def test_fill()
     assert_equal_draw <<~HEADER, <<~EXPECTED, <<~ACTUAL
+      noFill
       noStroke
     HEADER
-      fill 0, 255, 0
+      fill 0, 0, 255
       rect 100, 100, 500, 400
     EXPECTED
       s = createShape
       s.beginShape
-      s.fill 0, 255, 0
+      s.fill 0, 0, 255
+      s.vertex 100, 100
+      s.vertex 600, 100
+      s.vertex 600, 500
+      s.vertex 100, 500
+      s.endShape
+      shape s
+    ACTUAL
+    assert_equal_draw <<~HEADER, <<~EXPECTED, <<~ACTUAL
+      noFill
+      noStroke
+    HEADER
+      fill 0, 0, 255
+      rect 100, 100, 500, 400
+    EXPECTED
+      fill 0, 0, 255
+      s = createShape
+      s.beginShape
       s.vertex 100, 100
       s.vertex 600, 100
       s.vertex 600, 500
@@ -383,11 +402,50 @@ class TestShape < Test::Unit::TestCase
     ACTUAL
   end
+  def test_stroke()
+    assert_equal_draw <<~HEADER, <<~EXPECTED, <<~ACTUAL
+      noFill
+      noStroke
+    HEADER
+      stroke 0, 0, 255
+      rect 100, 100, 500, 400
+    EXPECTED
+      s = createShape
+      s.beginShape
+      s.stroke 0, 0, 255
+      s.vertex 100, 100
+      s.vertex 600, 100
+      s.vertex 600, 500
+      s.vertex 100, 500
+      s.endShape CLOSE
+      shape s
+    ACTUAL
+    assert_equal_draw <<~HEADER, <<~EXPECTED, <<~ACTUAL
+      noFill
+      noStroke
+    HEADER
+      stroke 0, 0, 255
+      rect 100, 100, 500, 400
+    EXPECTED
+      stroke 0, 0, 255
+      s = createShape
+      s.beginShape
+      s.vertex 100, 100
+      s.vertex 600, 100
+      s.vertex 600, 500
+      s.vertex 100, 500
+      s.endShape CLOSE
+      shape s
+    ACTUAL
+  end
   def test_setFill()
     assert_equal_draw <<~HEADER, <<~EXPECTED, <<~ACTUAL
+      noFill
       noStroke
     HEADER
-      fill 0, 255, 0
+      fill 0, 0, 255
       rect 100, 100, 500, 400
     EXPECTED
       s = createShape
@@ -397,18 +455,83 @@ class TestShape < Test::Unit::TestCase
       s.vertex 600, 500
       s.vertex 100, 500
       s.endShape
-      s.setFill 0, 255, 0
+      s.setFill 0, 0, 255
+      shape s
+    ACTUAL
+    assert_equal_draw <<~HEADER, <<~EXPECTED, <<~ACTUAL
+      noFill
+      noStroke
+    HEADER
+      fill 0, 0, 255
+      ellipse 300, 400, 500, 400
+    EXPECTED
+      s = createShape ELLIPSE, 300, 400, 500, 400
+      s.setFill 0, 0, 255
+      shape s
+    ACTUAL
+  end
+  def test_setStroke()
+    assert_equal_draw <<~HEADER, <<~EXPECTED, <<~ACTUAL
+      noFill
+      noStroke
+    HEADER
+      stroke 0, 0, 255
+      rect 100, 100, 500, 400
+    EXPECTED
+      s = createShape
+      s.beginShape
+      s.vertex 100, 100
+      s.vertex 600, 100
+      s.vertex 600, 500
+      s.vertex 100, 500
+      s.endShape CLOSE
+      s.setStroke 0, 0, 255
       shape s
     ACTUAL
     assert_equal_draw <<~HEADER, <<~EXPECTED, <<~ACTUAL
+      noFill
       noStroke
     HEADER
-      fill 0, 255, 0
+      stroke 0, 0, 255
+      ellipse 300, 400, 500, 400
+    EXPECTED
+      s = createShape ELLIPSE, 300, 400, 500, 400
+      s.setStroke 0, 0, 255
+      shape s
+    ACTUAL
+  end
+  def test_setStrokeWeight()
+    assert_equal_draw <<~HEADER, <<~EXPECTED, <<~ACTUAL
+      noFill
+      strokeWeight 1
+    HEADER
+      strokeWeight 100
+      rect 100, 100, 500, 400
+    EXPECTED
+      s = createShape
+      s.beginShape
+      s.vertex 100, 100
+      s.vertex 600, 100
+      s.vertex 600, 500
+      s.vertex 100, 500
+      s.endShape CLOSE
+      s.setStrokeWeight 100
+      shape s
+    ACTUAL
+    assert_equal_draw <<~HEADER, <<~EXPECTED, <<~ACTUAL
+      noFill
+      strokeWeight 1
+    HEADER
+      strokeWeight 100
       ellipse 300, 400, 500, 400
     EXPECTED
       s = createShape ELLIPSE, 300, 400, 500, 400
-      s.setFill 0, 255, 0
+      s.setStrokeWeight 100
       shape s
     ACTUAL
   end