glimmer-dsl-opal 0.7.3 → 0.9.1

data/VERSION

@@ -1 +1 @@
-0.7.3
+0.9.1

data/lib/glimmer-dsl-opal.rb

@@ -33,6 +33,11 @@ if RUBY_ENGINE == 'opal'
   # TODO look into making append_path work (causing some trouble right now)
 #   Opal.append_path File.expand_path('../glimmer-dsl-opal/missing', __FILE__)
 #   Opal.append_path GLIMMER_DSL_OPAL_MISSING
+  module Kernel
+    def include_package(package)
+      # No Op (just a shim)
+    end
+  end
   
   require 'opal-parser'
   require 'native' # move this to opal-async
@@ -49,14 +54,18 @@ if RUBY_ENGINE == 'opal'
 #   require 'glimmer-dsl-opal/vendor/jquery-ui/jquery-ui.structure.min.css'
 #   require 'glimmer-dsl-opal/vendor/jquery-ui/jquery-ui.theme.min.css'
   require 'opal-jquery'
+  require 'opal/jquery/local_storage'
  
   require 'facets/hash/symbolize_keys'
+  require 'glimmer-dsl-opal/ext/class'
+  require 'glimmer-dsl-opal/ext/file'
   require 'glimmer-dsl-opal/ext/struct'
   require 'glimmer'
   require 'glimmer-dsl-opal/ext/exception'
   require 'glimmer-dsl-opal/ext/date'
+  require 'glimmer-dsl-opal/ext/glimmer/dsl/engine'
   require 'uri'
-
+  
   # Spiking async logging
 #   logger = Glimmer::Config.logger
 #   original_add_method = logger.class.instance_method(:add)
@@ -68,14 +77,17 @@ if RUBY_ENGINE == 'opal'
 #   end
       
   require 'glimmer/dsl/opal/dsl'
-   
+  require 'glimmer/config/opal_logger'
   require 'glimmer-dsl-xml'
   require 'glimmer-dsl-css'
   Element.alias_native :replace_with, :replaceWith
   Element.alias_native :select
   
-#   Glimmer::Config.loop_max_count = 20
+#   Glimmer::Config.loop_max_count = 20 # TODO disable
   
+  original_logger_level = Glimmer::Config.logger.level
+  Glimmer::Config.logger = Glimmer::Config::OpalLogger.new(STDOUT)
+  Glimmer::Config.logger.level = original_logger_level
   Glimmer::Config.excluded_keyword_checkers << lambda do |method_symbol, *args|
     method = method_symbol.to_s
     result = false

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

@@ -0,0 +1,10 @@
+class Class
+  def inherited(klass)
+    @descendants ||= []
+    @descendants << klass
+  end
+  
+  def descendants
+    @descendants.to_collection.map { |klass| [klass] + (klass.descendants if klass.respond_to?(:descendants)).to_a }.flatten.compact
+  end
+end

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

@@ -0,0 +1,25 @@
+require 'glimmer/swt/latest_shell_proxy'
+require 'glimmer/swt/latest_message_box_proxy'
+
+module Glimmer
+  module DSL
+    class Engine
+      class << self
+        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)
+              dsl_stack.pop
+            end
+          end
+          if ['shell', 'message_box'].include?(keyword) && Glimmer::SWT::DisplayProxy.instance.send("#{keyword}s").empty?
+            Document.ready?(&work)
+            Glimmer::SWT.const_get("Latest#{keyword.camelcase(:upper)}Proxy").new
+          else
+            work.call
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -12,41 +12,76 @@ class ContactManager
     shell {
       text "Contact Manager"
       composite {
-        composite {
-          grid_layout 2, false
-          label {text "First &Name: "}
+        group {
+          grid_layout(2, false) {
+            margin_width 0
+            margin_height 0
+          }
+          layout_data :fill, :center, true, false
+          text 'Lookup Contacts'
+          font height: 24
+          
+          label {
+            layout_data :right, :center, false, false
+            text "First &Name: "
+            font height: 16
+          }
           text {
+            layout_data :fill, :center, true, false
             text bind(@contact_manager_presenter, :first_name)
             on_key_pressed {|key_event|
-              @contact_manager_presenter.find if key_event.keyCode == Glimmer::SWT::SWTProxy[:cr]
+              @contact_manager_presenter.find if key_event.keyCode == swt(:cr)
             }
           }
-          label {text "&Last Name: "}
+          
+          label {
+            layout_data :right, :center, false, false
+            text "&Last Name: "
+            font height: 16
+          }
           text {
+            layout_data :fill, :center, true, false
             text bind(@contact_manager_presenter, :last_name)
             on_key_pressed {|key_event|
-              @contact_manager_presenter.find if key_event.keyCode == Glimmer::SWT::SWTProxy[:cr]
+              @contact_manager_presenter.find if key_event.keyCode == swt(:cr)
             }
           }
-          label {text "&Email: "}
+          
+          label {
+            layout_data :right, :center, false, false
+            text "&Email: "
+            font height: 16
+          }
           text {
+            layout_data :fill, :center, true, false
             text bind(@contact_manager_presenter, :email)
             on_key_pressed {|key_event|
-              @contact_manager_presenter.find if key_event.keyCode == Glimmer::SWT::SWTProxy[:cr]
+              @contact_manager_presenter.find if key_event.keyCode == swt(:cr)
             }
           }
+          
           composite {
-            grid_layout 2, false
+            row_layout {
+              margin_width 0
+              margin_height 0
+            }
+            layout_data(:right, :center, false, false) {
+              horizontal_span 2
+            }
+            
             button {
               text "&Find"
-              on_widget_selected {
-                @contact_manager_presenter.find
+              on_widget_selected { @contact_manager_presenter.find }
+              on_key_pressed {|key_event|
+                @contact_manager_presenter.find if key_event.keyCode == swt(:cr)
               }
             }
+            
             button {
               text "&List All"
-              on_widget_selected {
-                @contact_manager_presenter.list
+              on_widget_selected { @contact_manager_presenter.list }
+              on_key_pressed {|key_event|
+                @contact_manager_presenter.list if key_event.keyCode == swt(:cr)
               }
             }
           }
@@ -63,25 +98,17 @@ class ContactManager
           table_column {
             text "First Name"
             width 80
-            on_widget_selected {
-              @contact_manager_presenter.toggle_sort(:first_name)
-            }
           }
           table_column {
             text "Last Name"
             width 80
-            on_widget_selected {
-              @contact_manager_presenter.toggle_sort(:last_name)
-            }
           }
           table_column {
             text "Email"
             width 200
-            on_widget_selected {
-              @contact_manager_presenter.toggle_sort(:email)
-            }
           }
-          items bind(@contact_manager_presenter, :results), column_properties(:first_name, :last_name, :email)
+          items bind(@contact_manager_presenter, :results),
+          column_properties(:first_name, :last_name, :email)
           on_mouse_up { |event|
             table_proxy.edit_table_item(event.table_item, event.column_index)
           }

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

@@ -1,6 +1,5 @@
 require "observer"
 
-#Presents login screen data
 class LoginPresenter
 
   attr_accessor :user_name
@@ -16,10 +15,13 @@ class LoginPresenter
   def status=(status)
     @status = status
 
-    #TODO add feature to bind dependent properties to master property (2017-07-25 nested data binding)
     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
     self.status == "Logged In"
@@ -30,6 +32,7 @@ class LoginPresenter
   end
 
   def login
+    return unless valid?
     self.status = "Logged In"
   end
 
@@ -41,7 +44,6 @@ class LoginPresenter
 
 end
 
-#Login screen
 class Login
   include Glimmer
 
@@ -53,15 +55,21 @@ class Login
         grid_layout 2, false #two columns with differing widths
 
         label { text "Username:" } # goes in column 1
-        text {                     # goes in column 2
+        @user_name_text = text {   # goes in column 2
           text bind(presenter, :user_name)
           enabled bind(presenter, :logged_out)
+          on_key_pressed { |event|
+            @password_text.set_focus if event.keyCode == swt(:cr)
+          }
         }
 
         label { text "Password:" }
-        text(:password, :border) {
+        @password_text = text(:password, :border) {
           text bind(presenter, :password)
           enabled bind(presenter, :logged_out)
+          on_key_pressed { |event|
+            presenter.login if event.keyCode == swt(:cr)
+          }
         }
 
         label { text "Status:" }
@@ -71,12 +79,21 @@ class Login
           text "Login"
           enabled bind(presenter, :logged_out)
           on_widget_selected { presenter.login }
+          on_key_pressed { |event|
+            presenter.login if event.keyCode == swt(:cr)
+          }
         }
 
         button {
           text "Logout"
           enabled bind(presenter, :logged_in)
           on_widget_selected { presenter.logout }
+          on_key_pressed { |event|
+            if event.keyCode == swt(:cr)
+              presenter.logout
+              @user_name_text.set_focus
+            end
+          }
         }
       }
     }

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

@@ -1,8 +1,31 @@
+# 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
+# "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.
+
 include Glimmer
 
 shell {
+  text 'Hello, Browser!'
   minimum_size 1024, 860
+  
   browser {
-    url 'http://brightonresort.com/about'
+    url 'https://brightonresort.com/about'
   }
 }.open

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

@@ -0,0 +1,46 @@
+# Copyright (c) 2007-2020 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 HelloButton
+  include Glimmer
+  
+  attr_accessor :count
+  
+  def initialize
+    @count = 0
+  end
+  
+  def launch
+    shell {
+      text 'Hello, Button!'
+      
+      button {
+        text bind(self, :count) {|value| "Click To Increment: #{value}  "}
+        
+        on_widget_selected {
+          self.count += 1
+        }
+      }
+    }.open
+  end
+end
+
+HelloButton.new.launch

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

@@ -1,3 +1,24 @@
+# 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
+# "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_relative 'hello_computed/contact'
 
 class HelloComputed
@@ -14,6 +35,7 @@ class HelloComputed
   def launch
     shell {
       text 'Hello, Computed!'
+      
       composite {
         grid_layout {
           num_columns 2
@@ -21,6 +43,7 @@ class HelloComputed
           horizontal_spacing 20
           vertical_spacing 10
         }
+        
         label {text 'First &Name: '}
         text {
           text bind(@contact, :first_name)
@@ -29,6 +52,7 @@ class HelloComputed
             grab_excess_horizontal_space true
           }
         }
+        
         label {text '&Last Name: '}
         text {
           text bind(@contact, :last_name)
@@ -37,6 +61,7 @@ class HelloComputed
             grab_excess_horizontal_space true
           }
         }
+        
         label {text '&Year of Birth: '}
         text {
           text bind(@contact, :year_of_birth)
@@ -45,6 +70,7 @@ class HelloComputed
             grab_excess_horizontal_space true
           }
         }
+        
         label {text 'Name: '}
         label {
           text bind(@contact, :name, computed_by: [:first_name, :last_name])
@@ -53,6 +79,7 @@ class HelloComputed
             grab_excess_horizontal_space true
           }
         }
+        
         label {text 'Age: '}
         label {
           text bind(@contact, :age, on_write: :to_i, computed_by: [:year_of_birth])

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

@@ -1,5 +1,5 @@
 # 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
 # "Software"), to deal in the Software without restriction, including
@@ -7,10 +7,10 @@
 # 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
@@ -26,7 +26,7 @@ require 'date'
 class EmailShell
   include Glimmer::UI::CustomShell
   
-  # multiple options without default values  
+  # multiple options without default values
   options :date, :subject, :from, :message
   
   # single option with default value
@@ -41,7 +41,7 @@ class EmailShell
     shell(swt_style) {
       grid_layout(2, false)
       
-      text subject      
+      text subject
 
       label {
         text 'Date:'
@@ -78,7 +78,7 @@ class EmailShell
         }
         
         background :white
-        text message        
+        text message
       }
     }
   }
@@ -149,7 +149,7 @@ class HelloCustomShell
         }
       }
     }.open
-  end  
+  end
 end
 
 HelloCustomShell.new.launch