glimmer-dsl-opal 0.14.0 → 0.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '009ae1a27f92b9fe4ae8d28374761c84a8a46add536c37b49c67aba167a121b7'
-  data.tar.gz: baf143fe8365b8a3164eaf74adc4a3df720521557003d0507f09580f0da9b6b3
+  metadata.gz: 724c0f462ad5dd94ef3eb8705f6ceb54b350c0f83976a6a7bb3f0506afe67f65
+  data.tar.gz: 0ba2076cb72f46bbe855c746e80c3747d0d2834f73167266fb42752d873e6290
 SHA512:
-  metadata.gz: 81014168a1822232725770564b6f8a4522f08a4e93db72c4986966deaeac28eaffe7674f9446d7abf2d5a3a6056eec38a7f12508c72f751734bd8dc6356fdc2c
-  data.tar.gz: 800d13580d55f8c1255a68b7c07f6c4e7bdfb9308d3a41b14e44e94b50dd66056c9e437df38f73f2d04643633937cd0a99edba8a1ed174194cf8ce0be25328bf
+  metadata.gz: c52727efe6e7efc09cffe80991ccddf6fb4ee69835ecb46f21321ab912997980f6dd9ba9fc68117ce5864f61d63809037139d64b741ff509f66dfda09a2ab0a1
+  data.tar.gz: e00c6998ab192d91340f27567c29b2b6ee63a65680ec316d0a3c74353c0905a04ed2f3771423b527c7441ee6d2dd8870d7c758a09e8151dd0223a4e6053f8a7a

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change Log
 
+## 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.15.1 (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)
 
@@ -141,7 +141,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.15.1 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 +151,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.15.1 (Pure Ruby Web GUI)](#-glimmer-dsl-for-opal-0151-pure-ruby-web-gui)
   - [Principles](#principles)
   - [Background](#background)
   - [Pre-requisites](#pre-requisites)
@@ -252,7 +252,7 @@ Add the following to `Gemfile`:
 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.15.1'
 gem 'glimmer-dsl-xml', '~> 1.2.0', require: false
 gem 'glimmer-dsl-css', '~> 1.2.0', require: false
 
@@ -2234,6 +2234,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 +2248,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.15.1

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,41 @@
+require 'fileutils'
+
+module Glimmer
+  class ImagePathsController < ApplicationController
+    def index
+      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 {|s| s.name == 'glimmer-dsl-opal' || s.dependencies.detect {|dep| dep.name == 'glimmer-dsl-swt'} }
+      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/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'
@@ -81,10 +85,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 +101,6 @@ if RUBY_ENGINE == 'opal'
     result ||= method == '<<'
     result ||= method == 'handle'
   end
-  
 else
   require_relative 'glimmer/engine'
 end

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

@@ -19,11 +19,42 @@
 # 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
+      if base
+        path = expand_path_without_glimmer(path, base)
+      end
+      path_include_dir_or_file = !!path.match(REGEXP_DIR_FILE)
+      if !path_include_dir_or_file
+        path
+      else
+        essential_path = path.split('(dir)').last.split('(file)').last
+        image_paths.detect do |image_path|
+          image_path.include?(essential_path)
+        end
+      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_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/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/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.15.1
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-11 00:00:00.000000000 Z
+date: 2021-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer
@@ -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
@@ -299,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