glimmer-dsl-opal 0.9.3 → 0.11.0

data/lib/glimmer/swt/swt_proxy.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020 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

data/lib/glimmer/swt/tab_folder_proxy.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020 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

data/lib/glimmer/swt/table_editor.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020 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

data/lib/glimmer/swt/table_item_proxy.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020 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

data/lib/glimmer/swt/table_proxy.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020 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

data/lib/glimmer/swt/widget_proxy.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020 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
@@ -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
@@ -77,15 +76,20 @@ module Glimmer
         def underscored_widget_name(widget_proxy)
           widget_proxy.class.name.split(/::|\./).last.sub(/Proxy$/, '').underscore
         end
+        
+        def widget_handling_listener
+          @@widget_handling_listener
+        end
       end
       
       DEFAULT_INITIALIZERS = {
+        # TODO remove if built in class initializer is taking care of this
         composite: lambda do |composite_proxy|
-          if composite_proxy.layout.nil?
-            layout = GridLayoutProxy.new(composite_proxy, [])
-            composite_proxy.layout = layout
-            layout.margin_width = 15
-            layout.margin_height = 15
+          if composite_proxy.get_layout.nil?
+            the_layout = GridLayoutProxy.new(composite_proxy, [])
+            composite_proxy.layout = the_layout
+            the_layout.margin_width = 15
+            the_layout.margin_height = 15
           end
         end,
 #         scrolled_composite: lambda do |scrolled_composite|
@@ -100,7 +104,7 @@ module Glimmer
           table_column_proxy.width = 80
         end,
 #         group: lambda do |group_proxy|
-#           group_proxy.layout = GridLayoutProxy.new(group_proxy, []) if group.layout.nil?
+#           group_proxy.layout = GridLayoutProxy.new(group_proxy, []) if group.get_layout.nil?
 #         end,
       }
       
@@ -135,8 +139,8 @@ module Glimmer
               dom_element.css('position', 'relative')
               menu&.render
               menu.dom_element.css('position', 'absolute')
-              menu.dom_element.css('left', mouse_event.x - parent.layout&.margin_width.to_i) # TODO - parent.layout&.margin_left.to_i)
-              menu.dom_element.css('top', mouse_event.y - parent.layout&.margin_height.to_i - 5) # TODO - parent.layout&.margin_top.to_i)
+              menu.dom_element.css('left', mouse_event.x - parent.get_layout&.margin_width.to_i) # TODO - parent.get_layout&.margin_left.to_i)
+              menu.dom_element.css('top', mouse_event.y - parent.get_layout&.margin_height.to_i - 5) # TODO - parent.get_layout&.margin_top.to_i)
               @menu_requested = false
             end
           }
@@ -186,18 +190,31 @@ module Glimmer
       def path
         "#{parent_path} #{element}##{id}.#{name}"
       end
+      alias widget_path path # pure path without subchildren modifications
 
       # Root element representing widget. Must be overridden by subclasses if different from div
       def element
         'div'
       end
       
-      def pack(*args)
-        # No Op (just a shim) TODO consider if it should be implemented
+      def shell
+        current_widget = self
+        current_widget = current_widget.parent until current_widget.parent.nil?
+        current_widget
       end
 
-      def layout(*args)
-        # No Op (just a shim) TODO consider if it should be implemented
+      def parents
+        parents_array = []
+        current_widget = self
+        until current_widget.parent.nil?
+          current_widget = current_widget.parent
+          parents_array << current_widget
+        end
+        parents_array
+      end
+
+      def dialog_ancestor
+        parents.detect {|p| p.is_a?(DialogProxy)}
       end
 
       def enabled=(value)
@@ -236,7 +253,7 @@ module Glimmer
       alias setFocus set_focus
       
       def parent_path
-        @parent.path
+        @parent&.path
       end
 
       def parent_dom_element
@@ -252,7 +269,6 @@ module Glimmer
           the_parent_dom_element.append(@dom) # TODO make a method attach to allow subclasses to override if needed
         else
           old_element.replace_with(@dom)
-          old_element.replace_with(@dom)
         end
         observation_requests&.each do |keyword, event_listener_set|
           event_listener_set.each do |event_listener|
@@ -287,12 +303,12 @@ module Glimmer
         # TODO consider passing parent element instead and having table item include a table cell widget only for opal
         @dom = nil
         @dom = dom
-        @dom = @parent.layout.dom(@dom) if @parent.respond_to?(:layout) && @parent.layout
+        @dom = @parent.get_layout.dom(@dom) if @parent.respond_to?(:layout) && @parent.get_layout
         @dom
       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
@@ -633,6 +649,18 @@ module Glimmer
         @event_listener_proxies ||= []
       end
       
+      def suspend_event_handling
+        @event_handling_suspended = true
+      end
+      
+      def resume_event_handling
+        @event_handling_suspended = false
+      end
+      
+      def event_handling_suspended?
+        @event_handling_suspended
+      end
+      
       def can_handle_observation_request?(observation_request)
         # TODO sort this out for Opal
         observation_request = observation_request.to_s
@@ -662,7 +690,10 @@ module Glimmer
             # TODO look into the issue with using async::task.new here. maybe put it in event listener (like not being able to call preventDefault or return false successfully )
             # maybe consider pushing inside the widget classes instead where needed only or implement universal doit support correctly to bypass this issue
 #             Async::Task.new do
-              event_listener.call(event)
+            @@widget_handling_listener = self
+            # TODO also make sure to disable all widgets for suspension
+            event_listener.call(event) unless dialog_ancestor&.event_handling_suspended?
+            @widget_handling_listener = nil
 #             end
           end
           the_listener_dom_element = event_element_css_selector ? Element[event_element_css_selector] : listener_dom_element
@@ -896,6 +927,7 @@ require 'glimmer/swt/button_proxy'
 require 'glimmer/swt/combo_proxy'
 require 'glimmer/swt/checkbox_proxy'
 require 'glimmer/swt/composite_proxy'
+require 'glimmer/swt/dialog_proxy'
 require 'glimmer/swt/date_time_proxy'
 require 'glimmer/swt/group_proxy'
 require 'glimmer/swt/label_proxy'

data/lib/glimmer/ui/custom_shell.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020 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
@@ -28,15 +28,29 @@ module Glimmer
     module CustomShell
       include Glimmer::UI::CustomWidget
       
+      module ClassMethods
+        attr_reader :custom_shell
+        
+        def launch
+          @custom_shell = send(self.name.underscore.gsub('::', '__'))
+          @custom_shell.open
+        end
+        
+        def shutdown
+          @custom_shell.close
+        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
@@ -56,7 +70,7 @@ module Glimmer
       
       def initialize(parent, args, options, &content)
         super(parent, args, options, &content)
-        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) || body_root.is_a?(Glimmer::SWT::LatestShellProxy)
+        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

data/lib/glimmer/ui/custom_widget.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020 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

data/lib/glimmer/util/proc_tracker.rb

@@ -1,5 +1,5 @@
-# Copyright (c) 2020 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
 # "Software"), to deal in the Software without restriction, including
@@ -7,10 +7,10 @@
 # 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
@@ -23,17 +23,28 @@ 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)
-      def initialize(proc)
-        super(proc)
+      attr_reader :owner, :invoked_from
+      
+      def initialize(proc = nil, owner: nil, invoked_from: nil, &block)
+        super(proc || block)
+        @owner = owner
+        @invoked_from = invoked_from
       end
+      
       def call(*args)
         __getobj__.call(*args)
         @called = true
       end
+      
       def called?
         !!@called
       end
+      
+      def respond_to?(method, *args, &block)
+        %w[owner invoked_from called?].include?(method.to_s) || super(method, *args, &block)
+      end
     end
   end
 end

data/lib/net/http.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020 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

data/lib/os.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-opal
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.11.0
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-09 00:00:00.000000000 Z
+date: 2021-07-08 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.5
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.5
+        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
@@ -92,7 +92,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.0.2
     - - "<"
       - !ruby/object:Gem::Version
         version: 2.0.0
@@ -102,7 +102,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.0.2
     - - "<"
       - !ruby/object:Gem::Version
         version: 2.0.0
@@ -288,6 +288,7 @@ files:
 - lib/glimmer-dsl-opal/samples/hello/hello_custom_shell.rb
 - lib/glimmer-dsl-opal/samples/hello/hello_custom_widget.rb
 - lib/glimmer-dsl-opal/samples/hello/hello_date_time.rb
+- lib/glimmer-dsl-opal/samples/hello/hello_dialog.rb
 - lib/glimmer-dsl-opal/samples/hello/hello_group.rb
 - lib/glimmer-dsl-opal/samples/hello/hello_list_multi_selection.rb
 - lib/glimmer-dsl-opal/samples/hello/hello_list_single_selection.rb
@@ -332,6 +333,7 @@ files:
 - lib/glimmer/dsl/opal/combo_selection_data_binding_expression.rb
 - lib/glimmer/dsl/opal/custom_widget_expression.rb
 - lib/glimmer/dsl/opal/data_binding_expression.rb
+- lib/glimmer/dsl/opal/dialog_expression.rb
 - lib/glimmer/dsl/opal/display_expression.rb
 - lib/glimmer/dsl/opal/dsl.rb
 - lib/glimmer/dsl/opal/exec_expression.rb
@@ -347,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
@@ -367,6 +371,7 @@ files:
 - lib/glimmer/swt/custom/checkbox_group.rb
 - lib/glimmer/swt/custom/radio_group.rb
 - lib/glimmer/swt/date_time_proxy.rb
+- lib/glimmer/swt/dialog_proxy.rb
 - lib/glimmer/swt/display_proxy.rb
 - lib/glimmer/swt/event_listener_proxy.rb
 - lib/glimmer/swt/fill_layout_proxy.rb
@@ -374,6 +379,7 @@ files:
 - lib/glimmer/swt/grid_layout_proxy.rb
 - lib/glimmer/swt/group_proxy.rb
 - lib/glimmer/swt/label_proxy.rb
+- lib/glimmer/swt/latest_dialog_proxy.rb
 - lib/glimmer/swt/latest_message_box_proxy.rb
 - lib/glimmer/swt/latest_shell_proxy.rb
 - lib/glimmer/swt/layout_data_proxy.rb
@@ -425,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