glimmer-dsl-opal 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4149153253dd59829bf590c406ff2e5b18c11a62cbbaf7130877f2046a04d2a1
-  data.tar.gz: f82f4d9c0bff2625f1f4ef8bef4be2703789a72aed847d4c851697d916cf48c4
+  metadata.gz: 321f0f4121858de374edacf81772b65ff3bd0ee1e155531b5a04681c1e7f5fa0
+  data.tar.gz: 5bfab859f5b96458ca452444253a8fb1fefe5274e2bdbc892e574ab6fcd74ed0
 SHA512:
-  metadata.gz: 202c4686ab1a2bf31377cbe4ee6f173c92318460e0758cb74356132323c571b381f3bd69d0d47933ac44c54a79fd24520ce7c2e1ffa1412db903ae2c27ce259b
-  data.tar.gz: 182085ad652639b3d83b9853bf993702839cb8066074b92e5377b5b8aa1998d659d925ef0d1f5cac0c659241bd97cf7fe109d2008142e0f5b34165f49e93bc67
+  metadata.gz: 58ee88fda2ed5729f1c3b58035d6aa252fbb23ac2a12b120e88040aa485d7e34bf9f337c1a8e6f289c73c23528aec4dd735a00c0542c4c120c9499141815cc38
+  data.tar.gz: d70d728a4beb4ff5bff63c68b823155ab39b014163698fe875ffacbba09c2e18b91fc3b11fd529876857187fe7aae5e331ecf32b06f4d417a0615bd38d64877a

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## 0.3.0
+
+- Support opening a custom shell in a browser tab/window by passing in query parameters to URL (e.g. ?custom_shell=keyword+option1=value1 etc...)
+- Make custom shells automatically open in a new tab/window (while standard shells continue to open in the same window by replacing its content)
+- Hello, Custom Shell! Sample
+
 ## 0.2.0
 
 - Color support

data/README.md

@@ -1,14 +1,14 @@
-# [<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.2.0 (Webify Desktop Apps)
+# [<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.3.0 (Webify Desktop Apps)
 [![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)
 
-### You can finally live in pure Ruby land even on the web!
+### You can finally live in pure Ruby land on the web!
 
 [Glimmer](https://github.com/AndyObtiva/glimmer) DSL for [Opal](https://opalrb.com/) is an experimental proof-of-concept web GUI adapter for [Glimmer](https://github.com/AndyObtiva/glimmer) desktop apps (i.e. apps built with [Glimmer DSL for SWT](https://github.com/AndyObtiva/glimmer-dsl-swt)). It webifies them via [Rails](https://rubyonrails.org/), allowing Ruby desktop apps to run on the web via [Opal Ruby](https://opalrb.com/) without changing a line of code. Apps may then be custom-styled for the web with standard CSS by web designers. 
 
-Glimmer DSL for Opal webifier successfully reuses the entire [Glimmer](https://github.com/AndyObtiva/glimmer) core DSL engine in [Opal Ruby](https://opalrb.com/) inside a web browser, and as such inherits the full range of powerful Glimmer desktop [data-binding](https://github.com/AndyObtiva/glimmer#data-binding) capabilities for the web.
+Glimmer DSL for Opal successfully reuses the entire [Glimmer](https://github.com/AndyObtiva/glimmer) core DSL engine in [Opal Ruby](https://opalrb.com/) inside a web browser, and as such inherits the full range of powerful Glimmer desktop [data-binding](https://github.com/AndyObtiva/glimmer#data-binding) capabilities for the web.
 
-NOTE: Alpha Version 0.2.0 only supports bare-minimum capabilities for the following [glimmer-dsl-swt](https://github.com/AndyObtiva/glimmer-dsl-swt) [samples](https://github.com/AndyObtiva/glimmer#samples):
+NOTE: Alpha Version 0.3.0 only supports bare-minimum capabilities for the following [glimmer-dsl-swt](https://github.com/AndyObtiva/glimmer-dsl-swt) [samples](https://github.com/AndyObtiva/glimmer#samples):
 - [Hello, World!](#hello-world)
 - [Hello, Combo!](#hello-combo)
 - [Hello, Computed!](#hello-computed)
@@ -17,6 +17,7 @@ NOTE: Alpha Version 0.2.0 only supports bare-minimum capabilities for the follow
 - [Hello, Browser!](#hello-browser)
 - [Hello, Tab!](#hello-tab)
 - [Hello, Custom Widget!](#hello-custom-widget)
+- [Hello, Custom Shell!](#hello-custom-shell)
 - [Login](#login)
 - [Tic Tac Toe](#tic-tac-toe)
 - [Contact Manager](#contact-manager)
@@ -44,10 +45,8 @@ Widgets:
 - `table`
 - `table_column`
 - `message_box`
-
-Graphics:
-- `color`
-- `font`
+- CustomWidget (ability to define any keyword as a custom widget)
+- CustomShell (ability to define any keyword as a custom shell (aka custom window) that opens in a new browser window)
 
 Layouts:
 - `grid_layout`
@@ -55,6 +54,10 @@ Layouts:
 - `fill_layout`
 - `layout_data`
 
+Graphics:
+- `color`
+- `font`
+
 Data-Binding/Observers:
 - `bind`
 - `observe`
@@ -86,11 +89,11 @@ Add the following to `Gemfile`:
 
 ```
 gem 'opal-rails', '~> 1.1.2'
-gem 'opal-async', '~> 1.1.1'
+gem 'opal-async', '~> 1.2.0'
 gem 'opal-jquery', '~> 0.4.4'
-gem 'glimmer-dsl-opal', '~> 0.2.0', require: false
-gem 'glimmer-dsl-xml', '~> 1.0.0', require: false
-gem 'glimmer-dsl-css', '~> 1.0.0', require: false
+gem 'glimmer-dsl-opal', '~> 0.3.0', require: false
+gem 'glimmer-dsl-xml', '~> 1.1.0', require: false
+gem 'glimmer-dsl-css', '~> 1.1.0', require: false
 
 ```
 
@@ -688,6 +691,175 @@ You should see "Hello, Custom Widget!"
 
 ![Glimmer DSL for Opal Hello Custom Widget](images/glimmer-dsl-opal-hello-custom-widget.gif)
 
+#### Hello, Custom Shell!
+
+Add the following require statement to `app/assets/javascripts/application.rb`
+
+```ruby
+require 'glimmer-dsl-opal/samples/hello/hello_custom_shell'
+```
+
+Or add the Glimmer code directly if you prefer to play around with it:
+
+```ruby
+require 'date'
+
+# This class declares an `email_shell` custom shell, aka custom window (by convention)
+# Used to view an email message
+class EmailShell
+  include Glimmer::UI::CustomShell
+  
+  # multiple options without default values  
+  options :date, :subject, :from, :message
+  
+  # single option with default value
+  option :to, default: '"John Irwin" <john.irwin@example.com>'
+  
+  before_body {
+    @swt_style |= swt(:shell_trim, :modeless)
+  }
+  
+  body {
+    # pass received swt_style through to shell to customize it (e.g. :dialog_trim for a blocking shell)
+    shell(swt_style) {
+      grid_layout(2, false)
+      
+      text subject      
+
+      label {
+        text 'Date:'
+      }
+      label {
+        text date
+      }
+
+      label {
+        text 'From:'
+      }
+      label {
+        text from
+      }
+
+      label {
+        text 'To:'
+      }
+      label {
+        text to
+      }
+
+      label {
+        text 'Subject:'
+      }
+      label {
+        text subject
+      }
+
+      label {
+        layout_data(:fill, :fill, true, true) {
+          horizontal_span 2 #TODO implement
+          vertical_indent 10
+        }
+        
+        background :white
+        text message        
+      }
+    }
+  }
+  
+end
+
+class HelloCustomShell
+  # including Glimmer enables the Glimmer DSL syntax, including auto-discovery of the `email_shell` custom widget
+  include Glimmer
+  
+  Email = Struct.new(:date, :subject, :from, :message, keyword_init: true)
+  EmailSystem = Struct.new(:emails, keyword_init: true)
+  
+  def initialize
+    @email_system = EmailSystem.new(
+      emails: [
+        Email.new(date: DateTime.new(2029, 10, 22, 11, 3, 0).strftime('%F %I:%M %p'), subject: '3rd Week Report', from: '"Dianne Tux" <dianne.tux@example.com>', message: "Hello,\n\nI was wondering if you'd like to go over the weekly report sometime this afternoon.\n\nDianne"),
+        Email.new(date: DateTime.new(2029, 10, 21, 8, 1, 0).strftime('%F %I:%M %p'), subject: 'Glimmer Upgrade v100.0', from: '"Robert McGabbins" <robert.mcgabbins@example.com>', message: "Team,\n\nWe are upgrading to Glimmer version 100.0.\n\nEveryone pull the latest code!\n\nRegards,\n\nRobert McGabbins"),
+        Email.new(date: DateTime.new(2029, 10, 19, 16, 58, 0).strftime('%F %I:%M %p'), subject: 'Christmas Party', from: '"Lisa Ferreira" <lisa.ferreira@example.com>', message: "Merry Christmas,\n\nAll office Christmas Party arrangements have been set\n\nMake sure to bring a Secret Santa gift\n\nBest regards,\n\nLisa Ferreira"),
+        Email.new(date: DateTime.new(2029, 10, 16, 9, 43, 0).strftime('%F %I:%M %p'), subject: 'Glimmer Upgrade v99.0', from: '"Robert McGabbins" <robert.mcgabbins@example.com>', message: "Team,\n\nWe are upgrading to Glimmer version 99.0.\n\nEveryone pull the latest code!\n\nRegards,\n\nRobert McGabbins"),
+        Email.new(date: DateTime.new(2029, 10, 15, 11, 2, 0).strftime('%F %I:%M %p'), subject: '2nd Week Report', from: '"Dianne Tux" <dianne.tux@example.com>', message: "Hello,\n\nI was wondering if you'd like to go over the weekly report sometime this afternoon.\n\nDianne"),
+        Email.new(date: DateTime.new(2029, 10, 2, 10, 34, 0).strftime('%F %I:%M %p'), subject: 'Glimmer Upgrade v98.0', from: '"Robert McGabbins" <robert.mcgabbins@example.com>', message: "Team,\n\nWe are upgrading to Glimmer version 98.0.\n\nEveryone pull the latest code!\n\nRegards,\n\nRobert McGabbins"),
+      ]
+    )
+  end
+  
+  def launch
+    shell {
+      grid_layout
+      
+      text 'Hello, Custom Shell!'
+      
+      label {
+        font height: 24, style: :bold
+        text 'Emails:'
+      }
+      
+      label {
+        font height: 18
+        text 'Click an email to view its message'
+      }
+      
+      table {
+        layout_data :fill, :fill, true, true
+      
+        table_column {
+          text 'Date:'
+          width 180
+        }
+        table_column {
+          text 'Subject:'
+          width 180
+        }
+        table_column {
+          text 'From:'
+          width 360
+        }
+        
+        items bind(@email_system, :emails), column_properties(:date, :subject, :from)
+        
+        on_mouse_up { |event|
+          email = event.table_item.get_data
+          Thread.new do
+            async_exec {
+              email_shell(date: email.date, subject: email.subject, from: email.from, message: email.message).open
+            }
+          end
+        }
+      }
+    }.open
+  end  
+end
+
+HelloCustomShell.new.launch
+```
+Glimmer app on the desktop (using [`glimmer-dsl-swt`](https://github.com/AndyObtiva/glimmer-dsl-swt) gem):
+
+![Glimmer DSL for SWT Hello Custom Shell](https://github.com/AndyObtiva/glimmer-dsl-swt/raw/master/images/glimmer-hello-custom-shell.png)
+![Glimmer DSL for SWT Hello Custom Shell Email1](https://github.com/AndyObtiva/glimmer-dsl-swt/raw/master/images/glimmer-hello-custom-shell-email1.png)
+![Glimmer DSL for SWT Hello Custom Shell Email2](https://github.com/AndyObtiva/glimmer-dsl-swt/raw/master/images/glimmer-hello-custom-shell-email2.png)
+![Glimmer DSL for SWT Hello Custom Shell Email3](https://github.com/AndyObtiva/glimmer-dsl-swt/raw/master/images/glimmer-hello-custom-shell-email3.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, Custom Widget!"
+
+![Glimmer DSL for Opal Hello Custom Shell](images/glimmer-dsl-opal-hello-custom-shell.png)
+![Glimmer DSL for Opal Hello Custom Shell Email1](images/glimmer-dsl-opal-hello-custom-shell-email1.png)
+![Glimmer DSL for Opal Hello Custom Shell Email2](images/glimmer-dsl-opal-hello-custom-shell-email2.png)
+![Glimmer DSL for Opal Hello Custom Shell Email3](images/glimmer-dsl-opal-hello-custom-shell-email3.png)
+
 ### Elaborate Samples
 
 #### Login

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/lib/glimmer-dsl-opal.rb

@@ -8,6 +8,7 @@ if RUBY_PLATFORM == 'opal'
   $LOAD_PATH.unshift(GLIMMER_DSL_OPAL_LIB)
   $LOAD_PATH.unshift(GLIMMER_DSL_OPAL_MISSING) # missing Ruby classes/methods
   
+  require 'opal-parser'
   require 'native' # move this to opal-async
   require 'opal-async'
   require 'async/ext'
@@ -16,6 +17,8 @@ if RUBY_PLATFORM == 'opal'
   require 'glimmer'
   require 'facets/hash/symbolize_keys'  
   require 'glimmer-dsl-opal/ext/exception'
+  require 'glimmer-dsl-opal/ext/date'
+  require 'glimmer-dsl-opal/missing/uri'
 
   # Spiking async logging
 #   logger = Glimmer::Config.logger

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

@@ -0,0 +1,13 @@
+require 'date'
+require 'time'
+
+class DateTime < Date
+  def initialize(*args, &block)
+    @time = Time.new(*args, &block)
+    @time.methods.each do |method|
+      singleton_class.define_method(method) do |*args, &block|
+        @time.send(method, *args, &block)
+      end
+    end  
+  end  
+end

data/lib/glimmer-dsl-opal/missing/uri.rb

@@ -16,9 +16,47 @@ module URI
     
     def to_s
       url
+    end       
+  end
+  
+  TBLENCWWWCOMP_ = {"\u0000"=>"%00", "\u0001"=>"%01", "\u0002"=>"%02", "\u0003"=>"%03", "\u0004"=>"%04", "\u0005"=>"%05", "\u0006"=>"%06", "\a"=>"%07", "\b"=>"%08", "\t"=>"%09", "\n"=>"%0A", "\v"=>"%0B", "\f"=>"%0C", "\r"=>"%0D", "\u000E"=>"%0E", "\u000F"=>"%0F", "\u0010"=>"%10", "\u0011"=>"%11", "\u0012"=>"%12", "\u0013"=>"%13", "\u0014"=>"%14", "\u0015"=>"%15", "\u0016"=>"%16", "\u0017"=>"%17", "\u0018"=>"%18", "\u0019"=>"%19", "\u001A"=>"%1A", "\e"=>"%1B", "\u001C"=>"%1C", "\u001D"=>"%1D", "\u001E"=>"%1E", "\u001F"=>"%1F", " "=>"+", "!"=>"%21", "\""=>"%22", "#"=>"%23", "$"=>"%24", "%"=>"%25", "&"=>"%26", "'"=>"%27", "("=>"%28", ")"=>"%29", "*"=>"%2A", "+"=>"%2B", ","=>"%2C", "-"=>"%2D", "."=>"%2E", "/"=>"%2F", "0"=>"%30", "1"=>"%31", "2"=>"%32", "3"=>"%33", "4"=>"%34", "5"=>"%35", "6"=>"%36", "7"=>"%37", "8"=>"%38", "9"=>"%39", ":"=>"%3A", ";"=>"%3B", "<"=>"%3C", "="=>"%3D", ">"=>"%3E", "?"=>"%3F", "@"=>"%40", "A"=>"%41", "B"=>"%42", "C"=>"%43", "D"=>"%44", "E"=>"%45", "F"=>"%46", "G"=>"%47", "H"=>"%48", "I"=>"%49", "J"=>"%4A", "K"=>"%4B", "L"=>"%4C", "M"=>"%4D", "N"=>"%4E", "O"=>"%4F", "P"=>"%50", "Q"=>"%51", "R"=>"%52", "S"=>"%53", "T"=>"%54", "U"=>"%55", "V"=>"%56", "W"=>"%57", "X"=>"%58", "Y"=>"%59", "Z"=>"%5A", "["=>"%5B", "\\"=>"%5C", "]"=>"%5D", "^"=>"%5E", "_"=>"%5F", "`"=>"%60", "a"=>"%61", "b"=>"%62", "c"=>"%63", "d"=>"%64", "e"=>"%65", "f"=>"%66", "g"=>"%67", "h"=>"%68", "i"=>"%69", "j"=>"%6A", "k"=>"%6B", "l"=>"%6C", "m"=>"%6D", "n"=>"%6E", "o"=>"%6F", "p"=>"%70", "q"=>"%71", "r"=>"%72", "s"=>"%73", "t"=>"%74", "u"=>"%75", "v"=>"%76", "w"=>"%77", "x"=>"%78", "y"=>"%79", "z"=>"%7A", "{"=>"%7B", "|"=>"%7C", "}"=>"%7D", "~"=>"%7E", "\u007F"=>"%7F", "\u0080"=>"%80", "\u0081"=>"%81", "\u0082"=>"%82", "\u0083"=>"%83", "\u0084"=>"%84", "\u0085"=>"%85", "\u0086"=>"%86", "\u0087"=>"%87", "\u0088"=>"%88", "\u0089"=>"%89", "\u008A"=>"%8A", "\u008B"=>"%8B", "\u008C"=>"%8C", "\u008D"=>"%8D", "\u008E"=>"%8E", "\u008F"=>"%8F", "\u0090"=>"%90", "\u0091"=>"%91", "\u0092"=>"%92", "\u0093"=>"%93", "\u0094"=>"%94", "\u0095"=>"%95", "\u0096"=>"%96", "\u0097"=>"%97", "\u0098"=>"%98", "\u0099"=>"%99", "\u009A"=>"%9A", "\u009B"=>"%9B", "\u009C"=>"%9C", "\u009D"=>"%9D", "\u009E"=>"%9E", "\u009F"=>"%9F", "\u00A0"=>"%A0", "\u00A1"=>"%A1", "\u00A2"=>"%A2", "\u00A3"=>"%A3", "\u00A4"=>"%A4", "\u00A5"=>"%A5", "\u00A6"=>"%A6", "\u00A7"=>"%A7", "\u00A8"=>"%A8", "\u00A9"=>"%A9", "\u00AA"=>"%AA", "\u00AB"=>"%AB", "\u00AC"=>"%AC", "\u00AD"=>"%AD", "\u00AE"=>"%AE", "\u00AF"=>"%AF", "\u00B0"=>"%B0", "\u00B1"=>"%B1", "\u00B2"=>"%B2", "\u00B3"=>"%B3", "\u00B4"=>"%B4", "\u00B5"=>"%B5", "\u00B6"=>"%B6", "\u00B7"=>"%B7", "\u00B8"=>"%B8", "\u00B9"=>"%B9", "\u00BA"=>"%BA", "\u00BB"=>"%BB", "\u00BC"=>"%BC", "\u00BD"=>"%BD", "\u00BE"=>"%BE", "\u00BF"=>"%BF", "\u00C0"=>"%C0", "\u00C1"=>"%C1", "\u00C2"=>"%C2", "\u00C3"=>"%C3", "\u00C4"=>"%C4", "\u00C5"=>"%C5", "\u00C6"=>"%C6", "\u00C7"=>"%C7", "\u00C8"=>"%C8", "\u00C9"=>"%C9", "\u00CA"=>"%CA", "\u00CB"=>"%CB", "\u00CC"=>"%CC", "\u00CD"=>"%CD", "\u00CE"=>"%CE", "\u00CF"=>"%CF", "\u00D0"=>"%D0", "\u00D1"=>"%D1", "\u00D2"=>"%D2", "\u00D3"=>"%D3", "\u00D4"=>"%D4", "\u00D5"=>"%D5", "\u00D6"=>"%D6", "\u00D7"=>"%D7", "\u00D8"=>"%D8", "\u00D9"=>"%D9", "\u00DA"=>"%DA", "\u00DB"=>"%DB", "\u00DC"=>"%DC", "\u00DD"=>"%DD", "\u00DE"=>"%DE", "\u00DF"=>"%DF", "\u00E0"=>"%E0", "\u00E1"=>"%E1", "\u00E2"=>"%E2", "\u00E3"=>"%E3", "\u00E4"=>"%E4", "\u00E5"=>"%E5", "\u00E6"=>"%E6", "\u00E7"=>"%E7", "\u00E8"=>"%E8", "\u00E9"=>"%E9", "\u00EA"=>"%EA", "\u00EB"=>"%EB", "\u00EC"=>"%EC", "\u00ED"=>"%ED", "\u00EE"=>"%EE", "\u00EF"=>"%EF", "\u00F0"=>"%F0", "\u00F1"=>"%F1", "\u00F2"=>"%F2", "\u00F3"=>"%F3", "\u00F4"=>"%F4", "\u00F5"=>"%F5", "\u00F6"=>"%F6", "\u00F7"=>"%F7", "\u00F8"=>"%F8", "\u00F9"=>"%F9", "\u00FA"=>"%FA", "\u00FB"=>"%FB", "\u00FC"=>"%FC", "\u00FD"=>"%FD", "\u00FE"=>"%FE", "\u00FF"=>"%FF"}.freeze
+  TBLDECWWWCOMP_ = TBLENCWWWCOMP_.invert.freeze
+  
+  # Encodes given +str+ to URL-encoded form data.
+  #
+  # This method doesn't convert *, -, ., 0-9, A-Z, _, a-z, but does convert SP
+  # (ASCII space) to + and converts others to %XX.
+  #
+  # If +enc+ is given, convert +str+ to the encoding before percent encoding.
+  #
+  # This is an implementation of
+  # https://www.w3.org/TR/2013/CR-html5-20130806/forms.html#url-encoded-form-data.
+  #
+  # See URI.decode_www_form_component, URI.encode_www_form.
+  def self.encode_www_form_component(str, enc=nil)
+    str = str.to_s.dup
+    if str.encoding != Encoding::ASCII_8BIT
+      if enc && enc != Encoding::ASCII_8BIT
+        str.encode!(Encoding::UTF_8, invalid: :replace, undef: :replace)
+        str.encode!(enc, fallback: ->(x){"&##{x.ord};"})
+      end
+      str.force_encoding(Encoding::ASCII_8BIT)
     end
+    str = str.gsub(/[^*\-.0-9A-Z_a-z]/, TBLENCWWWCOMP_)
+    str.force_encoding(Encoding::US_ASCII)
   end
+
+  # Decodes given +str+ of URL-encoded form data.
+  #
+  # This decodes + to SP.
+  #
+  # See URI.encode_www_form_component, URI.decode_www_form.
+  def self.decode_www_form_component(str, enc=Encoding::UTF_8)
+    raise ArgumentError, "invalid %-encoding (#{str})" if /%(?![0-9a-fA-F][0-9a-fA-F])/ =~ str
+    str.b.gsub(/\+|%[0-9a-fA-F][0-9a-fA-F]/, TBLDECWWWCOMP_).force_encoding(enc)
+  end     
 end
+
 module Kernel
   def URI(url)
     URI::HTTP.new(url)

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

@@ -1,4 +1,4 @@
-# Copyright (c) 2007-2020 Andy Maleh
+# Copyright (c) 2020 Andy Maleh
 # 
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -73,8 +73,8 @@ class EmailShell
 
       label {
         layout_data(:fill, :fill, true, true) {
-          horizontal_span 2
-          verticalIndent 10
+          horizontal_span 2 #TODO implement
+          vertical_indent 10
         }
         
         background :white

data/lib/glimmer/dsl/opal/custom_widget_expression.rb

@@ -39,11 +39,31 @@ module Glimmer
         end
   
         def interpret(parent, keyword, *args, &block)
-          options = args.last.is_a?(Hash) ? args.pop : {}
-          UI::CustomWidget.for(keyword).new(parent, *args, options, &block)
+          custom_widget_class = UI::CustomWidget.for(keyword)
+          # TODO clean code by extracting methods into CustomShell
+          if !Glimmer::UI::CustomShell.requested? && custom_widget_class.ancestors.include?(Glimmer::UI::CustomShell)
+            options = args.last.is_a?(Hash) ? args.pop : {}
+            options = options.merge('swt_style' => args.join(',')) unless args.join(',').empty?
+            params = {
+              'custom_shell' => keyword
+            }.merge(options)
+            param_string = params.to_a.map {|k, v| "#{k}=#{URI.encode_www_form_component(v)}"}.join('&')
+            url = "#{`document.location.href`}?#{param_string}"
+            `window.open(#{url})`
+             # just a placeholder that has an open method # TODO return an actual CustomShell in the future that does the work happening above in the #open method
+            Struct.new(:open).new(true)
+          else          
+            custom_widget_class.new(parent, *args, options, &block)
+          end
+        end
+        
+        def add_content(parent, &content)
+          content.call(parent) if parent.is_a?(Glimmer::SWT::ShellProxy) || parent.is_a?(Glimmer::UI::CustomShell)
         end
+        
   
         def add_content(parent, &block)
+          return unless parent.is_a?(Glimmer::UI::CustomWidget)
           # TODO consider avoiding source_location
           if block.source_location == parent.content&.__getobj__.source_location
             parent.content.call(parent) unless parent.content.called?

data/lib/glimmer/dsl/opal/dsl.rb

@@ -20,6 +20,7 @@ require 'glimmer/dsl/opal/color_expression'
 require 'glimmer/dsl/opal/rgb_expression'
 require 'glimmer/dsl/opal/rgba_expression'
 require 'glimmer/dsl/opal/custom_widget_expression'
+require 'glimmer/dsl/opal/swt_expression'
 
 module Glimmer
   module DSL

data/lib/glimmer/dsl/opal/layout_expression.rb

@@ -9,7 +9,7 @@ module Glimmer
         include ParentExpression
 
         def can_interpret?(parent, keyword, *args, &block)
-          parent.is_a?(Glimmer::SWT::CompositeProxy) &&
+          (parent.is_a?(Glimmer::SWT::CompositeProxy) or (parent.is_a?(Glimmer::UI::CustomWidget) and parent.body_root.is_a?(Glimmer::SWT::CompositeProxy))) and
             Glimmer::SWT::LayoutProxy.layout_exists?(keyword)
         end
 

data/lib/glimmer/dsl/opal/shell_expression.rb

@@ -2,6 +2,8 @@ require 'glimmer/dsl/static_expression'
 require 'glimmer/dsl/top_level_expression'
 require 'glimmer/dsl/parent_expression'
 require 'glimmer/swt/shell_proxy'
+require 'glimmer/ui/custom_shell'
+require 'glimmer/dsl/opal/custom_widget_expression'
 
 module Glimmer
   module DSL
@@ -11,7 +13,21 @@ module Glimmer
         include ParentExpression
 
         def interpret(parent, keyword, *args, &block)
-          Glimmer::SWT::ShellProxy.new(*args)
+          if Glimmer::UI::CustomShell.requested_and_not_handled?
+            parameters = Glimmer::UI::CustomShell.request_parameter_string.split("&").map {|str| str.split("=")}.to_h
+            `history.pushState(#{parameters.merge('custom_shell_handled' => 'true')}, document.title, #{"?#{Glimmer::UI::CustomShell.encoded_request_parameter_string}&custom_shell_handled=true"})`
+            custom_shell_keyword = parameters.delete('custom_shell')
+            CustomWidgetExpression.new.interpret(nil, custom_shell_keyword, *[parameters])
+            `history.pushState(#{parameters.reject {|k,v| k == 'custom_shell_handled'}}, document.title, #{"?#{Glimmer::UI::CustomShell.encoded_request_parameter_string.sub('&custom_shell_handled=true', '')}"})`
+            # just a placeholder that has an open method # TODO return an actual CustomShell in the future that does the work happening above in the #open method
+            Struct.new(:open).new(true)
+          else
+            Glimmer::SWT::ShellProxy.new(*args)
+          end
+        end
+        
+        def add_content(parent, &content)
+          content.call(parent) if parent.is_a?(Glimmer::SWT::ShellProxy)
         end
       end
     end

data/lib/glimmer/dsl/opal/swt_expression.rb

@@ -33,7 +33,7 @@ module Glimmer
       # discovers quickly by convention
       class SwtExpression < StaticExpression
         def can_interpret?(parent, keyword, *args, &block)
-          block.nil? &&
+          block.nil? and
             args.size > 0
         end
   

data/lib/glimmer/swt/layout_data_proxy.rb

@@ -8,6 +8,10 @@ module Glimmer
                   :args, 
                   :horizontal_alignment, 
                   :vertical_alignment, 
+                  :horizontal_span, 
+                  :vertical_span, 
+                  :horizontal_indent, 
+                  :vertical_indent, 
                   :grab_excess_horizontal_space,
                   :grab_excess_vertical_space,
                   :height_hint
@@ -15,31 +19,62 @@ module Glimmer
       def initialize(parent, args)
         @parent = parent
         @args = args
+        # TODO spread args correctly
+        # TODO avoid using reapply
         reapply
       end
 
       def height_hint=(height_hint)
         @height_hint = height_hint
+        # TODO
         reapply
       end
 
       def horizontal_alignment=(horizontal_alignment)
         @horizontal_alignment = horizontal_alignment
+        # TODO
         reapply
       end
       
       def vertical_alignment=(vertical_alignment)
         @vertical_alignment = vertical_alignment
+        # TODO
+        reapply
+      end
+      
+      def horizontal_span=(value)
+        @horizontal_span = value
+        @parent.dom_element.css('grid-column-start', "span #{@horizontal_span}")
+        reapply
+      end
+      
+      def vertical_span=(value)
+        @vertical_span = value
+        @parent.dom_element.css('grid-row-start', "span #{@horizontal_span}")
+        reapply
+      end
+      
+      def horizontal_indent=(value)
+        @horizontal_indent = value
+        @parent.dom_element.css('padding-left', @horizontal_indent)
+        reapply
+      end
+      
+      def vertical_indent=(value)
+        @vertical_indent = value
+        @parent.dom_element.css('padding-top', @vertical_indent)
         reapply
       end
       
       def grab_excess_horizontal_space=(grab_excess_horizontal_space)
         @grab_excess_horizontal_space = grab_excess_horizontal_space
+        # TODO
         reapply
       end
 
       def grab_excess_vertical_space=(grab_excess_vertical_space)
         @grab_excess_vertical_space = grab_excess_vertical_space
+        # TODO
         reapply
       end
 

data/lib/glimmer/swt/layout_proxy.rb

@@ -29,8 +29,9 @@ module Glimmer
       
       attr_reader :parent, :args
         
-      def initialize(parent, args)
+      def initialize(parent, args)      
         @parent = parent
+        @parent = parent.body_root if @parent.is_a?(Glimmer::UI::CustomWidget)
         @parent.css_classes.each do |css_class|
           @parent.remove_css_class(css_class) if css_class.include?('layout')
         end

data/lib/glimmer/swt/message_box_proxy.rb

@@ -93,7 +93,7 @@ module Glimmer
           }
           .modal-content {
             background-color: #fefefe;
-            margin: auto;
+            padding-bottom: 15px;
             border: 1px solid #888;
             display: inline-block;
             min-width: 200px;

data/lib/glimmer/swt/shell_proxy.rb

@@ -9,7 +9,7 @@ module Glimmer
     
       WIDTH_MIN = 130
       HEIGHT_MIN = 0
-    
+      
       def initialize(args)
         @args = args
         @children = []
@@ -238,6 +238,7 @@ module Glimmer
       end
       
       def open
+        # TODO consider the idea of delaying rendering till the open method
         # TODO make it start as hidden and show shell upon open
       end
     end

data/lib/glimmer/ui/custom_shell.rb

@@ -19,6 +19,7 @@
 # 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/ui/custom_widget'
 require 'glimmer/error'
 
 module Glimmer
@@ -32,15 +33,32 @@ module Glimmer
           klass.include(Glimmer) 
           Glimmer::UI::CustomWidget.add_custom_widget_namespaces_for(klass)
         end
+          
+        def request_parameter_string
+          URI.decode_www_form_component(`document.location.href`.match(/\?(.*)$/).to_a[1].to_s)
+        end
+        
+        def encoded_request_parameter_string
+          `document.location.href`.match(/\?(.*)$/).to_a[1].to_s
+        end
+        
+        def requested_and_not_handled?
+          requested? && !request_parameter_string.include?('custom_shell_handled=true')        
+        end   
+        
+        def requested?
+          request_parameter_string.include?('custom_shell=')
+        end   
       end
       
       def initialize(parent, args, options, &content)
-        super
+        super(parent, args, options, &content)
         raise Error, 'Invalid custom shell body root! Must be a shell or another custom shell.' unless body_root.is_a?(Glimmer::SWT::ShellProxy)
       end
 
       # Classes may override
       def open
+        # TODO consider the idea of delaying rendering till the open method
         body_root.open
       end
 

data/lib/glimmer/ui/custom_widget.rb

@@ -152,13 +152,14 @@ module Glimmer
 
       def initialize(parent, args, options, &content)
         @parent = parent
-        options = args.delete_at(-1) if args.is_a?(Array) && args.last.is_a?(Hash)
+        options = args.delete_at(-1) if options.nil? && args.is_a?(Array) && args.last.is_a?(Hash)
         if args.is_a?(Hash)
           options = args
           args = []
         end
+        args = options.delete('swt_style').split(',').map(&:to_sym) if options['swt_style']                
         @args = args
-        @swt_style = SWT::SWTProxy[*args]
+        @swt_style = SWT::SWTProxy[*@args]
         options ||= {}
         @options = self.class.options.merge(options)
         @content = Util::ProcTracker.new(content) if content

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-opal
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-12 00:00:00.000000000 Z
+date: 2020-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer
@@ -210,6 +210,7 @@ files:
 - README.md
 - VERSION
 - lib/glimmer-dsl-opal.rb
+- lib/glimmer-dsl-opal/ext/date.rb
 - lib/glimmer-dsl-opal/ext/exception.rb
 - lib/glimmer-dsl-opal/missing/net/http.rb
 - lib/glimmer-dsl-opal/missing/uri.rb