processing 0.5.29 → 0.5.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43c304fcb0736f53301de6d1dcdea69d62c0f2cce027c6f5557102c8e92372b7
-  data.tar.gz: a75abc1fec6ddbb3ee785ae444304dcd0a36ef1f67d5957779eb1926cc096fdd
+  metadata.gz: ca6d65b8e9bd003c16fabbf550a70f20f0adf70ea623d1abe01ec1b967b88fa0
+  data.tar.gz: e4f689b826f7854a4da0bf9b52c6368c27ef02179ae98e15e0995b452eafc096
 SHA512:
-  metadata.gz: 35a3a70db26dd8ff031675de548fb5593af891ca2699c6bf57a9fb2beccddada68e8ff2bd59ec8556edd625654d626fbe1c1aa82177253bcce884c3cec878ca7
-  data.tar.gz: 74ee44f9aad045d7c7646afbe51f0952a40929aac202a92080e469f1693d21f56e9381aa5c57a81d5a6ae5aa7607313297ee48ad550695eafd9633275494a4c7
+  metadata.gz: f74584e4c313f4c95ce326ccadd8fa20e59dba80a2b4598f083c7dd5f2041950b8f3d69f0ca34c7fc3021d5b704f26170879587d19d375bb499e244577d529e3
+  data.tar.gz: a38786a6783135f58ffd9a81edf929f5ba8d020dbd12fc06faa85cc6d36dc95c682249cccea600a823faee81e03b86eb3ffff2ca766704a520f867294cf51ae8

data/.github/workflows/release-gem.yml

@@ -17,19 +17,19 @@ jobs:
       - name: checkout
         uses: actions/checkout@v2
 
+      - name: setup gems
+        run: bundle install
+
       - name: setup dependencies
         run: "ruby -I.github/workflows -rutils -e 'setup_dependencies'"
 
-      - name: install gems
-        run: gem install yard
-
       - name: test
-        run: rake quiet test
+        run: bundle exec rake quiet test
 
       - name: create gem
         id: gem
         run: |
-          rake gem
+          bundle exec rake gem
           echo path=$(ruby -e 'print Dir.glob("*.gem").first') >> $GITHUB_OUTPUT
 
       - name: create github release
@@ -59,4 +59,4 @@ jobs:
           touch $HOME/.gem/credentials
           chmod 0600 $HOME/.gem/credentials
           printf -- "---\n:rubygems_api_key: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
-          rake upload
+          bundle exec rake upload

data/.github/workflows/test-draw.yml

@@ -0,0 +1,34 @@
+name: Test Draw
+
+on:
+  push:
+    branches: [master]
+  pull_request:
+    branches: [master]
+
+jobs:
+  test:
+    runs-on: macos-latest
+
+    steps:
+      - name: ruby 3.2
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 3.2
+
+      - name: checkout
+        uses: actions/checkout@v2
+
+      - name: setup gems
+        run: bundle install
+
+      - name: setup dependencies
+        run: "ruby -I.github/workflows -rutils -e 'setup_dependencies'"
+
+      - name: setup chrome
+        uses: browser-actions/setup-chrome@latest
+        with:
+          chrome-version: stable
+
+      - name: test
+        run: rake test:draw

data/.github/workflows/test.yml

@@ -19,8 +19,11 @@ jobs:
       - name: checkout
         uses: actions/checkout@v2
 
+      - name: setup gems
+        run: bundle install
+
       - name: setup dependencies
         run: "ruby -I.github/workflows -rutils -e 'setup_dependencies'"
 
       - name: test
-        run: rake test
+        run: bundle exec rake test

data/ChangeLog.md

@@ -1,6 +1,13 @@
 # processing ChangeLog
 
 
+## [v0.5.30] - 2023-11-09
+
+- Test drawing methods with p5.rb
+- Add .github/workflows/test-draw.yml
+- Use Gemfile to install gems for development instead of add_development_dependency in gemspec
+
+
 ## [v0.5.29] - 2023-10-29
 
 - Update dependencies

data/Gemfile

@@ -1,3 +1,6 @@
 source 'https://rubygems.org'
 
-gemspec
+gem 'rake'
+gem 'test-unit'
+gem 'yard'
+gem 'ferrum'

data/Gemfile.lock

@@ -0,0 +1,35 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    addressable (2.8.5)
+      public_suffix (>= 2.0.2, < 6.0)
+    concurrent-ruby (1.2.2)
+    ferrum (0.14)
+      addressable (~> 2.5)
+      concurrent-ruby (~> 1.1)
+      webrick (~> 1.7)
+      websocket-driver (>= 0.6, < 0.8)
+    power_assert (2.0.3)
+    public_suffix (5.0.3)
+    rake (13.1.0)
+    test-unit (3.6.1)
+      power_assert
+    webrick (1.7.0)
+    websocket-driver (0.7.6)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.5)
+    yard (0.9.34)
+
+PLATFORMS
+  arm64-darwin-20
+  arm64-darwin-21
+  x86_64-darwin-20
+
+DEPENDENCIES
+  ferrum
+  rake
+  test-unit
+  yard
+
+BUNDLED WITH
+   2.3.3

data/Rakefile

@@ -14,11 +14,26 @@ require 'reflex/extension'
 require 'processing/extension'
 
 
-EXTENSIONS = [Xot, Rucy, Rays, Reflex, Processing]
+EXTENSIONS    = [Xot, Rucy, Rays, Reflex, Processing]
+DRAW_TESTS    = Dir.glob('test/draw/test_*.rb')
+TESTS_EXCLUDE = DRAW_TESTS
 
 ENV['RDOC'] = 'yardoc --no-private'
 
 default_tasks
+use_bundler
 test_ruby_extension
 generate_documents
 build_ruby_gem
+
+task :clean => 'test:clean'
+
+namespace :test do
+  task :clean do
+    sh %( rm -rf test/draw/p5rb )
+  end
+
+  task :draw do
+    sh %( ruby #{DRAW_TESTS.join ' '} )
+  end
+end

data/VERSION

@@ -1 +1 @@
-0.5.29
+0.5.30

data/processing.gemspec

@@ -25,14 +25,10 @@ Gem::Specification.new do |s|
   s.platform              = Gem::Platform::RUBY
   s.required_ruby_version = '>= 3.0.0'
 
-  s.add_runtime_dependency 'xot',       '~> 0.1.39'
-  s.add_runtime_dependency 'rucy',      '~> 0.1.40'
-  s.add_runtime_dependency 'rays',      '~> 0.1.45'
-  s.add_runtime_dependency 'reflexion', '~> 0.1.53'
-
-  s.add_development_dependency 'rake'
-  s.add_development_dependency 'test-unit'
-  s.add_development_dependency 'yard'
+  s.add_runtime_dependency 'xot',       '~> 0.1.40'
+  s.add_runtime_dependency 'rucy',      '~> 0.1.41'
+  s.add_runtime_dependency 'rays',      '~> 0.1.46'
+  s.add_runtime_dependency 'reflexion', '~> 0.1.54'
 
   s.files            = `git ls-files`.split $/
   s.test_files       = s.files.grep %r{^(test|spec|features)/}

data/test/draw/helper.rb

@@ -0,0 +1,31 @@
+require 'digest/md5'
+require 'fileutils'
+
+require_relative '../helper'
+require_relative 'p5'
+
+
+def md5(s)
+  Digest::MD5.hexdigest s
+end
+
+def mkdir(dir: nil, filename: nil)
+  path = dir || File.dirname(filename)
+  FileUtils.mkdir_p path unless File.exist? path
+end
+
+def assert_draw(width = 100, height = 100, draw_src, threshold: 1.0)
+  path    = File.join __dir__, "p5rb", "#{md5(draw_src)}.png"
+  mkdir filename: path
+  density = draw_p5rb width, height, draw_src, path, headless: false
+  gfx     = graphics(width, height, density).tap do |g|
+    g.beginDraw do
+      g.background 0
+      g.fill 255, 0, 0
+      g.noStroke
+      g.instance_eval draw_src
+    end
+  end
+  gfx.save path.sub(/\.png$/, '.actual.png')
+  assert_equal_pixels gfx.loadImage(path), gfx, threshold: threshold
+end

data/test/draw/p5.rb

@@ -0,0 +1,63 @@
+require 'open-uri'
+require 'ferrum'
+
+RUBY_URL = 'https://cdn.jsdelivr.net/npm/ruby-3_2-wasm-wasi@next/dist/browser.script.iife.js'
+P5JS_URL = 'https://cdn.jsdelivr.net/npm/p5@1.5.0/lib/p5.js'
+P5RB_URL = 'https://raw.githubusercontent.com/ongaeshi/p5rb/master/docs/lib/p5.rb'
+
+P5RB_SRC = URI.open(P5RB_URL) {|f| f.read}
+
+def browser(width, height, headless: true)
+  hash        = ($browsers ||= {})
+  key         = [width, height, headless]
+  hash[key] ||= Ferrum::Browser.new headless: headless, window_size: [width, height]
+end
+
+def get_p5rb_html(width, height, draw_src)
+  <<~END
+    <html>
+      <head>
+        <script src="#{RUBY_URL}"></script>
+        <script src="#{P5JS_URL}"></script>
+        <script type="text/ruby">#{P5RB_SRC}</script>
+        <style type="text/css">
+          body {margin: 0;}
+        </style>
+        <script type="text/javascript">
+          function completed() {
+            id = 'completed'
+            if (document.querySelector("#" + id)) return;
+            let e = document.createElement("span");
+            e.id = id;
+            document.body.appendChild(e);
+          }
+        </script>
+        <script type="text/ruby">
+          def setup()
+            createCanvas #{width}, #{height}
+          end
+          def draw()
+            background 0
+            fill 255, 0, 0
+            noStroke
+            #{draw_src}
+            JS.global.completed
+          end
+          P5::init
+        </script>
+      </head>
+      <body><main></main></body>
+    </html>
+  END
+end
+
+def draw_p5rb(width, height, draw_src, path, 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
+    sleep 0.1 until b.evaluate 'document.querySelector("#completed") != null'
+    b.screenshot path: path
+  end
+  b.device_pixel_ratio
+end

data/test/draw/test_draw.rb

@@ -0,0 +1,22 @@
+require_relative 'helper'
+
+
+class TestDraw < Test::Unit::TestCase
+
+  def test_rect()
+    assert_draw                   'rect 10, 20, 30, 40'
+    assert_draw 'rectMode CORNER;  rect 10, 20, 30, 40'
+    assert_draw 'rectMode CORNERS; rect 10, 20, 30, 50'
+    assert_draw 'rectMode CENTER;  rect 40, 50, 30, 40'
+    assert_draw 'rectMode RADIUS;  rect 40, 50, 30, 40'
+  end
+
+  def test_ellipse()
+    assert_draw                      'ellipse 40, 50, 30, 40', threshold: 0.98
+    assert_draw 'ellipseMode CORNER;  ellipse 10, 20, 30, 40', threshold: 0.98
+    assert_draw 'ellipseMode CORNERS; ellipse 10, 20, 30, 50', threshold: 0.98
+    assert_draw 'ellipseMode CENTER;  ellipse 40, 50, 30, 40', threshold: 0.98
+    assert_draw 'ellipseMode RADIUS;  ellipse 40, 50, 30, 40', threshold: 0.98
+  end
+
+end# TestDraw

data/test/helper.rb

@@ -29,8 +29,8 @@ def get_pixels(image)
     .to_a
 end
 
-def graphics(width = 10, height = 10, &block)
-  Processing::Graphics.new(width, height).tap do |g|
+def graphics(width = 10, height = 10, *args, &block)
+  Processing::Graphics.new(width, height, *args).tap do |g|
     g.beginDraw {block.call g, g.getInternal__} if block
   end
 end
@@ -40,3 +40,15 @@ def assert_equal_vector(v1, v2, delta = 0.000001)
   assert_in_delta v1.y, v2.y, delta
   assert_in_delta v1.z, v2.z, delta
 end
+
+def assert_equal_pixels(expected, actual, threshold: 1.0)
+  exp_pixels = get_pixels expected
+  act_pixels = get_pixels actual
+  raise "Number of pixels does not match" if act_pixels.size != exp_pixels.size
+
+  equal_count = exp_pixels.zip(act_pixels).count {|a, b| a == b}
+  equal_rate  = equal_count.to_f / act_pixels.size.to_f
+  assert equal_rate >= threshold, <<~EOS
+    The rate of the same pixel #{equal_rate} is below the threshold #{threshold}
+  EOS
+end

data/test/test_graphics.rb

@@ -26,7 +26,7 @@ class TestGraphics < Test::Unit::TestCase
     end
     temppath(ext: 'png') do |path|
       assert_nothing_raised {g.save path}
-      assert_equal get_pixels(g), get_pixels(g.loadImage path)
+      assert_equal_pixels g, g.loadImage(path)
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: processing
 version: !ruby/object:Gem::Version
-  version: 0.5.29
+  version: 0.5.30
 platform: ruby
 authors:
 - xordog
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-28 00:00:00.000000000 Z
+date: 2023-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xot
@@ -16,98 +16,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.39
+        version: 0.1.40
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.39
+        version: 0.1.40
 - !ruby/object:Gem::Dependency
   name: rucy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.40
+        version: 0.1.41
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.40
+        version: 0.1.41
 - !ruby/object:Gem::Dependency
   name: rays
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.45
+        version: 0.1.46
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.45
+        version: 0.1.46
 - !ruby/object:Gem::Dependency
   name: reflexion
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.53
+        version: 0.1.54
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.53
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: test-unit
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.54
 description: Creative Coding Framework has API compatible to Processing or p5.js.
 email: xordog@gmail.com
 executables: []
@@ -116,12 +74,14 @@ extra_rdoc_files: []
 files:
 - ".github/workflows/release-gem.yml"
 - ".github/workflows/tag.yml"
+- ".github/workflows/test-draw.yml"
 - ".github/workflows/test.yml"
 - ".github/workflows/utils.rb"
 - ".gitignore"
 - ".yardopts"
 - ChangeLog.md
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -150,6 +110,9 @@ files:
 - lib/processing/vector.rb
 - lib/processing/window.rb
 - processing.gemspec
+- test/draw/helper.rb
+- test/draw/p5.rb
+- test/draw/test_draw.rb
 - test/helper.rb
 - test/test_capture.rb
 - test/test_font.rb
@@ -185,6 +148,9 @@ signing_key:
 specification_version: 4
 summary: Processing compatible Creative Coding Framework.
 test_files:
+- test/draw/helper.rb
+- test/draw/p5.rb
+- test/draw/test_draw.rb
 - test/helper.rb
 - test/test_capture.rb
 - test/test_font.rb