glimmer-dsl-opal 0.7.0 → 0.7.5

data/lib/glimmer/swt/text_proxy.rb

@@ -72,7 +72,7 @@ module Glimmer
                 doit
               }
             }
-          }
+          },
         }
       end
       

data/lib/glimmer/swt/widget_proxy.rb

@@ -29,7 +29,10 @@ module Glimmer
       include Glimmer
       include PropertyOwner
       
-      attr_reader :parent, :args, :path, :children, :enabled, :foreground, :background, :font, :focus
+      attr_reader :parent, :args, :path, :children, :enabled, :foreground, :background, :font, :focus, :disposed?, :rendered
+      alias isDisposed disposed?
+      alias is_disposed disposed?
+      alias rendered? rendered
       
       class << self
         # Factory Method that translates a Glimmer DSL keyword into a WidgetProxy object
@@ -103,6 +106,7 @@ module Glimmer
         @block = block
         @children = Set.new # TODO consider moving to composite
         @enabled = true
+        @data = {}
         DEFAULT_INITIALIZERS[self.class.underscored_widget_name(self)]&.call(self)
         @parent.post_initialize_child(self) # TODO rename to post_initialize_child to be closer to glimmer-dsl-swt terminology
       end
@@ -113,17 +117,52 @@ module Glimmer
         child.render
       end
       
+      # Executes for the parent of a child that just got disposed
+      def post_dispose_child(child)
+        @children&.delete(child)
+      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 set_data(key=nil, value)
+        @data[key] = value
+      end
+      alias setData set_data
+      alias data= set_data
+      
+      def get_data(key=nil)
+        @data[key]
+      end
+      alias getData get_data
+      alias data get_data
+      
       def css_classes
         dom_element.attr('class').to_s.split
       end
       
       def dispose
+        remove_all_listeners
         Document.find(path).remove
+        parent&.post_dispose_child(self)
+        # TODO fire on_widget_disposed listener
+        @disposed = true
+      end
+      
+      def remove_all_listeners
+        effective_observation_request_to_event_mapping.keys.each do |keyword|
+          effective_observation_request_to_event_mapping[keyword].to_collection.each do |mapping|
+            observation_requests[keyword].to_a.each do |event_listener|
+              event = mapping[:event]
+              event_handler = mapping[:event_handler]
+              event_element_css_selector = mapping[:event_element_css_selector]
+              the_listener_dom_element = event_element_css_selector ? Element[event_element_css_selector] : listener_dom_element
+              the_listener_dom_element.off(event)
+            end
+          end
+        end
       end
       
       def path
@@ -172,31 +211,52 @@ module Glimmer
         @parent.path
       end
 
-      def render
+      def parent_dom_element
+        Document.find(parent_path)
+      end
+      
+      def render(custom_parent_dom_element = nil)
+        the_parent_dom_element = custom_parent_dom_element || parent_dom_element
         old_element = dom_element
         brand_new = @dom.nil? || old_element.empty?
-        build_dom
+        build_dom(!custom_parent_dom_element) # TODO handle custom parent layout by passing parent instead of parent dom element
         if brand_new
-          Document.find(parent_path).append(@dom)
+          the_parent_dom_element.append(@dom)
         else
           old_element.replace_with(@dom)
         end
-        @observation_requests&.clone&.each do |keyword, event_listener_set|
+        observation_requests&.clone&.each do |keyword, event_listener_set|
           event_listener_set.each do |event_listener|
-            @observation_requests[keyword].delete(event_listener)
+            observation_requests[keyword].delete(event_listener) # TODO look into the implications of this and if it's needed.
             handle_observation_request(keyword, &event_listener)
           end
         end
         children.each do |child|
           child.render
         end
+        @rendered = true
+        content_on_render_blocks.each { |content_block| content(&content_block) }
       end
       alias redraw render
       
-      def build_dom
+      def content_on_render_blocks
+        @content_on_render_blocks ||= []
+      end
+      
+      def add_content_on_render(&content_block)
+        if rendered?
+          content_block.call
+        else
+          content_on_render_blocks << content_block
+        end
+      end
+      
+      def build_dom(layout=true)
+        # 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
       end
       
       def content(&block)
@@ -208,6 +268,21 @@ module Glimmer
         {}
       end
       
+      def effective_observation_request_to_event_mapping
+        default_observation_request_to_event_mapping.merge(observation_request_to_event_mapping)
+      end
+      
+      def default_observation_request_to_event_mapping
+        {
+          'on_focus_gained' => {
+            event: 'focus',
+          },
+          'on_focus_lost' => {
+            event: 'blur',
+          },
+        }
+      end
+      
       def name
         self.class.name.split('::').last.underscore.sub(/_proxy$/, '').gsub('_', '-')
       end
@@ -271,10 +346,6 @@ module Glimmer
         element
       end
       
-      def parent_dom_element
-        Document.find(parent_path)
-      end
-      
       def listener_path
         path
       end
@@ -296,14 +367,17 @@ module Glimmer
         end
       end
       
-      def handle_observation_request(keyword, &event_listener)
-        return unless observation_request_to_event_mapping.keys.include?(keyword)
+      def observation_requests
         @observation_requests ||= {}
-        @observation_requests[keyword] ||= Set.new
+      end
+      
+      def handle_observation_request(keyword, &event_listener)
+        return unless effective_observation_request_to_event_mapping.keys.include?(keyword)
         event = nil
         delegate = nil
-        [observation_request_to_event_mapping[keyword]].flatten.each do |mapping|
-          @observation_requests[keyword] << event_listener
+        effective_observation_request_to_event_mapping[keyword].to_collection.each do |mapping|
+          observation_requests[keyword] ||= Set.new
+          observation_requests[keyword] << event_listener
           event = mapping[:event]
           event_handler = mapping[:event_handler]
           event_element_css_selector = mapping[:event_element_css_selector]
@@ -334,6 +408,14 @@ module Glimmer
         super(attribute_name, *args) # PropertyOwner
       end
       
+      def method_missing(method, *args, &block)
+        if method.to_s.start_with?('on_')
+          handle_observation_request(method, &block)
+        else
+          super(method, *args, &block)
+        end
+      end
+      
       def apply_property_type_converters(attribute_name, args)
         if args.count == 1
           value = args.first
@@ -491,11 +573,7 @@ module Glimmer
           TableProxy => {
             :selection => lambda do |observer|
               on_widget_selected { |selection_event|
-                if has_style?(:multi)
-                  observer.call(selection.map(&:get_data))
-                else
-                  observer.call(selection.first&.get_data)
-                end
+                observer.call(selection_event.table_item.get_data)  # TODO ensure selection doesn't conflict with editing
               }
             end,
           },

data/lib/glimmer/ui/custom_shell.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
@@ -31,8 +31,10 @@ module Glimmer
       class << self
         def included(klass)
           klass.extend(CustomWidget::ClassMethods)
-          klass.include(Glimmer) 
+          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
@@ -44,12 +46,12 @@ module Glimmer
         end
         
         def requested_and_not_handled?
-          requested? && !request_parameter_string.include?('custom_shell_handled=true')        
-        end   
+          requested? && !request_parameter_string.include?('custom_shell_handled=true')
+        end
         
         def requested?
           request_parameter_string.include?('custom_shell=')
-        end   
+        end
       end
       
       def initialize(parent, args, options, &content)

data/lib/os.rb

@@ -0,0 +1,36 @@
+# 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
+# without limitation the rights to use, copy, modify, merge, publish,
+# 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
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+class OS
+  class << self
+    def windows?
+      # No Op in Opal
+    end
+    
+    def mac?
+      # No Op in Opal
+    end
+    
+    def linux?
+      # No Op in Opal
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-opal
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.5
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-02 00:00:00.000000000 Z
+date: 2020-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.0
+- !ruby/object:Gem::Dependency
+  name: to_collection
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: puts_debuggerer
   requirement: !ruby/object:Gem::Requirement
@@ -196,7 +210,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.4
-description: Glimmer DSL for Opal (Web GUI Adapter for Desktop Apps)
+description: Glimmer DSL for Opal (Pure Ruby Web GUI and Auto-Webifier of Desktop
+  Apps Running via Opal on Rails)
 email: andy.am@gmail.com
 executables: []
 extensions: []
@@ -222,9 +237,12 @@ files:
 - app/assets/stylesheets/glimmer/jquery-ui.structure.css
 - app/assets/stylesheets/glimmer/jquery-ui.theme.css
 - app/assets/stylesheets/glimmer/jquery.ui.timepicker.css
+- lib/display.rb
+- lib/file.rb
 - lib/glimmer-dsl-opal.rb
 - lib/glimmer-dsl-opal/ext/date.rb
 - lib/glimmer-dsl-opal/ext/exception.rb
+- lib/glimmer-dsl-opal/ext/struct.rb
 - lib/glimmer-dsl-opal/samples/elaborate/contact_manager.rb
 - lib/glimmer-dsl-opal/samples/elaborate/contact_manager/contact.rb
 - lib/glimmer-dsl-opal/samples/elaborate/contact_manager/contact_manager_presenter.rb
@@ -234,6 +252,7 @@ files:
 - lib/glimmer-dsl-opal/samples/elaborate/tic_tac_toe/board.rb
 - lib/glimmer-dsl-opal/samples/elaborate/tic_tac_toe/cell.rb
 - lib/glimmer-dsl-opal/samples/hello/hello_browser.rb
+- lib/glimmer-dsl-opal/samples/hello/hello_button.rb
 - lib/glimmer-dsl-opal/samples/hello/hello_checkbox.rb
 - lib/glimmer-dsl-opal/samples/hello/hello_checkbox_group.rb
 - lib/glimmer-dsl-opal/samples/hello/hello_combo.rb
@@ -311,6 +330,7 @@ files:
 - lib/glimmer/swt/color_proxy.rb
 - lib/glimmer/swt/combo_proxy.rb
 - lib/glimmer/swt/composite_proxy.rb
+- lib/glimmer/swt/control_editor.rb
 - lib/glimmer/swt/custom/checkbox_group.rb
 - lib/glimmer/swt/custom/radio_group.rb
 - lib/glimmer/swt/date_time_proxy.rb
@@ -338,6 +358,7 @@ files:
 - lib/glimmer/swt/tab_folder_proxy.rb
 - lib/glimmer/swt/tab_item_proxy.rb
 - lib/glimmer/swt/table_column_proxy.rb
+- lib/glimmer/swt/table_editor.rb
 - lib/glimmer/swt/table_item_proxy.rb
 - lib/glimmer/swt/table_proxy.rb
 - lib/glimmer/swt/text_proxy.rb
@@ -346,6 +367,7 @@ files:
 - lib/glimmer/ui/custom_widget.rb
 - lib/glimmer/util/proc_tracker.rb
 - lib/net/http.rb
+- lib/os.rb
 - lib/uri.rb
 homepage: http://github.com/AndyObtiva/glimmer-dsl-opal
 licenses: