glimmer-dsl-swing 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ecbd6a72ae4955c7f90995ef135f1aac59fc4b3294377fa4b7957b1b22069715
-  data.tar.gz: a58db866e29fd2d2f6620314918b629a94095cbe717ce7ca6c998d30a6d4348d
+  metadata.gz: d91f9d5241c9f9414d4f4c343568a71f19657560b72713a4fbfe4711af0e120f
+  data.tar.gz: 25079ddbf4e8b83a899b4857e88aa9dacfbde3f67147c7708047113654e42df7
 SHA512:
-  metadata.gz: 1c675e8abe364913657308555622a3969d7eed06b0e95894946686fa01e9493bf56e2a016bb5c135edcb1e6ac2a11fea91809c248724257f2d2ab4db59607d0a
-  data.tar.gz: a7c4ccc5cac6eececddf64760737c9765f9ef7c9b40efa6a6a77eb326b2257a425d222297087cb3a93a9589b215d9edbe8ddff27452ac0fcc14582aab228b6b8
+  metadata.gz: 23641076d917e3223517cfabfd82c72973360b4bff14032567e67e6352b4dd40e6e628d920833786401a8b0d65b3959d6303e6721cd2fd95254ff365e8bc64ee
+  data.tar.gz: f1b4f292413767713e88bf115e0b16cb4df5644f72cfb79c80f5043dbc4bfe639e6e3fb5ec79ec515b3e526e094c4be9aed3a48ed2a3ba7d402978517643770c

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Change Log
 
+## 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,4 +1,4 @@
-# [<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.2
 ## 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)
@@ -64,7 +64,7 @@ gem install glimmer-dsl-swing
 
 Add the following to `Gemfile`:
 ```
-gem 'glimmer-dsl-swing', '~> 0.0.1'
+gem 'glimmer-dsl-swing', '~> 0.0.2'
 ```
 
 And, then run:
@@ -86,6 +86,153 @@ jframe('Hello, World!') {
 }.show
 ```
 
+## 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/awt 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`, `JLabel`, and `JButton` 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 to always be curly braces to denote as View nesting code different from the logic in looping/conditional constructs that utilize `do;end` instead.
+
+Property arguments never have parentheses.
+
+4 - Listeners
+
+You may declare listeners with their 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
+```
+
+### 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`.
+
+Additionally, you can set `draw_color` or `fill_color` property as an rgb/rgba hash (e.g. `r: 255, g: 0, b: 0`)
+
+Example:
+
+```ruby
+require 'glimmer-dsl-swing'
+
+include Glimmer
+
+jframe('Hello, Shapes!') {
+  minimum_size 400, 400
+  
+  arc(40, 40, 90, 90, 30, 230, 0) {
+    fill_color r: 255, g: 0, b: 0
+    draw_color r: 0, g: 255, b: 255
+  }
+  
+  arc(40, 140, 90, 90, 30, 230, 1) {
+    fill_color r: 255, g: 0, b: 0
+    draw_color r: 0, g: 255, b: 255
+  }
+  
+  arc(40, 240, 90, 90, 30, 230, 2) {
+    fill_color r: 255, g: 0, b: 0
+    draw_color r: 0, g: 255, b: 255
+  }
+  
+  ellipse(140, 40, 180, 90) {
+    fill_color r: 0, g: 255, b: 255
+    draw_color r: 255, g: 0, b: 0
+  }
+  
+  rectangle(140, 140, 180, 90) {
+    fill_color r: 0, g: 255, b: 255
+    draw_color r: 255, g: 0, b: 0
+  }
+  
+  round_rectangle(140, 240, 180, 90, 60, 40) {
+    fill_color r: 0, g: 255, b: 255
+    draw_color r: 255, g: 0, b: 0
+  }
+
+  line(180, 60, 280, 110) {
+    draw_color r: 0, g: 0, b: 0
+  }
+  
+  quad_curve(170, 60, 180, 90, 220, 100) {
+    draw_color r: 0, g: 0, b: 0
+  }
+  
+  cubic_curve(190, 60, 240, 40, 220, 80, 260, 70) {
+    draw_color r: 0, g: 0, b: 0
+  }
+}.show
+```
+
+![screenshots/glimmer-dsl-swing-mac-hello-shapes.png](screenshots/glimmer-dsl-swing-mac-hello-shapes.png)
+
 ## Girb (Glimmer IRB)
 
 You can run the `girb` command (`bin/girb` if you cloned the project locally):
@@ -102,6 +249,18 @@ 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)
 
 ```ruby
@@ -116,6 +275,18 @@ 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)
 
 ```ruby
@@ -125,11 +296,79 @@ 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
+```
+
+#### 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)
+
+```ruby
+require 'glimmer-dsl-swing'
+
+include Glimmer
+
+jframe('Hello, Shapes!') {
+  minimum_size 400, 400
+  
+  arc(40, 40, 90, 90, 30, 230, 0) {
+    fill_color r: 255, g: 0, b: 0
+    draw_color r: 0, g: 255, b: 255
+  }
+  
+  arc(40, 140, 90, 90, 30, 230, 1) {
+    fill_color r: 255, g: 0, b: 0
+    draw_color r: 0, g: 255, b: 255
+  }
+  
+  arc(40, 240, 90, 90, 30, 230, 2) {
+    fill_color r: 255, g: 0, b: 0
+    draw_color r: 0, g: 255, b: 255
+  }
+  
+  ellipse(140, 40, 180, 90) {
+    fill_color r: 0, g: 255, b: 255
+    draw_color r: 255, g: 0, b: 0
+  }
+  
+  rectangle(140, 140, 180, 90) {
+    fill_color r: 0, g: 255, b: 255
+    draw_color r: 255, g: 0, b: 0
+  }
+  
+  round_rectangle(140, 240, 180, 90, 60, 40) {
+    fill_color r: 0, g: 255, b: 255
+    draw_color r: 255, g: 0, b: 0
+  }
+
+  line(180, 60, 280, 110) {
+    draw_color r: 0, g: 0, b: 0
+  }
+  
+  quad_curve(170, 60, 180, 90, 220, 100) {
+    draw_color r: 0, g: 0, b: 0
+  }
+  
+  cubic_curve(190, 60, 240, 40, 220, 80, 260, 70) {
+    draw_color r: 0, g: 0, b: 0
   }
 }.show
 ```

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

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

@@ -39,6 +39,7 @@ module Glimmer
           listener
           property
           component
+          shape
         ]
       )
     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)
         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

@@ -32,7 +32,7 @@ module Glimmer
 
       class << self
         def exist?(keyword)
-          !!component_proxy_class(keyword)
+          !!component_class(keyword)
         end
         
         def create(parent, keyword, *args, &block)
@@ -70,10 +70,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 +81,25 @@ module Glimmer
                   return nil
                 end
               end
+              component_class = Class.new(component_class) {
+                attr_accessor :shape_proxies
+      
+                def paint(g2)
+                  super(g2)
+                  shape_proxies.each do |shape_proxy|
+                    original_color = g2.get_color
+                    if shape_proxy.fill_color
+                      g2.color = Color.new(shape_proxy.fill_color[:r], shape_proxy.fill_color[:g], shape_proxy.fill_color[:b], shape_proxy.fill_color[:a] || 255)
+                      g2.fill(shape_proxy)
+                    end
+                    if shape_proxy.draw_color
+                      g2.color = Color.new(shape_proxy.draw_color[:r], shape_proxy.draw_color[:g], shape_proxy.draw_color[:b], shape_proxy.draw_color[:a] || 255)
+                      g2.draw(shape_proxy)
+                    end
+                    g2.color = original_color
+                  end
+                end
+              }
               flyweight_component_class[keyword] = component_class
             rescue SyntaxError, NameError => e
               Glimmer::Config.logger.debug {e.full_message}
@@ -106,7 +125,7 @@ module Glimmer
         @keyword = keyword
         @args = args
         @block = block
-        build_widget
+        build
         post_add_content if @block.nil?
       end
       
@@ -117,7 +136,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 +157,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 +253,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 +268,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,167 @@
+# 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
+      attr_accessor :draw_color, :fill_color
+      
+      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)
+        if child.is_a?(ShapeProxy)
+          add(child)
+        end
+      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
+      
+      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

@@ -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_shapes.rb

@@ -0,0 +1,49 @@
+require 'glimmer-dsl-swing'
+
+include Glimmer
+
+jframe('Hello, Shapes!') {
+  minimum_size 400, 400
+  
+  arc(40, 40, 90, 90, 30, 230, 0) {
+    fill_color r: 255, g: 0, b: 0
+    draw_color r: 0, g: 255, b: 255
+  }
+  
+  arc(40, 140, 90, 90, 30, 230, 1) {
+    fill_color r: 255, g: 0, b: 0
+    draw_color r: 0, g: 255, b: 255
+  }
+  
+  arc(40, 240, 90, 90, 30, 230, 2) {
+    fill_color r: 255, g: 0, b: 0
+    draw_color r: 0, g: 255, b: 255
+  }
+  
+  ellipse(140, 40, 180, 90) {
+    fill_color r: 0, g: 255, b: 255
+    draw_color r: 255, g: 0, b: 0
+  }
+  
+  rectangle(140, 140, 180, 90) {
+    fill_color r: 0, g: 255, b: 255
+    draw_color r: 255, g: 0, b: 0
+  }
+  
+  round_rectangle(140, 240, 180, 90, 60, 40) {
+    fill_color r: 0, g: 255, b: 255
+    draw_color r: 255, g: 0, b: 0
+  }
+
+  line(180, 60, 280, 110) {
+    draw_color r: 0, g: 0, b: 0
+  }
+  
+  quad_curve(170, 60, 180, 90, 220, 100) {
+    draw_color r: 0, g: 0, b: 0
+  }
+  
+  cubic_curve(190, 60, 240, 40, 220, 80, 260, 70) {
+    draw_color r: 0, g: 0, b: 0
+  }
+}.show

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-swing
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Andy Maleh
@@ -202,6 +202,7 @@ executables:
 - girb
 extensions: []
 extra_rdoc_files:
+- CHANGELOG.md
 - LICENSE.txt
 - README.md
 files:
@@ -217,6 +218,7 @@ files:
 - lib/glimmer/dsl/swing/dsl.rb
 - lib/glimmer/dsl/swing/listener_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 +226,9 @@ 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_shapes.rb
 - samples/hello/hello_world.rb
 homepage: http://github.com/AndyObtiva/glimmer-dsl-swing
 licenses:
@@ -246,7 +250,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.29
 signing_key:
 specification_version: 4
 summary: Glimmer DSL for Swing