glimmer-dsl-opal 0.27.0 → 0.28.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 885895f5a47d453757426eb0b05e0b413972ef5b11f5c9045c8df92c4c1cd03d
-  data.tar.gz: a33b454cd1229e8b6d640d31f55379875fdde969b3634ef85e524496b277117f
+  metadata.gz: 0f9cfe8a0d719c4ae80348ac72fd00f41190c31f405a2e38916f271ca35fab26
+  data.tar.gz: 0e44d82d8e35f15b35861195ec782cce25d0f2265b960cc65866212908a3a477
 SHA512:
-  metadata.gz: dad2612713d1ebcc95cc08fc0bdaddbb45a9f07032af5e583da857adba54327752f853d8f28bfd76d545c7271e9be86e825d42d600c798775328864e8d651927
-  data.tar.gz: 037c3e6f77c68a8edf343b3323b543f708adf5f41dffb03944148670ac46aa786cafbecb12675c24a5d4c5e3242ff2929886214d6ea43d9017de588ddc5db486
+  metadata.gz: 9f6321b66a2fbb55fb53f5d5d32031ef62afb8db46b0595161c6feaa41a0af01f12e44483c137c4ee06cced7633c0a6898f924f1ab46fc230d3d5c263762c8b8
+  data.tar.gz: 44add1a5d248c51c8876aefa4a48c26dba0fbe0a9acae9ad22eb22e0dd3785f3a5feeac2102dad98c0057bf030785bec97ef49b15a9a6b838ddc3d7016ae3646

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Change Log
 
+## 0.28.0
+
+- Initial support for Canvas Shape DSL keywords (no-databinding, nesting, or gradients yet):
+ - `line`
+ - `point`
+ - `oval`
+ - `polygon`
+ - `polyline`
+ - `rectangle`
+ - `string`
+ - `text`
+- Minimal initial version of Hello, Canvas! sample
+
 ## 0.27.0
 
 - Hello, Text!

data/README.md

@@ -145,7 +145,7 @@ Hello, Table! Game Booked
 
 NOTE: Glimmer DSL for Opal is an alpha project. Please help make better by contributing, adopting for small or low risk projects, and providing feedback. It is still an early alpha, so the more feedback and issues you report the better.
 
-**Alpha Version** 0.27.0 only supports bare-minimum capabilities for the included [samples](https://github.com/AndyObtiva/glimmer-dsl-opal#samples) (originally written for [glimmer-dsl-swt](https://github.com/AndyObtiva/glimmer-dsl-swt))
+**Alpha Version** 0.28.0 only supports bare-minimum capabilities for the included [samples](https://github.com/AndyObtiva/glimmer-dsl-opal#samples) (originally written for [glimmer-dsl-swt](https://github.com/AndyObtiva/glimmer-dsl-swt))
 
 Other [Glimmer](https://github.com/AndyObtiva/glimmer) DSL gems:
 - [glimmer-dsl-swt](https://github.com/AndyObtiva/glimmer-dsl-swt): Glimmer DSL for SWT (JRuby Desktop Development GUI Framework)
@@ -179,12 +179,14 @@ Other [Glimmer](https://github.com/AndyObtiva/glimmer) DSL gems:
       - [Hello, Radio!](#hello-radio)
       - [Hello, Radio Group!](#hello-radio-group)
       - [Hello, Group!](#hello-group)
+      - [Hello, Canvas!](#hello-canvas)
       - [Hello, C Combo!](#hello-c-combo)
       - [Hello, C Tab!](#hello-c-tab)
       - [Hello, Checkbox!](#hello-checkbox)
       - [Hello, Checkbox Group!](#hello-checkbox-group)
       - [Hello, Date Time!](#hello-date-time)
       - [Hello, Table!](#hello-table)
+      - [Hello, Text!](#hello-text)
       - [Hello, Button!](#hello-button)
       - [Hello, Arrow!](#hello-arrow)
       - [Hello, Message Box!](#hello-message-box)
@@ -269,7 +271,7 @@ gem 'opal', '1.0.5'
 gem 'opal-rails', '1.1.2'
 gem 'opal-async', '~> 1.4.0'
 gem 'opal-jquery', '~> 0.4.4'
-gem 'glimmer-dsl-opal', '~> 0.27.0'
+gem 'glimmer-dsl-opal', '~> 0.28.0'
 gem 'glimmer-dsl-xml', '~> 1.2.0', require: false
 gem 'glimmer-dsl-css', '~> 1.2.0', require: false
 
@@ -392,6 +394,16 @@ Event loop:
 - `display`: featured in [Tic Tac Toe](#tic-tac-toe)
 - `async_exec`: featured in [Hello, Custom Widget!](#hello-custom-widget) / [Hello, Custom Shell!](#hello-custom-shell)
 
+Canvas Shape DSL:
+- `line`
+- `point`
+- `oval`
+- `polygon`
+- `polyline`
+- `rectangle`
+- `string`
+- `text`
+
 ## Samples
 
 Follow the instructions below to try out [glimmer-dsl-swt](https://github.com/AndyObtiva/glimmer-dsl-swt) samples webified via [glimmer-dsl-opal](https://rubygems.org/gems/glimmer-dsl-opal)
@@ -1447,6 +1459,35 @@ You should see "Hello, Group!"
 
 ![Glimmer DSL for Opal Hello Group](images/glimmer-dsl-opal-hello-group.png)
 
+#### Hello, Canvas!
+
+This is a minimal initial version of the [Hello, Canvas! sample included in Glimmer DSL for SWT](https://github.com/AndyObtiva/glimmer-dsl-swt/blob/master/docs/reference/GLIMMER_SAMPLES.md#hello-canvas).
+
+It supports all shapes except `arc`, with no shape nesting, data-binding, or gradient support yet.
+
+Add the following require statement to `app/assets/javascripts/application.rb`
+
+```ruby
+require 'glimmer-dsl-opal/samples/hello/hello_canvas'
+```
+
+Glimmer app on the desktop (using [`glimmer-dsl-swt`](https://github.com/AndyObtiva/glimmer-dsl-swt) gem):
+
+![Glimmer DSL for SWT Hello Canvas](https://github.com/AndyObtiva/glimmer-dsl-swt/raw/master/images/glimmer-hello-canvas.png)
+
+Glimmer app on the web (using `glimmer-dsl-opal` gem):
+
+Start the Rails server:
+```
+rails s
+```
+
+Visit `http://localhost:3000`
+
+You should see "Hello, Canvas!"
+
+![Glimmer DSL for Opal Hello Canvas](images/glimmer-dsl-opal-hello-canvas.png)
+
 #### Hello, C Combo!
 
 This is the low level way of using `c_combo`
@@ -1733,6 +1774,31 @@ Hello, Table! Game Booked
 
 ![Glimmer DSL for Opal Hello Table](images/glimmer-dsl-opal-hello-table-game-booked.png)
 
+#### Hello, Text!
+
+Add the following require statement to `app/assets/javascripts/application.rb`
+
+```ruby
+require 'glimmer-dsl-opal/samples/hello/hello_text'
+```
+
+Glimmer app on the desktop (using [`glimmer-dsl-swt`](https://github.com/AndyObtiva/glimmer-dsl-swt) gem):
+
+![Glimmer DSL for SWT Hello Text](https://github.com/AndyObtiva/glimmer-dsl-swt/raw/master/images/glimmer-hello-text.png)
+
+Glimmer app on the web (using `glimmer-dsl-opal` gem):
+
+Start the Rails server:
+```
+rails s
+```
+
+Visit `http://localhost:3000`
+
+You should see "Hello, Text!"
+
+![Glimmer DSL for Opal Hello Text](images/glimmer-dsl-opal-hello-text.png)
+
 #### Hello, Button!
 
 Add the following require statement to `app/assets/javascripts/application.rb`

data/VERSION

@@ -1 +1 @@
-0.27.0
+0.28.0

data/lib/glimmer/dsl/opal/dsl.rb

@@ -30,6 +30,7 @@ require 'glimmer/dsl/opal/menu_expression'
 require 'glimmer/dsl/opal/dialog_expression'
 require 'glimmer/dsl/opal/shape_expression'
 require 'glimmer/dsl/opal/shine_data_binding_expression'
+require 'glimmer/dsl/opal/shape_expression'
 
 module Glimmer
   module DSL

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

@@ -1,5 +1,28 @@
+# Copyright (c) 2020-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'
+require 'glimmer/swt/swt_proxy'
+require 'glimmer/swt/custom/shape'
 
 module Glimmer
   module DSL
@@ -7,20 +30,25 @@ module Glimmer
       class ShapeExpression < Expression
         include ParentExpression
         
-        INCLUDED_KEYWORDS = %w[rectangle polygon]
-  
         def can_interpret?(parent, keyword, *args, &block)
-          INCLUDED_KEYWORDS.include?(keyword)
+          (parent.is_a?(Glimmer::SWT::WidgetProxy) or parent.is_a?(Glimmer::SWT::Custom::Shape)) and
+            Glimmer::SWT::Custom::Shape.valid?(parent, keyword, args, &block) &&
+            (keyword != 'text' || args.size >= 3)
         end
-
+        
         def interpret(parent, keyword, *args, &block)
-          # TODO
+          Glimmer::SWT::Custom::Shape.create(parent, keyword, args, &block)
         end
         
         def add_content(parent, keyword, *args, &block)
-          # TODO
+          super(parent, keyword, *args, &block)
+          parent.post_add_content
         end
+      
       end
+      
     end
+    
   end
+  
 end

data/lib/glimmer/swt/canvas_proxy.rb

@@ -0,0 +1,27 @@
+require 'glimmer/swt/composite_proxy'
+
+module Glimmer
+  module SWT
+    class CanvasProxy < CompositeProxy
+      def default_layout
+        nil
+      end
+    
+      def element
+        'svg'
+      end
+      
+      def dom
+        canvas_id = id
+        canvas_class = name
+        # TODO in the future, calculate width and height from children automatically (just like Glimmer DSL for SWT)
+        @dom ||= html {
+          svg(id: canvas_id, class: canvas_class) {
+            'Sorry, your browser does not support inline SVG.'
+          }
+        }.to_s
+      end
+    
+    end
+  end
+end

data/lib/glimmer/swt/composite_proxy.rb

@@ -78,8 +78,6 @@ module Glimmer
             
     end
     
-    CanvasProxy = CompositeProxy # TODO implement fully eventually
-    
   end
   
 end

data/lib/glimmer/swt/custom/shape/line.rb

@@ -0,0 +1,50 @@
+# Copyright (c) 2020-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/swt/custom/shape'
+require 'glimmer/swt/swt_proxy'
+require 'glimmer/swt/display_proxy'
+require 'glimmer/swt/color_proxy'
+# require 'glimmer/swt/transform_proxy'
+
+module Glimmer
+  module SWT
+    module Custom
+      class Shape
+        class Line < Shape
+                
+          def element
+            'line'
+          end
+          
+          def dom
+            shape_id = id
+            shape_class = name
+            @dom ||= xml {
+              line(id: shape_id, class: shape_class, x1: @args[0], y1: @args[1], x2: @args[2], y2: @args[3])
+            }.to_s
+          end
+          
+        end
+      end
+    end
+  end
+end

data/lib/glimmer/swt/custom/shape/oval.rb

@@ -0,0 +1,58 @@
+# Copyright (c) 2020-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/swt/custom/shape'
+require 'glimmer/swt/swt_proxy'
+require 'glimmer/swt/display_proxy'
+require 'glimmer/swt/color_proxy'
+# require 'glimmer/swt/transform_proxy'
+
+module Glimmer
+  module SWT
+    module Custom
+      class Shape
+        class Oval < Shape
+                
+          def element
+            'ellipse'
+          end
+          
+          def dom
+            shape_id = id
+            shape_class = name
+            x = @args[0]
+            y = @args[1]
+            width = @args[2]
+            height = @args[3]
+            rx = width / 2.0
+            ry = height / 2.0
+            cx = x + rx
+            cy = y + ry
+            @dom ||= xml {
+              ellipse(id: shape_id, class: shape_class, cx: cx, cy: cy, rx: rx, ry: ry)
+            }.to_s
+          end
+          
+        end
+      end
+    end
+  end
+end

data/lib/glimmer/swt/custom/shape/point.rb

@@ -0,0 +1,50 @@
+# Copyright (c) 2020-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/swt/custom/shape'
+require 'glimmer/swt/swt_proxy'
+require 'glimmer/swt/display_proxy'
+require 'glimmer/swt/color_proxy'
+# require 'glimmer/swt/transform_proxy'
+
+module Glimmer
+  module SWT
+    module Custom
+      class Shape
+        class Point < Shape
+                
+          def element
+            'rect'
+          end
+          
+          def dom
+            shape_id = id
+            shape_class = name
+            @dom ||= xml {
+              rect(id: shape_id, class: shape_class, x: @args[0], y: @args[1], width: 1, height: 1)
+            }.to_s
+          end
+          
+        end
+      end
+    end
+  end
+end

data/lib/glimmer/swt/custom/shape/polygon.rb

@@ -0,0 +1,50 @@
+# Copyright (c) 2020-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/swt/custom/shape'
+require 'glimmer/swt/swt_proxy'
+require 'glimmer/swt/display_proxy'
+require 'glimmer/swt/color_proxy'
+# require 'glimmer/swt/transform_proxy'
+
+module Glimmer
+  module SWT
+    module Custom
+      class Shape
+        class Polygon < Shape
+                
+          def element
+            'polygon'
+          end
+          
+          def dom
+            shape_id = id
+            shape_class = name
+            @dom ||= xml {
+              polygon(id: shape_id, class: shape_class, points: @args.map(&:to_s).join(' '))
+            }.to_s
+          end
+          
+        end
+      end
+    end
+  end
+end

data/lib/glimmer/swt/custom/shape/polyline.rb

@@ -0,0 +1,50 @@
+# Copyright (c) 2020-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/swt/custom/shape'
+require 'glimmer/swt/swt_proxy'
+require 'glimmer/swt/display_proxy'
+require 'glimmer/swt/color_proxy'
+# require 'glimmer/swt/transform_proxy'
+
+module Glimmer
+  module SWT
+    module Custom
+      class Shape
+        class Polyline < Shape
+                
+          def element
+            'polyline'
+          end
+          
+          def dom
+            shape_id = id
+            shape_class = name
+            @dom ||= xml {
+              polyline(id: shape_id, class: shape_class, points: @args.map(&:to_s).join(' '))
+            }.to_s
+          end
+          
+        end
+      end
+    end
+  end
+end

data/lib/glimmer/swt/custom/shape/rectangle.rb

@@ -0,0 +1,50 @@
+# Copyright (c) 2020-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/swt/custom/shape'
+require 'glimmer/swt/swt_proxy'
+require 'glimmer/swt/display_proxy'
+require 'glimmer/swt/color_proxy'
+# require 'glimmer/swt/transform_proxy'
+
+module Glimmer
+  module SWT
+    module Custom
+      class Shape
+        class Rectangle < Shape
+                
+          def element
+            'rect'
+          end
+          
+          def dom
+            shape_id = id
+            shape_class = name
+            @dom ||= xml {
+              rect(id: shape_id, class: shape_class, x: @args[0], y: @args[1], width: @args[2], height: @args[3], rx: @args[4], ry: @args[5])
+            }.to_s
+          end
+          
+        end
+      end
+    end
+  end
+end

data/lib/glimmer/swt/custom/shape/text.rb

@@ -0,0 +1,64 @@
+# Copyright (c) 2020-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/swt/custom/shape'
+require 'glimmer/swt/swt_proxy'
+require 'glimmer/swt/display_proxy'
+require 'glimmer/swt/color_proxy'
+# require 'glimmer/swt/transform_proxy'
+
+module Glimmer
+  module SWT
+    module Custom
+      class Shape
+        class Text < Shape
+        
+          def background=(value)
+            # TODO override background= to fill a rectangle containing text, matching its size
+            # For now, disable background when foreground is not set
+            super(value) unless foreground.nil?
+          end
+        
+          def foreground=(value)
+            super(value)
+            self.background = value
+          end
+
+          def element
+            'text'
+          end
+          
+          def dom
+            shape_id = id
+            shape_class = name
+            @dom ||= xml {
+              tag(:_name => 'text', id: shape_id, class: shape_class, x: @args[1], y: @args[2]) {
+                @args[0]
+              }
+            }.to_s
+          end
+          
+        end
+        String = Text
+      end
+    end
+  end
+end

data/lib/glimmer/swt/custom/shape.rb

@@ -0,0 +1,109 @@
+# Copyright (c) 2007-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/swt/property_owner'
+require 'glimmer/swt/swt_proxy'
+require 'glimmer/swt/display_proxy'
+require 'glimmer/swt/color_proxy'
+require 'glimmer/swt/font_proxy'
+# require 'glimmer/swt/transform_proxy'
+require 'glimmer/swt/point'
+require 'glimmer/swt/rectangle'
+
+module Glimmer
+  module SWT
+    module Custom
+      # Represents a shape (graphics) to be drawn on a control/widget/canvas/display
+      # That is because Shape is drawn on a parent as graphics and doesn't have an SWT widget for itself
+      class Shape < WidgetProxy
+        include PropertyOwner
+        
+        class << self
+          def create(parent, keyword, args, &property_block)
+            potential_shape_class_name = keyword.to_s.camelcase(:upper).to_sym
+            if constants.include?(potential_shape_class_name)
+              const_get(potential_shape_class_name).new(parent, args, &property_block)
+            else
+              new(parent, args, &property_block)
+            end
+          end
+        
+          def valid?(parent, keyword, args, &block)
+            return true if keyword.to_s == 'shape'
+            keywords.include?(keyword.to_s)
+          end
+          
+          def keywords
+            constants.select do |constant|
+              constant_value = const_get(constant)
+              constant_value.respond_to?(:ancestors) && constant_value.ancestors.include?(Glimmer::SWT::Custom::Shape)
+            end.map {|constant| constant.to_s.underscore}
+          end
+          
+        end
+        
+        def background=(value)
+          value = ColorProxy.new(value) if value.is_a?(String)
+          @background = value
+          dom_element.css('fill', background.to_css) unless background.nil?
+        end
+        
+        def foreground=(value)
+          value = ColorProxy.new(value) if value.is_a?(String)
+          @foreground = value
+          dom_element.css('stroke', foreground.to_css) unless foreground.nil?
+          dom_element.css('fill', 'transparent') if background.nil?
+        end
+        
+        def attach(the_parent_dom_element)
+          the_parent_dom_element.html("#{the_parent_dom_element.html()}\n#{@dom}")
+        end
+        
+        def element
+          'g'
+        end
+        
+        def dom
+          shape_id = id
+          shape_class = name
+          @dom ||= xml {
+            g(id: shape_id, class: shape_class) {
+            }
+          }.to_s
+        end
+        
+        # TODO implement shape_at_location potentially with document.elementFromPoint(x, y);
+        
+      end
+      
+    end
+    
+  end
+  
+end
+
+require 'glimmer/swt/custom/shape/line'
+require 'glimmer/swt/custom/shape/oval'
+require 'glimmer/swt/custom/shape/point'
+require 'glimmer/swt/custom/shape/polygon'
+require 'glimmer/swt/custom/shape/polyline'
+require 'glimmer/swt/custom/shape/rectangle'
+require 'glimmer/swt/custom/shape/text'

data/lib/glimmer/swt/point.rb

@@ -1,5 +1,7 @@
 module Glimmer
   module SWT
+    # emulating org.eclipse.swt.graphics.Point
     Point = Struct.new(:x, :y)
+    # TODO alias as org.eclipse.swt.graphics.Point
   end
 end

data/lib/glimmer/swt/rectangle.rb

@@ -0,0 +1,7 @@
+module Glimmer
+  module SWT
+    # emulating org.eclipse.swt.graphics.Rectangle
+    Rectangle = Struct.new(:x, :y, :width, :height)
+    # TODO alias as org.eclipse.swt.graphics.Rectangle
+  end
+end

data/lib/glimmer/swt/widget_proxy.rb

@@ -30,7 +30,7 @@ module Glimmer
     class WidgetProxy
       include Glimmer
       include PropertyOwner
-      
+            
       Event = Struct.new(:widget, keyword_init: true)
     
       JS_KEY_CODE_TO_SWT_KEY_CODE_MAP = {
@@ -331,9 +331,10 @@ module Glimmer
         brand_new = @dom.nil? || old_element.empty? || brand_new
         build_dom(layout: !custom_parent_dom_element) # TODO handle custom parent layout by passing parent instead of parent dom element
         if brand_new
-          the_parent_dom_element.append(@dom) # TODO make a method attach to allow subclasses to override if needed
+          # TODO make a method attach to allow subclasses to override if needed
+          attach(the_parent_dom_element)
         else
-          old_element.replace_with(@dom)
+          reattach(old_element)
         end
         observation_requests&.each do |keyword, event_listener_set|
           event_listener_set.each do |event_listener|
@@ -347,6 +348,14 @@ module Glimmer
         content_on_render_blocks.each { |content_block| content(&content_block) } unless skip_content_on_render_blocks?
       end
       alias redraw render
+        
+      def attach(the_parent_dom_element)
+        the_parent_dom_element.append(@dom)
+      end
+        
+      def reattach(old_element)
+        old_element.replace_with(@dom)
+      end
       
       def content_on_render_blocks
         @content_on_render_blocks ||= []
@@ -367,7 +376,7 @@ module Glimmer
       def build_dom(layout: true)
         # TODO consider passing parent element instead and having table item include a table cell widget only for opal
         @dom = nil
-        @dom = dom
+        @dom = dom # TODO unify how to build dom for most widgets based on element, id, and name (class)
         @dom = @parent.get_layout.dom(@dom) if @parent.respond_to?(:layout) && @parent.get_layout
         @dom
       end
@@ -1143,6 +1152,7 @@ require 'glimmer/swt/combo_proxy'
 require 'glimmer/swt/c_combo_proxy'
 require 'glimmer/swt/checkbox_proxy'
 require 'glimmer/swt/composite_proxy'
+require 'glimmer/swt/canvas_proxy'
 require 'glimmer/swt/date_time_proxy'
 require 'glimmer/swt/group_proxy'
 require 'glimmer/swt/label_proxy'

data/lib/glimmer-dsl-opal/samples/elaborate/tetris.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2007-2021 Andy Maleh
+# Copyright (c) 2020-2021 Andy Maleh
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -25,11 +25,7 @@ require_relative 'tetris/view/playfield'
 require_relative 'tetris/view/score_lane'
 require_relative 'tetris/view/high_score_dialog'
 require_relative 'tetris/view/tetris_menu_bar'
-class Event
-  def location
-    `#@native.location`
-  end
-end
+
 class Tetris
   include Glimmer::UI::CustomShell
   
@@ -147,7 +143,7 @@ class Tetris
   def show_about_dialog
     message_box {
       text 'Glimmer Tetris'
-      message "Glimmer Tetris\n\nGlimmer DSL for SWT Sample\n\nUse arrow keys for movement\nand right/left alt/shift keys for rotation\nAlternatively:\nLeft is A\nRight is D\nDown is S\nUp is W\nRotate Left is Q\nRotate Right is E\n\n for Left, Down, Right, Up\n\nCopyright (c) 2007-2021 Andy Maleh"
+      message "Glimmer Tetris\n\nGlimmer DSL for SWT Sample\n\nUse arrow keys for movement\nand right/left alt/shift keys for rotation\nAlternatively:\nLeft is A\nRight is D\nDown is S\nUp is W\nRotate Left is Q\nRotate Right is E\n\nCopyright (c) 2007-2021 Andy Maleh"
     }.open
   end
 end

data/lib/glimmer-dsl-opal/samples/hello/hello_canvas.rb

@@ -0,0 +1,83 @@
+# Copyright (c) 2020-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.
+
+class HelloCanvas
+  include Glimmer::UI::CustomShell
+  
+  body {
+    shell {
+      text 'Hello, Canvas!'
+      minimum_size 320, 400
+    
+      canvas {
+        background :yellow
+        
+        rectangle(0, 0, 220, 400) {
+          background rgb(255, 0, 0)
+        }
+        rectangle(50, 20, 300, 150, 30, 50) {
+          background :magenta
+        }
+        rectangle(50, 20, 300, 150, 30, 50) {
+          foreground :yellow
+        }
+        rectangle(205, 50, 86, 97) {
+          foreground :yellow
+        }
+        rectangle(67, 75, 128, 38) {
+          background :yellow
+        }
+        rectangle(150, 200, 100, 70) {
+          background :dark_magenta
+        }
+        rectangle(50, 200, 30, 70) {
+          background :magenta
+        }
+        oval(110, 310, 100, 100) {
+          background :yellow
+        }
+        text('Picasso', 67, 103) {
+          foreground :dark_magenta
+          font name: 'Courier', height: 30
+        }
+        polygon(250, 210, 260, 170, 270, 210, 290, 230) {
+          background :dark_yellow
+        }
+        polyline(250, 110, 260, 70, 270, 110, 290, 130, 250, 110) {
+          foreground :black
+        }
+        3.times do |n|
+          line(250, 120 + n*10, 270 + n*10, 80 + n*10) {
+            foreground :yellow
+          }
+        end
+        10.times do |n|
+          point(220 + n*5, 100 + n*5) {
+            foreground :yellow
+          }
+        end
+      }
+    }
+  }
+end
+
+HelloCanvas.launch
+        

data/lib/glimmer-dsl-opal/samples/hello/hello_text.rb

@@ -97,7 +97,7 @@ class HelloText
       }
       text(:read_only, :border) {
         layout_data :fill, :center, true, false
-        text <=> [self, :read_only]
+        text <= [self, :read_only]
       }
       
       label {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-opal
 version: !ruby/object:Gem::Version
-  version: 0.27.0
+  version: 0.28.0
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-27 00:00:00.000000000 Z
+date: 2021-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer
@@ -300,6 +300,7 @@ files:
 - lib/glimmer-dsl-opal/samples/hello/hello_button.rb
 - lib/glimmer-dsl-opal/samples/hello/hello_c_combo.rb
 - lib/glimmer-dsl-opal/samples/hello/hello_c_tab.rb
+- lib/glimmer-dsl-opal/samples/hello/hello_canvas.rb
 - lib/glimmer-dsl-opal/samples/hello/hello_checkbox.rb
 - lib/glimmer-dsl-opal/samples/hello/hello_checkbox_group.rb
 - lib/glimmer-dsl-opal/samples/hello/hello_combo.rb
@@ -407,6 +408,7 @@ files:
 - lib/glimmer/swt/c_combo_proxy.rb
 - lib/glimmer/swt/c_tab_folder_proxy.rb
 - lib/glimmer/swt/c_tab_item_proxy.rb
+- lib/glimmer/swt/canvas_proxy.rb
 - lib/glimmer/swt/checkbox_proxy.rb
 - lib/glimmer/swt/color_proxy.rb
 - lib/glimmer/swt/combo_proxy.rb
@@ -414,6 +416,14 @@ files:
 - lib/glimmer/swt/control_editor.rb
 - lib/glimmer/swt/custom/checkbox_group.rb
 - lib/glimmer/swt/custom/radio_group.rb
+- lib/glimmer/swt/custom/shape.rb
+- lib/glimmer/swt/custom/shape/line.rb
+- lib/glimmer/swt/custom/shape/oval.rb
+- lib/glimmer/swt/custom/shape/point.rb
+- lib/glimmer/swt/custom/shape/polygon.rb
+- lib/glimmer/swt/custom/shape/polyline.rb
+- lib/glimmer/swt/custom/shape/rectangle.rb
+- lib/glimmer/swt/custom/shape/text.rb
 - lib/glimmer/swt/date_time_proxy.rb
 - lib/glimmer/swt/dialog_proxy.rb
 - lib/glimmer/swt/display_proxy.rb
@@ -437,6 +447,7 @@ files:
 - lib/glimmer/swt/progress_bar_proxy.rb
 - lib/glimmer/swt/property_owner.rb
 - lib/glimmer/swt/radio_proxy.rb
+- lib/glimmer/swt/rectangle.rb
 - lib/glimmer/swt/row_layout_proxy.rb
 - lib/glimmer/swt/scale_proxy.rb
 - lib/glimmer/swt/scrolled_composite_proxy.rb