glimmer-dsl-swing 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 839a9058d2f94757fbe185bb825a23a10fd840a0588b9e5f4fc44ede4ca4d511
-  data.tar.gz: efd4e9dead40a0076b3d3647657fe27642101f498b7381efe7cf554a3d440d51
+  metadata.gz: f105e5227247c67f51be098e70d2ea1fdb1e084fcecf00f1960c838b4fd65c48
+  data.tar.gz: '07290abf4d15a2f70b38829ba540f3c9efd98a61cc4b8417484e30db8bfee1d6'
 SHA512:
-  metadata.gz: 88bb15d31a9186a28d5e321f35080ff97bcdd055747f815e672c481e549dfd2076d9202f905e76d18528aead464ef8b5e920dd65a90736debedbc986a0cfecc7
-  data.tar.gz: 1bda4d359a7974c9f8ee4fa4ca21ef30d6f833038b200dc0de8acd7e8dae7b9ac717a15d984a48d7e8c4cb7d600b440259b57e3f8d9dde23c50cc745c4716d0c
+  metadata.gz: e34417a4033877f520b7ead9871a734ab859fa3cfece7e02ea32d1cad4d278db870573182e46e23cbe4b037eda0a0ba8410dcf4c31a6ac63fc2b3319f16ecd71
+  data.tar.gz: e19f0b1bed9dea8e5cf4cc98939a83e0f00b7210ce1ef5a5b0282822a3ab11a58af95ec142dff27824789fdb9a040b14a05d082cad9da6410e99843962e93afd

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # 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

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.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.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)
@@ -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 -v0.0.4
+gem install glimmer-dsl-swing -v0.0.5
 ```
 
 ### Option 2: Bundler
 
 Add the following to `Gemfile`:
 ```
-gem 'glimmer-dsl-swing', '0.0.4'
+gem 'glimmer-dsl-swing', '0.0.5'
 ```
 
 And, then run:
@@ -189,7 +189,7 @@ Despite `#show` being deprecated in the Java API, it is recommended to use `#sho
 
 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](https://camo.githubusercontent.com/0651c35cc70c5ba422876936733b07667368835bbd3cdbf5e706151410bdea04/68747470733a2f2f7777772e7265736561726368676174652e6e65742f70726f66696c652f44616e6e792d5765796e732f7075626c69636174696f6e2f3236393330333631312f6669677572652f666967322f41533a38353831333330353634363238363640313538313630363237323830302f536d616c6c74616c6b38302d4d56432d7061747465726e2d566965772d616e642d436f6e74726f6c6c65722d776f726b2d61732d612d706169722d616c6c6f77696e672d7468652d757365722d746f2d696e7465726163742e70706d)
+![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'`).
 
@@ -254,6 +254,12 @@ Additionally, you can set these shape properties:
 - `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
@@ -314,6 +320,32 @@ jframe('Hello, Shapes!') {
     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
 ```
 
@@ -514,6 +546,32 @@ jframe('Hello, Shapes!') {
     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.4
+0.0.5

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

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

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/swing/shape_proxy.rb

@@ -116,9 +116,7 @@ module Glimmer
       
       # 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
+        @original.append(child.original, false) if @original&.is_a?(Path2D) && child.is_a?(ShapeProxy)
       end
       
       def respond_to?(method_name, *args, &block)

data/samples/hello/hello_shapes.rb

@@ -55,4 +55,30 @@ jframe('Hello, Shapes!') {
     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.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-15 00:00:00.000000000 Z
+date: 2021-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -217,6 +217,7 @@ files:
 - 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