glimmer-dsl-swing 0.0.1 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ecbd6a72ae4955c7f90995ef135f1aac59fc4b3294377fa4b7957b1b22069715
-  data.tar.gz: a58db866e29fd2d2f6620314918b629a94095cbe717ce7ca6c998d30a6d4348d
+  metadata.gz: f105e5227247c67f51be098e70d2ea1fdb1e084fcecf00f1960c838b4fd65c48
+  data.tar.gz: '07290abf4d15a2f70b38829ba540f3c9efd98a61cc4b8417484e30db8bfee1d6'
 SHA512:
-  metadata.gz: 1c675e8abe364913657308555622a3969d7eed06b0e95894946686fa01e9493bf56e2a016bb5c135edcb1e6ac2a11fea91809c248724257f2d2ab4db59607d0a
-  data.tar.gz: a7c4ccc5cac6eececddf64760737c9765f9ef7c9b40efa6a6a77eb326b2257a425d222297087cb3a93a9589b215d9edbe8ddff27452ac0fcc14582aab228b6b8
+  metadata.gz: e34417a4033877f520b7ead9871a734ab859fa3cfece7e02ea32d1cad4d278db870573182e46e23cbe4b037eda0a0ba8410dcf4c31a6ac63fc2b3319f16ecd71
+  data.tar.gz: e19f0b1bed9dea8e5cf4cc98939a83e0f00b7210ce1ef5a5b0282822a3ab11a58af95ec142dff27824789fdb9a040b14a05d082cad9da6410e99843962e93afd

data/CHANGELOG.md

@@ -1,5 +1,30 @@
 # Change Log
 
+## 0.0.5
+
+- Support `path`, which can primarily contain `move_to`, `line_to`, `curve_to`, `close_path` calls, and secondarily other shapes like `line` or `rectangle`.
+- Support invoking component/shape operations in their content (e.g. nesting `move_to` inside `path`)
+
+## 0.0.4
+
+- Support setting `stroke` attribute in shapes
+- Rename `draw_color` and `fill_color` to `draw_paint` and `fill_paint` to be consistent with `java.awt.Graphics2D` terminology (while keeping older syntax as an alias/alternative)
+- Enable antialiasing by default on Java 2D graphics
+- Update Hello, Shapes! to take advantage of `stroke`
+
+## 0.0.3
+
+- Support `observe` keyword for observing model attributes to update the View
+- Support adding `include Glimmer` inside a class
+- Hello, Button! sample version 2 (decoupled view using `observe` keyword)
+
+## 0.0.2
+
+- General Java 2D shape support by nesting under any component
+- Support setting `jframe` `minimum_size width, height` without building `Dimension` object manually
+- Hello, Shapes! sample
+- Improve Hello, Button! sample
+
 ## 0.0.1
 
 - Initial version of Glimmer DSL for Swing

data/README.md

@@ -1,11 +1,11 @@
-# [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=85 />](https://github.com/AndyObtiva/glimmer) Glimmer DSL for Swing 0.0.1
+# [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=85 />](https://github.com/AndyObtiva/glimmer) Glimmer DSL for Swing 0.0.5
 ## JRuby Swing Desktop Development GUI Library
 [![Gem Version](https://badge.fury.io/rb/glimmer-dsl-swing.svg)](http://badge.fury.io/rb/glimmer-dsl-swing)
 [![Join the chat at https://gitter.im/AndyObtiva/glimmer](https://badges.gitter.im/AndyObtiva/glimmer.svg)](https://gitter.im/AndyObtiva/glimmer?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 [Glimmer](https://github.com/AndyObtiva/glimmer) DSL for [Swing](https://docs.oracle.com/javase/tutorial/uiswing/) enables building desktop applications with [Java Swing](https://docs.oracle.com/javase/tutorial/uiswing/), [Java AWT](https://docs.oracle.com/javase/8/docs/technotes/guides/awt/index.html), [Java Foundation Classes](https://docs.oracle.com/javase/tutorial/uiswing/start/about.html) and [Java 2D](https://docs.oracle.com/javase/tutorial/2d/index.html) via [JRuby](https://www.jruby.org/).
 
-There has been a great divide between two big GUI toolkits in Java in the past:
+There has been a great divide between two big GUI toolkits in Java:
 - [Eclipse SWT](https://www.eclipse.org/swt/)
 - [Java Swing/AWT/JFC/2D](https://docs.oracle.com/javase/tutorial/uiswing/)
 
@@ -14,8 +14,8 @@ There has been a great divide between two big GUI toolkits in Java in the past:
 That said, from a balanced software engineering point of view, there are sometimes non-functional requirements that might target [Swing](https://docs.oracle.com/javase/tutorial/uiswing/) as an appropriate GUI toolkit solution. Like in the case of extending legacy [Swing](https://docs.oracle.com/javase/tutorial/uiswing/) applications or developing rare applications that require fully custom looking graphical user interfaces (typically not recommended), such as traffic control planning or diagramming applications. In the latter case, it would not matter whether to use [SWT](https://www.eclipse.org/swt/) or [Swing](https://docs.oracle.com/javase/tutorial/uiswing/) as they both provide support for building non-native components (in addition to native widgets in the case of [SWT](https://www.eclipse.org/swt/)).
 
 [Glimmer DSL for Swing](https://rubygems.org/gems/glimmer-dsl-swing) aims to supercharge productivity and maintainability in developing [Swing](https://docs.oracle.com/javase/tutorial/uiswing/) applications by providing a DSL similar to [Glimmer DSL for SWT](https://github.com/AndyObtiva/glimmer-dsl-swt) having:
-- Declarative DSL syntax that visually maps to the GUI component hierarchy
-- Convention over configuration via smart defaults and automation of low-level details
+- [Declarative DSL syntax](#glimmer-gui-dsl) that visually maps to the GUI component hierarchy
+- Convention over configuration via [smart defaults and automation of low-level details](#smart-defaults-and-conventions)
 - Requiring the least amount of syntax possible to build GUI
 - Custom Keyword support
 - Bidirectional Data-Binding to declaratively wire and automatically synchronize GUI with Business Models
@@ -57,14 +57,14 @@ Note: On the Mac, if you have [Glimmer DSL for SWT](https://github.com/AndyObtiv
 
 Run this command to install directly:
 ```
-gem install glimmer-dsl-swing
+gem install glimmer-dsl-swing -v0.0.5
 ```
 
 ### Option 2: Bundler
 
 Add the following to `Gemfile`:
 ```
-gem 'glimmer-dsl-swing', '~> 0.0.1'
+gem 'glimmer-dsl-swing', '0.0.5'
 ```
 
 And, then run:
@@ -86,6 +86,276 @@ jframe('Hello, World!') {
 }.show
 ```
 
+For actual application development outside of simple demos, mixin the `Glimmer` module into a custom application class instead:
+
+```ruby
+require 'glimmer-dsl-swing'
+
+class SomeApplication
+  include Glimmer
+
+  def launch
+    jframe('Hello, World!') {
+      jlabel('Hello, World!')
+    }.show
+  end
+end
+
+SomeApplication.new.launch
+```
+
+## Glimmer GUI DSL
+
+The Glimmer GUI DSL enables development of desktop graphical user interfaces in a manner similar to HTML, but in one language, Ruby, thus avoiding the multi-language separation dissonance encountered on the web, especially given that Ruby looping/conditional constructs do not need scriptlets to be added around View code. This makes desktop development extremely productive.
+
+1 - Keywords
+
+You may declare any [swing](https://docs.oracle.com/javase/8/docs/api/javax/swing/package-summary.html)/[awt](https://docs.oracle.com/javase/8/docs/api/java/awt/package-summary.html) component with its keyword, which is the underscored version of the class name. For example, `jframe` is the keyword for `javax.swing.JFrame` (`j_frame` is acceptable too)
+
+Examples:
+
+```ruby
+jframe
+jbutton
+jlabel
+```
+
+2 - Arguments
+
+You may pass any arguments that a [swing](https://docs.oracle.com/javase/8/docs/api/javax/swing/package-summary.html)/[awt](https://docs.oracle.com/javase/8/docs/api/java/awt/package-summary.html) component constructor accepts to its Glimmer keyword.
+
+Example (`JFrame`, `JButton`, and `JLabel` have a constructor signature that accepts a string representing title or text):
+
+```ruby
+jframe('Hello, World!')
+jbutton('Push Me')
+jlabel('Name')
+```
+
+The recommended style is to always wrap arguments with parentheses for component keywords.
+
+3 - Content Block
+
+You may pass a content block to any [swing](https://docs.oracle.com/javase/8/docs/api/javax/swing/package-summary.html)/[awt](https://docs.oracle.com/javase/8/docs/api/java/awt/package-summary.html) component keyword, which contains properties and/or nested components.
+
+Example:
+
+```ruby
+jframe('Hello, World!') {
+  minimum_size 320, 240
+
+  jlabel('Hello, World!')
+}
+```
+
+The recommended style for the content block is always curly braces `{}` to denote as View nesting code different from looping/conditional logic, which utilizes `do;end` instead.
+
+Property arguments never have parentheses.
+
+4 - Listeners
+
+You may declare listeners with their `on_`-prefixed event method name on the [swing](https://docs.oracle.com/javase/8/docs/api/javax/swing/package-summary.html)/[awt](https://docs.oracle.com/javase/8/docs/api/java/awt/package-summary.html) listener class (these are the classes in the signatures of `AddXYZListener` methods on [swing](https://docs.oracle.com/javase/8/docs/api/javax/swing/package-summary.html)/[awt](https://docs.oracle.com/javase/8/docs/api/java/awt/package-summary.html) component classes).
+
+For example, `JButton` has an `AddXYZListener` method called `AddActionListener`, which accepts an `ActionListener` class. That class has one event method: `actionPerformed`. In Glimmer, you simply underscore that and prefix with `on_`:
+
+```ruby
+jframe('Hello, Button!') {
+  jbutton('Click') {
+    on_action_performed do
+      puts 'Clicked!'
+    end
+  }
+}
+```
+
+The recommended style for listeners is always a `do; end` block.
+
+5 - Component Proxy & Methods
+
+When utilizing the Glimmer GUI DSL, you get back proxy objects that wrap [swing](https://docs.oracle.com/javase/8/docs/api/javax/swing/package-summary.html)/[awt](https://docs.oracle.com/javase/8/docs/api/java/awt/package-summary.html) components. To access the original component wrapped by the proxy object, you may call the `#original` method.
+
+Furthermore, you may invoke any method available on the component on the proxy object, like the `#show` method on `JFrame`.
+
+```ruby
+frame1 = jframe('Hello, World!') {
+  # ...
+}
+frame1.show
+```
+
+Despite `#show` being deprecated in the Java API, it is recommended to use `#show` instead of `visible=` in the Glimmer GUI DSL because it has less awkward syntax (it calls `visible=` behind the scenes to avoid the deprecated API). `#show` also invokes `pack` automatically on first run, utilizing `SwingUtilities.invokeLater`.
+
+6 - Observe Model Attributes
+
+In Smalltalk-MVC ([Model View Controller](https://en.wikipedia.org/wiki/Model%E2%80%93view%E2%80%93controller) Architectural Pattern), the View is an active View that observes the Model for changes and updates itself.
+
+![MVC](http://3.bp.blogspot.com/-4eW59Ao0ess/ToiBzAiYdZI/AAAAAAAAAOg/SiYa6XHwBFE/s320/Screen+shot+2011-10-02+at+10.22.11+AM.png)
+
+This can be achieved with the Glimmer GUI DSL using the `observe` keyword, which takes a model (any object, including `self`) and attribute Symbol or String expression (e.g. `:count` or `'address.street'`).
+
+The model is automatically enhanced as an `Glimmer::DataBinding::ObservableModel` / `Glimmer::DataBinding::ObservableHash` / `Glimmer::DataBinding::ObservableArray` depending on its type to support notifying observers of attribute changes (when performed using the attribute writer, which automatically calls added method `notify_observers(attribute)`)
+
+Note that it is usually recommended to observe external model objects (not `self`), but `self` is OK in very simple cases or presentation-related attributes only.
+
+Example:
+
+```ruby
+require 'glimmer-dsl-swing'
+
+class Counter
+  attr_accessor :count
+
+  def initialize
+    self.count = 0
+  end
+end
+
+class HelloButton
+  include Glimmer
+  
+  def initialize
+    @counter = Counter.new
+
+    observe(@counter, :count) do |new_count|
+      @button.text = "Click To Increment: #{new_count}"
+    end
+  end
+  
+  def launch
+    jframe('Hello, Button!') {
+      @button = jbutton('Click To Increment: 0') {
+        on_action_performed do
+          @counter.count += 1
+        end
+      }
+    }.show
+  end
+end
+
+HelloButton.new.launch
+```
+
+![screenshots/glimmer-dsl-swing-mac-hello-button.png](screenshots/glimmer-dsl-swing-mac-hello-button.png)
+
+### Shape DSL
+
+[Glimmer DSL for Swing](https://rubygems.org/gems/glimmer-dsl-swing) might be the only Ruby Swing DSL out there that supports an additional Shape DSL.
+
+This enables declarative painting of arbitrary shapes using Java 2D, which is similar to how SVG works on the web.
+
+Simply utilize underscored shape names from the `java.awt.geom` [package classes](https://docs.oracle.com/javase/8/docs/api/java/awt/geom/package-summary.html) minus the `2D` suffix, following the same general rules of the [Glimmer GUI DSL](#glimmer-gui-dsl).
+
+For example, `Arc2D` becomes simply `arc`.
+
+Glimmer utilizes the `Double` variation of shape classes.
+
+Additionally, you can set these shape properties:
+- `draw_paint` (alias: `draw_color`): takes [`java.awt.Color`](https://docs.oracle.com/javase/8/docs/api/java/awt/Color.html) rgba arguments to use color for drawing
+- `fill_paint` (alias: `fill_color`): takes [`java.awt.Color`](https://docs.oracle.com/javase/8/docs/api/java/awt/Color.html) rgba arguments to use color for filling
+- `stroke`: takes [`java.awt.BasicStroke`](https://docs.oracle.com/javase/8/docs/api/java/awt/BasicStroke.html) line width and other arguments to use for drawing
+
+`path` can have the following operations nested:
+- `move_to x, y`: move to point
+- `line_to x2, y2`: connect line to end point
+- `curve_to ctrl_x1, ctrl_y1, ctrl_x2, ctrl_y2, x2, y2`: connect curve to control point 1, control point 2, and end point
+- `close_path`: close path, reconnecting last shape/point back to first point
+
+Example:
+
+```ruby
+require 'glimmer-dsl-swing'
+
+include Glimmer
+
+jframe('Hello, Shapes!') {
+  minimum_size 400, 400
+  
+  arc(40, 40, 90, 90, 30, 230, 0) {
+    fill_paint 255, 0, 0
+    draw_paint 0, 128, 255
+    stroke 3
+  }
+  
+  arc(40, 140, 90, 90, 30, 230, 1) {
+    fill_paint 255, 0, 0
+    draw_paint 0, 128, 255
+    stroke 3
+  }
+  
+  arc(40, 240, 90, 90, 30, 230, 2) {
+    fill_paint 255, 0, 0
+    draw_paint 0, 128, 255
+    stroke 3
+  }
+  
+  rectangle(140, 40, 180, 90) {
+    fill_paint 255, 255, 0
+    draw_paint 255, 0, 0
+    stroke 3
+  }
+  
+  round_rectangle(140, 140, 180, 90, 60, 40) {
+    fill_paint 255, 255, 0
+    draw_paint 255, 0, 0
+    stroke 3
+  }
+
+  ellipse(140, 240, 180, 90) {
+    fill_paint 255, 255, 0
+    draw_paint 255, 0, 0
+    stroke 3
+  }
+  
+  line(180, 60, 280, 110) {
+    draw_paint 255, 0, 0
+    stroke 3
+  }
+  
+  quad_curve(170, 60, 180, 90, 220, 100) {
+    draw_paint 0, 255, 0
+    stroke 3
+  }
+  
+  cubic_curve(190, 60, 240, 40, 220, 80, 260, 70) {
+    draw_paint 0, 0, 255
+    stroke 3
+  }
+  
+  path {
+    move_to 200, 150
+    line_to 270, 170
+    line_to 250, 220
+    line_to 220, 190
+    line_to 200, 200
+    line_to 180, 170
+    
+    close_path
+    
+    fill_paint 0, 255, 0
+    draw_paint 0, 0, 255
+    stroke 3
+  }
+  
+  path {
+    move_to 160, 300
+    curve_to 190, 260, 200, 280, 210, 270
+    curve_to 240, 280, 250, 300, 260, 290
+    curve_to 290, 290, 300, 310, 310, 300
+    
+    fill_paint 0, 255, 0
+    draw_paint 0, 0, 255
+    stroke 3
+  }
+}.show
+```
+
+![screenshots/glimmer-dsl-swing-mac-hello-shapes.png](screenshots/glimmer-dsl-swing-mac-hello-shapes.png)
+
+## Smart Defaults and Conventions
+
+- `jframe` automatically invokes `pack` on first run of `show`, and ensures utilizing `SwingUtilities.invokeLater` behind the scenes.
+- When nesting a shape under a [swing](https://docs.oracle.com/javase/8/docs/api/javax/swing/package-summary.html)/[awt](https://docs.oracle.com/javase/8/docs/api/java/awt/package-summary.html) component, it is automatically added to shapes to paint on top of component (after painting component itself).
+
 ## Girb (Glimmer IRB)
 
 You can run the `girb` command (`bin/girb` if you cloned the project locally):
@@ -94,7 +364,7 @@ You can run the `girb` command (`bin/girb` if you cloned the project locally):
 girb
 ```
 
-This gives you `irb` with the `glimmer-dsl-gtk` gem loaded and the `Glimmer` module mixed into the main object for easy experimentation with GUI.
+This gives you `irb` with the `glimmer-dsl-swing` gem loaded and the `Glimmer` module mixed into the main object for easy experimentation with GUI.
 
 ## Samples
 
@@ -102,8 +372,22 @@ This gives you `irb` with the `glimmer-dsl-gtk` gem loaded and the `Glimmer` mod
 
 #### Hello, World!
 
+Run with gem installed:
+
+```
+jruby -r glimmer-dsl-swing -e "require 'samples/hello/hello_world'"
+```
+
+Or run from locally cloned project directory:
+
+```
+jruby -r ./lib/glimmer-dsl-swing samples/hello/hello_world.rb
+```
+
 ![screenshots/glimmer-dsl-swing-mac-hello-world.png](screenshots/glimmer-dsl-swing-mac-hello-world.png)
 
+[samples/hello/hello_world.rb](samples/hello/hello_world.rb):
+
 ```ruby
 require 'glimmer-dsl-swing'
 
@@ -116,8 +400,22 @@ jframe('Hello, World!') {
 
 #### Hello, Button!
 
+Run with gem installed:
+
+```
+jruby -r glimmer-dsl-swing -e "require 'samples/hello/hello_button'"
+```
+
+Or run from locally cloned project directory:
+
+```
+jruby -r ./lib/glimmer-dsl-swing samples/hello/hello_button.rb
+```
+
 ![screenshots/glimmer-dsl-swing-mac-hello-button.png](screenshots/glimmer-dsl-swing-mac-hello-button.png)
 
+Version 1 (without model) - [samples/hello/hello_button.rb](samples/hello/hello_button.rb):
+
 ```ruby
 require 'glimmer-dsl-swing'
 
@@ -125,11 +423,154 @@ include Glimmer
 
 jframe('Hello, Button!') {
   @button = jbutton('Click To Increment: 0') {
-    on_action_performed {
+    on_action_performed do
       button_text_match = @button.text.match(/(.*)(\d+)$/)
       count = button_text_match[2].to_i + 1
       @button.text = "#{button_text_match[1]}#{count}"
-    }
+    end
+  }
+}.show
+```
+
+Version 2 (with model) - [samples/hello/hello_button2.rb](samples/hello/hello_button2.rb):
+
+```ruby
+require 'glimmer-dsl-swing'
+
+class Counter
+  attr_accessor :count
+
+  def initialize
+    self.count = 0
+  end
+end
+
+class HelloButton
+  include Glimmer
+  
+  def initialize
+    @counter = Counter.new
+
+    observe(@counter, :count) do |new_count|
+      @button.text = "Click To Increment: #{new_count}"
+    end
+  end
+  
+  def launch
+    jframe('Hello, Button!') {
+      @button = jbutton('Click To Increment: 0') {
+        on_action_performed do
+          @counter.count += 1
+        end
+      }
+    }.show
+  end
+end
+
+HelloButton.new.launch
+```
+
+#### Hello, Shapes!
+
+Run with gem installed:
+
+```
+jruby -r glimmer-dsl-swing -e "require 'samples/hello/hello_shapes'"
+```
+
+Or run from locally cloned project directory:
+
+```
+jruby -r ./lib/glimmer-dsl-swing samples/hello/hello_shapes.rb
+```
+
+![screenshots/glimmer-dsl-swing-mac-hello-shapes.png](screenshots/glimmer-dsl-swing-mac-hello-shapes.png)
+
+[samples/hello/hello_shapes.rb](samples/hello/hello_shapes.rb):
+
+```ruby
+require 'glimmer-dsl-swing'
+
+include Glimmer
+
+jframe('Hello, Shapes!') {
+  minimum_size 400, 400
+  
+  arc(40, 40, 90, 90, 30, 230, 0) {
+    fill_paint 255, 0, 0
+    draw_paint 0, 128, 255
+    stroke 3
+  }
+  
+  arc(40, 140, 90, 90, 30, 230, 1) {
+    fill_paint 255, 0, 0
+    draw_paint 0, 128, 255
+    stroke 3
+  }
+  
+  arc(40, 240, 90, 90, 30, 230, 2) {
+    fill_paint 255, 0, 0
+    draw_paint 0, 128, 255
+    stroke 3
+  }
+  
+  rectangle(140, 40, 180, 90) {
+    fill_paint 255, 255, 0
+    draw_paint 255, 0, 0
+    stroke 3
+  }
+  
+  round_rectangle(140, 140, 180, 90, 60, 40) {
+    fill_paint 255, 255, 0
+    draw_paint 255, 0, 0
+    stroke 3
+  }
+
+  ellipse(140, 240, 180, 90) {
+    fill_paint 255, 255, 0
+    draw_paint 255, 0, 0
+    stroke 3
+  }
+  
+  line(180, 60, 280, 110) {
+    draw_paint 255, 0, 0
+    stroke 3
+  }
+  
+  quad_curve(170, 60, 180, 90, 220, 100) {
+    draw_paint 0, 255, 0
+    stroke 3
+  }
+  
+  cubic_curve(190, 60, 240, 40, 220, 80, 260, 70) {
+    draw_paint 0, 0, 255
+    stroke 3
+  }
+  
+  path {
+    move_to 200, 150
+    line_to 270, 170
+    line_to 250, 220
+    line_to 220, 190
+    line_to 200, 200
+    line_to 180, 170
+    
+    close_path
+    
+    fill_paint 0, 255, 0
+    draw_paint 0, 0, 255
+    stroke 3
+  }
+  
+  path {
+    move_to 160, 300
+    curve_to 190, 260, 200, 280, 210, 270
+    curve_to 240, 280, 250, 300, 260, 290
+    curve_to 290, 290, 300, 310, 310, 300
+    
+    fill_paint 0, 255, 0
+    draw_paint 0, 0, 255
+    stroke 3
   }
 }.show
 ```

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.5

data/lib/glimmer/dsl/swing/component_expression.rb

@@ -29,12 +29,12 @@ module Glimmer
         include ParentExpression
   
         def can_interpret?(parent, keyword, *args, &block)
-          keyword = "j_#{keyword[1..-1]}" if keyword.match(/j[a-z]/)
+          keyword = "j_#{keyword[1..-1]}" if keyword.match(/j[a-z]/) # TODO move this logic to ComponentProxy
           Glimmer::Swing::ComponentProxy.exist?(keyword)
         end
   
         def interpret(parent, keyword, *args, &block)
-          keyword = "j_#{keyword[1..-1]}" if keyword.match(/j[a-z]/)
+          keyword = "j_#{keyword[1..-1]}" if keyword.match(/j[a-z]/) # TODO move this logic to ComponentProxy
           Glimmer::Swing::ComponentProxy.create(parent, keyword, *args, &block)
         end
         

data/lib/glimmer/dsl/swing/dsl.rb

@@ -38,7 +38,9 @@ module Glimmer
         %w[
           listener
           property
+          operation
           component
+          shape
         ]
       )
     end

data/lib/glimmer/dsl/swing/observe_expression.rb

@@ -0,0 +1,35 @@
+# Copyright (c) 2021 Andy Maleh
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+require 'glimmer/dsl/static_expression'
+require 'glimmer/dsl/top_level_expression'
+require 'glimmer/dsl/observe_expression'
+
+module Glimmer
+  module DSL
+    module Swing
+      class ObserveExpression < StaticExpression
+        include TopLevelExpression
+        include Glimmer::DSL::ObserveExpression
+      end
+    end
+  end
+end

data/lib/glimmer/dsl/swing/operation_expression.rb

@@ -0,0 +1,45 @@
+# Copyright (c) 2021 Andy Maleh
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+require 'glimmer/dsl/expression'
+require 'glimmer/swing/component_proxy'
+require 'glimmer/swing/shape_proxy'
+
+module Glimmer
+  module DSL
+    module Swing
+      class OperationExpression < Expression
+        def can_interpret?(parent, keyword, *args, &block)
+          (
+            parent.is_a?(Glimmer::Swing::ComponentProxy) or
+            parent.is_a?(Glimmer::Swing::ShapeProxy)
+          ) and
+            block.nil? and
+            parent.respond_to?(keyword, *args)
+        end
+  
+        def interpret(parent, keyword, *args, &block)
+          parent.send(keyword, *args)
+        end
+      end
+    end
+  end
+end

data/lib/glimmer/dsl/swing/property_expression.rb

@@ -27,13 +27,16 @@ module Glimmer
     module Swing
       class PropertyExpression < Expression
         def can_interpret?(parent, keyword, *args, &block)
-          parent.is_a?(Glimmer::Swing::ComponentProxy) and
+          (
+            parent.is_a?(Glimmer::Swing::ComponentProxy) or
+            parent.is_a?(Glimmer::Swing::ShapeProxy)
+          ) and
             block.nil? and
-            parent.respond_to?(keyword, *args)
+            parent.respond_to?("#{keyword}=", *args)
         end
   
         def interpret(parent, keyword, *args, &block)
-          parent.send(keyword, *args)
+          parent.send("#{keyword}=", *args)
         end
       end
     end

data/lib/glimmer/dsl/swing/shape_expression.rb

@@ -0,0 +1,48 @@
+# Copyright (c) 2021 Andy Maleh
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+require 'glimmer/dsl/expression'
+require 'glimmer/dsl/parent_expression'
+
+module Glimmer
+  module DSL
+    module Swing
+      class ShapeExpression < Expression
+        include ParentExpression
+  
+        def can_interpret?(parent, keyword, *args, &block)
+          Glimmer::Swing::ShapeProxy.exist?(keyword)
+        end
+  
+        def interpret(parent, keyword, *args, &block)
+          Glimmer::Swing::ShapeProxy.create(parent, keyword, *args, &block)
+        end
+        
+        def add_content(parent, keyword, *args, &block)
+          super
+          parent.post_add_content
+        end
+      end
+    end
+  end
+end
+
+require 'glimmer/swing/shape_proxy'

data/lib/glimmer/swing/component_proxy/j_frame_proxy.rb

@@ -31,11 +31,21 @@ module Glimmer
         DEFAULT_WIDTH = 190
         DEFAULT_HEIGHT = 150
         
+        def set_minimum_size(*args)
+          @minimum_size_set = true
+          if args.size == 1 && args.first.is_a?(Java::JavaAwt::Dimension)
+            super
+          else
+            super(Java::JavaAwt::Dimension.new(*args))
+          end
+        end
+        alias minimum_size= set_minimum_size
+        
         def post_add_content
           unless @initial_content_added
             @initial_content_added = true
-            the_width = width == 0 ? DEFAULT_WIDTH : width
-            the_height = height == 0 ? DEFAULT_HEIGHT : height
+            the_width = @minimum_size_set ? minimum_size.width : DEFAULT_WIDTH
+            the_height = @minimum_size_set ? minimum_size.height : DEFAULT_HEIGHT
             set_minimum_size(Java::JavaAwt::Dimension.new(the_width, the_height))
             set_default_close_operation(Java::JavaxSwing::JFrame::EXIT_ON_CLOSE)
           end

data/lib/glimmer/swing/component_proxy.rb

@@ -31,8 +31,10 @@ module Glimmer
       include Packages
 
       class << self
+        include Packages
+        
         def exist?(keyword)
-          !!component_proxy_class(keyword)
+          !!component_class(keyword)
         end
         
         def create(parent, keyword, *args, &block)
@@ -70,10 +72,10 @@ module Glimmer
         end
           
         def component_class(keyword)
-          unless flyweight_component_class.keys.include?(keyword)
+          unless flyweight_component_class[keyword]
             begin
-              pd component_class_name = component_class_symbol(keyword).to_s
-              pd component_class = eval(component_class_name)
+              component_class_name = component_class_symbol(keyword).to_s
+              component_class = eval(component_class_name)
               unless component_class.ancestors.include?(Java::JavaAwt::Component)
                 component_class = component_class_manual_entries[keyword]
                 if component_class.nil?
@@ -81,6 +83,30 @@ module Glimmer
                   return nil
                 end
               end
+              component_class = Class.new(component_class) {
+                attr_accessor :shape_proxies
+      
+                def paint(g2)
+                  rendering_hints = RenderingHints.new(RenderingHints::KEY_ANTIALIASING, RenderingHints::VALUE_ANTIALIAS_ON)
+                  g2.set_rendering_hints(rendering_hints)
+                  super(g2)
+                  shape_proxies.each do |shape_proxy|
+                    original_paint = g2.get_paint
+                    original_stroke = g2.get_stroke
+                    if shape_proxy.fill_color
+                      g2.set_paint shape_proxy.fill_paint
+                      g2.fill(shape_proxy)
+                    end
+                    if shape_proxy.draw_color
+                      g2.set_stroke shape_proxy.stroke unless shape_proxy.stroke.nil?
+                      g2.set_paint shape_proxy.draw_paint
+                      g2.draw(shape_proxy)
+                    end
+                    g2.set_paint original_paint
+                    g2.set_stroke original_stroke || BasicStroke.new
+                  end
+                end
+              }
               flyweight_component_class[keyword] = component_class
             rescue SyntaxError, NameError => e
               Glimmer::Config.logger.debug {e.full_message}
@@ -106,7 +132,7 @@ module Glimmer
         @keyword = keyword
         @args = args
         @block = block
-        build_widget
+        build
         post_add_content if @block.nil?
       end
       
@@ -117,7 +143,15 @@ module Glimmer
       
       # Subclasses may override to perform post initialization work on an added child (normally must also call super)
       def post_initialize_child(child)
-        add(child)
+        if child.is_a?(ComponentProxy)
+          add(child)
+        elsif child.is_a?(ShapeProxy)
+          shape_proxies << child
+        end
+      end
+      
+      def shape_proxies
+        @shape_proxies ||= []
       end
       
       def respond_to?(method_name, *args, &block)
@@ -130,7 +164,9 @@ module Glimmer
       end
       
       def method_missing(method_name, *args, &block)
-        if @original.respond_to?("set_#{method_name}", true) && !args.empty?
+        if respond_to?("#{method_name}=", true) && !args.empty?
+          send("#{method_name}=", *args)
+        elsif @original.respond_to?("set_#{method_name}", true) && !args.empty?
           send_to_original("set_#{method_name}", *args, &block)
         elsif @original.respond_to?(method_name, true)
           send_to_original(method_name, *args, &block)
@@ -224,10 +260,9 @@ module Glimmer
 
       private
       
-      def build_widget
-        pd keyword
-        pd ComponentProxy.component_class(keyword)
+      def build
         @original = ComponentProxy.component_class(keyword).new(*normalize_args(args))
+        @original.shape_proxies = shape_proxies
       end
       
       def normalize_args(args)
@@ -240,3 +275,4 @@ module Glimmer
 end
 
 Dir[File.expand_path("./#{File.basename(__FILE__, '.rb')}/*.rb", __dir__)].each {|f| require f}
+require 'glimmer/swing/shape_proxy'

data/lib/glimmer/swing/shape_proxy.rb

@@ -0,0 +1,192 @@
+# Copyright (c) 2021 Andy Maleh
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+require 'glimmer/swing/packages'
+
+module Glimmer
+  module Swing
+    # Proxy for Java2D shape objects
+    #
+    # Follows the Proxy Design Pattern
+    class ShapeProxy
+      include Packages
+
+      class << self
+        def exist?(keyword)
+          !!shape_class(keyword)
+        end
+        
+        def create(parent, keyword, *args, &block)
+          shape_proxy_class(keyword).new(parent, keyword, *args, &block)
+        end
+        
+        def shape_proxy_class(keyword)
+          begin
+            class_name = shape_proxy_class_symbol(keyword)
+            Glimmer::Swing::ShapeProxy.const_get(class_name)
+          rescue => e
+            Glimmer::Config.logger.debug e.full_message
+            Glimmer::Swing::ShapeProxy
+          end
+        end
+        
+        def shape_proxy_class_symbol(keyword)
+          "#{keyword.camelcase(:upper)}Proxy".to_sym
+        end
+        
+        def shape_class_symbol(keyword)
+          keyword.camelcase(:upper).to_sym
+        end
+        
+        def keyword(shape_proxy_class)
+          shape_proxy_class.to_s.underscore.sub(/_proxy$/, '')
+        end
+        
+        def shape_class_manual_entries
+          # add mappings for any classes (minus the namespace) that conflict with standard Ruby classes
+          {
+            # example:
+            # 'date_time' => Java::OrgEclipseSwtWidgets::DateTime
+          }
+        end
+          
+        def shape_class(keyword)
+          unless flyweight_shape_class.keys.include?(keyword)
+            begin
+              shape_class_name = shape_class_symbol(keyword).to_s
+              shape_class = eval("#{shape_class_name}2D::Double") rescue eval(shape_class_name)
+              unless shape_class.ancestors.include?(Java::JavaAwt::Shape)
+                shape_class = shape_class_manual_entries[keyword]
+                if shape_class.nil?
+                  Glimmer::Config.logger.debug {"Class #{shape_class} matching #{keyword} is not a subclass of java.awt.Component"}
+                  return nil
+                end
+              end
+              flyweight_shape_class[keyword] = shape_class
+            rescue SyntaxError, NameError => e
+              Glimmer::Config.logger.debug {e.full_message}
+              nil
+            rescue => e
+              Glimmer::Config.logger.debug {e.full_message}
+              nil
+            end
+          end
+          flyweight_shape_class[keyword]
+        end
+        
+        # Flyweight Design Pattern memoization cache. Can be cleared if memory is needed.
+        def flyweight_shape_class
+          @flyweight_shape_class ||= {}
+        end
+      end
+      
+      attr_reader :parent_proxy, :original, :args, :keyword, :block
+      
+      def initialize(parent, keyword, *args, &block)
+        @parent_proxy = parent
+        @keyword = keyword
+        @args = args
+        @block = block
+        build
+        post_add_content if @block.nil?
+      end
+      
+      # Subclasses may override to perform post add_content work (normally must call super)
+      def post_add_content
+        @parent_proxy&.post_initialize_child(self)
+      end
+      
+      # Subclasses may override to perform post initialization work on an added child (normally must also call super)
+      def post_initialize_child(child)
+        @original.append(child.original, false) if @original&.is_a?(Path2D) && child.is_a?(ShapeProxy)
+      end
+      
+      def respond_to?(method_name, *args, &block)
+        respond_to_original?(method_name, *args, &block) ||
+          super(method_name, true)
+      end
+      
+      def respond_to_original?(method_name, *args, &block)
+        @original.respond_to?(method_name, true) || @original.respond_to?("set_#{method_name}", true)
+      end
+      
+      def method_missing(method_name, *args, &block)
+        if @original.respond_to?("set_#{method_name}", true) && !args.empty?
+          send_to_original("set_#{method_name}", *args, &block)
+        elsif @original.respond_to?(method_name, true)
+          send_to_original(method_name, *args, &block)
+        else
+          super
+        end
+      end
+      
+      def send_to_original(method_name, *args, &block)
+        @original.send(method_name, *normalize_args(args), &block)
+      end
+      
+      def content(&block)
+        Glimmer::DSL::Engine.add_content(self, Glimmer::DSL::Swing::ShapeExpression.new, @keyword, &block)
+      end
+      
+      def stroke=(*args)
+        @stroke = BasicStroke.new(*args)
+      end
+      
+      def stroke
+        @stroke
+      end
+      
+      def draw_paint=(*args)
+        @draw_paint = Color.new(*args)
+      end
+      alias draw_color= draw_paint=
+      
+      def draw_paint
+        @draw_paint
+      end
+      alias draw_color draw_paint
+      
+      def fill_paint=(*args)
+        @fill_paint = Color.new(*args)
+      end
+      alias fill_color= fill_paint=
+      
+      def fill_paint
+        @fill_paint
+      end
+      alias fill_color fill_paint
+      
+      private
+      
+      def build
+        @original = ShapeProxy.shape_class(keyword).new(*normalize_args(args))
+      end
+      
+      def normalize_args(args)
+        args.map do |arg|
+          arg.is_a?(ShapeProxy) ? arg.original : arg
+        end
+      end
+    end
+  end
+end
+
+Dir[File.expand_path("./#{File.basename(__FILE__, '.rb')}/*.rb", __dir__)].each {|f| require f}

data/lib/glimmer-dsl-swing.rb

@@ -24,11 +24,11 @@ $LOAD_PATH.unshift(File.expand_path('.', __dir__))
 # External requires
 # require 'logging'
 require 'puts_debuggerer' if ENV['pd'].to_s.downcase == 'true'
+require 'nested_inherited_jruby_include_package'
 # require 'super_module'
 require 'java'
 require 'concurrent-ruby' # ensures glimmer relies on Concurrent data-structure classes (e.g. Concurrent::Array)
 require 'glimmer'
-require 'nested_inherited_jruby_include_package'
 require 'os'
 require 'array_include_methods'
 require 'facets/string/underscore'
@@ -36,8 +36,6 @@ require 'facets/string/camelcase'
 require 'facets/hash/stringify_keys'
 
 # Internal requires
-# require 'ext/glimmer/config'
-# require 'ext/glimmer'
 require 'glimmer/swing'
 require 'glimmer/swing/ext/glimmer'
 require 'glimmer/swing/ext/glimmer/config'

data/samples/hello/hello_button.rb

@@ -4,10 +4,10 @@ include Glimmer
 
 jframe('Hello, Button!') {
   @button = jbutton('Click To Increment: 0') {
-    on_action_performed {
-      button_text_match = @button.text.match(/(.*)(\d+)$/)
+    on_action_performed do
+      button_text_match = @button.text.match(/([^0-9]+)(\d+)$/)
       count = button_text_match[2].to_i + 1
       @button.text = "#{button_text_match[1]}#{count}"
-    }
+    end
   }
 }.show

data/samples/hello/hello_button2.rb

@@ -0,0 +1,33 @@
+require 'glimmer-dsl-swing'
+
+class Counter
+  attr_accessor :count
+
+  def initialize
+    self.count = 0
+  end
+end
+
+class HelloButton
+  include Glimmer
+  
+  def initialize
+    @counter = Counter.new
+
+    observe(@counter, :count) do |new_count|
+      @button.text = "Click To Increment: #{new_count}"
+    end
+  end
+  
+  def launch
+    jframe('Hello, Button!') {
+      @button = jbutton('Click To Increment: 0') {
+        on_action_performed do
+          @counter.count += 1
+        end
+      }
+    }.show
+  end
+end
+
+HelloButton.new.launch

data/samples/hello/hello_shapes.rb

@@ -0,0 +1,84 @@
+require 'glimmer-dsl-swing'
+
+include Glimmer
+
+jframe('Hello, Shapes!') {
+  minimum_size 400, 400
+  
+  arc(40, 40, 90, 90, 30, 230, 0) {
+    fill_paint 255, 0, 0
+    draw_paint 0, 128, 255
+    stroke 3
+  }
+  
+  arc(40, 140, 90, 90, 30, 230, 1) {
+    fill_paint 255, 0, 0
+    draw_paint 0, 128, 255
+    stroke 3
+  }
+  
+  arc(40, 240, 90, 90, 30, 230, 2) {
+    fill_paint 255, 0, 0
+    draw_paint 0, 128, 255
+    stroke 3
+  }
+  
+  rectangle(140, 40, 180, 90) {
+    fill_paint 255, 255, 0
+    draw_paint 255, 0, 0
+    stroke 3
+  }
+  
+  round_rectangle(140, 140, 180, 90, 60, 40) {
+    fill_paint 255, 255, 0
+    draw_paint 255, 0, 0
+    stroke 3
+  }
+
+  ellipse(140, 240, 180, 90) {
+    fill_paint 255, 255, 0
+    draw_paint 255, 0, 0
+    stroke 3
+  }
+  
+  line(180, 60, 280, 110) {
+    draw_paint 255, 0, 0
+    stroke 3
+  }
+  
+  quad_curve(170, 60, 180, 90, 220, 100) {
+    draw_paint 0, 255, 0
+    stroke 3
+  }
+  
+  cubic_curve(190, 60, 240, 40, 220, 80, 260, 70) {
+    draw_paint 0, 0, 255
+    stroke 3
+  }
+  
+  path {
+    move_to 200, 150
+    line_to 270, 170
+    line_to 250, 220
+    line_to 220, 190
+    line_to 200, 200
+    line_to 180, 170
+    
+    close_path
+    
+    fill_paint 0, 255, 0
+    draw_paint 0, 0, 255
+    stroke 3
+  }
+  
+  path {
+    move_to 160, 300
+    curve_to 190, 260, 200, 280, 210, 270
+    curve_to 240, 280, 250, 300, 260, 290
+    curve_to 290, 290, 300, 310, 310, 300
+    
+    fill_paint 0, 255, 0
+    draw_paint 0, 0, 255
+    stroke 3
+  }
+}.show

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-swing
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.5
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-14 00:00:00.000000000 Z
+date: 2021-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -216,7 +216,10 @@ files:
 - lib/glimmer/dsl/swing/component_expression.rb
 - lib/glimmer/dsl/swing/dsl.rb
 - lib/glimmer/dsl/swing/listener_expression.rb
+- lib/glimmer/dsl/swing/observe_expression.rb
+- lib/glimmer/dsl/swing/operation_expression.rb
 - lib/glimmer/dsl/swing/property_expression.rb
+- lib/glimmer/dsl/swing/shape_expression.rb
 - lib/glimmer/swing.rb
 - lib/glimmer/swing/component_listener_proxy.rb
 - lib/glimmer/swing/component_proxy.rb
@@ -224,7 +227,10 @@ files:
 - lib/glimmer/swing/ext/glimmer.rb
 - lib/glimmer/swing/ext/glimmer/config.rb
 - lib/glimmer/swing/packages.rb
+- lib/glimmer/swing/shape_proxy.rb
 - samples/hello/hello_button.rb
+- samples/hello/hello_button2.rb
+- samples/hello/hello_shapes.rb
 - samples/hello/hello_world.rb
 homepage: http://github.com/AndyObtiva/glimmer-dsl-swing
 licenses: