glimmer-dsl-swt 0.2.4 → 0.5.0

data/lib/glimmer/swt/widget_proxy.rb

@@ -3,7 +3,6 @@ require 'glimmer/swt/color_proxy'
 require 'glimmer/swt/font_proxy'
 require 'glimmer/swt/swt_proxy'
 require 'glimmer/swt/dnd_proxy'
-require 'glimmer/data_binding/observable_widget'
 
 # TODO refactor to make file smaller and extract sub-widget-proxies out of this
 
@@ -20,11 +19,10 @@ module Glimmer
     # Follows the Proxy Design Pattern
     class WidgetProxy
       include Packages
-      include DataBinding::ObservableWidget
 
       DEFAULT_STYLES = {
         "text"        => [:border],
-        "table"       => [:border],
+        "table"       => [:virtual, :border],
         "tree"       =>  [:virtual, :border, :h_scroll, :v_scroll],
         "spinner"     => [:border],
         "styled_text" => [:border],
@@ -60,6 +58,7 @@ module Glimmer
         styles, extra_options = extract_args(underscored_widget_name, args)
         swt_widget_class = self.class.swt_widget_class_for(underscored_widget_name)
         @swt_widget = swt_widget_class.new(parent.swt_widget, style(underscored_widget_name, styles), *extra_options)
+        @swt_widget.set_data('proxy', self)
         DEFAULT_INITIALIZERS[underscored_widget_name]&.call(@swt_widget)
         parent.post_initialize_child(self)
       end
@@ -176,44 +175,44 @@ module Glimmer
               }
             end,
             :caret_position => lambda do |observer|
-              on_event_keydown { |event|
+              on_swt_keydown { |event|
                 observer.call(@swt_widget.getCaretPosition)
               }
-              on_event_keyup { |event|
+              on_swt_keyup { |event|
                 observer.call(@swt_widget.getCaretPosition)
               }
-              on_event_mousedown { |event|
+              on_swt_mousedown { |event|
                 observer.call(@swt_widget.getCaretPosition)
               }
-              on_event_mouseup { |event|
+              on_swt_mouseup { |event|
                 observer.call(@swt_widget.getCaretPosition)
               }
             end,
             :selection => lambda do |observer|
-              on_event_keydown { |event|
+              on_swt_keydown { |event|
                 observer.call(@swt_widget.getSelection)
               }
-              on_event_keyup { |event|
+              on_swt_keyup { |event|
                 observer.call(@swt_widget.getSelection)
               }
-              on_event_mousedown { |event|
+              on_swt_mousedown { |event|
                 observer.call(@swt_widget.getSelection)
               }
-              on_event_mouseup { |event|
+              on_swt_mouseup { |event|
                 observer.call(@swt_widget.getSelection)
               }
             end,
             :selection_count => lambda do |observer|
-              on_event_keydown { |event|
+              on_swt_keydown { |event|
                 observer.call(@swt_widget.getSelectionCount)
               }
-              on_event_keyup { |event|
+              on_swt_keyup { |event|
                 observer.call(@swt_widget.getSelectionCount)
               }
-              on_event_mousedown { |event|
+              on_swt_mousedown { |event|
                 observer.call(@swt_widget.getSelectionCount)
               }
-              on_event_mouseup { |event|
+              on_swt_mouseup { |event|
                 observer.call(@swt_widget.getSelectionCount)
               }
             end,
@@ -267,17 +266,17 @@ module Glimmer
         swt_widget_name = underscored_widget_name.camelcase(:upper)
         swt_widget_class = eval(swt_widget_name)
         unless swt_widget_class.ancestors.include?(org.eclipse.swt.widgets.Widget)
-          Glimmer::Config.logger&.debug("Class #{swt_widget_class} matching #{underscored_widget_name} is not a subclass of org.eclipse.swt.widgets.Widget")
+          Glimmer::Config.logger.debug {"Class #{swt_widget_class} matching #{underscored_widget_name} is not a subclass of org.eclipse.swt.widgets.Widget"}
           return nil
         end
         swt_widget_class
-      rescue NameError => e
-        Glimmer::Config.logger&.debug e.full_message
-        # Glimmer::Config.logger&.debug("#{e.message}\n#{e.backtrace.join("\n")}")
+      rescue SyntaxError, NameError => e
+        Glimmer::Config.logger.debug {e.full_message}
+        # Glimmer::Config.logger.debug {"#{e.message}\n#{e.backtrace.join("\n")}"}
         nil
       rescue => e
-        Glimmer::Config.logger&.debug e.full_message
-        # Glimmer::Config.logger&.debug("#{e.message}\n#{e.backtrace.join("\n")}")
+        Glimmer::Config.logger.debug {e.full_message}
+        # Glimmer::Config.logger.debug {"#{e.message}\n#{e.backtrace.join("\n")}"}
         nil
       end
 
@@ -336,10 +335,10 @@ module Glimmer
       
       # TODO eliminate duplication in the following methods perhaps by relying on exceptions
 
-      def can_handle_observation_request?(observation_request)
+      def can_handle_observation_request?(observation_request)        
         observation_request = observation_request.to_s
-        if observation_request.start_with?('on_event_')
-          constant_name = observation_request.sub(/^on_event_/, '')
+        if observation_request.start_with?('on_swt_')
+          constant_name = observation_request.sub(/^on_swt_/, '')
           SWTProxy.has_constant?(constant_name)
         elsif observation_request.start_with?('on_')
           event = observation_request.sub(/^on_/, '')
@@ -357,6 +356,9 @@ module Glimmer
             @drag_source_proxy = nil
           end
         end
+      rescue => e
+        Glimmer::Config.logger.debug {e.full_message}
+        false        
       end
 
       def can_handle_drop_observation_request?(observation_request)
@@ -372,8 +374,9 @@ module Glimmer
       end
 
       def handle_observation_request(observation_request, &block)
-        if observation_request.start_with?('on_event_')
-          constant_name = observation_request.sub(/^on_event_/, '')
+        observation_request = observation_request.to_s
+        if observation_request.start_with?('on_swt_')
+          constant_name = observation_request.sub(/^on_swt_/, '')
           add_swt_event_listener(constant_name, &block)
         elsif observation_request.start_with?('on_')
           event = observation_request.sub(/^on_/, '')
@@ -392,6 +395,23 @@ module Glimmer
         Glimmer::DSL::Engine.add_content(self, Glimmer::DSL::SWT::WidgetExpression.new, &block)
       end
 
+      def method_missing(method, *args, &block)
+        if can_handle_observation_request?(method)          
+          handle_observation_request(method, &block)
+        else
+          swt_widget.send(method, *args, &block)
+        end
+      rescue => e
+        Glimmer::Config.logger.debug {"Neither WidgetProxy nor #{swt_widget.class.name} can handle the method ##{method}"}
+        super
+      end
+      
+      def respond_to?(method, *args, &block)
+        super || 
+          can_handle_observation_request?(method) ||
+          swt_widget.respond_to?(method, *args, &block)
+      end
+
       private
 
       def style(underscored_widget_name, styles)
@@ -437,7 +457,7 @@ module Glimmer
       def add_listener(underscored_listener_name, &block)
         widget_add_listener_method, listener_class, listener_method = self.class.find_listener(@swt_widget.getClass, underscored_listener_name)        
         widget_listener_proxy = nil
-        safe_block = lambda { |event| block.call(event) unless @swt_widget.isDisposed }        
+        safe_block = lambda { |*args| block.call(*args) unless @swt_widget.isDisposed }        
         listener = listener_class.new(listener_method => safe_block)
         @swt_widget.send(widget_add_listener_method, listener)
         widget_listener_proxy = WidgetListenerProxy.new(swt_widget: @swt_widget, swt_listener: listener, widget_add_listener_method: widget_add_listener_method, swt_listener_class: listener_class, swt_listener_method: listener_method)
@@ -479,9 +499,9 @@ module Glimmer
             listener_class.define_method('initialize') do |event_method_block_mapping|
               @event_method_block_mapping = event_method_block_mapping
             end
-            listener_type.getMethods.each do |event_method|
-              listener_class.define_method(event_method.getName) do |event|
-                @event_method_block_mapping[event_method.getName]&.call(event)
+            listener_type.getMethods.each do |event_method|              
+              listener_class.define_method(event_method.getName) do |*args|
+                @event_method_block_mapping[event_method.getName]&.call(*args)
               end
             end
           end
@@ -492,7 +512,7 @@ module Glimmer
       def add_swt_event_listener(swt_constant, &block)
         event_type = SWTProxy[swt_constant]
         widget_listener_proxy = nil
-        safe_block = lambda { |event| block.call(event) unless @swt_widget.isDisposed }
+        safe_block = lambda { |*args| block.call(*args) unless @swt_widget.isDisposed }
         @swt_widget.addListener(event_type, &safe_block)
         widget_listener_proxy = WidgetListenerProxy.new(swt_widget: @swt_widget, swt_listener: @swt_widget.getListeners(event_type).last, event_type: event_type, swt_constant: swt_constant)
       end
@@ -579,7 +599,7 @@ module Glimmer
               end
               image_data = ImageData.new(value)
               # TODO in the future, look into unregistering this listener when no longer needed
-              on_event_Resize do |resize_event|
+              on_swt_Resize do |resize_event|
                 new_image_data = image_data.scaledTo(@swt_widget.getSize.x, @swt_widget.getSize.y)
                 @swt_widget.getBackgroundImage&.dispose
                 @swt_widget.setBackgroundImage(Image.new(@swt_widget.getDisplay, new_image_data))

data/lib/glimmer/ui/custom_shell.rb

@@ -5,9 +5,10 @@ module Glimmer
     module CustomShell
       include SuperModule
       include Glimmer::UI::CustomWidget
-
+      
       def initialize(parent, *swt_constants, options, &content)
         super
+        @swt_widget.set_data('custom_shell', self)
         raise Error, 'Invalid custom shell body root! Must be a shell or another custom shell.' unless body_root.swt_widget.is_a?(org.eclipse.swt.widgets.Shell)
       end
 

data/lib/glimmer/ui/custom_widget.rb

@@ -5,7 +5,6 @@ require 'glimmer/swt/display_proxy'
 require 'glimmer/util/proc_tracker'
 require 'glimmer/data_binding/observer'
 require 'glimmer/data_binding/observable_model'
-require 'glimmer/data_binding/observable_widget'
 
 module Glimmer
   module UI
@@ -15,7 +14,6 @@ module Glimmer
 
       super_module_included do |klass|
         klass.include(Glimmer) unless klass.name.include?('Glimmer::UI::CustomShell')
-        klass.prepend DataBinding::ObservableWidget
         Glimmer::UI::CustomWidget.add_custom_widget_namespaces_for(klass) unless klass.name.include?('Glimmer::UI::CustomShell')
       end
 
@@ -36,15 +34,15 @@ module Glimmer
                 return constant if constant.ancestors.include?(Glimmer::UI::CustomWidget)
                 constant
               rescue => e
-                # Glimmer::Config.logger&.debug "#{e.message}\n#{e.backtrace.join("\n")}"
+                # Glimmer::Config.logger.debug {"#{e.message}\n#{e.backtrace.join("\n")}"}
                 result
               end
             end
           end
           raise "#{underscored_custom_widget_name} has no custom widget class!"
         rescue => e
-          Glimmer::Config.logger&.debug e.message
-          Glimmer::Config.logger&.debug "#{e.message}\n#{e.backtrace.join("\n")}"
+          Glimmer::Config.logger.debug {e.message}
+          Glimmer::Config.logger.debug {"#{e.message}\n#{e.backtrace.join("\n")}"}
           nil
         end
  
@@ -134,16 +132,18 @@ module Glimmer
         body_block = self.class.instance_variable_get("@body_block")
         raise Glimmer::Error, 'Invalid custom widget for having no body! Please define body block!' if body_block.nil?
         @body_root = instance_exec(&body_block)
-        execute_hooks('after_body')
         @swt_widget = @body_root.swt_widget
+        @swt_widget.set_data('custom_widget', self)
+        execute_hooks('after_body')
       end
       
       # Subclasses may override to perform post initialization work on an added child
       def post_initialize_child(child)
-        body_root.post_initialize_child(child)
-      end      
+        # No Op by default
+      end
 
       def can_handle_observation_request?(observation_request)
+        observation_request = observation_request.to_s
         result = false
         if observation_request.start_with?('on_updated_')
           property = observation_request.sub(/^on_updated_/, '')
@@ -153,6 +153,7 @@ module Glimmer
       end
 
       def handle_observation_request(observation_request, &block)
+        observation_request = observation_request.to_s
         if observation_request.start_with?('on_updated_')
           property = observation_request.sub(/^on_updated_/, '') # TODO look into eliminating duplication from above
           add_observer(DataBinding::Observer.proc(&block), property) if can_add_observer?(property)
@@ -162,7 +163,7 @@ module Glimmer
       end
 
       def can_add_observer?(attribute_name)
-        has_instance_method?(attribute_name) || respond_to?("#{attribute_name}?") || @body_root.can_add_observer?(attribute_name)
+        has_instance_method?(attribute_name) || has_instance_method?("#{attribute_name}?") || @body_root.can_add_observer?(attribute_name)
       end
 
       def add_observer(observer, attribute_name)
@@ -174,12 +175,12 @@ module Glimmer
       end
 
       def has_attribute?(attribute_name, *args)
-        respond_to?(attribute_setter(attribute_name), args) ||
+        has_instance_method?(attribute_setter(attribute_name)) ||
           @body_root.has_attribute?(attribute_name, *args)
       end
 
       def set_attribute(attribute_name, *args)
-        if respond_to?(attribute_setter(attribute_name), args)
+        if has_instance_method?(attribute_setter(attribute_name))
           send(attribute_setter(attribute_name), *args)
         else
           @body_root.set_attribute(attribute_name, *args)
@@ -188,7 +189,10 @@ module Glimmer
 
       # This method ensures it has an instance method not coming from Glimmer DSL
       def has_instance_method?(method_name)
-        respond_to?(method_name) && !method(method_name)&.source_location&.first&.include?('glimmer/dsl/engine.rb')
+        respond_to?(method_name) && 
+          !swt_widget.respond_to?(method_name) &&
+          !method(method_name)&.source_location&.first&.include?('glimmer/dsl/engine.rb') && 
+          !method(method_name)&.source_location&.first&.include?('glimmer/swt/widget_proxy.rb')
       end
 
       def get_attribute(attribute_name)
@@ -203,7 +207,6 @@ module Glimmer
         "#{attribute_name}="
       end
 
-
       def has_style?(style)
         (swt_style & SWT::SWTProxy[style]) == SWT::SWTProxy[style]
       end
@@ -229,12 +232,19 @@ module Glimmer
         end
       end
 
-      def dispose
-        body_root.dispose
-      end
-      
       def method_missing(method, *args, &block)
-        body_root.send(method, *args, &block)
+        if can_handle_observation_request?(method)
+          handle_observation_request(method, &block)
+        else
+          body_root.send(method, *args, &block)
+        end
+      end
+
+      alias local_respond_to? respond_to?      
+      def respond_to?(method, *args, &block)
+        super or
+          can_handle_observation_request?(method) or
+          body_root.respond_to?(method, *args, &block)
       end
 
       private

metadata

@@ -1,21 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-swt
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.5.0
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-15 00:00:00.000000000 Z
+date: 2020-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.4
+        version: 0.10.1
   name: glimmer
   type: :runtime
   prerelease: false
@@ -23,7 +23,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.4
+        version: 0.10.1
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -57,7 +57,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.2
+        version: 0.9.0
   name: puts_debuggerer
   type: :runtime
   prerelease: false
@@ -65,67 +65,67 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.2
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.4
+        version: 2.3.9
     - - "<"
       - !ruby/object:Gem::Version
-        version: 2.0.0
-  name: text-table
+        version: 3.0.0
+  name: jeweler
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.4
+        version: 2.3.9
     - - "<"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 2.3.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 2.0.0
-  name: os
+        version: 3.0.0
+  name: logging
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 2.3.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.5
+        version: 1.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.0.0
-  name: warbler
+        version: 2.0.0
+  name: os
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.5
+        version: 1.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -151,41 +151,61 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.9
+        version: 6.2.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.0.0
-  name: jeweler
+        version: 7.0.0
+  name: rdoc
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.9
+        version: 6.2.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 7.0.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.2.1
+        version: 1.2.4
     - - "<"
       - !ruby/object:Gem::Version
-        version: 7.0.0
-  name: rdoc
+        version: 2.0.0
+  name: text-table
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.2.1
+        version: 1.2.4
     - - "<"
       - !ruby/object:Gem::Version
-        version: 7.0.0
+        version: 2.0.0
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.5
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  name: warbler
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.5
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements: