glimmer-dsl-opal 0.0.9 → 0.1.0

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

@@ -1,7 +1,7 @@
 require 'glimmer/dsl/static_expression'
 require 'glimmer/dsl/top_level_expression'
 require 'glimmer/dsl/parent_expression'
-require 'glimmer/opal/modal'
+require 'glimmer/swt/message_box_proxy'
 
 module Glimmer
   module DSL
@@ -12,7 +12,7 @@ module Glimmer
 
         def interpret(parent, keyword, *args, &block)
           parent = args.delete_at(0)
-          Glimmer::Opal::Modal.new(parent, args)
+          Glimmer::SWT::MessageBoxProxy.new(parent, args)
         end
       end
     end

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

@@ -1,7 +1,7 @@
 require 'glimmer/dsl/static_expression'
 require 'glimmer/dsl/top_level_expression'
 require 'glimmer/dsl/parent_expression'
-require 'glimmer/opal/document_proxy'
+require 'glimmer/swt/shell_proxy'
 
 module Glimmer
   module DSL
@@ -11,7 +11,7 @@ module Glimmer
         include ParentExpression
 
         def interpret(parent, keyword, *args, &block)
-          Glimmer::Opal::DocumentProxy.new(args)
+          Glimmer::SWT::ShellProxy.new(*args)
         end
       end
     end

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

@@ -1,6 +1,6 @@
 require 'glimmer/dsl/static_expression'
 require 'glimmer/dsl/parent_expression'
-require 'glimmer/opal/table_proxy'
+require 'glimmer/swt/table_proxy'
 
 module Glimmer
   module DSL
@@ -9,7 +9,7 @@ module Glimmer
         include ParentExpression
 
         def interpret(parent, keyword, *args, &block)
-          Glimmer::Opal::TableProxy.new(parent, args)
+          Glimmer::SWT::TableProxy.new(parent, args)
         end
       end
     end

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

@@ -1,7 +1,7 @@
 require 'glimmer/dsl/expression'
 require 'glimmer/data_binding/model_binding'
 require 'glimmer/data_binding/table_items_binding'
-require 'glimmer/opal/table_proxy'
+require 'glimmer/swt/table_proxy'
 
 module Glimmer
   module DSL
@@ -11,7 +11,7 @@ module Glimmer
         def can_interpret?(parent, keyword, *args, &block)
           keyword == "items" and
             block.nil? and
-            parent.is_a?(Glimmer::Opal::TableProxy) and
+            parent.is_a?(Glimmer::SWT::TableProxy) and
             args.size == 2 and
             args[0].is_a?(DataBinding::ModelBinding) and
             args[0].evaluate_property.is_a?(Array) and

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

@@ -0,0 +1,23 @@
+require 'glimmer/dsl/expression'
+require 'glimmer/dsl/parent_expression'
+require 'glimmer/swt/widget_proxy'
+
+module Glimmer
+  module DSL
+    module Opal
+      class WidgetExpression < Expression
+        include ParentExpression
+        EXCLUDED_KEYWORDS = %w[shell display]
+  
+        def can_interpret?(parent, keyword, *args, &block)
+          !EXCLUDED_KEYWORDS.include?(keyword) and
+            parent.is_a?(Glimmer::SWT::WidgetProxy) 
+        end
+
+        def interpret(parent, keyword, *args, &block)
+          Glimmer::SWT::WidgetProxy.for(keyword, parent, args)
+        end
+      end
+    end
+  end
+end

data/lib/glimmer/opal/display_proxy.rb

@@ -9,11 +9,11 @@ module Glimmer
       
       def async_exec(&block)
         executer = lambda do
-          if $document.at_css('.modal')
+          if Document.find('.modal').to_a.empty?
+            block.call
+          else
             sleep(0.05)
             Async::Task.new(&executer)
-          else
-            block.call
           end
         end
         Async::Task.new(&executer)

data/lib/glimmer/opal/element_proxy.rb

@@ -1,10 +1,10 @@
-require 'glimmer/opal/property_owner'
+require 'glimmer/swt/property_owner'
 
 module Glimmer
   module Opal
     class ElementProxy
       include Glimmer
-      include PropertyOwner
+      include Glimmer::SWT::PropertyOwner
       attr_reader :parent, :args, :css_classes, :css, :children, :enabled
       
       class << self
@@ -17,7 +17,11 @@ module Glimmer
         end
         
         def max_id_numbers
-          @max_id_numbers ||= {}
+          @max_id_numbers ||= reset_max_id_numbers!
+        end
+        
+        def reset_max_id_numbers!
+          @max_id_numbers = {}
         end
       end
       
@@ -30,6 +34,10 @@ module Glimmer
         @enabled = true
         @parent.add_child(self)
       end
+      
+      def dispose
+        dom.remove
+      end
 
       def add_child(child)
 #         return if @children.include?(child) # TODO consider adding an option to enable this if needed to prevent dom repetition        

data/lib/glimmer/swt/browser_proxy.rb

@@ -0,0 +1,27 @@
+require 'glimmer/swt/widget_proxy'
+
+module Glimmer
+  module SWT
+    class BrowserProxy < WidgetProxy
+      attr_reader :url
+      
+      def url=(value)
+        @url = value
+        redraw
+      end
+    
+      def element
+        'iframe'
+      end
+    
+      def dom
+        iframe_id = id
+        iframe_url = url
+        @dom ||= html {
+          iframe(id: iframe_id, class: name, src: iframe_url, frameBorder: 0) {
+          }
+        }.to_s
+      end      
+    end
+  end
+end

data/lib/glimmer/swt/button_proxy.rb

@@ -0,0 +1,40 @@
+require 'glimmer/swt/widget_proxy'
+
+module Glimmer
+  module SWT
+    class ButtonProxy < WidgetProxy
+      attr_reader :text
+      
+      def text=(value)
+        @text = value
+        redraw
+      end
+      
+      def element
+        'button'
+      end
+
+      def observation_request_to_event_mapping
+        {
+          'on_widget_selected' => {
+            event: 'click'
+          }, 
+        }
+      end
+      
+      def dom
+        input_text = @text
+        input_id = id
+        input_style = css
+        input_args = {}
+        input_disabled = @enabled ? {} : {'disabled': 'disabled'}
+        input_args = input_args.merge(type: 'password') if has_style?(:password)
+        @dom ||= html {
+          button(input_args.merge(id: input_id, class: name, style: input_style, style: 'min-width: 27px;').merge(input_disabled)) {
+            input_text.to_s == '' ? '&nbsp;' : input_text
+          }
+        }.to_s
+      end
+    end
+  end
+end

data/lib/glimmer/{opal/select_proxy.rb → swt/combo_proxy.rb}

@@ -1,10 +1,9 @@
 require 'glimmer/data_binding/observable_element'
-require 'glimmer/opal/event_listener_proxy'
-require 'glimmer/opal/element_proxy'
+require 'glimmer/swt/widget_proxy'
 
 module Glimmer
-  module Opal
-    class SelectProxy < ElementProxy
+  module SWT
+    class ComboProxy < WidgetProxy
       include Glimmer::DataBinding::ObservableElement
       attr_reader :text, :items
       
@@ -13,9 +12,13 @@ module Glimmer
         @items = []
       end
       
+      def element
+        'select'
+      end
+      
       def text=(value)
         @text = value
-        redraw
+        Document.find(path).value = value
       end
       
       def items=(the_items)
@@ -23,12 +26,12 @@ module Glimmer
         redraw
       end
 
-      def observation_request_to_event_mapping
+      def observation_request_to_event_mapping      
         {
           'on_widget_selected' => {
             event: 'change',
             event_handler: -> (event_listener) {
-              -> (event) {
+              -> (event) {                
                 @text = event.target.value
                 event_listener.call(event)              
               }
@@ -42,8 +45,9 @@ module Glimmer
         items = @items
         select_id = id
         select_style = css
-        @dom ||= DOM {
-          select(id: select_id, style: select_style) {
+        select_class = name
+        @dom ||= html {
+          select(id: select_id, class: select_class, style: select_style) {
             items.to_a.each do |item|
               option_hash = {value: item}
               option_hash[:selected] = 'selected' if select_text == item
@@ -52,7 +56,7 @@ module Glimmer
               } 
             end
           }
-        }
+        }.to_s
       end
     end
   end

data/lib/glimmer/{opal/div_proxy.rb → swt/composite_proxy.rb}

@@ -1,8 +1,9 @@
-require 'glimmer/opal/element_proxy'
+require 'glimmer/swt/grid_layout_proxy'
+require 'glimmer/swt/widget_proxy'
 
 module Glimmer
-  module Opal
-    class DivProxy < ElementProxy
+  module SWT
+    class CompositeProxy < WidgetProxy
       attr_reader :layout
       
       def initialize(parent, args)
@@ -20,9 +21,10 @@ module Glimmer
       def dom
         div_id = id
         div_style = css
-        @dom ||= DOM {
-          div(id: div_id, class: 'grid-layout', style: div_style)
-        }
+        div_class = "#{name} grid-layout"
+        @dom ||= html {
+          div(id: div_id, class: div_class, style: div_style)
+        }.to_s
       end
     end
   end

data/lib/glimmer/{opal → swt}/event_listener_proxy.rb

@@ -1,5 +1,5 @@
 module Glimmer
-  module Opal
+  module SWT
     class EventListenerProxy
       attr_reader :element_proxy, :event, :selector, :delegate
 

data/lib/glimmer/{opal → swt}/grid_layout_proxy.rb

@@ -1,15 +1,12 @@
-require 'glimmer/opal/property_owner'
+require 'glimmer/swt/layout_proxy'
 
 module Glimmer
-  module Opal
-    class GridLayoutProxy
-      include PropertyOwner
-      attr_reader :parent, :args, :num_columns, :make_columns_equal_width, :horizontal_spacing, :vertical_spacing
+  module SWT
+    class GridLayoutProxy < LayoutProxy
+      attr_reader :num_columns, :make_columns_equal_width, :horizontal_spacing, :vertical_spacing
     
       def initialize(parent, args)
-        @parent = parent
-        @args = args
-        @parent.add_css_class('grid-layout')
+        super(parent, args)
         @horizontal_spacing = 10
         @vertical_spacing = 10
         @num_columns = @args.first || 1        
@@ -39,16 +36,6 @@ module Glimmer
 #         @parent.add_css_class("vertical-spacing-#{@vertical_spacing}")
         reapply
       end
-      
-      def reapply
-        @parent.css = <<~CSS
-          display: grid;
-          grid-template-columns: #{'auto ' * @num_columns.to_i};
-          grid-row-gap: #{@vertical_spacing}px;
-          grid-column-gap: #{@horizontal_spacing}px;
-          justify-content: start;
-        CSS
-      end
     end
   end
 end

data/lib/glimmer/swt/label_proxy.rb

@@ -0,0 +1,30 @@
+require 'glimmer/swt/widget_proxy'
+
+module Glimmer
+  module SWT
+    class LabelProxy < WidgetProxy
+      attr_reader :text
+
+      def text=(value)
+        @text = value
+        redraw
+      end
+      
+      def element
+        'label'
+      end
+      
+      def dom
+        label_text = @text
+        label_id = id
+        label_style = css
+        label_class = name
+        @dom ||= html {
+          label(id: label_id, style: label_style, class: label_class) {
+            label_text
+          }
+        }.to_s
+      end
+    end
+  end
+end

data/lib/glimmer/{opal → swt}/layout_data_proxy.rb

@@ -1,9 +1,9 @@
-require 'glimmer/opal/property_owner'
+require 'glimmer/swt/property_owner'
 
 module Glimmer
-  module Opal
+  module SWT
     class LayoutDataProxy
-      include PropertyOwner
+      include Glimmer::SWT::PropertyOwner
       attr_reader :parent, 
                   :args, 
                   :horizontal_alignment, 

data/lib/glimmer/swt/layout_proxy.rb

@@ -0,0 +1,60 @@
+require 'glimmer/swt/property_owner'
+
+module Glimmer
+  module SWT
+    class LayoutProxy
+      include Glimmer::SWT::PropertyOwner
+      
+      class << self
+        # Factory Method that translates a Glimmer DSL keyword into a WidgetProxy object
+        def for(keyword, parent, args)
+          the_layout_class = layout_class(keyword) || Glimmer::SWT::GridLayoutProxy
+          the_layout_class.new(parent, args)
+        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)
+          a_layout_class if a_layout_class.ancestors.include?(Glimmer::SWT::LayoutProxy)
+        rescue => e
+          puts "Layout #{keyword} was not found!"
+          nil
+        end
+        
+        def layout_exists?(keyword)
+          !!layout_class(keyword)
+        end
+      end      
+      
+      attr_reader :parent, :args
+        
+      def initialize(parent, args)
+        @parent = parent
+        @args = args
+        @parent.add_css_class(css_class)
+      end
+
+      def css_class
+        self.class.name.split('::').last.underscore.sub(/_proxy$/, '').gsub('_', '-')
+      end
+      
+      def reapply
+        layout_css = <<~CSS
+          display: grid;
+          grid-template-columns: #{'auto ' * @num_columns.to_i};
+          grid-row-gap: #{@vertical_spacing}px;
+          grid-column-gap: #{@horizontal_spacing}px;
+          justify-content: start;
+        CSS
+        layout_css.split(";").map(&:strip).map {|l| l.split(':').map(&:strip)}.each do |key, value|
+          unless key.nil?
+            @parent.dom_element.css(key, value)
+          end
+        end
+      end
+    end
+  end
+end
+
+require 'glimmer/swt/grid_layout_proxy'