glimmer-dsl-opal 0.5.1 → 0.6.0

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

@@ -13,14 +13,14 @@ module Glimmer
         include TopLevelExpression
         include ParentExpression
 
-        def interpret(parent, keyword, *args, &block)          
+        def interpret(parent, keyword, *args, &block)
           if Glimmer::UI::CustomShell.requested_and_not_handled?
             parameters = Glimmer::UI::CustomShell.request_parameter_string.split("&").map {|str| str.split("=")}.to_h
             `history.pushState(#{parameters.merge('custom_shell_handled' => 'true')}, document.title, #{"?#{Glimmer::UI::CustomShell.encoded_request_parameter_string}&custom_shell_handled=true"})`
             custom_shell_keyword = parameters.delete('custom_shell')
             CustomWidgetExpression.new.interpret(nil, custom_shell_keyword, *[parameters])
             `history.pushState(#{parameters.reject {|k,v| k == 'custom_shell_handled'}}, document.title, #{"?#{Glimmer::UI::CustomShell.encoded_request_parameter_string.sub('&custom_shell_handled=true', '')}"})`
-            # just a placeholder that has an open method # TODO return an actual CustomShell in the future that does the work happening above in the #open method            
+            # just a placeholder that has an open method # TODO return an actual CustomShell in the future that does the work happening above in the #open method
             Glimmer::SWT::MakeShiftShellProxy.new
           else
             Glimmer::SWT::ShellProxy.new(*args)
@@ -30,6 +30,11 @@ module Glimmer
         def add_content(parent, &content)
           content.call(parent) if parent.is_a?(Glimmer::SWT::ShellProxy)
         end
+
+        def add_content(parent, &block)
+          super(parent, &block)
+          parent.post_add_content
+        end
       end
     end
   end

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

@@ -18,6 +18,11 @@ module Glimmer
         def interpret(parent, keyword, *args, &block)
           Glimmer::SWT::WidgetProxy.for(keyword, parent, args)
         end
+
+        def add_content(parent, &block)
+          super(parent, &block)
+          parent.post_add_content
+        end
       end
     end
   end

data/lib/glimmer/engine.rb

@@ -0,0 +1,9 @@
+module Glimmer
+  class Engine < ::Rails::Engine
+    isolate_namespace Glimmer
+
+    initializer "glimmer.assets.precompile" do |app|
+      app.config.assets.precompile += %w( glimmer.css jquery-ui.css jquery-ui.structure.css jquery-ui.theme.css jquery.ui.timepicker.css )
+    end
+  end
+end

data/lib/glimmer/swt.rb

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

data/lib/glimmer/swt/button_proxy.rb

@@ -6,7 +6,7 @@ module Glimmer
   module SWT
     class ButtonProxy < WidgetProxy
       class << self
-        def create(parent, args)
+        def create(keyword, parent, args)
           if args.to_a.include?(:radio)
             RadioProxy.new(parent, args)
           elsif args.to_a.include?(:check)

data/lib/glimmer/swt/checkbox_proxy.rb

@@ -3,6 +3,7 @@ require 'glimmer/swt/widget_proxy'
 module Glimmer
   module SWT
     class CheckboxProxy < WidgetProxy
+      # TODO add a create method that ensures passing :check style in if not there
       STYLE=<<~CSS
         .checkbox {
           display: inline;

data/lib/glimmer/swt/date_time_proxy.rb

@@ -0,0 +1,144 @@
+require 'glimmer/swt/widget_proxy'
+
+module Glimmer
+  module SWT
+    class DateTimeProxy < WidgetProxy
+      class << self
+        def create(keyword, parent, args)
+          case keyword
+          when 'date'
+            args += [:date]
+          when 'date_drop_down'
+            args += [:date, :drop_down]
+          when 'time'
+            args += [:time]
+          when 'calendar'
+            args += [:calendar]
+          end
+          new(parent, args)
+        end
+      end
+      
+      def initialize(parent, args)
+        super(parent, args)
+      end
+      
+      def post_add_content
+        # TODO handle date_drop_down version
+        if time?
+          dom_element.timepicker({
+            showPeriod: true,
+            showLeadingZero: true,
+            showOn: 'both',
+            button: "##{time_button_id}",
+          })
+        else
+          options = {}
+          if drop_down?
+            options = {
+              showOn: 'both',
+              buttonImage: 'assets/glimmer/images/calendar.gif',
+              buttonImageOnly: true,
+              buttonText: 'Select date'
+            }
+          end
+          dom_element.datepicker(options)
+        end
+        date_time_value = self.date_time
+        @added_content = true
+        self.date_time = date_time_value
+      end
+      
+      def date?
+        args.to_a.include?(:date)
+      end
+      
+      def time?
+        args.to_a.include?(:time)
+      end
+      
+      def drop_down?
+        args.to_a.include?(:drop_down)
+      end
+      
+      def calendar?
+        args.to_a.include?(:calendar)
+      end
+      
+      def date_time
+        if @added_content
+          default_date = DateTime.new if @date_time.nil?
+          default_year = @date_time&.year || default_date.year
+          default_month = @date_time&.month || default_date.month
+          default_day = @date_time&.day || default_date.day
+          default_hour = @date_time&.hour || default_date.hour
+          default_min = @date_time&.min || default_date.min
+          default_sec = @date_time&.sec || default_date.sec
+          if time?
+            @date_time = DateTime.new(default_year, default_month, default_day, dom_element.timepicker('getHour').to_i, dom_element.timepicker('getMinute').to_i, default_sec)
+          else
+            @date_time = DateTime.new(dom_element.datepicker('getDate')&.year.to_i, dom_element.datepicker('getDate')&.month.to_i, dom_element.datepicker('getDate')&.day.to_i, default_hour, default_min, default_sec)
+          end
+          @date_time = @date_time&.to_datetime
+        else
+          @initial_date_time
+        end
+      end
+      
+      def date_time=(value)
+        if @added_content
+          @date_time = value&.to_datetime || DateTime.new
+          if time?
+            dom_element.timepicker('setTime', "#{@date_time.hour}:#{@date_time.min}")
+          else
+            dom_element.datepicker('setDate', @date_time.to_time)
+          end
+        else
+          @initial_date_time = value
+        end
+      end
+      
+      # TODO add date, time, year, month, day, hours, minutes, seconds attribute methods
+      
+      def observation_request_to_event_mapping
+        {
+          'on_widget_selected' => [
+            {
+              event: 'change'
+            },
+          ],
+        }
+      end
+      
+      def time_button_id
+        "#{id}-time-button"
+      end
+      
+      def time_button_class
+        "#{name}-time-button"
+      end
+      
+      def element
+        calendar? ? 'div' : 'input'
+      end
+      
+      def dom
+        @dom ||= html {
+          span {
+            send(element, type: 'text', id: id, class: name)
+            button(id: time_button_id, class: time_button_class, style: "border: none; background: url(assets/glimmer/images/ui-icons_222222_256x240.png) -80px, -96px; width: 16px; height: 16px;") if time?
+          }
+        }.to_s
+      end
+      
+    end
+    
+    # Aliases: `date`, `date_drop_down`, `time`, and `calendar`
+    DateProxy         = DateTimeProxy
+    DateDropDownProxy = DateTimeProxy
+    TimeProxy         = DateTimeProxy
+    CalendarProxy     = DateTimeProxy
+    
+  end
+  
+end

data/lib/glimmer/swt/make_shift_shell_proxy.rb

@@ -1,5 +1,5 @@
 # Copyright (c) 2020 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
@@ -26,7 +26,7 @@ module Glimmer
         # No Op
       end
       
-      def add_child(child)
+      def post_initialize_child(child)
         # No Op
       end
       

data/lib/glimmer/swt/message_box_proxy.rb

@@ -37,7 +37,7 @@ module Glimmer
       end
       
       def open
-        document.add_child(self)
+        document.post_initialize_child(self)
       end
       
       def hide
@@ -53,11 +53,11 @@ module Glimmer
       end
       
       def selector
-        super + ' .close' 
+        super + ' .close'
       end
     
       def listener_path
-        path + ' .close' 
+        path + ' .close'
       end
     
       def observation_request_to_event_mapping
@@ -66,7 +66,7 @@ module Glimmer
             event: 'click'
           },
         }
-      end      
+      end
  
       def style_dom_modal_css
         <<~CSS
@@ -119,11 +119,11 @@ module Glimmer
         modal_text = text
         modal_message = message
         modal_class = ['modal', name].join(' ')
-        @dom ||= html {        
+        @dom ||= html {
           div(id: modal_id, style: modal_style, class: modal_class) {
             style(class: 'modal-style') {
               style_dom_modal_css #.split("\n").map(&:strip).join(' ')
-            }        
+            }
             div(class: 'modal-content') {
               header(class: 'text') {
                 modal_text

data/lib/glimmer/swt/radio_proxy.rb

@@ -3,6 +3,7 @@ require 'glimmer/swt/widget_proxy'
 module Glimmer
   module SWT
     class RadioProxy < WidgetProxy
+      # TODO add a create method that ensures passing :radio style in if not there
       STYLE=<<~CSS
         .radio {
           display: inline;

data/lib/glimmer/swt/tab_folder_proxy.rb

@@ -2,7 +2,7 @@ require 'glimmer/swt/widget_proxy'
 
 module Glimmer
   module SWT
-    class TabFolderProxy < WidgetProxy      
+    class TabFolderProxy < WidgetProxy
       attr_reader :tabs
       
       def initialize(parent, args)
@@ -10,9 +10,9 @@ module Glimmer
         @tabs = []
       end
       
-      def add_child(child)
+      def post_initialize_child(child)
         unless @children.include?(child)
-          @children << child 
+          @children << child
           tabs_dom_element.append(child.tab_dom)
           child.render
         end

data/lib/glimmer/swt/table_proxy.rb

@@ -16,11 +16,11 @@ module Glimmer
       end
       
       # Only table_columns may be added as children
-      def add_child(child)
+      def post_initialize_child(child)
         if child.is_a?(TableColumnProxy)
           @columns << child
         else
-          @children << child        
+          @children << child
         end
         child.redraw
       end
@@ -36,14 +36,14 @@ module Glimmer
         changed.each(&:redraw)
       end
             
-      def items=(new_items)        
+      def items=(new_items)
         @children = new_items
         redraw
       end
       
       def search(&condition)
         items.select {|item| condition.nil? || condition.call(item)}
-      end      
+      end
       
       def index_of(item)
         items.index(item)
@@ -84,9 +84,9 @@ module Glimmer
             event.singleton_class.send(:define_method, :column_index) do
               (table_data || event.target).attr('data-column-index')
             end
-            event_listener.call(event)              
+            event_listener.call(event)
           }
-        } 
+        }
 
         {
           'on_mouse_down' => {
@@ -102,7 +102,7 @@ module Glimmer
       
       def redraw
         super()
-        @columns.to_a.each(&:redraw)  
+        @columns.to_a.each(&:redraw)
       end
       
       def element
@@ -125,7 +125,7 @@ module Glimmer
         Document.find(items_path)
       end
       
-      def columns_dom        
+      def columns_dom
         tr {
         }
       end
@@ -134,9 +134,9 @@ module Glimmer
         thead {
           columns_dom
         }
-      end            
+      end
       
-      def items_dom        
+      def items_dom
         tbody {
         }
       end

data/lib/glimmer/swt/text_proxy.rb

@@ -21,12 +21,12 @@ module Glimmer
             event_handler: -> (event_listener) {
               -> (event) {
                 @text = event.target.value
-                event_listener.call(event)              
+                event_listener.call(event)
               }
             }
           }
         }
-      end      
+      end
       
       def dom
         text_text = @text

data/lib/glimmer/swt/widget_proxy.rb

@@ -35,7 +35,7 @@ module Glimmer
         # Factory Method that translates a Glimmer DSL keyword into a WidgetProxy object
         def for(keyword, parent, args)
           the_widget_class = widget_class(keyword)
-          the_widget_class.respond_to?(:create) ? the_widget_class.create(parent, args) : the_widget_class.new(parent, args)
+          the_widget_class.respond_to?(:create) ? the_widget_class.create(keyword, parent, args) : the_widget_class.new(parent, args)
         end
         
         def widget_class(keyword)
@@ -103,7 +103,18 @@ module Glimmer
         @children = Set.new # TODO consider moving to composite
         @enabled = true
         DEFAULT_INITIALIZERS[self.class.underscored_widget_name(self)]&.call(self)
-        @parent.add_child(self) # TODO rename to post_initialize_child to be closer to glimmer-dsl-swt terminology
+        @parent.post_initialize_child(self) # TODO rename to post_initialize_child to be closer to glimmer-dsl-swt terminology
+      end
+      
+      # Executes for the parent of a child that just got added
+      def post_initialize_child(child)
+        @children << child
+        child.render
+      end
+      
+      # Executes at the closing of a parent widget curly braces after all children/properties have been added/set
+      def post_add_content
+        # No Op by default
       end
       
       def css_classes
@@ -123,11 +134,6 @@ module Glimmer
         'div'
       end
 
-      def add_child(child)
-        @children << child
-        child.render
-      end
-      
       def enabled=(value)
         @enabled = value
         dom_element.prop('disabled', !@enabled)
@@ -248,6 +254,8 @@ module Glimmer
         Document.find(path)
       end
       
+      # TODO consider adding a default #dom method implementation for the common case, automatically relying on #element and other methods to build the dom html
+      
       def style_element
         style_element_id = "#{id}-style"
         style_element_selector = "style##{style_element_id}"
@@ -458,6 +466,13 @@ module Glimmer
 #               }
 #             end,
 #           },
+          DateTimeProxy => { #radio?
+            :date_time => lambda do |observer|
+              on_widget_selected { |selection_event|
+                observer.call(date_time)
+              }
+            end
+          },
           RadioProxy => { #radio?
             :selection => lambda do |observer|
               on_widget_selected { |selection_event|
@@ -491,6 +506,7 @@ require 'glimmer/swt/button_proxy'
 require 'glimmer/swt/combo_proxy'
 require 'glimmer/swt/checkbox_proxy'
 require 'glimmer/swt/composite_proxy'
+require 'glimmer/swt/date_time_proxy'
 require 'glimmer/swt/group_proxy'
 require 'glimmer/swt/label_proxy'
 require 'glimmer/swt/list_proxy'