glimmer-dsl-opal 0.28.1 → 0.28.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4fe3d0b1328a0e5a9f0ea452608d31a75c0fe5d1d24f1a988a8474ab89b415b9
-  data.tar.gz: b575cc548458f30e64ddd5e29d3fc85673382306c16a125a9f4620d9f477fde4
+  metadata.gz: 87981d1ce51eda46029d81945b4a0135e0b08a54d9b935504ab015d789d0b417
+  data.tar.gz: 0db15d4faaff573e66074299725c052814f3d291cff145f8c871ee95f1b5bfc2
 SHA512:
-  metadata.gz: ebb320d8c8a58c55a424a1eb44ddee3d041d99a69610c5932caa9bc03ad891b48a7f03206d9112195bcd901611ed6ebbf08b2dee88eb7fc4ef8f7dfb2280c16e
-  data.tar.gz: 4221da20509698c503f374b4fd127ea732e4b86280c246c617c2d2a750982840a3523a72eb76da53caeb5eb580c06937de7706d4dde631ffd5ee59d22da14a45
+  metadata.gz: 441432dc7b68d4163d9a08b0e8df43580692fa84ff1091ee6f6f6e71abf9199a96038a2df17d017d9fed4016457d5254b7667f71d7f4880fc63dd12f23f4918c
+  data.tar.gz: edee0a32bfcc5f41a756a837fe904d63039160c446578c4a843190285bd7edb9d99aec946e69c2b956d8ef3cdfd2ee06221061d217aac789c502a7f37c87fd8f

data/CHANGELOG.md

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

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.28.1 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.2 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)
@@ -271,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.28.1'
+gem 'glimmer-dsl-opal', '~> 0.28.2'
 gem 'glimmer-dsl-xml', '~> 1.2.0', require: false
 gem 'glimmer-dsl-css', '~> 1.2.0', require: false
 
@@ -1463,7 +1463,7 @@ You should see "Hello, Group!"
 
 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` and `image`, with no shape nesting, data-binding, or gradient support yet.
+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`
 

data/VERSION

@@ -1 +1 @@
-0.28.1
+0.28.2

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

@@ -31,6 +31,7 @@ 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
@@ -47,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,67 @@
+# 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)
+              ) or
+              (
+                args.size < 3
+              )
+            )
+          )
+        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/shape_expression.rb

@@ -32,7 +32,7 @@ module Glimmer
         
         def can_interpret?(parent, keyword, *args, &block)
           (parent.is_a?(Glimmer::SWT::WidgetProxy) or parent.is_a?(Glimmer::SWT::Custom::Shape)) and
-            Glimmer::SWT::Custom::Shape.valid?(parent, keyword, args, &block) &&
+            Glimmer::SWT::Custom::Shape.valid?(parent, keyword, args, &block) and
             (keyword != 'text' || args.size >= 3)
         end
         

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

@@ -0,0 +1,54 @@
+# 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/image_proxy'
+# require 'glimmer/swt/transform_proxy'
+
+module Glimmer
+  module SWT
+    module Custom
+      class Shape
+        class Image < Shape
+        
+          def element
+            'image'
+          end
+          
+          def dom
+            shape_id = id
+            shape_class = name
+            href = @args[0].is_a?(Glimmer::SWT::ImageProxy) ? @args[0].file_path : @args[0]
+            width = @args[0].is_a?(Glimmer::SWT::ImageProxy) ? @args[0].width : nil
+            height = @args[0].is_a?(Glimmer::SWT::ImageProxy) ? @args[0].height : nil
+            @dom ||= xml {
+              image(id: shape_id, class: shape_class, href: href, x: @args[1], y: @args[2], width: width, height: height)
+            }.to_s
+          end
+          
+        end
+      end
+    end
+  end
+end

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

@@ -101,6 +101,7 @@ module Glimmer
 end
 
 require 'glimmer/swt/custom/shape/arc'
+require 'glimmer/swt/custom/shape/image'
 require 'glimmer/swt/custom/shape/line'
 require 'glimmer/swt/custom/shape/oval'
 require 'glimmer/swt/custom/shape/point'

data/lib/glimmer/swt/image_proxy.rb

@@ -0,0 +1,29 @@
+module Glimmer
+  module SWT
+    # emulating org.eclipse.swt.graphics.Image
+    class ImageProxy
+      class << self
+        def create(*args, &content)
+          if args.size == 1 && args.first.is_a?(ImageProxy)
+            args.first
+          else
+            new(*args, &content)
+          end
+        end
+      end
+    
+      attr_reader :file_path, :width, :height
+      
+      def initialize(*args)
+        options = args.last.is_a?(Hash) ? args.last : {}
+        # TODO support a parent as a first argument before the file path
+        @file_path = args.first
+        @width = options[:width]
+        @height = options[:height]
+      end
+      
+      # TODO implement scale_to
+    end
+    # TODO alias as org.eclipse.swt.graphics.Image
+  end
+end

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

@@ -22,6 +22,10 @@
 class HelloCanvas
   include Glimmer::UI::CustomShell
   
+  before_body do
+    @image_object = image(File.expand_path('./images/scaffold_app.png', __dir__), width: 50)
+  end
+  
   body {
     shell {
       text 'Hello, Canvas!'
@@ -61,6 +65,7 @@ class HelloCanvas
           foreground :dark_magenta
           font name: 'Courier', height: 30
         }
+        image(@image_object, 205, 55)
         polygon(250, 210, 260, 170, 270, 210, 290, 230) {
           background :dark_yellow
         }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-opal
 version: !ruby/object:Gem::Version
-  version: 0.28.1
+  version: 0.28.2
 platform: ruby
 authors:
 - AndyMaleh
@@ -339,6 +339,7 @@ files:
 - lib/glimmer-dsl-opal/samples/hello/images/mexico.png
 - lib/glimmer-dsl-opal/samples/hello/images/netherlands.png
 - lib/glimmer-dsl-opal/samples/hello/images/norway.png
+- lib/glimmer-dsl-opal/samples/hello/images/scaffold_app.png
 - lib/glimmer-dsl-opal/samples/hello/images/usa.png
 - lib/glimmer-dsl-opal/vendor/jquery-ui-timepicker/GPL-LICENSE.txt
 - lib/glimmer-dsl-opal/vendor/jquery-ui-timepicker/MIT-LICENSE.txt
@@ -380,6 +381,7 @@ files:
 - lib/glimmer/dsl/opal/dsl.rb
 - lib/glimmer/dsl/opal/exec_expression.rb
 - lib/glimmer/dsl/opal/font_expression.rb
+- lib/glimmer/dsl/opal/image_expression.rb
 - lib/glimmer/dsl/opal/layout_data_expression.rb
 - lib/glimmer/dsl/opal/layout_expression.rb
 - lib/glimmer/dsl/opal/list_selection_data_binding_expression.rb
@@ -419,6 +421,7 @@ files:
 - lib/glimmer/swt/custom/radio_group.rb
 - lib/glimmer/swt/custom/shape.rb
 - lib/glimmer/swt/custom/shape/arc.rb
+- lib/glimmer/swt/custom/shape/image.rb
 - lib/glimmer/swt/custom/shape/line.rb
 - lib/glimmer/swt/custom/shape/oval.rb
 - lib/glimmer/swt/custom/shape/point.rb
@@ -434,6 +437,7 @@ files:
 - lib/glimmer/swt/font_proxy.rb
 - lib/glimmer/swt/grid_layout_proxy.rb
 - lib/glimmer/swt/group_proxy.rb
+- lib/glimmer/swt/image_proxy.rb
 - lib/glimmer/swt/label_proxy.rb
 - lib/glimmer/swt/latest_dialog_proxy.rb
 - lib/glimmer/swt/latest_message_box_proxy.rb