glimmer-dsl-opal 0.13.0 → 0.16.1

data/lib/glimmer-dsl-opal/samples/hello/hello_computed.rb

@@ -19,20 +19,38 @@
 # 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_relative 'hello_computed/contact'
-
 class HelloComputed
-  include Glimmer
+  class Contact
+    attr_accessor :first_name, :last_name, :year_of_birth
+  
+    def initialize(attribute_map)
+      @first_name = attribute_map[:first_name]
+      @last_name = attribute_map[:last_name]
+      @year_of_birth = attribute_map[:year_of_birth]
+    end
+  
+    def name
+      "#{last_name}, #{first_name}"
+    end
+  
+    def age
+      Time.now.year - year_of_birth.to_i
+    rescue
+      0
+    end
+  end
+
+  include Glimmer::UI::CustomShell
 
-  def initialize
+  before_body {
     @contact = Contact.new(
       first_name: 'Barry',
       last_name: 'McKibbin',
       year_of_birth: 1985
     )
-  end
+  }
 
-  def launch
+  body {
     shell {
       text 'Hello, Computed!'
       
@@ -89,8 +107,8 @@ class HelloComputed
           }
         }
       }
-    }.open
-  end
+    }
+  }
 end
 
-HelloComputed.new.launch
+HelloComputed.launch

data/lib/glimmer-dsl-opal/samples/hello/hello_table.rb

@@ -179,25 +179,33 @@ class HelloTable
     end
   end
 
-  include Glimmer
-    
-  def launch
+  include Glimmer::UI::CustomShell
+  
+  before_body {
+    Display.app_name = 'Hello, Table!'
+  }
+  
+  body {
     shell {
       grid_layout
       
       text 'Hello, Table!'
+      background_image File.expand_path('hello_table/baseball_park.png', __dir__)
+      image File.expand_path('hello_table/baseball_park.png', __dir__)
       
       label {
         layout_data :center, :center, true, false
         
-        text 'Baseball Playoff Schedule'
-        font height: 30, style: :bold
+        text 'BASEBALL PLAYOFF SCHEDULE'
+        background :transparent if OS.windows?
+        foreground rgb(94, 107, 103)
+        font name: 'Optima', height: 38, style: :bold
       }
       
       combo(:read_only) {
         layout_data :center, :center, true, false
         selection <=> [BaseballGame, :playoff_type]
-        font height: 16
+        font height: 14
       }
       
       table(:editable) { |table_proxy|
@@ -248,29 +256,29 @@ class HelloTable
         # Sort by these additional properties after handling sort by the column the user clicked
         additional_sort_properties :date, :time, :home_team, :away_team, :ballpark, :promotion
         
-#         menu {
-#           menu_item {
-#             text 'Book'
-#
-#             on_widget_selected {
-#               book_selected_game
-#             }
-#           }
-#         }
+        menu {
+          menu_item {
+            text 'Book'
+            
+            on_widget_selected {
+              book_selected_game
+            }
+          }
+        }
       }
       
       button {
         text 'Book Selected Game'
         layout_data :center, :center, true, false
-        font height: 16
-        enabled <=> [BaseballGame, :selected_game]
+        font height: 14
+        enabled <= [BaseballGame, :selected_game]
         
         on_widget_selected {
           book_selected_game
         }
       }
-    }.open
-  end
+    }
+  }
   
   def book_selected_game
     message_box {
@@ -280,4 +288,4 @@ class HelloTable
   end
 end
 
-HelloTable.new.launch
+HelloTable.launch

data/lib/glimmer/config.rb

@@ -0,0 +1,11 @@
+module Glimmer
+  # Consumer Rails apps can set these attributes in their assets.rb file
+  module Config
+    class << self
+      # (server-side option) used to collect image paths for copying to assets & matching in Opal to download and use in Glimmer GUI
+      def gems_having_image_paths
+        @gems_having_image_paths ||= []
+      end
+    end
+  end
+end

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/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/grid_layout_proxy.rb

@@ -16,44 +16,27 @@ module Glimmer
     
       def num_columns=(columns)
         @num_columns = columns
-        # TODO do the following instead of reapply
-#         @parent.add_css_class("num-columns-#{@num_columns}")
-        # reinitialize # TODO reimplement without using reinitialize
-        layout_css = <<~CSS
-          grid-template-columns: #{'auto ' * @num_columns.to_i};
-          grid-row-gap: #{@vertical_spacing}px;
-          grid-column-gap: #{@horizontal_spacing}px;
-        CSS
-        if @parent.css_classes.include?('grid-layout')
-          layout_css.split(";").map(&:strip).map {|l| l.split(':').map(&:strip)}.each do |key, value|
-            @parent.dom_element.css(key, value) unless key.nil?
-          end
-          if @parent.is_a?(GroupProxy)
-            @parent.dom_element.find('legend').css('grid-column-start', "span #{@num_columns.to_i}")
-          end
-        else
-          layout_css.split(";").map(&:strip).map {|l| l.split(':').map(&:strip)}.each do |key, value|
-            @parent.dom_element.css(key, 'initial') unless key.nil?
-          end
-        end
+        @parent.dom_element.css('grid-template-columns', 'auto ' * @num_columns.to_i)
+        @parent.dom_element.find('legend').css('grid-column-start', "span #{@num_columns.to_i}") if @parent.is_a?(GroupProxy)
       end
       
       def make_columns_equal_width=(equal_width)
         @make_columns_equal_width = equal_width
-#         @parent.add_css_class('make_columns_equal_width') if @make_columns_equal_width
-        # reinitialize # TODO reimplement without using reinitialize
+        if @make_columns_equal_width
+          @parent.dom_element.css('grid-template-columns', "#{100.0/@num_columns.to_f}% " * @num_columns.to_i)
+        else
+          @parent.dom_element.css('grid-template-columns', 'auto ' * @num_columns.to_i)
+        end
       end
       
       def horizontal_spacing=(spacing)
         @horizontal_spacing = spacing
-#         @parent.add_css_class("horizontal-spacing-#{@horizontal_spacing}")
-        # reinitialize # TODO reimplement without using reinitialize
+        @parent.dom_element.css('grid-column-gap', "#{@horizontal_spacing}px")
       end
 
       def vertical_spacing=(spacing)
         @vertical_spacing = spacing
-#         @parent.add_css_class("vertical-spacing-#{@vertical_spacing}")
-        # reinitialize # TODO reimplement without using reinitialize
+        @parent.dom_element.css('grid-row-gap', "#{@vertical_spacing}px")
       end
       
       def margin_width=(pixels)
@@ -79,7 +62,8 @@ module Glimmer
         self.vertical_spacing = 10
         self.margin_width = 15
         self.margin_height = 15
-        self.num_columns = @args.first || 1
+        self.num_columns = @args[0] || 1
+        self.make_columns_equal_width = @args[1] || false
       end
     end
   end

data/lib/glimmer/swt/label_proxy.rb

@@ -40,12 +40,12 @@ module Glimmer
         text&.gsub("\n", '<br />')
       end
       
-      def background_image=(*image_options)
+#       def background_image=(*image_options)
         # TODO consider if there is a difference between background_image and image in label and to have one reuse the other
         # TODO finish implementation
 #         @background_image = Glimmer::SWT::ImageProxy.create(*image_options)
 #         dom_element.css('background-image', @background_image.image_data.dom_element.src)
-      end
+#       end
       
       def image=(*image_options)
         # TODO finish implementation
@@ -53,6 +53,19 @@ module Glimmer
 #         dom_element.css('background-image', @image.image_data.dom_element.src)
       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
+      
       def element
         'label'
       end

data/lib/glimmer/swt/layout_data_proxy.rb

@@ -92,7 +92,7 @@ module Glimmer
       def grab_excess_horizontal_space=(grab_excess_horizontal_space)
         @grab_excess_horizontal_space = grab_excess_horizontal_space
         @parent.dom_element.css('justify-self', @horizontal_alignment) if @grab_excess_horizontal_space && @horizontal_alignment != 'fill' && width_hint.nil?
-        @parent.parent.dom_element.css('justify-content', "normal") if @grab_excess_horizontal_space
+        @parent.parent.dom_element.css('justify-content', 'stretch') if @grab_excess_horizontal_space
 #         reapply
       end
 

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/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.13.0
+  version: 0.16.1
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-10 00:00:00.000000000 Z
+date: 2021-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: glimmer-dsl-xml
   requirement: !ruby/object:Gem::Requirement
@@ -263,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
@@ -278,13 +282,14 @@ 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_composite.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
@@ -299,6 +304,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
@@ -319,6 +325,7 @@ files:
 - lib/glimmer-dsl-opal/vendor/jquery-ui/package.json
 - lib/glimmer-dsl-opal/vendor/jquery.js
 - lib/glimmer-dsl-swt.rb
+- lib/glimmer/config.rb
 - lib/glimmer/config/opal_logger.rb
 - lib/glimmer/data_binding/element_binding.rb
 - lib/glimmer/data_binding/list_selection_binding.rb
@@ -431,7 +438,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: Glimmer DSL for Opal