glimmer-dsl-opal 0.10.3 → 0.15.1

data/VERSION

@@ -1 +1 @@
-0.10.3
+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/{lib/glimmer-dsl-opal/samples/hello/hello_computed/contact.rb → config/routes.rb}

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

data/lib/display.rb

@@ -24,8 +24,11 @@ class Display
     def setAppName(app_name)
       # No Op in Opal
     end
+    alias app_name= setAppName
+    
     def setAppVersion(version)
       # No Op in Opal
     end
+    alias app_version= setAppVersion
   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'
@@ -56,6 +60,7 @@ if RUBY_ENGINE == 'opal'
 #   require 'glimmer-dsl-opal/vendor/jquery-ui/jquery-ui.theme.min.css'
   require 'opal-jquery'
   require 'opal/jquery/local_storage'
+  require 'promise'
  
   require 'facets/hash/symbolize_keys'
   require 'glimmer-dsl-opal/ext/class'
@@ -80,11 +85,12 @@ 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 = 300 # TODO disable
+    
+  Glimmer::Config.loop_max_count = 250 # TODO disable
   
   original_logger_level = Glimmer::Config.logger.level
   Glimmer::Config.logger = Glimmer::Config::OpalLogger.new(STDOUT)
@@ -95,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/ext/glimmer/dsl/engine.rb

@@ -31,7 +31,7 @@ module Glimmer
         def interpret_expression(expression, keyword, *args, &block)
           work = lambda do
             expression.interpret(parent, keyword, *args, &block).tap do |ui_object|
-              add_content(ui_object, expression, &block)
+              add_content(ui_object, expression, keyword, *args, &block)
               dsl_stack.pop
             end
           end

data/lib/glimmer-dsl-opal/samples/elaborate/contact_manager.rb

@@ -1,14 +1,14 @@
 require_relative "contact_manager/contact_manager_presenter"
 
 class ContactManager
-  include Glimmer
+  include Glimmer::UI::CustomShell
 
-  def initialize
+  before_body {
     @contact_manager_presenter = ContactManagerPresenter.new
     @contact_manager_presenter.list
-  end
+  }
 
-  def launch
+  body {
     shell {
       text "Contact Manager"
       composite {
@@ -28,7 +28,7 @@ class ContactManager
           }
           text {
             layout_data :fill, :center, true, false
-            text bind(@contact_manager_presenter, :first_name)
+            text <=> [@contact_manager_presenter, :first_name]
             on_key_pressed {|key_event|
               @contact_manager_presenter.find if key_event.keyCode == swt(:cr)
             }
@@ -41,7 +41,7 @@ class ContactManager
           }
           text {
             layout_data :fill, :center, true, false
-            text bind(@contact_manager_presenter, :last_name)
+            text <=> [@contact_manager_presenter, :last_name]
             on_key_pressed {|key_event|
               @contact_manager_presenter.find if key_event.keyCode == swt(:cr)
             }
@@ -54,7 +54,7 @@ class ContactManager
           }
           text {
             layout_data :fill, :center, true, false
-            text bind(@contact_manager_presenter, :email)
+            text <=> [@contact_manager_presenter, :email]
             on_key_pressed {|key_event|
               @contact_manager_presenter.find if key_event.keyCode == swt(:cr)
             }
@@ -87,7 +87,7 @@ class ContactManager
           }
         }
 
-        table(:multi) { |table_proxy|
+        table(:editable, :multi) { |table_proxy|
           layout_data {
             horizontal_alignment :fill
             vertical_alignment :fill
@@ -95,6 +95,7 @@ class ContactManager
             grab_excess_vertical_space true
             height_hint 200
           }
+          
           table_column {
             text "First Name"
             width 80
@@ -107,15 +108,16 @@ class ContactManager
             text "Email"
             width 200
           }
-          items bind(@contact_manager_presenter, :results),
-          column_properties(:first_name, :last_name, :email)
+          
+          items <=> [@contact_manager_presenter, :results, column_attributes: [:first_name, :last_name, :email]]
+          
           on_mouse_up { |event|
             table_proxy.edit_table_item(event.table_item, event.column_index)
           }
         }
       }
-    }.open
-  end
+    }
+  }
 end
 
-ContactManager.new.launch
+ContactManager.launch

data/lib/glimmer-dsl-opal/samples/elaborate/login.rb

@@ -1,4 +1,25 @@
-require "observer"
+# 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-dsl-swt'
 
 class LoginPresenter
 
@@ -14,29 +35,26 @@ class LoginPresenter
 
   def status=(status)
     @status = status
-
-    notify_observers("logged_in")
-    notify_observers("logged_out")
   end
   
   def valid?
     !@user_name.to_s.strip.empty? && !@password.to_s.strip.empty?
   end
 
-  def logged_in
+  def logged_in?
     self.status == "Logged In"
   end
 
-  def logged_out
-    !self.logged_in
+  def logged_out?
+    !self.logged_in?
   end
 
-  def login
+  def login!
     return unless valid?
     self.status = "Logged In"
   end
 
-  def logout
+  def logout!
     self.user_name = ""
     self.password = ""
     self.status = "Logged Out"
@@ -45,19 +63,24 @@ class LoginPresenter
 end
 
 class Login
-  include Glimmer
+  include Glimmer::UI::CustomShell
+  
+  before_body {
+    @presenter = LoginPresenter.new
+  }
 
-  def launch
-    presenter = LoginPresenter.new
-    @shell = shell {
+  body {
+    shell {
       text "Login"
+      
       composite {
         grid_layout 2, false #two columns with differing widths
 
         label { text "Username:" } # goes in column 1
         @user_name_text = text {   # goes in column 2
-          text bind(presenter, :user_name)
-          enabled bind(presenter, :logged_out)
+          text <=> [@presenter, :user_name]
+          enabled <= [@presenter, :logged_out?, computed_by: :status]
+          
           on_key_pressed { |event|
             @password_text.set_focus if event.keyCode == swt(:cr)
           }
@@ -65,40 +88,44 @@ class Login
 
         label { text "Password:" }
         @password_text = text(:password, :border) {
-          text bind(presenter, :password)
-          enabled bind(presenter, :logged_out)
+          text <=> [@presenter, :password]
+          enabled <= [@presenter, :logged_out?, computed_by: :status]
+          
           on_key_pressed { |event|
-            presenter.login if event.keyCode == swt(:cr)
+            @presenter.login! if event.keyCode == swt(:cr)
           }
         }
 
         label { text "Status:" }
-        label { text bind(presenter, :status) }
+        label { text <= [@presenter, :status] }
 
         button {
           text "Login"
-          enabled bind(presenter, :logged_out)
-          on_widget_selected { presenter.login }
+          enabled <= [@presenter, :logged_out?, computed_by: :status]
+          
+          on_widget_selected { @presenter.login! }
           on_key_pressed { |event|
-            presenter.login if event.keyCode == swt(:cr)
+            if event.keyCode == swt(:cr)
+              @presenter.login!
+            end
           }
         }
 
         button {
           text "Logout"
-          enabled bind(presenter, :logged_in)
-          on_widget_selected { presenter.logout }
+          enabled <= [@presenter, :logged_in?, computed_by: :status]
+          
+          on_widget_selected { @presenter.logout! }
           on_key_pressed { |event|
             if event.keyCode == swt(:cr)
-              presenter.logout
+              @presenter.logout!
               @user_name_text.set_focus
             end
           }
         }
       }
     }
-    @shell.open
-  end
+  }
 end
 
-Login.new.launch
+Login.launch

data/lib/glimmer-dsl-opal/samples/elaborate/tic_tac_toe.rb

@@ -35,8 +35,8 @@ class TicTacToe
           (1..3).each { |column|
             button {
               layout_data :fill, :fill, true, true
-              text        bind(@tic_tac_toe_board[row, column], :sign)
-              enabled     bind(@tic_tac_toe_board[row, column], :empty)
+              text        <= [@tic_tac_toe_board[row, column], :sign]
+              enabled     <= [@tic_tac_toe_board[row, column], :empty]
               font        style: :bold, height: 20
               on_widget_selected {
                 @tic_tac_toe_board.mark(row, column)

data/lib/glimmer-dsl-opal/samples/elaborate/weather.rb

@@ -0,0 +1,157 @@
+# 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 'net/http'
+require 'json'
+require 'facets/string/titlecase'
+
+class Weather
+  include Glimmer::UI::CustomShell
+  
+  DEFAULT_FONT_HEIGHT = 30
+  DEFAULT_FOREGROUND = :white
+  DEFAULT_BACKGROUND = rgb(135, 176, 235)
+  
+  attr_accessor :city, :temp, :temp_min, :temp_max, :feels_like, :humidity
+  
+  before_body {
+    @weather_mutex = Mutex.new
+    self.city = 'Montreal, QC, CA'
+    fetch_weather!
+  }
+  
+  body {
+    shell(:no_resize) {
+      grid_layout
+            
+      text 'Glimmer Weather'
+      minimum_size 400, 300
+      background DEFAULT_BACKGROUND
+      
+      text {
+        layout_data(:center, :center, true, true)
+        
+        text <=> [self, :city]
+        
+        on_key_pressed {|event|
+          if event.keyCode == swt(:cr) # carriage return
+            Thread.new do
+              fetch_weather!
+            end
+          end
+        }
+      }
+            
+      tab_folder {
+        layout_data(:center, :center, true, true)
+        
+        ['℃', '℉'].each do |temp_unit|
+          tab_item {
+            grid_layout 2, false
+            
+            text temp_unit
+            background DEFAULT_BACKGROUND
+            
+            rectangle(0, 0, [:default, -2], [:default, -2], 15, 15) {
+              foreground DEFAULT_FOREGROUND
+            }
+      
+            %w[temp temp_min temp_max feels_like].each do |field_name|
+              temp_field(field_name, temp_unit)
+            end
+            
+            humidity_field
+          }
+        end
+      }
+    }
+  }
+  
+  def temp_field(field_name, temp_unit)
+    name_label(field_name)
+    label {
+      layout_data(:fill, :center, true, false)
+      text <= [self, field_name, on_read: ->(t) { "#{kelvin_to_temp_unit(t, temp_unit).to_f.round}°" }]
+      font height: DEFAULT_FONT_HEIGHT
+      foreground DEFAULT_FOREGROUND
+    }
+  end
+  
+  def humidity_field
+    name_label('humidity')
+    label {
+      layout_data(:fill, :center, true, false)
+      text <= [self, 'humidity', on_read: ->(h) { "#{h.to_f.round}%" }]
+      font height: DEFAULT_FONT_HEIGHT
+      foreground DEFAULT_FOREGROUND
+    }
+  end
+  
+  def name_label(field_name)
+    label {
+      layout_data :fill, :center, false, false
+      text field_name.titlecase
+      font height: DEFAULT_FONT_HEIGHT
+      foreground DEFAULT_FOREGROUND
+    }
+  end
+  
+  def fetch_weather!
+    @weather_mutex.synchronize do
+      self.weather_data = JSON.parse(Net::HTTP.get('api.openweathermap.org', "/data/2.5/weather?q=#{city}&appid=1d16d70a9aec3570b5cbd27e6b421330"))
+    end
+  rescue => e
+    Glimmer::Config.logger.error "Unable to fetch weather due to error: #{e.full_message}"
+  end
+  
+  def weather_data=(data)
+    @weather_data = data
+    main_data = data['main']
+    # temps come back in Kelvin
+    self.temp = main_data['temp']
+    self.temp_min = main_data['temp_min']
+    self.temp_max = main_data['temp_max']
+    self.feels_like = main_data['feels_like']
+    self.humidity = main_data['humidity']
+  end
+  
+  def kelvin_to_temp_unit(kelvin, temp_unit)
+    temp_unit == '℃' ? kelvin_to_celsius(kelvin) : kelvin_to_fahrenheit(kelvin)
+  end
+  
+  def kelvin_to_celsius(kelvin)
+    return nil if kelvin.nil?
+    kelvin - 273.15
+  end
+  
+  def celsius_to_fahrenheit(celsius)
+    return nil if celsius.nil?
+    (celsius * 9 / 5 ) + 32
+  end
+  
+  def kelvin_to_fahrenheit(kelvin)
+    return nil if kelvin.nil?
+    celsius_to_fahrenheit(kelvin_to_celsius(kelvin))
+  end
+  
+end
+
+Weather.launch