processing 1.1.2 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 159f0c770707e1d98c9d4ac42ad3f64fb33b8015b36c888bc324cfda5502ca6b
-  data.tar.gz: aaa6a13dadcd68f6019c6aecaf170f52a77e7c0415dcfd54c75e9b991cd3f766
+  metadata.gz: 6ef8468c160d98ed171b6895b53b5d7f2de366412dc11016009344e84e5eeb3d
+  data.tar.gz: c0d126f5efdca61a943ce8636e6e8de9b0f00d9c11e8fe992cf7acf4344e16ab
 SHA512:
-  metadata.gz: 8c504755164e52205c77a200f058429507ad4d64251f30b9f9d25318507fd33e134798225c28b9690dd1b4db10a9f82ab3d3d070750f8f328cd2c9a819ee52da
-  data.tar.gz: a96bc6008c03e6e69ab980f8cee631867f92328950256d33e180b3fb2f490bb3ad5b80d853d675b3b497c940c75b7f51d903a982caf920705073058aa9a81a8b
+  metadata.gz: a3bf31eac373300c0c5adbe71a43931cee89f78c90de57a77f065430e4622295f6ac94af876f542764864e4be40735a5f1fa4d3fc0e728d1fbd7baf11bc8e9c1
+  data.tar.gz: ed6609b295154cac65f3fe1af3f48a4532421da3cac7b0846feccccfb135181e88db60bdf5b5b478f1f57c8084f230af5738cfa651cadd979aa1c72cf7cd4800

data/ChangeLog.md

@@ -1,6 +1,18 @@
 # processing ChangeLog
 
 
+## [v1.1.4] - 2025-01-27
+
+- Event blocks can be defined as methods with 'def'
+- Alias snake case methods
+- ellipse() can take 3 params
+
+
+## [v1.1.3] - 2025-01-23
+
+- Update dependencies
+
+
 ## [v1.1.2] - 2025-01-14
 
 - Update workflow files

data/VERSION

@@ -1 +1 @@
-1.1.2
+1.1.4

data/lib/processing/all.rb

@@ -9,6 +9,59 @@ require 'net/http'
 require 'xot/inspectable'
 require 'reflex'
 
+
+module Processing
+
+  # @private
+  EVENT_NAMES__ = %i[
+    setup draw
+    keyPressed keyReleased keyTyped
+    mousePressed mouseReleased mouseMoved mouseDragged
+    mouseClicked doubleClicked mouseWheel
+    touchStarted touchEnded touchMoved
+    windowMoved windowResized motion
+  ]
+
+  # @private
+  def self.setup__(namespace)
+    w = (ENV['WIDTH']  || 500).to_i
+    h = (ENV['HEIGHT'] || 500).to_i
+
+    window  = Processing::Window.new(w, h) {start}
+    context = namespace::Context.new window
+    funcs   = (context.methods - Object.instance_methods)
+      .reject {_1 =~ /__$/} # methods for internal use
+    events  = to_snake_case__(EVENT_NAMES__).flatten.uniq
+      .each.with_object({}) {|event, hash| hash[event] = -> {__send__ event}}
+
+    return window, context, funcs, events
+  end
+
+  # @private
+  def self.alias_snake_case_methods__(klass, recursive = 1)
+    to_snake_case__(klass.instance_methods false)
+      .reject {|camel, snake| camel =~ /__$/}
+      .reject {|camel, snake| klass.method_defined? snake}
+      .each   {|camel, snake| klass.alias_method snake, camel}
+    if recursive > 0
+      klass.constants.map {klass.const_get _1}
+        .flatten
+        .select {_1.class == Module || _1.class == Class}
+        .each {|inner_class| alias_snake_case_methods__ inner_class, recursive - 1}
+    end
+  end
+
+  # @private
+  def self.to_snake_case__(camel_case_names)
+    camel_case_names.map do |camel|
+      snake = camel.to_s.gsub(/([a-z])([A-Z])/) {"#{$1}_#{$2.downcase}"}
+      [camel, snake].map(&:to_sym)
+    end
+  end
+
+end# Processing
+
+
 require 'processing/extension'
 require 'processing/app'
 require 'processing/window'

data/lib/processing/graphics_context.rb

@@ -1540,6 +1540,9 @@ module Processing
     #
     # The parameters a, b, c, and d are determined by ellipseMode().
     #
+    # @overload ellipse(a, b, c)
+    # @overload ellipse(a, b, c, d)
+    #
     # @param a [Numeric] horizontal position of the shape, by default
     # @param b [Numeric] vertical position of the shape, by default
     # @param c [Numeric] width of the shape, by default
@@ -1550,9 +1553,9 @@ module Processing
     # @see https://processing.org/reference/ellipse_.html
     # @see https://p5js.org/reference/p5/ellipse/
     #
-    def ellipse(a, b, c, d)
+    def ellipse(a, b, c, d = nil)
       assertDrawing__
-      x, y, w, h = toXYWH__ @ellipseMode__, a, b, c, d
+      x, y, w, h = toXYWH__ @ellipseMode__, a, b, c, (d || c)
       @painter__.ellipse x, y, w, h
       nil
     end

data/lib/processing.rb

@@ -2,19 +2,24 @@ require 'processing/all'
 
 
 module Processing
-  w = (ENV['WIDTH']  || 500).to_i
-  h = (ENV['HEIGHT'] || 500).to_i
-  WINDOW__  = Processing::Window.new(w, h) {start}
-  CONTEXT__ = Processing::Context.new WINDOW__
+  Processing.alias_snake_case_methods__ Processing
+
+  WINDOW__, CONTEXT__, funcs, events = Processing.setup__ Processing
 
   refine Object do
-    (CONTEXT__.methods - Object.instance_methods)
-      .reject {_1 =~ /__$/} # methods for internal use
-      .each do |method|
-        define_method method do |*args, **kwargs, &block|
-          CONTEXT__.__send__ method, *args, **kwargs, &block
-        end
+    funcs.each do |func|
+      define_method func do |*args, **kwargs, &block|
+        CONTEXT__.__send__ func, *args, **kwargs, &block
+      end
+    end
+
+    event_names = events.keys
+    Object.singleton_class.define_method :method_added do |method|
+      if event_names.include? method
+        caller = events[method]
+        CONTEXT__.__send__(method) {caller.call} if caller
       end
+    end
   end
 end# Processing
 

data/processing.gemspec

@@ -26,10 +26,10 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 3.0.0'
 
   s.add_dependency 'rexml'
-  s.add_dependency 'xot',       '~> 0.3.2', '>= 0.3.2'
-  s.add_dependency 'rucy',      '~> 0.3.2', '>= 0.3.2'
-  s.add_dependency 'rays',      '~> 0.3.2', '>= 0.3.2'
-  s.add_dependency 'reflexion', '~> 0.3.2', '>= 0.3.2'
+  s.add_dependency 'xot',       '~> 0.3.3', '>= 0.3.3'
+  s.add_dependency 'rucy',      '~> 0.3.3', '>= 0.3.3'
+  s.add_dependency 'rays',      '~> 0.3.3', '>= 0.3.3'
+  s.add_dependency 'reflexion', '~> 0.3.3', '>= 0.3.3'
 
   s.files            = `git ls-files`.split $/
   s.test_files       = s.files.grep %r{^(test|spec|features)/}

data/test/test_graphics_context.rb

@@ -198,9 +198,13 @@ class TestGraphicsContext < Test::Unit::TestCase
 
   def test_ellipse_with_ellipseMode()
     assert_p5_draw 'ellipseMode CORNER;  ellipse 100, 200, 300, 400'
+    assert_p5_draw 'ellipseMode CORNER;  ellipse 100, 200, 300'
     assert_p5_draw 'ellipseMode CORNERS; ellipse 100, 200, 300, 500'
+    assert_p5_draw 'ellipseMode CORNERS; ellipse 100, 200, 300'
     assert_p5_draw 'ellipseMode CENTER;  ellipse 400, 500, 300, 400'
+    assert_p5_draw 'ellipseMode CENTER;  ellipse 400, 500, 300'
     assert_p5_draw 'ellipseMode RADIUS;  ellipse 400, 500, 300, 400'
+    assert_p5_draw 'ellipseMode RADIUS;  ellipse 400, 500, 300'
   end
 
   def test_circle()

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: processing
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.4
 platform: ruby
 authors:
 - xordog
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-13 00:00:00.000000000 Z
+date: 2025-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rexml
@@ -30,80 +30,80 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.3.3
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.3.3
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.3.3
 - !ruby/object:Gem::Dependency
   name: rucy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.3.3
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.3.3
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.3.3
 - !ruby/object:Gem::Dependency
   name: rays
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.3.3
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.3.3
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.3.3
 - !ruby/object:Gem::Dependency
   name: reflexion
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.3.3
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.3.3
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.3.3
 description: Creative Coding Framework has API compatible to Processing or p5.js.
 email: xordog@gmail.com
 executables: []