glimmer-dsl-opal 0.14.0 → 0.16.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '009ae1a27f92b9fe4ae8d28374761c84a8a46add536c37b49c67aba167a121b7'
-  data.tar.gz: baf143fe8365b8a3164eaf74adc4a3df720521557003d0507f09580f0da9b6b3
+  metadata.gz: 73ea5888d9b6351e59225c868c98bf3c5f8d7bf20e1314bf2289be1528cd5d65
+  data.tar.gz: 0d5420f934e0d29a8fcdb15e68f2e30365f2d70d9d89e2dc19bbd24d14a91626
 SHA512:
-  metadata.gz: 81014168a1822232725770564b6f8a4522f08a4e93db72c4986966deaeac28eaffe7674f9446d7abf2d5a3a6056eec38a7f12508c72f751734bd8dc6356fdc2c
-  data.tar.gz: 800d13580d55f8c1255a68b7c07f6c4e7bdfb9308d3a41b14e44e94b50dd66056c9e437df38f73f2d04643633937cd0a99edba8a1ed174194cf8ce0be25328bf
+  metadata.gz: 79e7aae7f3b6e5342e2231f08330cf50e2c5574444b3f07c86b2166722e356e18ca6fb89a2ad21509951360432a42e8f6c449a19b5ff5737b08f521b8f473b79
+  data.tar.gz: 6f4be96f8c26c160b0d8d8d2dfc92d40cfa95fc79a76cfe886567cd2f55671861adf9b19cfdbc5d1f6fa78a1ce516f7ab46c330bdef2821a1a312b8b165c91cc

data/CHANGELOG.md

@@ -1,5 +1,30 @@
 # Change Log
 
+## 0.16.2
+
+- Support `grid_layout` `margin_top`, `margin_right`, `margin_bottom`, and `margin_left` attributes
+- Support `row_layout` `wrap` and `justify` attributes
+- Hello, Layout! sample
+- Partial CGI implementation to have `escapeHTML` (alias: `escape_html`) method
+- HTML Escape label text content
+- Fix issue with `row_layout` `fill` attribute not working
+
+## 0.16.1
+
+- Support `grid_layout` `make_columns_equal_width`, `horizontal_spacing`, and `vertical_spacing` attributes
+- Hello, Composite! sample
+
+## 0.16.0
+
+- Support label widget background_image attribute
+- Have File.expand_path support expanding paths even if they did not base off of __dir__ or __FILE__
+- Custom specification of gems having image paths via server-side configuration in Glimmer::Config.gems_having_image_paths
+
+## 0.15.1
+
+- Auto-expose images of gems that depend on glimmer-dsl-opal as downloadable asset links providing `/glimmer/image_paths` server call to obtain them
+- Update Hello, Table! to work with image background
+
 ## 0.14.0
 
 - Initial Net::HTTP support for get and post_form

data/README.md

@@ -1,4 +1,4 @@
-# [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=85 />](https://github.com/AndyObtiva/glimmer) Glimmer DSL for Opal 0.14.0 (Pure Ruby Web GUI)
+# [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=85 />](https://github.com/AndyObtiva/glimmer) Glimmer DSL for Opal 0.16.2 (Pure Ruby Web GUI)
 [![Gem Version](https://badge.fury.io/rb/glimmer-dsl-opal.svg)](http://badge.fury.io/rb/glimmer-dsl-opal)
 [![Join the chat at https://gitter.im/AndyObtiva/glimmer](https://badges.gitter.im/AndyObtiva/glimmer.svg)](https://gitter.im/AndyObtiva/glimmer?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
@@ -14,6 +14,8 @@ Glimmer DSL for Opal successfully reuses the entire [Glimmer](https://github.com
 
 #### Hello, Table! Sample
 
+Code: [lib/glimmer-dsl-opal/samples/hello/hello_table.rb](lib/glimmer-dsl-opal/samples/hello/hello_table.rb)
+
 Glimmer GUI code from [glimmer-dsl-opal/samples/hello/hello_table.rb](lib/glimmer-dsl-opal/samples/hello/hello_table.rb):
 
 ```ruby
@@ -141,7 +143,7 @@ Hello, Table! Game Booked
 
 NOTE: Glimmer DSL for Opal is an alpha project. Please help make better by contributing, adopting for small or low risk projects, and providing feedback. It is still an early alpha, so the more feedback and issues you report the better.
 
-**Alpha Version** 0.14.0 only supports bare-minimum capabilities for the included [samples](https://github.com/AndyObtiva/glimmer-dsl-opal#samples) (originally written for [glimmer-dsl-swt](https://github.com/AndyObtiva/glimmer-dsl-swt))
+**Alpha Version** 0.16.2 only supports bare-minimum capabilities for the included [samples](https://github.com/AndyObtiva/glimmer-dsl-opal#samples) (originally written for [glimmer-dsl-swt](https://github.com/AndyObtiva/glimmer-dsl-swt))
 
 Other [Glimmer](https://github.com/AndyObtiva/glimmer) DSL gems:
 - [glimmer-dsl-swt](https://github.com/AndyObtiva/glimmer-dsl-swt): Glimmer DSL for SWT (JRuby Desktop Development GUI Framework)
@@ -151,7 +153,7 @@ Other [Glimmer](https://github.com/AndyObtiva/glimmer) DSL gems:
 
 ## Table of Contents
 
-- [Glimmer DSL for Opal 0.14.0 (Pure Ruby Web GUI)](#-glimmer-dsl-for-opal-0140-pure-ruby-web-gui)
+- [Glimmer DSL for Opal 0.16.2 (Pure Ruby Web GUI)](#-glimmer-dsl-for-opal-0162-pure-ruby-web-gui)
   - [Principles](#principles)
   - [Background](#background)
   - [Pre-requisites](#pre-requisites)
@@ -161,6 +163,7 @@ Other [Glimmer](https://github.com/AndyObtiva/glimmer) DSL gems:
     - [Hello Samples](#hello-samples)
       - [Hello, World!](#hello-world)
       - [Hello, Combo!](#hello-combo)
+      - [Hello, Composite!](#hello-composite)
       - [Hello, Computed!](#hello-computed)
       - [Hello, List Single Selection!](#hello-list-single-selection)
       - [Hello, List Multi Selection!](#hello-list-multi-selection)
@@ -221,7 +224,8 @@ Alternatively, web developers may directly use [Glimmer DSL for Opal](https://ru
 ## Pre-requisites
 
 - Rails 5: [https://github.com/rails/rails/tree/5-2-stable](https://github.com/rails/rails/tree/5-2-stable)
-- Opal 1: [https://github.com/opal/opal-rails](https://github.com/opal/opal-rails)
+- Opal 1.0.4: [https://github.com/opal/opal](https://github.com/opal/opal)
+- Opal-Rails 1.1.2: [https://github.com/opal/opal-rails](https://github.com/opal/opal-rails)
 - jQuery 3: [https://code.jquery.com/](https://code.jquery.com/) (jQuery 3.5.1 is included in the [glimmer-dsl-opal](https://rubygems.org/gems/glimmer-dsl-opal) gem)
 - jQuery-UI 1.12: [https://code.jquery.com/](https://jqueryui.com/) (jQuery-UI 1.12.1 is included in the [glimmer-dsl-opal](https://rubygems.org/gems/glimmer-dsl-opal) gem)
 - jQuery-UI Timepicker 0.3: [https://code.jquery.com/](https://fgelinas.com/code/timepicker/) (jQuery-UI Timepicker 0.3.3 is included in the [glimmer-dsl-opal](https://rubygems.org/gems/glimmer-dsl-opal) gem)
@@ -249,10 +253,11 @@ rails new glimmer_app_server
 Add the following to `Gemfile`:
 
 ```
-gem 'opal-rails', '~> 1.1.2'
+gem 'opal', '1.0.4'
+gem 'opal-rails', '1.1.2'
 gem 'opal-async', '~> 1.2.0'
 gem 'opal-jquery', '~> 0.4.4'
-gem 'glimmer-dsl-opal', '~> 0.14.0'
+gem 'glimmer-dsl-opal', '~> 0.16.2'
 gem 'glimmer-dsl-xml', '~> 1.2.0', require: false
 gem 'glimmer-dsl-css', '~> 1.2.0', require: false
 
@@ -488,7 +493,7 @@ HelloCombo.launch
 ```
 Glimmer app on the desktop (using [`glimmer-dsl-swt`](https://github.com/AndyObtiva/glimmer-dsl-swt) gem):
 
-![Glimmer DSL for SWT Hello Combo](https://github.com/AndyObtiva/glimmer/blob/master/images/glimmer-hello-combo.png)
+![Glimmer DSL for SWT Hello Combo](https://github.com/AndyObtiva/glimmer-dsl-swt/blob/master/images/glimmer-hello-combo.png)
 
 Glimmer app on the web (using `glimmer-dsl-opal` gem):
 
@@ -503,6 +508,31 @@ You should see "Hello, Combo!"
 
 ![Glimmer DSL for Opal Hello Combo](images/glimmer-dsl-opal-hello-combo.png)
 
+#### Hello, Composite!
+
+Add the following require statement to `app/assets/javascripts/application.rb`
+
+```ruby
+require 'glimmer-dsl-opal/samples/hello/hello_composite'
+```
+
+Glimmer app on the desktop (using [`glimmer-dsl-swt`](https://github.com/AndyObtiva/glimmer-dsl-swt) gem):
+
+![Glimmer DSL for SWT Hello Composite](https://github.com/AndyObtiva/glimmer-dsl-swt/blob/master/images/glimmer-hello-composite.png)
+
+Glimmer app on the web (using `glimmer-dsl-opal` gem):
+
+Start the Rails server:
+```
+rails s
+```
+
+Visit `http://localhost:3000`
+
+You should see "Hello, Composite!"
+
+![Glimmer DSL for Opal Hello Composite](images/glimmer-dsl-opal-hello-composite.png)
+
 #### Hello, Computed!
 
 Add the following require statement to `app/assets/javascripts/application.rb`
@@ -626,6 +656,58 @@ You should see "Hello, Computed!"
 
 ![Glimmer DSL for Opal Hello Computed](images/glimmer-dsl-opal-hello-computed.png)
 
+#### Hello, Layout!
+
+Add the following require statement to `app/assets/javascripts/application.rb`
+
+
+```ruby
+require 'glimmer-dsl-opal/samples/hello/hello_layout'
+```
+
+Glimmer app on the desktop (using [`glimmer-dsl-swt`](https://github.com/AndyObtiva/glimmer-dsl-swt) gem):
+
+![Glimmer DSL for SWT Hello Layout](https://github.com/AndyObtiva/glimmer-dsl-swt/raw/master/images/glimmer-hello-layout-tab1.png)
+
+![Glimmer DSL for SWT Hello Layout](https://github.com/AndyObtiva/glimmer-dsl-swt/raw/master/images/glimmer-hello-layout-tab2.png)
+
+![Glimmer DSL for SWT Hello Layout](https://github.com/AndyObtiva/glimmer-dsl-swt/raw/master/images/glimmer-hello-layout-tab3.png)
+
+![Glimmer DSL for SWT Hello Layout](https://github.com/AndyObtiva/glimmer-dsl-swt/raw/master/images/glimmer-hello-layout-tab4.png)
+
+![Glimmer DSL for SWT Hello Layout](https://github.com/AndyObtiva/glimmer-dsl-swt/raw/master/images/glimmer-hello-layout-tab5.png)
+
+![Glimmer DSL for SWT Hello Layout](https://github.com/AndyObtiva/glimmer-dsl-swt/raw/master/images/glimmer-hello-layout-tab6.png)
+
+![Glimmer DSL for SWT Hello Layout](https://github.com/AndyObtiva/glimmer-dsl-swt/raw/master/images/glimmer-hello-layout-tab7.png)
+
+Glimmer app on the web (using `glimmer-dsl-opal` gem):
+
+Start the Rails server:
+```
+rails s
+```
+
+Visit `http://localhost:3000`
+
+You should see "Hello, Layout!"
+
+![Glimmer DSL for Opal Hello Layout](images/glimmer-dsl-opal-hello-layout-tab1.png)
+
+![Glimmer DSL for Opal Hello Layout](images/glimmer-dsl-opal-hello-layout-tab2.png)
+
+![Glimmer DSL for Opal Hello Layout](images/glimmer-dsl-opal-hello-layout-tab3.png)
+
+![Glimmer DSL for Opal Hello Layout](images/glimmer-dsl-opal-hello-layout-tab4.png)
+
+![Glimmer DSL for Opal Hello Layout](images/glimmer-dsl-opal-hello-layout-tab4-shrunk.png)
+
+![Glimmer DSL for Opal Hello Layout](images/glimmer-dsl-opal-hello-layout-tab5.png)
+
+![Glimmer DSL for Opal Hello Layout](images/glimmer-dsl-opal-hello-layout-tab6.png)
+
+![Glimmer DSL for Opal Hello Layout](images/glimmer-dsl-opal-hello-layout-tab7.png)
+
 #### Hello, List Single Selection!
 
 Add the following require statement to `app/assets/javascripts/application.rb`
@@ -2234,6 +2316,8 @@ Glimmer DSL for Opal Contact Manager Edit Done
 
 #### Weather
 
+Code: [lib/glimmer-dsl-opal/samples/elaborate/weather](lib/glimmer-dsl-opal/samples/elaborate/weather.rb)
+
 Add the following require statement to `app/assets/javascripts/application.rb`
 
 ```ruby
@@ -2246,7 +2330,7 @@ Glimmer app on the desktop (using [`glimmer-dsl-swt`](https://github.com/AndyObt
 
 ![Weather Montreal F](https://github.com/AMaleh/glimmer-dsl-swt/raw/master/images/glimmer-weather-montreal-fahrenheit.png)
 
-![Weather Atlanta F](https://github.com/AMaleh            /glimmer-dsl-swt/raw/master/images/glimmer-weather-atlanta-fahrenheit.png)
+![Weather Atlanta F](https://github.com/AMaleh/glimmer-dsl-swt/raw/master/images/glimmer-weather-atlanta-fahrenheit.png)
 
 Glimmer app on the web (using `glimmer-dsl-opal` gem):
 

data/VERSION

@@ -1 +1 @@
-0.14.0
+0.16.2

data/app/controllers/glimmer/application_controller.rb

@@ -0,0 +1,4 @@
+module Glimmer
+  class ApplicationController < ActionController::Base
+  end
+end

data/app/controllers/glimmer/image_paths_controller.rb

@@ -0,0 +1,46 @@
+require 'fileutils'
+
+module Glimmer
+  class ImagePathsController < ApplicationController
+    def index
+      # TODO apply caching in the future to avoid recopying files on every request
+      Gem.loaded_specs.map(&:last).select {|s| s.name == 'glimmer-dsl-opal' || s.dependencies.detect {|dep| dep.name == 'glimmer-dsl-opal'} }
+      full_gem_specs = Gem.loaded_specs.map(&:last).select do |s|
+        s.name == 'glimmer-dsl-opal' ||
+          Glimmer::Config.gems_having_image_paths.to_a.include?(s.name) || # consider turning into a Glimmer::Config server-side option
+          s.dependencies.detect {|dep| dep.name == 'glimmer-dsl-swt'}
+      end
+      full_gem_paths = full_gem_specs.map {|gem_spec| gem_spec.full_gem_path}
+      full_gem_names = full_gem_paths.map {|path| File.basename(path)}
+      full_gem_image_path_collections = full_gem_paths.map do |gem_path|
+        Dir[File.join(gem_path, '**', '*')].to_a.select {|f| !!f.match(/(png|jpg|jpeg|gif)$/) }
+      end
+      download_gem_image_path_collections = full_gem_names.size.times.map do |n|
+        full_gem_name = full_gem_names[n]
+        full_gem_image_paths = full_gem_image_path_collections[n]
+        full_gem_image_paths.map do |image_path|
+          File.join(full_gem_name, image_path.split(full_gem_name).last)
+        end
+      end
+      download_gem_image_paths = download_gem_image_path_collections.flatten
+      download_gem_image_dir_names = download_gem_image_paths.map {|p| File.dirname(p)}.uniq
+      download_gem_image_dir_names.each do |image_dir_name|
+        FileUtils.mkdir_p(Rails.root.join('app', 'assets', 'images', image_dir_name))
+      end
+      full_gem_names.size.times.each do |n|
+        full_image_paths = full_gem_image_path_collections[n]
+        download_image_paths = download_gem_image_path_collections[n]
+        full_image_paths.each_with_index do |image_path, i|
+          download_image_path = download_image_paths[i]
+          image_dir_name = File.dirname(image_path)
+          FileUtils.cp_r(image_path, Rails.root.join('app', 'assets', 'images', download_image_path)) # TODO check first if files match and avoid copying if so to save time
+        end
+      end
+      download_gem_image_paths = download_gem_image_paths.map {|p| "/assets/#{p}"}
+            
+      # TODO apply a security white list
+      render json: download_gem_image_paths
+    end
+  
+  end
+end

data/app/views/glimmer/image_paths/index.html.erb

@@ -0,0 +1 @@
+ NADA

data/config/routes.rb

@@ -0,0 +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.
+
+Glimmer::Engine.routes.draw do
+  resources :image_paths, only: [:index]
+end

data/lib/cgi.rb

@@ -0,0 +1,14 @@
+class CGI
+  class << self
+    def escapeHTML(string)
+      string.
+        gsub('&', '&amp;').
+        gsub('<', '&lt;').
+        gsub('>', '&gt;').
+        gsub("'", '&apos;').
+        gsub('"', '&quot;')
+    end
+    alias escape_html escapeHTML
+    
+  end
+end

data/lib/glimmer-dsl-opal.rb

@@ -37,6 +37,10 @@ if RUBY_ENGINE == 'opal'
     def include_package(package)
       # No Op (just a shim)
     end
+    
+    def __dir__
+      '(dir)'
+    end
   end
   
   require 'opal-parser'
@@ -46,6 +50,7 @@ if RUBY_ENGINE == 'opal'
   require 'to_collection'
   require 'pure-struct'
   require 'os'
+  require 'cgi'
   require 'file'
   require 'display'
   require 'glimmer-dsl-opal/vendor/jquery'
@@ -81,10 +86,11 @@ if RUBY_ENGINE == 'opal'
   require 'glimmer/config/opal_logger'
   require 'glimmer-dsl-xml'
   require 'glimmer-dsl-css'
+  
   Element.alias_native :replace_with, :replaceWith
   Element.alias_native :select
   Element.alias_native :dialog
-  
+    
   Glimmer::Config.loop_max_count = 250 # TODO disable
   
   original_logger_level = Glimmer::Config.logger.level
@@ -96,7 +102,7 @@ if RUBY_ENGINE == 'opal'
     result ||= method == '<<'
     result ||= method == 'handle'
   end
-  
 else
+  require_relative 'glimmer/config'
   require_relative 'glimmer/engine'
 end

data/lib/glimmer-dsl-opal/ext/file.rb

@@ -19,11 +19,36 @@
 # 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 'net/http'
+
 class File
   class << self
+    REGEXP_DIR_FILE = /\(dir\)|\(file\)/
+    
+    attr_accessor :image_paths
+    
     def read(*args, &block)
       # TODO implement via asset downloads in the future
       # No Op in Opal
     end
+    
+    # Include special processing for images that matches them against a list of available image paths from the server
+    # to convert to web paths.
+    alias expand_path_without_glimmer expand_path
+    def expand_path(path, base=nil)
+      get_image_paths unless image_paths
+      path = expand_path_without_glimmer(path, base) if base
+      path_include_dir_or_file = !!path.match(REGEXP_DIR_FILE)
+      essential_path = path.split('(dir)').last.split('(file)').last.split('../').last.split('./').last
+      image_paths.detect do |image_path|
+        image_path.include?(essential_path)
+      end
+    end
+    
+    def get_image_paths
+      image_paths_json = Net::HTTP.get(`window.location.origin`, "/glimmer/image_paths.json")
+      self.image_paths = JSON.parse(image_paths_json)
+    end
+    
   end
 end

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

@@ -0,0 +1,69 @@
+# 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.
+
+class HelloComposite
+  include Glimmer::UI::CustomShell
+  
+  body {
+    shell {
+      # shell (which is a composite) has fill_layout(:horizontal) by default with no margins
+      # we override below
+      fill_layout(:vertical)
+      text 'Hello, Composite!'
+      
+      composite { # composite simply contains widgets for visual organization via a layout
+        # it has grid_layout(1, false) as its default layout
+        label {
+          text "Field is above its text widget"
+        }
+        text {
+          layout_data :fill, :center, true, false # fill horizontally, align center vertically, grab remaining horizontal space, but not vertical
+        }
+      }
+      
+      composite { # composite simply contains widgets for visual organization via a layout
+        grid_layout 2, true
+        
+        label {
+          text "Field has equal width to its text widget's"
+        }
+        text {
+          layout_data :fill, :center, true, false # fill horizontally, align center vertically, grab remaining horizontal space, but not vertical
+        }
+      }
+      
+      composite { # composite simply contains widgets for visual organization via a layout
+        grid_layout 2, false
+        
+        label {
+          text "Field has inequal width"
+        }
+        
+        text {
+          layout_data :fill, :center, true, false # fill horizontally, align center vertically, grab remaining horizontal space, but not vertical
+        }
+      }
+    }
+  
+  }
+end
+
+HelloComposite.launch

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

@@ -0,0 +1,241 @@
+# 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.
+
+class HelloLayout
+  include Glimmer::UI::CustomShell
+  
+  body {
+    shell {
+      # shell (which is a composite) has fill_layout(:horizontal) by default with no margins
+      text 'Hello, Layout!'
+      tab_folder {
+      
+        # every tab item has its own composite, which can set a layout
+        tab_item {
+          text 'Fill Layout (horizontal)'
+          
+          fill_layout(:horizontal) {
+            margin_width 30
+            margin_height 40
+            spacing 5
+          }
+          
+          10.times { |n|
+            label {
+              text "<label #{n+1}>"
+            }
+          
+          }
+        
+        }
+      
+        tab_item {
+          text 'Fill Layout (vertical)'
+          
+          fill_layout {
+            type :vertical # alternative way of specifying orientation
+            margin_width 40
+            margin_height 30
+            spacing 10
+          }
+          
+          10.times { |n|
+            label(:center) {
+              text "<label #{n+1}>"
+            }
+          
+          }
+        
+        }
+      
+        tab_item {
+          text 'Row Layout (horizontal)'
+          
+          row_layout(:horizontal) {
+            # row layout has margin attributes for top, left, right, and bottom
+            # in addition to width and height (and sets margin_width and margin_height to 5 by default)
+            margin_top 40
+            margin_left 30
+            spacing 5
+            wrap false
+            center true
+            justify true
+          }
+          
+          10.times { |n|
+            label {
+              text "<label #{n+1}>"
+            }
+          
+          }
+        
+        }
+      
+        tab_item {
+          text 'Row Layout (wrap on shrink)'
+          
+          row_layout { # :horizontal is the default type
+            margin_height 40
+            margin_width 30
+            spacing 35
+            # wrap true # is the default
+          }
+          
+          10.times { |n|
+            label {
+              text "<label #{n+1}>"
+            }
+          
+          }
+        
+        }
+        
+        tab_item {
+          text 'Row Layout (vertical)'
+          background :yellow
+
+          row_layout(:vertical) { |l|
+            margin_height 0
+            margin_width 0
+            spacing 10
+            fill true # fills horizontally to match the widest child (opposite to row layout orientation)
+            center false # enable and disable fill to see what this does
+          }
+
+          10.times { |n|
+            label {
+              # layout_data allows a widget to tweak its layout configuration (generating RowData object for RowLayout)
+              layout_data {
+                height 30
+#                 width unspecified yet calculated
+              }
+              text "<this is a ver#{'r'*(rand*200).to_i}y wide label #{n+1}>"
+              background :green
+            }
+
+          }
+
+        }
+            
+        tab_item {
+          text 'Grid Layout'
+          
+          grid_layout {
+            num_columns 5
+            make_columns_equal_width true
+            horizontal_spacing 15
+            vertical_spacing 10
+
+            # grid layout has margin attributes for top, left, right, and bottom
+            # in addition to width and height (and sets margin_width and margin_height to 5 by default)
+            margin_height 0
+            margin_top 20
+          }
+          
+          10.times { |n|
+            label {
+              text "<this label is wide enough to fill #{n+1}>"
+              background :white
+            }
+          }
+        
+          label {
+            # layout_data allows a widget to tweak its layout configuration (generating GridData object for GridLayout)
+            layout_data {
+              width_hint 120
+              height_hint 40
+            }
+            text "<this label is clipped>"
+            background :cyan
+          }
+        
+          label {
+            # layout_data allows a widget to tweak its layout configuration (generating GridData object for GridLayout)
+            layout_data {
+              horizontal_span 2
+            }
+            text "<this label spans two columns, so it can contain more text than normal>"
+            background :green
+          }
+        
+          label {
+            # layout_data allows a widget to tweak its layout configuration (generating GridData object for GridLayout)
+            layout_data {
+              vertical_span 2
+              vertical_alignment :fill
+            }
+            text "<this label spans two rows, \nso it can contain new lines\n1\n2\n3\n4\n5\n6\n7>"
+            background :yellow
+          }
+          
+          5.times { label } # just filler
+          
+          label {
+            
+            # layout_data allows a widget to tweak its layout configuration (generating GridData object for GridLayout)
+            layout_data {
+              horizontal_span 5
+              horizontal_alignment :fill # could be :beginning, :center or :end too
+              vertical_alignment :fill # could be :beginning, :center, or :end too
+              grab_excess_horizontal_space true
+              grab_excess_vertical_space true
+            }
+            
+            # this is a short alternative for specifying what is above
+#             layout_data(:fill, :fill, true, true) {
+#               horizontal_span 5
+#             }
+            
+            text "<this label fills all the space it can get\nhorizontally and vertically>"
+            background :magenta
+          }
+        
+        }
+        
+            
+        tab_item {
+          text 'Grid Layout (non-equal columns)'
+          
+          grid_layout(2, false) # alt syntax: (numColumns, make_columns_equal_width)
+          
+          10.times { |n|
+            label {
+              text "Field #{n+1}"
+            }
+            text {
+              layout_data {
+                width_hint 600
+              }
+              
+              text "Please enter text"
+            }
+          }
+        
+        }
+                                  
+      }
+    
+    }
+  
+  }
+end
+
+HelloLayout.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/fill_layout_proxy.rb

@@ -28,13 +28,11 @@ module Glimmer
     
       def initialize(parent, args)
         super(parent, args)
-        @type = @args.first || :horizontal
+        self.type = @args.first || :horizontal
         self.margin_width = 15
         self.margin_height = 15
         @parent.css_classes << 'fill-layout'
-        @parent.css_classes << (horizontal? ? 'fill-layout-horizontal' : 'fill-layout-vertical')
         @parent.dom_element.add_class('fill-layout')
-        @parent.dom_element.add_class(horizontal? ? 'fill-layout-horizontal' : 'fill-layout-vertical')
       end
       
       def horizontal?
@@ -44,6 +42,14 @@ module Glimmer
       def vertical?
         @type == :vertical
       end
+      
+      def type=(value)
+        @parent.dom_element.remove_class(horizontal? ? 'fill-layout-horizontal' : 'fill-layout-vertical')
+        @parent.css_classes.delete(horizontal? ? 'fill-layout-horizontal' : 'fill-layout-vertical')
+        @type = value
+        @parent.dom_element.add_class(horizontal? ? 'fill-layout-horizontal' : 'fill-layout-vertical')
+        @parent.css_classes << horizontal? ? 'fill-layout-horizontal' : 'fill-layout-vertical'
+      end
 
       def margin_width=(pixels)
         @margin_width = pixels

data/lib/glimmer/swt/grid_layout_proxy.rb

@@ -12,48 +12,31 @@ module Glimmer
         }
       CSS
       
-      attr_reader :num_columns, :make_columns_equal_width, :horizontal_spacing, :vertical_spacing, :margin_width, :margin_height
+      attr_reader :num_columns, :make_columns_equal_width, :horizontal_spacing, :vertical_spacing, :margin_width, :margin_height, :margin_top, :margin_right, :margin_bottom, :margin_left
     
       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)
@@ -72,6 +55,38 @@ module Glimmer
         @parent.dom_element.css('padding-top', effective_margin_height)
         @parent.dom_element.css('padding-bottom', effective_margin_height)
       end
+      
+      def margin_top=(pixels)
+        @margin_top = pixels
+        # Using padding for width since margin-right isn't getting respected with width 100%
+        effective_margin_top = @margin_top
+        effective_margin_top += 9 if @parent.is_a?(GroupProxy)
+        @parent.dom_element.css('padding-top', effective_margin_top)
+      end
+      
+      def margin_right=(pixels)
+        @margin_right = pixels
+        effective_margin_right = @margin_right
+        effective_margin_right += 6 if @parent.is_a?(GroupProxy)
+        @parent.dom_element.css('padding-right', effective_margin_right)
+      end
+      
+      def margin_bottom=(pixels)
+        @margin_bottom = pixels
+        # Using padding for width since margin-right isn't getting respected with width 100%
+        effective_margin_bottom = @margin_bottom
+        effective_margin_bottom += 9 if @parent.is_a?(GroupProxy)
+        @parent.dom_element.css('padding-bottom', effective_margin_bottom)
+      end
+      
+      def margin_left=(pixels)
+        @margin_left = pixels
+        effective_margin_left = @margin_left
+        effective_margin_left += 6 if @parent.is_a?(GroupProxy)
+        @parent.dom_element.css('padding-left', effective_margin_left)
+      end
+            
+      
             
       def initialize(parent, args)
         super(parent, args)
@@ -79,7 +94,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

@@ -33,19 +33,19 @@ module Glimmer
 
       def text=(value)
         @text = value
-        dom_element.html(html_text)
+        dom_element.html(html_text) # TODO deal with issue of handling lines and escaping at the same time
       end
       
       def html_text
-        text&.gsub("\n", '<br />')
+        text && CGI.escape_html(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/row_layout_proxy.rb

@@ -24,6 +24,14 @@ module Glimmer
           margin-left: auto;
           margin-right: auto;
         }
+        
+        .row-layout-wrap {
+          flex-wrap: wrap;
+        }
+                
+        .row-layout-justify {
+          justify-content: space-around;
+        }
                 
         .row-layout-horizontal {
           flex-direction: row;
@@ -42,13 +50,14 @@ module Glimmer
         }
       CSS
     
-      attr_reader :type, :fill, :margin_width, :margin_height, :margin_top, :margin_right, :margin_bottom, :margin_left, :spacing, :pack, :center
+      attr_reader :type, :margin_width, :margin_height, :margin_top, :margin_right, :margin_bottom, :margin_left, :spacing, :pack, :center, :wrap, :justify
         
       def initialize(parent, args)
         super(parent, args)
         @parent.dom_element.add_class('row-layout')
         self.type = args.first || :horizontal
         self.pack = true
+        self.wrap = true
       end
       
       def type=(value)
@@ -79,9 +88,13 @@ module Glimmer
         end
       end
       
+      def fill
+        !pack
+      end
+      
       def fill=(value)
         # TODO verify this is a correct implementation and interpretation of RowLayout in SWT
-        self.pack(!value)
+        self.pack = !value
       end
       
       def center=(center_value)
@@ -94,6 +107,24 @@ module Glimmer
         end
       end
       
+      def wrap=(wrap_value)
+        @wrap = wrap_value
+        if @wrap
+          parent.dom_element.add_class("row-layout-wrap")
+        else
+          parent.dom_element.remove_class("row-layout-wrap")
+        end
+      end
+      
+      def justify=(justify_value)
+        @justify = justify_value
+        if @justify
+          parent.dom_element.add_class("row-layout-justify")
+        else
+          parent.dom_element.remove_class("row-layout-justify")
+        end
+      end
+      
       def margin_width=(pixels)
         @margin_width = pixels
         # Using padding for width since margin-right isn't getting respected with width 100%

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

@@ -37,7 +37,8 @@ module Net
       end
       
       def get(uri, path_and_params)
-        uri = "#{`window.location.protocol`}//#{File.join(uri, path_and_params)}" unless uri.start_with?('http:') || uri.start_with?('https:') # TODO refactor repetitive code
+        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?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-opal
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.16.2
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-11 00:00:00.000000000 Z
+date: 2021-08-13 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,11 @@ 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/cgi.rb
 - lib/display.rb
 - lib/glimmer-dsl-opal.rb
 - lib/glimmer-dsl-opal/ext/class.rb
@@ -284,12 +289,14 @@ files:
 - 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_custom_shell.rb
 - lib/glimmer-dsl-opal/samples/hello/hello_custom_widget.rb
 - lib/glimmer-dsl-opal/samples/hello/hello_date_time.rb
 - lib/glimmer-dsl-opal/samples/hello/hello_dialog.rb
 - lib/glimmer-dsl-opal/samples/hello/hello_group.rb
+- lib/glimmer-dsl-opal/samples/hello/hello_layout.rb
 - lib/glimmer-dsl-opal/samples/hello/hello_list_multi_selection.rb
 - lib/glimmer-dsl-opal/samples/hello/hello_list_single_selection.rb
 - lib/glimmer-dsl-opal/samples/hello/hello_menu_bar.rb
@@ -299,6 +306,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 +327,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 +440,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