glimmer-dsl-opal 0.13.0 → 0.16.1

data/VERSION

@@ -1 +1 @@
-0.13.0
+0.16.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,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/{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/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,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
@@ -95,7 +101,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/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

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

@@ -20,15 +20,15 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 class HelloButton
-  include Glimmer
+  include Glimmer::UI::CustomShell
   
   attr_accessor :count
   
-  def initialize
+  before_body {
     @count = 0
-  end
+  }
   
-  def launch
+  body {
     shell {
       text 'Hello, Button!'
       
@@ -39,8 +39,8 @@ class HelloButton
           self.count += 1
         }
       }
-    }.open
-  end
+    }
+  }
 end
 
-HelloButton.new.launch
+HelloButton.launch

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

@@ -19,45 +19,47 @@
 # 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 Person
-  attr_accessor :country, :country_options
-
-  def initialize
-    self.country_options = ['', 'Canada', 'US', 'Mexico']
-    reset_country
-  end
-
-  def reset_country
-    self.country = 'Canada'
+class HelloCombo
+  class Person
+    attr_accessor :country, :country_options
+  
+    def initialize
+      self.country_options = ['', 'Canada', 'US', 'Mexico']
+      reset_country!
+    end
+  
+    def reset_country!
+      self.country = 'Canada'
+    end
   end
-end
 
-class HelloCombo
-  include Glimmer
+  include Glimmer::UI::CustomShell
   
-  def launch
-    person = Person.new
-    
+  before_body {
+    @person = Person.new
+  }
+  
+  body {
     shell {
       row_layout(:vertical) {
-        pack false
+        fill true
       }
       
       text 'Hello, Combo!'
       
       combo(:read_only) {
-        selection <=> [person, :country]
+        selection <=> [@person, :country] # also binds to country_options by convention
       }
       
       button {
         text 'Reset Selection'
         
         on_widget_selected do
-          person.reset_country
+          @person.reset_country!
         end
       }
-    }.open
-  end
+    }
+  }
 end
 
-HelloCombo.new.launch
+HelloCombo.launch

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