glimmer 0.4.9 → 0.5.0

data/lib/glimmer/{swt → ui}/custom_shell.rb

@@ -1,14 +1,14 @@
-require 'super_module'
+require 'glimmer/error'
 
 module Glimmer
-  module SWT
+  module UI
     module CustomShell
       include SuperModule
-      include Glimmer::SWT::CustomWidget
+      include Glimmer::UI::CustomWidget
 
       def initialize(parent, *swt_constants, options, &content)
         super
-        raise 'Invalid custom shell body root! Must be a shell or another custom shell.' unless body_root.is_a?(GShell) || body_root.is_a?(CustomShell)
+        raise Error, 'Invalid custom shell body root! Must be a shell or another custom shell.' unless body_root.is_a?(SWT::ShellProxy) || body_root.is_a?(CustomShell)
       end
 
       # Classes may override

data/lib/glimmer/{swt → ui}/custom_widget.rb

@@ -1,13 +1,22 @@
-require_relative 'proc_tracker'
-require_relative 'observable_model'
+require 'glimmer'
+require 'glimmer/error'
+require 'glimmer/swt/swt_proxy'
+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 SWT
+  module UI
     module CustomWidget
       include SuperModule
-      include Glimmer
-      include Parent
-      include ObservableModel
+      include DataBinding::ObservableModel
+
+      super_module_included do |klass|
+        klass.include(Glimmer) unless klass.name.include?('Glimmer::UI::CustomShell')
+        klass.prepend DataBinding::ObservableWidget
+      end
 
       class << self
         def for(underscored_custom_widget_name)
@@ -16,11 +25,27 @@ module Glimmer
             split(/__/).map do |namespace|
               namespace.camelcase(:upper)
             end
-          custom_widget_class = namespaces.reduce(Object) do |result, namespace|
-            result.const_get(namespace.to_sym)
-          end
-          custom_widget_class if custom_widget_class.ancestors.include?(Glimmer::SWT::CustomWidget)
+          custom_widget_class = [Object, Glimmer::UI].reduce([]) do |found, base|
+            if found.empty?
+              found << namespaces.reduce(base) do |result, namespace|
+                namespace = namespace.to_sym
+                if !result.constants.include?(namespace)
+                  namespace = result.constants.detect {|c| c.to_s.upcase == namespace.to_s.upcase } || namespace
+                end
+                begin
+                  result.const_get(namespace)
+                rescue => e
+                  # Glimmer.logger.debug "#{e.message}\n#{e.backtrace.join("\n")}"
+                  result
+                end
+              end
+            end
+            found - [Object, Glimmer::UI]
+          end.first
+          raise "#{underscored_custom_widget_name} has no custom widget class!" if custom_widget_class.nil?
+          custom_widget_class if custom_widget_class.ancestors.include?(Glimmer::UI::CustomWidget)
         rescue => e
+          Glimmer.logger.debug e.message
           Glimmer.logger.debug "#{e.message}\n#{e.backtrace.join("\n")}"
           nil
         end
@@ -36,7 +61,7 @@ module Glimmer
           if new_options.empty?
             @options ||= {} # maps options to defaults
           else
-            new_options = new_options.reduce({}) {|new_options, new_option| new_options.merge(new_option => nil)}
+            new_options = new_options.reduce({}) {|new_options_hash, new_option| new_options_hash.merge(new_option => nil)}
             @options = options.merge(new_options)
             def_option_attr_readers(new_options)
           end
@@ -64,28 +89,31 @@ module Glimmer
           @before_body_blocks << block
         end
 
+        # TODO rename to content as well as before and after blocks
+        def body(&block)
+          @body_block = block
+        end
+
         def after_body(&block)
           @after_body_blocks ||= []
           @after_body_blocks << block
         end
       end
 
-      attr_reader :body_root, :widget, :parent, :swt_style, :options, :content
+      attr_reader :body_root, :swt_widget, :parent, :swt_style, :options
 
       def initialize(parent, *swt_constants, options, &content)
         @parent = parent
-        @swt_style = GSWT[*swt_constants]
+        @swt_style = SWT::SWTProxy[*swt_constants]
         options ||= {}
         @options = self.class.options.merge(options)
-        @content = ProcTracker.new(content) if content
+        @content = Util::ProcTracker.new(content) if content
         execute_hooks('before_body')
-        @body_root = body
+        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')
-        @widget = @body_root.widget
-      end
-
-      def body
-        raise 'Not implemented!'
+        @swt_widget = @body_root.swt_widget
       end
 
       def can_handle_observation_request?(observation_request)
@@ -100,7 +128,7 @@ module Glimmer
       def handle_observation_request(observation_request, &block)
         if observation_request.start_with?('on_updated_')
           property = observation_request.sub(/^on_updated_/, '')
-          add_observer(Observer::Proc.new(&block), property) if can_add_observer?(property)
+          add_observer(DataBinding::Observer.proc(&block), property) if can_add_observer?(property)
         else
           body_root.handle_observation_request(observation_request, &block)
         end
@@ -143,53 +171,41 @@ module Glimmer
         "#{attribute_name}="
       end
 
-      # TODO see if it is worth it to eliminate duplication of method_missing
-      # from GWidget using a module
-
-      def method_missing(method, *args, &block)
-        method_name = method.to_s
-        if can_handle_observation_request?(method_name)
-          handle_observation_request(method_name, &block)
-        else
-          super
-        end
-      end
-
-      def process_block(block)
-        if block.source_location == @content&.__getobj__.source_location
-          @content.call(self) unless @content.called?
-        else
-          block.call(self)
-        end
-      end
 
       def has_style?(style)
-        (swt_style & GSWT[style]) == GSWT[style]
+        (swt_style & SWT::SWTProxy[style]) == SWT::SWTProxy[style]
       end
 
       # TODO see if it is worth it to eliminate duplication of async_exec/sync_exec
-      # delegation to GDisplay, via a module
+      # delegation to DisplayProxy, via a module
 
       def async_exec(&block)
-        GDisplay.instance.async_exec(&block)
+        SWT::DisplayProxy.instance.async_exec(&block)
       end
 
       def sync_exec(&block)
-        GDisplay.instance.sync_exec(&block)
+        SWT::DisplayProxy.instance.sync_exec(&block)
+      end
+
+      # Returns content block if used as an attribute reader (no args)
+      # 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)
+        else
+          @content
+        end
       end
 
-      def add_content(&block)
-        body_root.add_content(&block)
+      def dispose
+        body_root.dispose
       end
 
       private
 
       def execute_hooks(hook_name)
-        self.class.instance_variable_get("@#{hook_name}_blocks")&.each_with_index do |hook_block, i|
-          hook_block_number = i + 1
-          self.class.define_method("__#{hook_name}#{hook_block_number}", hook_block)
-          send("__#{hook_name}#{hook_block_number}")
-          self.class.send(:undef_method, "__#{hook_name}#{hook_block_number}")
+        self.class.instance_variable_get("@#{hook_name}_blocks")&.each do |hook_block|
+          instance_exec(&hook_block)
         end
       end
     end

data/lib/glimmer/{swt → ui}/video.rb

@@ -1,11 +1,15 @@
-require_relative 'custom_widget'
-require_relative 'g_color'
+require 'glimmer/ui/custom_widget'
+require 'glimmer/swt/color_proxy'
 
 #TODO display progress wheel while loading video
 
 module Glimmer
-  module SWT
+  module UI
     class Video
+      include Glimmer::UI::CustomWidget
+
+      include_package 'org.eclipse.swt.browser'
+
       PROPERTIES_OBSERVED = [
         'playing',
         'paused',
@@ -15,10 +19,6 @@ module Glimmer
         'current_time',
       ]
 
-      include_package 'org.eclipse.swt.browser'
-
-      include Glimmer::SWT::CustomWidget
-
       options :file, :url
       option :autoplay, true
       option :controls, true
@@ -35,7 +35,7 @@ module Glimmer
       alias fit_to_width? fit_to_width
       alias fit_to_height? fit_to_height
 
-      def body
+      body {
         browser {
           text <<~HTML
             <html>
@@ -71,7 +71,7 @@ module Glimmer
             </html>
           HTML
         }
-      end
+      }
 
       def source
         file ? "file://#{file}" : url
@@ -88,7 +88,7 @@ module Glimmer
       private
 
       def video_action(action)
-        widget.execute("document.getElementById('video').#{action}()")
+        swt_widget.execute("document.getElementById('video').#{action}()")
       end
 
       def browser_video_autoplay
@@ -114,9 +114,9 @@ module Glimmer
       def browser_body_background
         color = background
         if color.is_a?(Symbol) || color.is_a?(String)
-          color = GColor.color_for(parent.widget.getDisplay, color)
-        elsif color.is_a?(GColor)
-          color = color.color
+          color = SWT::ColorProxy.new(color).swt_color
+        elsif color.is_a?(SWT::ColorProxy)
+          color = color.swt_color
         end
         "rgba(#{color.getRed}, #{color.getGreen}, #{color.getBlue}, #{color.getAlpha})"
       end

data/lib/glimmer/{swt → util}/proc_tracker.rb

@@ -1,5 +1,5 @@
 module Glimmer
-  module SWT
+  module Util
     class ProcTracker < DelegateClass(Proc)
       def initialize(proc)
         super(proc)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer
 version: !ruby/object:Gem::Version
-  version: 0.4.9
+  version: 0.5.0
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-04 00:00:00.000000000 Z
+date: 2020-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -43,7 +43,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 1.4.0
   name: super_module
   type: :runtime
   prerelease: false
@@ -51,13 +51,13 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.3.0
   name: nested_inherited_jruby_include_package
   type: :runtime
   prerelease: false
@@ -65,7 +65,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -164,8 +164,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.1
-description: JRuby Desktop UI DSL + Data-Binding library that enables easy and efficient
-  authoring of user-interfaces using the robust platform-independent Eclipse SWT library
+description: JRuby Desktop UI DSL + Data-Binding cross-platform library that enables
+  productive and efficient authoring of desktop user-interfaces using the robust platform-native
+  Eclipse SWT library
 email: andy.am@gmail.com
 executables:
 - glimmer
@@ -181,69 +182,64 @@ files:
 - bin/girb_runner.rb
 - bin/glimmer
 - lib/glimmer.rb
-- lib/glimmer/command_handler.rb
-- lib/glimmer/command_handler_chain_factory.rb
-- lib/glimmer/command_handler_chain_link.rb
-- lib/glimmer/command_handlers.rb
-- lib/glimmer/ext/module.rb
+- lib/glimmer/data_binding/list_selection_binding.rb
+- lib/glimmer/data_binding/model_binding.rb
+- lib/glimmer/data_binding/observable.rb
+- lib/glimmer/data_binding/observable_array.rb
+- lib/glimmer/data_binding/observable_model.rb
+- lib/glimmer/data_binding/observable_widget.rb
+- lib/glimmer/data_binding/observer.rb
+- lib/glimmer/data_binding/shine.rb
+- lib/glimmer/data_binding/table_items_binding.rb
+- lib/glimmer/data_binding/tree_items_binding.rb
+- lib/glimmer/data_binding/widget_binding.rb
+- lib/glimmer/dsl.rb
+- lib/glimmer/dsl/async_exec_expression.rb
+- lib/glimmer/dsl/bind_expression.rb
+- lib/glimmer/dsl/color_expression.rb
+- lib/glimmer/dsl/column_properties_expression.rb
+- lib/glimmer/dsl/combo_selection_data_binding_expression.rb
+- lib/glimmer/dsl/custom_widget_expression.rb
+- lib/glimmer/dsl/data_binding_expression.rb
+- lib/glimmer/dsl/display_expression.rb
+- lib/glimmer/dsl/engine.rb
+- lib/glimmer/dsl/exec_expression.rb
+- lib/glimmer/dsl/expression.rb
+- lib/glimmer/dsl/expression_handler.rb
+- lib/glimmer/dsl/layout_data_expression.rb
+- lib/glimmer/dsl/layout_expression.rb
+- lib/glimmer/dsl/list_selection_data_binding_expression.rb
+- lib/glimmer/dsl/observe_expression.rb
+- lib/glimmer/dsl/parent_expression.rb
+- lib/glimmer/dsl/property_expression.rb
+- lib/glimmer/dsl/shell_expression.rb
+- lib/glimmer/dsl/static_expression.rb
+- lib/glimmer/dsl/swt_expression.rb
+- lib/glimmer/dsl/sync_exec_expression.rb
+- lib/glimmer/dsl/tab_item_expression.rb
+- lib/glimmer/dsl/table_items_data_binding_expression.rb
+- lib/glimmer/dsl/tree_items_data_binding_expression.rb
+- lib/glimmer/dsl/tree_properties_expression.rb
+- lib/glimmer/dsl/widget_expression.rb
+- lib/glimmer/dsl/widget_listener_expression.rb
+- lib/glimmer/error.rb
+- lib/glimmer/invalid_keyword_error.rb
 - lib/glimmer/launcher.rb
-- lib/glimmer/parent.rb
-- lib/glimmer/shine.rb
-- lib/glimmer/swt/command_handlers/bind_command_handler.rb
-- lib/glimmer/swt/command_handlers/color_command_handler.rb
-- lib/glimmer/swt/command_handlers/combo_selection_data_binding_command_handler.rb
-- lib/glimmer/swt/command_handlers/custom_widget_command_handler.rb
-- lib/glimmer/swt/command_handlers/data_binding_command_handler.rb
-- lib/glimmer/swt/command_handlers/display_command_handler.rb
-- lib/glimmer/swt/command_handlers/layout_command_handler.rb
-- lib/glimmer/swt/command_handlers/layout_data_command_handler.rb
-- lib/glimmer/swt/command_handlers/list_selection_data_binding_command_handler.rb
-- lib/glimmer/swt/command_handlers/observe_command_handler.rb
-- lib/glimmer/swt/command_handlers/property_command_handler.rb
-- lib/glimmer/swt/command_handlers/shell_command_handler.rb
-- lib/glimmer/swt/command_handlers/tab_item_command_handler.rb
-- lib/glimmer/swt/command_handlers/table_column_properties_data_binding_command_handler.rb
-- lib/glimmer/swt/command_handlers/table_items_data_binding_command_handler.rb
-- lib/glimmer/swt/command_handlers/tree_items_data_binding_command_handler.rb
-- lib/glimmer/swt/command_handlers/tree_properties_data_binding_command_handler.rb
-- lib/glimmer/swt/command_handlers/widget_command_handler.rb
-- lib/glimmer/swt/command_handlers/widget_listener_command_handler.rb
-- lib/glimmer/swt/custom_shell.rb
-- lib/glimmer/swt/custom_widget.rb
-- lib/glimmer/swt/g_color.rb
-- lib/glimmer/swt/g_display.rb
-- lib/glimmer/swt/g_font.rb
-- lib/glimmer/swt/g_layout.rb
-- lib/glimmer/swt/g_layout_data.rb
-- lib/glimmer/swt/g_runnable.rb
-- lib/glimmer/swt/g_shell.rb
-- lib/glimmer/swt/g_swt.rb
-- lib/glimmer/swt/g_tab_item_composite.rb
-- lib/glimmer/swt/g_widget.rb
-- lib/glimmer/swt/g_widget_listener.rb
-- lib/glimmer/swt/list_selection_binding.rb
-- lib/glimmer/swt/model_binding.rb
-- lib/glimmer/swt/observable.rb
-- lib/glimmer/swt/observable_array.rb
-- lib/glimmer/swt/observable_model.rb
-- lib/glimmer/swt/observer.rb
-- lib/glimmer/swt/proc_tracker.rb
-- lib/glimmer/swt/table_items_binding.rb
-- lib/glimmer/swt/tree_items_binding.rb
-- lib/glimmer/swt/video.rb
-- lib/glimmer/swt/widget_binding.rb
-- lib/glimmer/swt_packages.rb
-- lib/glimmer/xml/command_handlers/html_command_handler.rb
-- lib/glimmer/xml/command_handlers/xml_command_handler.rb
-- lib/glimmer/xml/command_handlers/xml_name_space_command_handler.rb
-- lib/glimmer/xml/command_handlers/xml_tag_command_handler.rb
-- lib/glimmer/xml/command_handlers/xml_text_command_handler.rb
-- lib/glimmer/xml/depth_first_search_iterator.rb
-- lib/glimmer/xml/name_space_visitor.rb
-- lib/glimmer/xml/node.rb
-- lib/glimmer/xml/node_visitor.rb
-- lib/glimmer/xml/xml_visitor.rb
-- lib/glimmer/xml_command_handlers.rb
+- lib/glimmer/swt/color_proxy.rb
+- lib/glimmer/swt/display_proxy.rb
+- lib/glimmer/swt/font_proxy.rb
+- lib/glimmer/swt/layout_data_proxy.rb
+- lib/glimmer/swt/layout_proxy.rb
+- lib/glimmer/swt/packages.rb
+- lib/glimmer/swt/shell_proxy.rb
+- lib/glimmer/swt/swt_proxy.rb
+- lib/glimmer/swt/tab_item_proxy.rb
+- lib/glimmer/swt/widget_listener_proxy.rb
+- lib/glimmer/swt/widget_proxy.rb
+- lib/glimmer/ui/custom_shell.rb
+- lib/glimmer/ui/custom_widget.rb
+- lib/glimmer/ui/video.rb
+- lib/glimmer/util/proc_tracker.rb
 - vendor/swt/linux/swt.jar
 - vendor/swt/mac/swt.jar
 - vendor/swt/windows/swt.jar