processing 1.1.3 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f9bd898aff5ff7b56bfd6ffcc238202a3488cfbc083987dce630b08a88c671b
-  data.tar.gz: e0f8c2c453e34320e04a45bf13b06f4f45f0b7c79b30007614fbaaa0c9b7c1e7
+  metadata.gz: c8f47bfbe64ef981036e63d3764e68d0136d9279f155eda380484c5e82b09c0b
+  data.tar.gz: 8d73f1f9a94c04ebe2050007ab2a07c9ca5febae8611373af831b9b1ab30973b
 SHA512:
-  metadata.gz: 3195ec55d3d870a3905d17430b86d2cf5772566b9fcd57e6c02242d1e14a01d6562b8b22b2163f19db8eeb285f3d9eaed337f179fc28c8533cf2f671a8bf7f11
-  data.tar.gz: 596d56d8b9cb9af92df912ef2733195bbc3df0b4ecdac9123e3370610202e2ac90699dfd0a84bf2f396732d278cc620b25e55c450d374b4393837650dfac06ae
+  metadata.gz: f38a551e8d521bd34f3c6fd41c554f3fc95cf33fee013e40b4142580cf679078d248d2fe00c5ee84d19a2f24b8108a9bfe6541678e103a59cd5bb845d8fd8006
+  data.tar.gz: 9b7fe7c09c8daee0e9d7e0fb44a1e9fe66a95145f20003614492480c2325a650ec860f263062e9b9f4b7defa92a89cd98a59eca446a034f912e48a5d2a95e960

data/ChangeLog.md

@@ -1,6 +1,18 @@
 # processing ChangeLog
 
 
+## [v1.1.5] - 2025-01-30
+
+- Do not define snake_case methods by default
+
+
+## [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

data/VERSION

@@ -1 +1 @@
-1.1.3
+1.1.5

data/lib/processing/all.rb

@@ -9,6 +9,66 @@ 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
+
+    return window, context
+  end
+
+  # @private
+  def self.funcs__(context)
+    (context.methods - Object.instance_methods)
+      .reject {_1 =~ /__$/} # methods for internal use
+  end
+
+  # @private
+  def self.events__(context)
+    to_snake_case__(EVENT_NAMES__).flatten.uniq.select {context.respond_to? _1}
+  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,23 +2,37 @@ 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__
+  WINDOW__, CONTEXT__ = 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
+    context = CONTEXT__
+    Processing.funcs__(context).each do |func|
+      define_method func do |*args, **kwargs, &block|
+        context.__send__ func, *args, **kwargs, &block
       end
+    end
   end
 end# Processing
 
 
+def Processing(snake_case: false)
+  return Processing unless snake_case
+
+  $processing_refinements_with_snake_case ||= Module.new do
+    Processing.alias_snake_case_methods__ Processing
+
+    refine Object do
+      context = Processing::CONTEXT__
+      Processing.funcs__(context).each do |func|
+        define_method func do |*args, **kwargs, &block|
+          context.__send__ func, *args, **kwargs, &block
+        end
+      end
+    end
+  end
+end
+
+
 begin
   w, c = Processing::WINDOW__, Processing::CONTEXT__
 
@@ -28,6 +42,11 @@ begin
 
   w.__send__ :begin_draw
   at_exit do
+    Processing.events__(c).each do |event|
+      m = begin method event; rescue NameError; nil end
+      c.__send__(event) {__send__ event} if m
+    end
+
     w.__send__ :end_draw
     Processing::App.new {w.show}.start if c.hasUserBlocks__ && !$!
   end

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.3
+  version: 1.1.5
 platform: ruby
 authors:
 - xordog
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-22 00:00:00.000000000 Z
+date: 2025-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rexml