glimmer-dsl-opal 0.10.3 → 0.15.1

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

@@ -12,10 +12,10 @@ module Glimmer
           keyword == "items" and
             block.nil? and
             parent.is_a?(Glimmer::SWT::TableProxy) and
-            args.size == 2 and
+            args.size.between?(1, 2) and
             args[0].is_a?(DataBinding::ModelBinding) and
             args[0].evaluate_property.is_a?(Array) and
-            args[1].is_a?(Array)
+            (args[1].nil? or args[1].is_a?(Array))
         end
   
         def interpret(parent, keyword, *args, &block)

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

@@ -20,7 +20,7 @@ module Glimmer
           Glimmer::SWT::WidgetProxy.for(keyword, parent, args, block)
         end
         
-        def add_content(parent, &block)
+        def add_content(parent, keyword, *args, &block)
           if parent.rendered? || parent.skip_content_on_render_blocks?
             super(parent, &block)
             parent.post_add_content

data/lib/glimmer/engine.rb

@@ -1,3 +1,24 @@
+# Copyright (c) 2020-2021 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.
+
 module Glimmer
   class Engine < ::Rails::Engine
     isolate_namespace Glimmer

data/lib/glimmer/swt/combo_proxy.rb

@@ -6,6 +6,7 @@ module Glimmer
     class ComboProxy < WidgetProxy
       include Glimmer::DataBinding::ObservableElement
       attr_reader :text, :items
+      attr_accessor :selection # virtual attribute just to pass the shine data-binding test (TODO THINK OF A BETTER WAY OF HANDLING THIS)
       
       def initialize(parent, args, block)
         super(parent, args, block)

data/lib/glimmer/swt/composite_proxy.rb

@@ -1,3 +1,24 @@
+# Copyright (c) 2020-2021 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.
+
 require 'glimmer/swt/grid_layout_proxy'
 require 'glimmer/swt/widget_proxy'
 
@@ -41,6 +62,19 @@ module Glimmer
         # TODO implement layout(changed = nil, all = nil) just as per SWT API
         @layout&.layout(self, changed)
       end
+      
+      # background image
+      def background_image
+        @background_image
+      end
+      
+      # background image is stretched by default
+      def background_image=(value)
+        @background_image = value
+        dom_element.css('background-image', "url(#{background_image})")
+        dom_element.css('background-repeat', 'no-repeat')
+        dom_element.css('background-size', 'cover')
+      end
             
     end
     

data/lib/glimmer/swt/dialog_proxy.rb

@@ -138,7 +138,7 @@ module Glimmer
       
       
       def content(&block)
-        Glimmer::DSL::Engine.add_content(self, Glimmer::DSL::Opal::DialogExpression.new, &block)
+        Glimmer::DSL::Engine.add_content(self, Glimmer::DSL::Opal::DialogExpression.new, 'dialog', &block)
       end
       
       def path

data/lib/glimmer/swt/display_proxy.rb

@@ -79,6 +79,7 @@ module Glimmer
            )
           queue = WidgetProxy.widget_handling_listener
         end
+        return block.call if !modal_open?
         schedule_async_exec(block, queue)
       end
       # sync_exec kept for API compatibility reasons

data/lib/glimmer/swt/layout_proxy.rb

@@ -1,3 +1,24 @@
+# Copyright (c) 2020-2021 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.
+
 require 'glimmer/swt/property_owner'
 
 module Glimmer
@@ -13,9 +34,8 @@ module Glimmer
         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)
+          class_name_main = "#{keyword.camelcase(:upper)}Proxy"
+          a_layout_class = Glimmer::SWT.const_get(class_name_main.to_sym)
           a_layout_class if a_layout_class.ancestors.include?(Glimmer::SWT::LayoutProxy)
         rescue => e
           Glimmer::Config.logger.debug "Layout #{keyword} was not found!"

data/lib/glimmer/swt/message_box_proxy.rb

@@ -118,7 +118,7 @@ module Glimmer
       end
       
       def content(&block)
-        Glimmer::DSL::Engine.add_content(self, Glimmer::DSL::Opal::MessageBoxExpression.new, &block)
+        Glimmer::DSL::Engine.add_content(self, Glimmer::DSL::Opal::MessageBoxExpression.new, 'message_box', *@args, &block)
       end
       
       def selector

data/lib/glimmer/swt/shell_proxy.rb

@@ -1,3 +1,24 @@
+# Copyright (c) 2020-2021 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.
+
 require 'glimmer/swt/widget_proxy'
 require 'glimmer/swt/layout_proxy'
 require 'glimmer/swt/display_proxy'
@@ -71,6 +92,28 @@ module Glimmer
         Document.title = value
       end
       
+      # favicon
+      def image
+        @image
+      end
+      
+      def image=(value)
+        @image = value
+        # TODO consider moving this code to favicon_dom_element
+        if favicon_dom_element.empty?
+          favicon_element = Element.new(:link)
+          favicon_element.attr('rel', 'icon')
+          Document.find('head').append(favicon_element)
+        else
+          favicon_element = favicon_dom_element
+        end
+        favicon_element.attr('href', image)
+      end
+      
+      def favicon_dom_element
+        Document.find('link[rel=icon]')
+      end
+      
       def minimum_size=(width_or_minimum_size, height = nil)
         @minimum_size = height.nil? ? width_or_minimum_size : Point.new(width_or_minimum_size, height)
         return if @minimum_size.nil?

data/lib/glimmer/swt/table_item_proxy.rb

@@ -28,6 +28,9 @@ module Glimmer
         tr.table-item td {
           padding-bottom: 0;
         }
+        tr.table-item:nth-child(odd):not(.selected) {
+          background: white;
+        }
         tr.table-item:nth-child(even):not(.selected) {
           background: rgb(243, 244, 246);
         }

data/lib/glimmer/swt/table_proxy.rb

@@ -257,9 +257,7 @@ module Glimmer
         @table_editor.minimumWidth = 90
         @table_editor.minimumHeight = 20
         if editable?
-          on_mouse_up { |event|
-            edit_table_item(event.table_item, event.column_index)
-          }
+          add_editable_event_listener
         end
       end
       
@@ -311,6 +309,24 @@ module Glimmer
       end
       alias editable editable?
       
+      def editable=(value)
+        if value
+          args.push(:editable)
+          dom_element.addClass('editable')
+          add_editable_event_listener
+        else
+          args.delete(:editable)
+          dom_element.removeClass('editable')
+          @editable_on_mouse_up_event_listener.deregister # TODO see why table event listener deregistration is not working
+        end
+      end
+      
+      def add_editable_event_listener
+        @editable_on_mouse_up_event_listener = on_mouse_up { |event|
+          edit_table_item(event.table_item, event.column_index) if editable?
+        }
+      end
+      
       def selection
         @selection.to_a
       end

data/lib/glimmer/swt/widget_proxy.rb

@@ -46,9 +46,8 @@ module Glimmer
         end
         
         def widget_class(keyword)
-          class_name_alternative = keyword.camelcase(:upper)
-          class_name_main = "#{class_name_alternative}Proxy"
-          Glimmer::SWT.const_get(class_name_main.to_sym) rescue Glimmer::SWT.const_get(class_name_alternative.to_sym)
+          class_name_main = "#{keyword.camelcase(:upper)}Proxy"
+          Glimmer::SWT.const_get(class_name_main.to_sym)
         rescue => e
           puts "Widget #{keyword} was not found!"
           nil
@@ -309,7 +308,7 @@ module Glimmer
       end
       
       def content(&block)
-        Glimmer::DSL::Engine.add_content(self, Glimmer::DSL::Opal::WidgetExpression.new, &block)
+        Glimmer::DSL::Engine.add_content(self, Glimmer::DSL::Opal::WidgetExpression.new, self.class.underscored_widget_name(self), &block)
       end
       
       # Subclasses must override with their own mappings

data/lib/glimmer/ui/custom_shell.rb

@@ -29,15 +29,12 @@ module Glimmer
       include Glimmer::UI::CustomWidget
       
       module ClassMethods
+        include Glimmer
         attr_reader :custom_shell
         
         def launch
-          @custom_shell = send(self.name.underscore.gsub('::', '__'))
-          @custom_shell.open
-        end
-        
-        def shutdown
-          @custom_shell.close
+          custom_shell = send(self.name.underscore.gsub('::', '__'))
+          custom_shell.open
         end
       end
       
@@ -73,11 +70,17 @@ module Glimmer
         raise Error, 'Invalid custom shell body root! Must be a shell or another custom shell.' unless body_root.is_a?(Glimmer::SWT::ShellProxy) || body_root.is_a?(Glimmer::UI::CustomShell)
       end
 
-      # Classes may override
-      def open
-        # TODO consider the idea of delaying rendering till the open method
-        body_root.open
+      def open(async: true)
+        work = lambda do
+          body_root.open
+        end
+        if async
+          Glimmer::SWT::DisplayProxy.instance.async_exec(&work)
+        else
+          work.call
+        end
       end
+      
 
       # DO NOT OVERRIDE. JUST AN ALIAS FOR `#open`. OVERRIDE `#open` INSTEAD.
       def show

data/lib/glimmer/ui/custom_widget.rb

@@ -83,6 +83,16 @@ module Glimmer
           @after_body_blocks ||= []
           @after_body_blocks << block
         end
+        
+        def keyword
+          self.name.underscore.gsub('::', '__')
+        end
+        
+        # Returns shortcut keyword to use for this custom widget (keyword minus namespace)
+        def shortcut_keyword
+          self.name.underscore.gsub('::', '__').split('__').last
+        end
+        
       end
       
       class << self
@@ -143,7 +153,6 @@ module Glimmer
         def reset_custom_widget_namespaces
           @custom_widget_namespaces = Set[Object, Glimmer::UI]
         end
-
       end
       # <- end of class methods
       
@@ -259,7 +268,7 @@ module Glimmer
       # 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)
+          Glimmer::DSL::Engine.add_content(self, Glimmer::DSL::Opal::CustomWidgetExpression.new, self.class.keyword, &block)
         else
           @content
         end

data/lib/net/http.rb

@@ -19,8 +19,6 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-# Missing Net module class methods TODO implement
-
 require_relative '../uri'
 
 module Net
@@ -30,11 +28,22 @@ module Net
   class HTTP
     class << self
       def post_form(uri, params)
-        response_body = nil
-        result = ::HTTP.post(uri, payload: params) do |response|
-           response_body = response.body
+        uri = "#{`window.location.protocol`}//#{File.join(uri)}" unless uri.start_with?('http:') || uri.start_with?('https:') # TODO refactor repetitive code
+        result = nil
+        ::HTTP.post(uri, {async: false, dataType: 'text', data: params}) do |response|
+          result = response.body if response.ok?
+        end
+        result
+      end
+      
+      def get(uri, path_and_params)
+        uri = File.join(uri, path_and_params)
+        uri = "#{`window.location.protocol`}//#{uri}" unless uri.start_with?('http:') || uri.start_with?('https:') # TODO refactor repetitive code
+        result = nil
+        ::HTTP.get(uri, {async: false, dataType: 'text'}) do |response|
+          result = response.body if response.ok?
         end
-        response_body
+        result
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-opal
 version: !ruby/object:Gem::Version
-  version: 0.10.3
+  version: 0.15.1
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-25 00:00:00.000000000 Z
+date: 2021-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer
@@ -16,56 +16,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.10
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.10
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: glimmer-dsl-xml
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: glimmer-dsl-css
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: opal-async
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: to_collection
   requirement: !ruby/object:Gem::Requirement
@@ -242,9 +242,11 @@ email: andy.am@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files:
+- CHANGELOG.md
 - LICENSE.txt
 - README.md
 files:
+- CHANGELOG.md
 - LICENSE.txt
 - README.md
 - VERSION
@@ -261,6 +263,10 @@ 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
+- app/controllers/glimmer/application_controller.rb
+- app/controllers/glimmer/image_paths_controller.rb
+- app/views/glimmer/image_paths/index.html.erb
+- config/routes.rb
 - lib/display.rb
 - lib/glimmer-dsl-opal.rb
 - lib/glimmer-dsl-opal/ext/class.rb
@@ -276,13 +282,13 @@ files:
 - lib/glimmer-dsl-opal/samples/elaborate/tic_tac_toe.rb
 - 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/elaborate/weather.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
 - lib/glimmer-dsl-opal/samples/hello/hello_computed.rb
-- lib/glimmer-dsl-opal/samples/hello/hello_computed/contact.rb
 - lib/glimmer-dsl-opal/samples/hello/hello_custom_shell.rb
 - lib/glimmer-dsl-opal/samples/hello/hello_custom_widget.rb
 - lib/glimmer-dsl-opal/samples/hello/hello_date_time.rb
@@ -297,6 +303,7 @@ files:
 - lib/glimmer-dsl-opal/samples/hello/hello_radio_group.rb
 - lib/glimmer-dsl-opal/samples/hello/hello_tab.rb
 - lib/glimmer-dsl-opal/samples/hello/hello_table.rb
+- lib/glimmer-dsl-opal/samples/hello/hello_table/baseball_park.png
 - lib/glimmer-dsl-opal/samples/hello/hello_world.rb
 - lib/glimmer-dsl-opal/vendor/jquery-ui-timepicker/GPL-LICENSE.txt
 - lib/glimmer-dsl-opal/vendor/jquery-ui-timepicker/MIT-LICENSE.txt
@@ -349,6 +356,7 @@ files:
 - lib/glimmer/dsl/opal/rgba_expression.rb
 - lib/glimmer/dsl/opal/shape_expression.rb
 - lib/glimmer/dsl/opal/shell_expression.rb
+- lib/glimmer/dsl/opal/shine_data_binding_expression.rb
 - lib/glimmer/dsl/opal/swt_expression.rb
 - lib/glimmer/dsl/opal/sync_exec_expression.rb
 - lib/glimmer/dsl/opal/table_column_expression.rb
@@ -428,7 +436,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: Glimmer DSL for Opal