glimmer-dsl-opal 0.27.0 → 0.28.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 885895f5a47d453757426eb0b05e0b413972ef5b11f5c9045c8df92c4c1cd03d
-  data.tar.gz: a33b454cd1229e8b6d640d31f55379875fdde969b3634ef85e524496b277117f
+  metadata.gz: 07466f2f1bdce190b47b5150a6eb6dec007cc3053ff33fdcc8e0241ed859a42f
+  data.tar.gz: 84f91160a5c1147119f9f48a1189b9d78d20791450b48a6589dcacd6adf4e4cf
 SHA512:
-  metadata.gz: dad2612713d1ebcc95cc08fc0bdaddbb45a9f07032af5e583da857adba54327752f853d8f28bfd76d545c7271e9be86e825d42d600c798775328864e8d651927
-  data.tar.gz: 037c3e6f77c68a8edf343b3323b543f708adf5f41dffb03944148670ac46aa786cafbecb12675c24a5d4c5e3242ff2929886214d6ea43d9017de588ddc5db486
+  metadata.gz: ba7a681470d023e717b3d545df05a49950d0c4b7139350c4bbe4631a885152be4e9eefbe13496493563fe6272ca95056d5b6dcd154fb98aa052ea37cc4928f23
+  data.tar.gz: e816232d3661aa2dac6e2d9da8e54ac0cc857018ef7a25bb236c3f8802ddd4b82c8cd802f7bb89ddacf3204b25a8fc72f226b694f10d1f8dda56f187191650c4

data/CHANGELOG.md

@@ -1,5 +1,35 @@
 # Change Log
 
+## 0.28.3
+
+- Support Canvas Shape DSL data-binding
+- Use Canvas Shape DSL data-binding with Hello, Canvas! text string attribute
+- Add bevel 3D look to Tetris elaborate sample via Canvas Shape DSL
+- Ensure shell height compensates for providing extra top space to menu_bar when rendered
+
+## 0.28.2
+
+- Support `image` Canvas Shape DSL keyword
+- Use `image` in Hello, Canvas! sample
+
+## 0.28.1
+
+- Support `arc` Canvas Shape DSL keyword (partial support whereby width is assumed to be equal to height to start from a circle basis)
+- Use `arc` in Hello, Canvas! sample
+
+## 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.3 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.3'
 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](#supported-glimmer-dsl-keywords) all shapes, but 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`
@@ -2587,7 +2653,7 @@ Glimmer DSL for Opal Contact Manager Edit Done
 
 #### Tetris
 
-This is a minimal initial version of the [Tetris seen in Glimmer DSL for SWT](https://github.com/AndyObtiva/glimmer-dsl-swt/blob/master/docs/reference/GLIMMER_SAMPLES.md#glimmer-tetris).
+This is a slightly minimal version of the [Tetris seen in Glimmer DSL for SWT](https://github.com/AndyObtiva/glimmer-dsl-swt/blob/master/docs/reference/GLIMMER_SAMPLES.md#glimmer-tetris).
 
 Note that while the Glimmer GUI DSL code is mostly the same, some of the behavioral code around threads is changed
 into async Opal code via the [opal-async](https://github.com/AndyObtiva/opal-async) gem due to the async nature of transpiled JavaScript.
@@ -2677,6 +2743,8 @@ You should see "User Profile"
 
 #### Weather
 
+This sample does everything the desktop sample does except for the Canvas Shape DSL rectangle decoration (until supported).
+
 Code: [lib/glimmer-dsl-opal/samples/elaborate/weather](lib/glimmer-dsl-opal/samples/elaborate/weather.rb)
 
 Add the following require statement to `app/assets/javascripts/application.rb`

data/VERSION

@@ -1 +1 @@
-0.27.0
+0.28.3

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

@@ -30,6 +30,8 @@ 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'
+require 'glimmer/dsl/opal/image_expression'
 
 module Glimmer
   module DSL
@@ -46,6 +48,7 @@ module Glimmer
          checkbox_group_selection_data_binding
          data_binding
          font
+         image
          layout
          block_property
          property

data/lib/glimmer/dsl/opal/image_expression.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/dsl/expression'
+require 'glimmer/dsl/top_level_expression'
+require 'glimmer/dsl/parent_expression'
+require 'glimmer/swt/image_proxy'
+
+module Glimmer
+  module DSL
+    module Opal
+      # image expression
+      # Note: Cannot be a static expression because it clashes with image property expression
+      class ImageExpression < Expression
+        include TopLevelExpression
+        include ParentExpression
+        
+        def can_interpret?(parent, keyword, *args, &block)
+          options = args.last.is_a?(Hash) ? args.last : {}
+          (
+            (keyword == 'image') and
+            (
+              options.keys.include?(:top_level) or
+              (
+                !parent.is_a?(Glimmer::SWT::Custom::Shape) &&
+                !parent.is_a?(Glimmer::SWT::CanvasProxy)
+              )
+            )
+          )
+        end
+  
+        def interpret(parent, keyword, *args, &block)
+#           options = args.last.is_a?(Hash) ? args.last : {}
+#           args.unshift(parent) unless parent.nil? || options[:top_level]
+          Glimmer::SWT::ImageProxy.create(*args, &block)
+        end
+
+        def add_content(parent, keyword, *args, &block)
+          return if @create_pixel_by_pixel || block&.parameters&.count == 2
+          super
+          parent.post_add_content
+        end
+      end
+    end
+  end
+end

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

@@ -1,11 +1,10 @@
 require 'glimmer/dsl/expression'
+require 'glimmer/swt/custom/shape'
 
 module Glimmer
   module DSL
     module Opal
       class PropertyExpression < StaticExpression
-        include TopLevelExpression
-
         def can_interpret?(parent, keyword, *args, &block)
           parent and
             (!args.empty?) and

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

@@ -1,5 +1,29 @@
+# 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/canvas_proxy'
+require 'glimmer/swt/custom/shape'
 
 module Glimmer
   module DSL
@@ -7,20 +31,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::CanvasProxy) or parent.is_a?(Glimmer::SWT::Custom::Shape)) and
+            Glimmer::SWT::Custom::Shape.valid?(parent, keyword, args, &block) and
+            ((keyword != 'text' && keyword != 'image') || args.size >= 3 || (args.empty? && block_given?))
         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/arc.rb

@@ -0,0 +1,75 @@
+# 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 Arc < Shape
+          def parameter_names
+            [:x, :y, :width, :height, :start_angle, :arc_angle]
+          end
+        
+          def post_add_content
+            @performing_post_add_content = true
+            render
+            @performing_post_add_content = false
+          end
+          
+          def background=(value)
+            super(value)
+            self.foreground = value
+          end
+
+          def render(custom_parent_dom_element: nil, brand_new: false)
+            return unless @performing_post_add_content
+            the_parent_element = Native(`document.getElementById(#{parent.id})`)
+            params = { type: `Two.Types.svg` }
+            two = Native(`new Two(#{params})`)
+            two.appendTo(the_parent_element)
+            x = @args[0]
+            y = @args[1]
+            width = @args[2]
+            height = @args[3]
+            start_angle = -1*@args[4]
+            arc_angle = -1*@args[5]
+            end_angle = start_angle + arc_angle
+            rx = width / 2.0
+            ry = height / 2.0
+            cx = x + rx
+            cy = y + ry
+            arc = two.makeArcSegment(cx, cy, 0, ry, 2*`Math.PI`*(start_angle)/360.0, 2*`Math.PI`*(end_angle)/360.0);
+            arc.fill = background.to_css unless background.nil?
+            arc.stroke = foreground.to_css unless foreground.nil?
+            two.update
+          end
+                    
+        end
+      end
+    end
+  end
+end