glimmer-dsl-swt 4.17.10.7 → 4.17.10.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 00b44b39eadc5263ddccde3ac95a754a9b4ad32c9412c268e9cf481ce89b7b05
-  data.tar.gz: 7a72f47c3a36921160c3217652cc98a1b377f8c5202c2c24ade6288106d87b7a
+  metadata.gz: f86e6ce8dc5b52db4661c0cb5aa9d9bce7e0cc644408ae1536aed5d2ea25d0cd
+  data.tar.gz: ccdbb42c7bebc81a2a73235ee80ef53ce6607810152ea66b6336e33490a8e83a
 SHA512:
-  metadata.gz: c630340b8dad5f0fe4f12481aec9dd039e21cd5be5fec8350c8624b23d3a76aa4cd84ce3e5b85fd1506c1037ab5094e2872548061029cf02c906a13b56df5f5b
-  data.tar.gz: 1bd3f35d763bb34095e3b600abaf013d38ad7c4545bbcff6e1f1739a9702d760e79b533bc29b863587307bac567e34604fe212980cac3552eb96b05595bbd5c9
+  metadata.gz: 7d1e3ee58b861a453d79cca264749bcfc17f0efd4e490864aadec61a4b4269ad033cc49fbf291ccf8b9840ed54813130e8620a557d1f15c3c6c25883276ee6cb
+  data.tar.gz: 7fb220ed34798e701839cf118e1a7df1ebf5492b938570a8ee7dd0ad6a0a624808f52fe74ac30d221f58e6269ff708dd6d71098b0251c3470d16fa2a5c472323

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Change Log
 
+### 4.17.10.8
+
+- Support editing sample code in the Glimmer Meta-Sample to enable experimentation and learning
+- Add a "Reset" button to the Glimmer Meta-Sample to allow resetting sample code changes
+- Refactor/revise hello_message_box.rb and hello_pop_up_context_menu.rb samples
+- Upgrade to glimmer 1.0.6
+
 ### 4.17.10.7
 
 - Loosened dependencies on most Glimmer author-owned gems

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 SWT 4.17.10.7
+# [<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 SWT 4.17.10.8
 
 ## JRuby Desktop Development GUI Framework
 [![Gem Version](https://badge.fury.io/rb/glimmer-dsl-swt.svg)](http://badge.fury.io/rb/glimmer-dsl-swt)
@@ -449,7 +449,7 @@ jgem install glimmer-dsl-swt
 
 Or this command if you want a specific version:
 ```
-jgem install glimmer-dsl-swt -v 4.17.10.7
+jgem install glimmer-dsl-swt -v 4.17.10.8
 
 ```
 
@@ -526,7 +526,7 @@ bin/glimmer samples
 Below are the full usage instructions that come up when running `glimmer` without args.
 
 ```
-Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.17.10.7
+Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.17.10.8
 
       
 Usage: glimmer [--bundler] [--pd] [--quiet] [--debug] [--log-level=VALUE] [[ENV_VAR=VALUE]...] [[-jruby-option]...] (application.rb or task[task_args]) [[application2.rb]...]
@@ -1003,8 +1003,8 @@ Output:
   Name         Gem          Version    Author          Description
                                                                          
   Css    glimmer-dsl-css    1.1.0     AndyMaleh    Glimmer DSL for CSS
-  Opal   glimmer-dsl-opal   0.4.0     AndyMaleh    Glimmer DSL for Opal
-  Swt    glimmer-dsl-swt    4.17.10.7
+  Opal   glimmer-dsl-opal   0.8.0     AndyMaleh    Glimmer DSL for Opal
+  Swt    glimmer-dsl-swt    4.17.10.8
   AndyMaleh    Glimmer DSL for SWT
   Tk     glimmer-dsl-tk     0.0.6     AndyMaleh    Glimmer DSL for Tk
   Xml    glimmer-dsl-xml    1.1.0     AndyMaleh    Glimmer DSL for XML
@@ -3286,10 +3286,8 @@ Glimmer Meta-Sample Code Example:
 
 ```ruby
 # ...
-code_text {
-  text bind(SampleDirectory, 'selected_sample.content')
-  editable false
-  caret nil
+@code_text = code_text {
+  text bind(SampleDirectory, 'selected_sample.content', read_only: true)
 }
 # ...
 ```
@@ -3625,7 +3623,7 @@ https://www.eclipse.org/nebula/
 
 ## Samples
 
-Check the [samples](samples) directory in [glimmer-dsl-swt](https://github.com/AndyObtiva/glimmer-dsl-swt) for examples on how to write Glimmer applications. To run a sample, make sure to install the `glimmer` gem first and then use the `glimmer` command to run it (alternatively, you may clone the repo, follow [CONTRIBUTING.md](CONTRIBUTING.md) instructions, and run samples locally with development glimmer command: `bin/glimmer`).
+Check the [samples](samples) directory in [glimmer-dsl-swt](https://github.com/AndyObtiva/glimmer-dsl-swt) for examples on how to write Glimmer applications. To run a sample, make sure to install the `glimmer` gem first and then use the `glimmer samples` command to run it (alternatively, you may clone the repo, follow [CONTRIBUTING.md](CONTRIBUTING.md) instructions, and run samples locally with development glimmer command: `bin/glimmer`).
 
 You may run any sample via this command:
 
@@ -3637,6 +3635,8 @@ This brings up the [Glimmer Meta-Sample (The Sample of Samples)](samples/elabora
 
 ![Glimmer Meta-Sample](images/glimmer-meta-sample.png)
 
+You may edit the code of any sample before launching it via the "Launch" button. This helps you learn by experiementing with Glimmer GUI DSL syntax. To go back to original code, simply hit the "Reset" button.
+
 ### Hello Samples
 
 For hello-type simple samples, check the following.

data/VERSION

@@ -1 +1 @@
-4.17.10.7
+4.17.10.8

data/glimmer-dsl-swt.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: glimmer-dsl-swt 4.17.10.7 ruby lib
+# stub: glimmer-dsl-swt 4.17.10.8 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "glimmer-dsl-swt".freeze
-  s.version = "4.17.10.7"
+  s.version = "4.17.10.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["AndyMaleh".freeze]
-  s.date = "2020-12-15"
+  s.date = "2020-12-17"
   s.description = "Glimmer DSL for SWT (JRuby Desktop Development GUI Framework)".freeze
   s.email = "andy.am@gmail.com".freeze
   s.executables = ["glimmer".freeze, "girb".freeze]
@@ -174,7 +174,7 @@ Gem::Specification.new do |s|
   end
 
   if s.respond_to? :add_runtime_dependency then
-    s.add_runtime_dependency(%q<glimmer>.freeze, ["~> 1.0.5"])
+    s.add_runtime_dependency(%q<glimmer>.freeze, ["~> 1.0.6"])
     s.add_runtime_dependency(%q<super_module>.freeze, [">= 1.4.1", "< 2.0.0"])
     s.add_runtime_dependency(%q<nested_inherited_jruby_include_package>.freeze, [">= 0.3.0", "< 2.0.0"])
     s.add_runtime_dependency(%q<puts_debuggerer>.freeze, [">= 0.11.0", "< 2.0.0"])
@@ -193,7 +193,7 @@ Gem::Specification.new do |s|
     s.add_development_dependency(%q<simplecov>.freeze, ["~> 0.16.1"])
     s.add_development_dependency(%q<simplecov-lcov>.freeze, ["~> 0.7.0"])
   else
-    s.add_dependency(%q<glimmer>.freeze, ["~> 1.0.5"])
+    s.add_dependency(%q<glimmer>.freeze, ["~> 1.0.6"])
     s.add_dependency(%q<super_module>.freeze, [">= 1.4.1", "< 2.0.0"])
     s.add_dependency(%q<nested_inherited_jruby_include_package>.freeze, [">= 0.3.0", "< 2.0.0"])
     s.add_dependency(%q<puts_debuggerer>.freeze, [">= 0.11.0", "< 2.0.0"])

data/samples/elaborate/meta_sample.rb

@@ -1,4 +1,8 @@
+require 'fileutils'
+
 class Sample
+  include Glimmer::DataBinding::ObservableModel
+  
   attr_accessor :sample_directory, :file, :selected
   
   def initialize(file, sample_directory: )
@@ -19,12 +23,33 @@ class Sample
     @name
   end
   
-  def content
-    @content = File.read(file)
+  def code
+    reset_code! if @code.nil?
+    @code
   end
-    
-  def launch
-    load file
+  
+  def reset_code!
+    @code = File.read(file)
+    notify_observers('code')
+  end
+  
+  def launch(modified_code)
+    modified_file = File.join(File.dirname(file), ".#{File.basename(file)}")
+    begin
+      File.write(modified_file, modified_code)
+      begin
+        load(modified_file)
+      rescue StandardError, SyntaxError => launch_error
+        message_box {
+          text 'Error Launching'
+          message launch_error.full_message
+        }.open
+      end
+    rescue
+      load(file) # load original file if failed to write changes
+    ensure
+      FileUtils.rm_rf(modified_file)
+    end
   end
 end
 
@@ -111,15 +136,17 @@ end
 class MetaSampleApplication
   include Glimmer
   
+  def initialize
+    selected_sample_directory = SampleDirectory.sample_directories.first
+    selected_sample = selected_sample_directory.samples.first
+    selected_sample_directory.selected_sample_name = selected_sample.name
+  end
+  
   def launch
     shell {
       minimum_size 1280, 768
       text 'Glimmer Meta-Sample (The Sample of Samples)'
       
-      on_swt_show {
-        SampleDirectory.selected_sample = SampleDirectory.all_samples.first
-      }
-      
       sash_form {
         composite {
           grid_layout 1, false
@@ -144,22 +171,31 @@ class MetaSampleApplication
             }
           }
           
-          button {
+          composite {
+            fill_layout
             layout_data(:fill, :center, true, false) {
               height_hint 120
             }
-            text 'Launch Sample'
-            font height: 30
-            on_widget_selected {
-              SampleDirectory.selected_sample.launch
+            
+            button {
+              text 'Launch'
+              font height: 30
+              on_widget_selected {
+                SampleDirectory.selected_sample.launch(@code_text.text)
+              }
+            }
+            button {
+              text 'Reset'
+              font height: 30
+              on_widget_selected {
+                SampleDirectory.selected_sample.reset_code!
+              }
             }
           }
         }
             
-        code_text {
-          text bind(SampleDirectory, 'selected_sample.content')
-          editable false
-          caret nil
+        @code_text = code_text {
+          text bind(SampleDirectory, 'selected_sample.code', read_only: true)
         }
         
         weights 4, 9

data/samples/hello/hello_browser.rb

@@ -22,7 +22,9 @@
 include Glimmer
 
 shell {
+  text 'Hello, Browser!'
   minimum_size 1024, 860
+  
   browser {
     url 'https://brightonresort.com/about'
   }

data/samples/hello/hello_computed.rb

@@ -1,5 +1,5 @@
 # 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
@@ -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
@@ -35,6 +35,7 @@ class HelloComputed
   def launch
     shell {
       text 'Hello, Computed!'
+      
       composite {
         grid_layout {
           num_columns 2
@@ -42,6 +43,7 @@ class HelloComputed
           horizontal_spacing 20
           vertical_spacing 10
         }
+        
         label {text 'First &Name: '}
         text {
           text bind(@contact, :first_name)
@@ -50,6 +52,7 @@ class HelloComputed
             grab_excess_horizontal_space true
           }
         }
+        
         label {text '&Last Name: '}
         text {
           text bind(@contact, :last_name)
@@ -58,6 +61,7 @@ class HelloComputed
             grab_excess_horizontal_space true
           }
         }
+        
         label {text '&Year of Birth: '}
         text {
           text bind(@contact, :year_of_birth)
@@ -66,6 +70,7 @@ class HelloComputed
             grab_excess_horizontal_space true
           }
         }
+        
         label {text 'Name: '}
         label {
           text bind(@contact, :name, computed_by: [:first_name, :last_name])
@@ -74,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/samples/hello/hello_message_box.rb

@@ -1,5 +1,5 @@
 # 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
@@ -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
@@ -21,16 +21,17 @@
 
 include Glimmer
 
-@shell = shell {
+shell {
   text 'Hello, Message Box!'
+  
   button {
     text 'Please Click To Win a Surprise'
+    
     on_widget_selected {
-      message_box(@shell) {
+      message_box {
         text 'Surprise'
-        message "Congratulations!\n\nYou have won $1,000,000!"
+        message "Congratulations!\n\nYou won $1,000,000!"
       }.open
     }
   }
-}
-@shell.open
+}.open

data/samples/hello/hello_pop_up_context_menu.rb

@@ -21,12 +21,18 @@
 
 include Glimmer
 
-shell { |shell_proxy|
+shell {
+  grid_layout {
+    margin_width 0
+    margin_height 0
+  }
+  
   text 'Hello, Pop Up Context Menu!'
-  grid_layout
+  
   label {
-    font height: 16
-    text 'Right-Click To Pop Up a Context Menu'
+    text "Right-Click on the Text to\nPop Up a Context Menu"
+    font height: 50
+    
     menu {
       menu {
         text '&History'
@@ -35,7 +41,7 @@ shell { |shell_proxy|
           menu_item {
             text 'File 1'
             on_widget_selected {
-              message_box(shell_proxy) {
+              message_box {
                 text 'File 1'
                 message 'File 1 Contents'
               }.open
@@ -44,13 +50,34 @@ shell { |shell_proxy|
           menu_item {
             text 'File 2'
             on_widget_selected {
-              message_box(shell_proxy) {
+              message_box {
                 text 'File 2'
                 message 'File 2 Contents'
               }.open
             }
           }
         }
+        menu {
+          text '&Archived'
+          menu_item {
+            text 'File 3'
+            on_widget_selected {
+              message_box {
+                text 'File 3'
+                message 'File 3 Contents'
+              }.open
+            }
+          }
+          menu_item {
+            text 'File 4'
+            on_widget_selected {
+              message_box {
+                text 'File 4'
+                message 'File 4 Contents'
+              }.open
+            }
+          }
+        }
       }
     }
   }

metadata

@@ -1,21 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-swt
 version: !ruby/object:Gem::Version
-  version: 4.17.10.7
+  version: 4.17.10.8
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-15 00:00:00.000000000 Z
+date: 2020-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.5
+        version: 1.0.6
   name: glimmer
   prerelease: false
   type: :runtime
@@ -23,7 +23,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.5
+        version: 1.0.6
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements: