glimmer-dsl-opal 0.10.1 → 0.13.0

data/lib/glimmer/swt/grid_layout_proxy.rb

@@ -19,6 +19,23 @@ module Glimmer
         # TODO do the following instead of reapply
 #         @parent.add_css_class("num-columns-#{@num_columns}")
         # reinitialize # TODO reimplement without using reinitialize
+        layout_css = <<~CSS
+          grid-template-columns: #{'auto ' * @num_columns.to_i};
+          grid-row-gap: #{@vertical_spacing}px;
+          grid-column-gap: #{@horizontal_spacing}px;
+        CSS
+        if @parent.css_classes.include?('grid-layout')
+          layout_css.split(";").map(&:strip).map {|l| l.split(':').map(&:strip)}.each do |key, value|
+            @parent.dom_element.css(key, value) unless key.nil?
+          end
+          if @parent.is_a?(GroupProxy)
+            @parent.dom_element.find('legend').css('grid-column-start', "span #{@num_columns.to_i}")
+          end
+        else
+          layout_css.split(";").map(&:strip).map {|l| l.split(':').map(&:strip)}.each do |key, value|
+            @parent.dom_element.css(key, 'initial') unless key.nil?
+          end
+        end
       end
       
       def make_columns_equal_width=(equal_width)
@@ -63,23 +80,6 @@ module Glimmer
         self.margin_width = 15
         self.margin_height = 15
         self.num_columns = @args.first || 1
-        layout_css = <<~CSS
-          grid-template-columns: #{'auto ' * @num_columns.to_i};
-          grid-row-gap: #{@vertical_spacing}px;
-          grid-column-gap: #{@horizontal_spacing}px;
-        CSS
-        if @parent.css_classes.include?('grid-layout')
-          layout_css.split(";").map(&:strip).map {|l| l.split(':').map(&:strip)}.each do |key, value|
-            @parent.dom_element.css(key, value) unless key.nil?
-          end
-          if @parent.is_a?(GroupProxy)
-            @parent.dom_element.find('legend').css('grid-column-start', "span #{@num_columns.to_i}")
-          end
-        else
-          layout_css.split(";").map(&:strip).map {|l| l.split(':').map(&:strip)}.each do |key, value|
-            @parent.dom_element.css(key, 'initial') unless key.nil?
-          end
-        end
       end
     end
   end

data/lib/glimmer/swt/layout_proxy.rb

@@ -1,3 +1,24 @@
+# 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/property_owner'
 
 module Glimmer
@@ -13,9 +34,8 @@ module Glimmer
         end
         
         def layout_class(keyword)
-          class_name_alternative = keyword.camelcase(:upper)
-          class_name_main = "#{class_name_alternative}Proxy"
-          a_layout_class = Glimmer::SWT.const_get(class_name_main.to_sym) rescue Glimmer::SWT.const_get(class_name_alternative.to_sym)
+          class_name_main = "#{keyword.camelcase(:upper)}Proxy"
+          a_layout_class = Glimmer::SWT.const_get(class_name_main.to_sym)
           a_layout_class if a_layout_class.ancestors.include?(Glimmer::SWT::LayoutProxy)
         rescue => e
           Glimmer::Config.logger.debug "Layout #{keyword} was not found!"

data/lib/glimmer/swt/message_box_proxy.rb

@@ -74,14 +74,13 @@ module Glimmer
         i = 0
         @parent = parent
         @parent = nil if parent.is_a?(LatestShellProxy)
-        @parent ||= DisplayProxy.instance.shells.last || ShellProxy.new([])
+        @parent ||= DisplayProxy.instance.shells.detect(&:open?) || ShellProxy.new([])
         @args = args
         @block = block
         @children = Set.new
         @enabled = true
         on_widget_selected {
           hide
-          @open = false
         }
         DisplayProxy.instance.message_boxes << self
       end
@@ -106,7 +105,7 @@ module Glimmer
       
       def open
         shell.open(async: false) unless shell.open?
-        owned_proc = Glimmer::Util::ProcTracker.new(owner: self) {
+        owned_proc = Glimmer::Util::ProcTracker.new(owner: self, invoked_from: :open) {
           parent.post_initialize_child(self)
           @open = true
         }
@@ -115,10 +114,11 @@ module Glimmer
       
       def hide
         dom_element.remove
+        @open = false
       end
       
       def content(&block)
-        Glimmer::DSL::Engine.add_content(self, Glimmer::DSL::Opal::MessageBoxExpression.new, &block)
+        Glimmer::DSL::Engine.add_content(self, Glimmer::DSL::Opal::MessageBoxExpression.new, 'message_box', *@args, &block)
       end
       
       def selector

data/lib/glimmer/swt/row_layout_proxy.rb

@@ -42,13 +42,17 @@ module Glimmer
         }
       CSS
     
-      attr_reader :type, :margin_width, :margin_height, :margin_top, :margin_right, :margin_bottom, :margin_left, :spacing, :pack, :center
+      attr_reader :type, :fill, :margin_width, :margin_height, :margin_top, :margin_right, :margin_bottom, :margin_left, :spacing, :pack, :center
         
       def initialize(parent, args)
         super(parent, args)
-        @type = args.first || :horizontal
-        self.pack = true
         @parent.dom_element.add_class('row-layout')
+        self.type = args.first || :horizontal
+        self.pack = true
+      end
+      
+      def type=(value)
+        @type = value
         @parent.dom_element.add_class(horizontal? ? 'row-layout-horizontal' : 'row-layout-vertical')
       end
       
@@ -75,6 +79,11 @@ module Glimmer
         end
       end
       
+      def fill=(value)
+        # TODO verify this is a correct implementation and interpretation of RowLayout in SWT
+        self.pack(!value)
+      end
+      
       def center=(center_value)
         @center = center_value
         # Using padding for width since margin-right isn't getting respected with width 100%

data/lib/glimmer/swt/table_proxy.rb

@@ -257,9 +257,7 @@ module Glimmer
         @table_editor.minimumWidth = 90
         @table_editor.minimumHeight = 20
         if editable?
-          on_mouse_up { |event|
-            edit_table_item(event.table_item, event.column_index)
-          }
+          add_editable_event_listener
         end
       end
       
@@ -311,6 +309,24 @@ module Glimmer
       end
       alias editable editable?
       
+      def editable=(value)
+        if value
+          args.push(:editable)
+          dom_element.addClass('editable')
+          add_editable_event_listener
+        else
+          args.delete(:editable)
+          dom_element.removeClass('editable')
+          @editable_on_mouse_up_event_listener.deregister # TODO see why table event listener deregistration is not working
+        end
+      end
+      
+      def add_editable_event_listener
+        @editable_on_mouse_up_event_listener = on_mouse_up { |event|
+          edit_table_item(event.table_item, event.column_index) if editable?
+        }
+      end
+      
       def selection
         @selection.to_a
       end

data/lib/glimmer/swt/widget_proxy.rb

@@ -46,9 +46,8 @@ module Glimmer
         end
         
         def widget_class(keyword)
-          class_name_alternative = keyword.camelcase(:upper)
-          class_name_main = "#{class_name_alternative}Proxy"
-          Glimmer::SWT.const_get(class_name_main.to_sym) rescue Glimmer::SWT.const_get(class_name_alternative.to_sym)
+          class_name_main = "#{keyword.camelcase(:upper)}Proxy"
+          Glimmer::SWT.const_get(class_name_main.to_sym)
         rescue => e
           puts "Widget #{keyword} was not found!"
           nil
@@ -309,7 +308,7 @@ module Glimmer
       end
       
       def content(&block)
-        Glimmer::DSL::Engine.add_content(self, Glimmer::DSL::Opal::WidgetExpression.new, &block)
+        Glimmer::DSL::Engine.add_content(self, Glimmer::DSL::Opal::WidgetExpression.new, self.class.underscored_widget_name(self), &block)
       end
       
       # Subclasses must override with their own mappings

data/lib/glimmer/ui/custom_shell.rb

@@ -28,15 +28,26 @@ module Glimmer
     module CustomShell
       include Glimmer::UI::CustomWidget
       
+      module ClassMethods
+        include Glimmer
+        attr_reader :custom_shell
+        
+        def launch
+          custom_shell = send(self.name.underscore.gsub('::', '__'))
+          custom_shell.open
+        end
+      end
+      
       class << self
         def included(klass)
           klass.extend(CustomWidget::ClassMethods)
+          klass.extend(CustomShell::ClassMethods)
           klass.include(Glimmer)
           Glimmer::UI::CustomWidget.add_custom_widget_namespaces_for(klass)
           keyword = klass.name.split(':').last.underscore
           LocalStorage[keyword] = $LOADED_FEATURES.last
         end
-          
+        
         def request_parameter_string
           URI.decode_www_form_component(`document.location.href`.match(/\?(.*)$/).to_a[1].to_s)
         end
@@ -59,11 +70,17 @@ module Glimmer
         raise Error, 'Invalid custom shell body root! Must be a shell or another custom shell.' unless body_root.is_a?(Glimmer::SWT::ShellProxy) || body_root.is_a?(Glimmer::UI::CustomShell)
       end
 
-      # Classes may override
-      def open
-        # TODO consider the idea of delaying rendering till the open method
-        body_root.open
+      def open(async: true)
+        work = lambda do
+          body_root.open
+        end
+        if async
+          Glimmer::SWT::DisplayProxy.instance.async_exec(&work)
+        else
+          work.call
+        end
       end
+      
 
       # DO NOT OVERRIDE. JUST AN ALIAS FOR `#open`. OVERRIDE `#open` INSTEAD.
       def show

data/lib/glimmer/ui/custom_widget.rb

@@ -83,6 +83,16 @@ module Glimmer
           @after_body_blocks ||= []
           @after_body_blocks << block
         end
+        
+        def keyword
+          self.name.underscore.gsub('::', '__')
+        end
+        
+        # Returns shortcut keyword to use for this custom widget (keyword minus namespace)
+        def shortcut_keyword
+          self.name.underscore.gsub('::', '__').split('__').last
+        end
+        
       end
       
       class << self
@@ -143,7 +153,6 @@ module Glimmer
         def reset_custom_widget_namespaces
           @custom_widget_namespaces = Set[Object, Glimmer::UI]
         end
-
       end
       # <- end of class methods
       
@@ -259,7 +268,7 @@ module Glimmer
       # Otherwise, if a block is passed, it adds it as content to this custom widget
       def content(&block)
         if block_given?
-          body_root.content(&block)
+          Glimmer::DSL::Engine.add_content(self, Glimmer::DSL::Opal::CustomWidgetExpression.new, self.class.keyword, &block)
         else
           @content
         end

data/lib/glimmer/util/proc_tracker.rb

@@ -23,12 +23,14 @@ require 'delegate'
 
 module Glimmer
   module Util
+    # Decorator that provides tracking facilities for Ruby procs, tracking owner (string), invoked_form method name (symbol/string), and called? (boolean)
     class ProcTracker < DelegateClass(Proc)
-      attr_reader :owner
+      attr_reader :owner, :invoked_from
       
-      def initialize(proc = nil, owner: nil, &block)
+      def initialize(proc = nil, owner: nil, invoked_from: nil, &block)
         super(proc || block)
         @owner = owner
+        @invoked_from = invoked_from
       end
       
       def call(*args)
@@ -41,7 +43,7 @@ module Glimmer
       end
       
       def respond_to?(method, *args, &block)
-        %w[owner called?].include?(method.to_s) || super(method, *args, &block)
+        %w[owner invoked_from called?].include?(method.to_s) || super(method, *args, &block)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-opal
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.13.0
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-15 00:00:00.000000000 Z
+date: 2021-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.7
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.7
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: glimmer-dsl-xml
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: glimmer-dsl-css
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: opal-async
   requirement: !ruby/object:Gem::Requirement
@@ -349,7 +349,9 @@ files:
 - lib/glimmer/dsl/opal/radio_group_selection_data_binding_expression.rb
 - lib/glimmer/dsl/opal/rgb_expression.rb
 - lib/glimmer/dsl/opal/rgba_expression.rb
+- lib/glimmer/dsl/opal/shape_expression.rb
 - lib/glimmer/dsl/opal/shell_expression.rb
+- lib/glimmer/dsl/opal/shine_data_binding_expression.rb
 - lib/glimmer/dsl/opal/swt_expression.rb
 - lib/glimmer/dsl/opal/sync_exec_expression.rb
 - lib/glimmer/dsl/opal/table_column_expression.rb
@@ -429,7 +431,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: Glimmer DSL for Opal