glimmer-dsl-opal 0.25.0 → 0.25.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3acd64cce93e2c522567f6b10967489a8edb74e19aad32d9b6aef070f8339715
-  data.tar.gz: 78adb831387641339c046839bf8ccd034354881a1a963c0eb7084c4065167c2b
+  metadata.gz: d82f0649f5baefa289ee1facb6102608e4d84e5a98e84a775ab1112f1698cc3d
+  data.tar.gz: da29c7ccd153e217867d2dd47afc7611311d79511461bb9395529a6561551cca
 SHA512:
-  metadata.gz: 340aa792a59e2577c818461ef4ebe88a01b06a8becf19e2f138c8895cdfa691872d227ea9c490f1bb48d14fd6edf3bb2b65aabe8f21bb0982e8fcf4bfdb2d5e1
-  data.tar.gz: c5509de40b089c73879d46aabb4c7440698eda864acd80509e1496b7bb1ca0558b47c399c96d28b295fa9ec088dffdaf7958861f23dcb9b4b24bbb58a798561d
+  metadata.gz: 427deabace568823bb59fc9e09dbbbdc7c37c22c25dd131daa41fa61a88cc61a7cc746480d733b2862055fe798a05728ca1a809bacba839068ae346f9ce005da
+  data.tar.gz: bf34f31729b7c49c25442f12292042c92faf9eeb97e02582d87ad25f548a201ba574af4d00d5280166235c157509b95c2e5412a9e06f3f3924ea2738c6a3555a

data/CHANGELOG.md

@@ -1,5 +1,25 @@
 # Change Log
 
+## 0.25.4
+
+- Upgrade to opal-async 1.4.0 
+- Update Hello, Custom Widget! to utilize `Array#async_cycle` instead of `Array#cycle`
+
+## 0.25.3
+
+- Fix `c_combo`'s data-binding of selection receiving model changes
+- Fix Hello, C Combo!'s reset button
+- Fix Login sample by removing unnecessary require statement at the top
+
+## 0.25.2
+
+- Fix sizing of buttons with font height specified to fit text
+
+## 0.25.1
+
+- Support `progress_bar` `:vertical` SWT style
+- Add `progress_bar` `:vertical` SWT style to Hello, Progress Bar!
+
 ## 0.25.0
 
 - Support `progress_bar` widget without `:vertical` SWT style support

data/README.md

@@ -12,6 +12,8 @@ Use in one of two ways:
 
 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 Glimmer desktop [data-binding](https://github.com/AndyObtiva/glimmer#data-binding) capabilities for the web (including Shine syntax using `<=>` and `<=` for bidirectional [two-way] and unidirectional [one-way] data-binding respectively).
 
+(note that auto-webification of desktop apps that involve multiple threads might involve extra changes to the code to utilize web async calls due to the async nature of transpiled JavaScript code)
+
 #### Hello, Table! Sample
 
 Code: [lib/glimmer-dsl-opal/samples/hello/hello_table.rb](lib/glimmer-dsl-opal/samples/hello/hello_table.rb)
@@ -143,7 +145,7 @@ Hello, Table! Game Booked
 
 NOTE: Glimmer DSL for Opal is an alpha project. Please help make better by contributing, adopting for small or low risk projects, and providing feedback. It is still an early alpha, so the more feedback and issues you report the better.
 
-**Alpha Version** 0.24.0 only supports bare-minimum capabilities for the included [samples](https://github.com/AndyObtiva/glimmer-dsl-opal#samples) (originally written for [glimmer-dsl-swt](https://github.com/AndyObtiva/glimmer-dsl-swt))
+**Alpha Version** 0.25.4 only supports bare-minimum capabilities for the included [samples](https://github.com/AndyObtiva/glimmer-dsl-opal#samples) (originally written for [glimmer-dsl-swt](https://github.com/AndyObtiva/glimmer-dsl-swt))
 
 Other [Glimmer](https://github.com/AndyObtiva/glimmer) DSL gems:
 - [glimmer-dsl-swt](https://github.com/AndyObtiva/glimmer-dsl-swt): Glimmer DSL for SWT (JRuby Desktop Development GUI Framework)
@@ -232,7 +234,7 @@ Alternatively, web developers may directly use [Glimmer DSL for Opal](https://ru
 
 ## Pre-requisites
 
-- Rails 5: [https://github.com/rails/rails/tree/5-2-stable](https://github.com/rails/rails/tree/5-2-stable)
+- Rails 5.2: [https://github.com/rails/rails/tree/5-2-stable](https://github.com/rails/rails/tree/5-2-stable)
 - Opal 1.0.4: [https://github.com/opal/opal](https://github.com/opal/opal)
 - Opal-Rails 1.1.2: [https://github.com/opal/opal-rails](https://github.com/opal/opal-rails)
 - jQuery 3: [https://code.jquery.com/](https://code.jquery.com/) (jQuery 3.5.1 is included in the [glimmer-dsl-opal](https://rubygems.org/gems/glimmer-dsl-opal) gem)
@@ -264,9 +266,9 @@ Add the following to `Gemfile`:
 ```
 gem 'opal', '1.0.4'
 gem 'opal-rails', '1.1.2'
-gem 'opal-async', '~> 1.3.0'
+gem 'opal-async', '~> 1.4.0'
 gem 'opal-jquery', '~> 0.4.4'
-gem 'glimmer-dsl-opal', '~> 0.24.0'
+gem 'glimmer-dsl-opal', '~> 0.25.4'
 gem 'glimmer-dsl-xml', '~> 1.2.0', require: false
 gem 'glimmer-dsl-css', '~> 1.2.0', require: false
 
@@ -1035,7 +1037,7 @@ Add the following require statement to `app/assets/javascripts/application.rb`
 require 'glimmer-dsl-opal/samples/hello/hello_custom_widget'
 ```
 
-Or add the Glimmer code directly if you prefer to play around with it:
+Or add the Glimmer code directly if you prefer to play around with it (note that the Opal version needs `Array#async_cycle` from the opal-async gem instead of `Array#cycle` due to the async nature of JavaScript):
 
 ```ruby
 # This class declares a `greeting_label` custom widget (by convention)
@@ -1060,7 +1062,7 @@ class GreetingLabel
     return if colors.nil?
     
     Thread.new { # imported from Glimmer DSL for SWT. In Opal, avoid Threads and sleep to avoid blocking GUI.
-      colors.cycle { |color|
+      colors.async_cycle { |color|
         async_exec {
           self.color = color
         }
@@ -1881,6 +1883,8 @@ Visit `http://localhost:3000`
 
 You should see "Hello, Progress Bar!"
 
+![Glimmer DSL for Opal Hello Progress Bar](https://github.com/AndyObtiva/glimmer-dsl-opal/raw/master/images/glimmer-dsl-opal-hello-progress-bar.gif)
+
 #### Hello, Pop Up Context Menu!
 
 Add the following require statement to `app/assets/javascripts/application.rb`

data/VERSION

@@ -1 +1 @@
-0.25.0
+0.25.4

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

@@ -19,8 +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.
 
-require 'glimmer-dsl-swt'
-
 class LoginPresenter
 
   attr_accessor :user_name
@@ -64,10 +62,10 @@ end
 
 class Login
   include Glimmer::UI::CustomShell
-  
-  before_body {
+
+  before_body do
     @presenter = LoginPresenter.new
-  }
+  end
 
   body {
     shell {

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

@@ -41,7 +41,7 @@ class GreetingLabel
     return if colors.nil?
     
     Thread.new {
-      colors.cycle { |color|
+      colors.async_cycle { |color|
         async_exec {
           self.color = color
         }

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

@@ -91,14 +91,14 @@ class HelloProgressBar
       }
       
       # :vertical SWT style is unsupported for now
-#       progress_bar(:vertical) {
-#         layout_data(:fill, :center, true, false) {
-#           horizontal_span 4
-#         }
-#         minimum <= [@progress_model, :minimum]
-#         maximum <= [@progress_model, :maximum]
-#         selection <= [@progress_model, :selection]
-#       }
+      progress_bar(:vertical) {
+        layout_data(:fill, :center, true, false) {
+          horizontal_span 4
+        }
+        minimum <= [@progress_model, :minimum]
+        maximum <= [@progress_model, :maximum]
+        selection <= [@progress_model, :selection]
+      }
       
       button {
         layout_data(:fill, :center, true, false) {

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

@@ -6,17 +6,17 @@ require 'glimmer/swt/combo_proxy'
 module Glimmer
   module DSL
     module Opal
-      class ComboSelectionDataBindingExpression < Expression  
+      class ComboSelectionDataBindingExpression < Expression
         def can_interpret?(parent, keyword, *args, &block)
           keyword == 'selection' and
             block.nil? and
-            parent.is_a?(Glimmer::SWT::ComboProxy) and
+            (parent.is_a?(Glimmer::SWT::ComboProxy) || parent.is_a?(Glimmer::SWT::CComboProxy)) and
             args.size == 1 and
             args[0].is_a?(DataBinding::ModelBinding) and
             args[0].evaluate_options_property.is_a?(Array)
         end
   
-        def interpret(parent, keyword, *args, &block)          
+        def interpret(parent, keyword, *args, &block)
           model_binding = args[0]
   
           #TODO make this options observer dependent and all similar observers in element specific data binding handlers

data/lib/glimmer/swt/button_proxy.rb

@@ -47,6 +47,11 @@ module Glimmer
         dom_element.html(@text)
       end
       
+      def font=(value)
+        super(value)
+        dom_element.css('height', @font.height + 10) if @font&.height
+      end
+      
       def element
         'button'
       end

data/lib/glimmer/swt/c_combo_proxy.rb

@@ -26,7 +26,7 @@ module Glimmer
   module SWT
     class CComboProxy < ComboProxy
       def post_add_content
-        `$(#{path}).selectmenu()`
+        dom_element.selectmenu
         c_combo_dom_element.css('width', 'initial')
       end
       
@@ -38,6 +38,11 @@ module Glimmer
         c_combo_dom_element.css('font-size', "#{@font.height}px") unless @font.nil?
       end
       
+      def text=(value)
+        super(value)
+        c_combo_text_element.text(value)
+      end
+      
       def c_combo_path
         "##{id}-button"
       end
@@ -45,6 +50,30 @@ module Glimmer
       def c_combo_dom_element
         Document.find(c_combo_path)
       end
+      
+      def c_combo_text_path
+        c_combo_path + ' .ui-selectmenu-text'
+      end
+      
+      def c_combo_text_element
+        Document.find(c_combo_text_path)
+      end
+      
+      def observation_request_to_event_mapping
+        super.merge(
+          'on_widget_selected' => [
+            {
+              event: 'selectmenuchange',
+              event_handler: -> (event_listener) {
+                -> (event) {
+                  self.text = event.target.value
+                  event_listener.call(event)
+                }
+              }
+            },
+          ],
+        )
+      end
     end
   end
   

data/lib/glimmer/swt/combo_proxy.rb

@@ -1,3 +1,4 @@
+
 require 'glimmer/data_binding/observable_element'
 require 'glimmer/swt/widget_proxy'
 
@@ -6,7 +7,6 @@ module Glimmer
     class ComboProxy < WidgetProxy
       include Glimmer::DataBinding::ObservableElement
       attr_reader :text, :items
-      attr_accessor :selection # virtual attribute just to pass the shine data-binding test (TODO THINK OF A BETTER WAY OF HANDLING THIS)
       
       def initialize(parent, args, block)
         super(parent, args, block)
@@ -19,7 +19,15 @@ module Glimmer
       
       def text=(value)
         @text = value
-        Document.find(path).value = value
+        dom_element.val(value)
+      end
+      
+      def selection
+        text
+      end
+      
+      def selection=(value)
+        self.text = value
       end
       
       def items=(the_items)

data/lib/glimmer/swt/fill_layout_proxy.rb

@@ -11,8 +11,8 @@ module Glimmer
         }
         
         .fill-layout > * {
-          width: 100%;
-          height: 100%;
+          width: 100% !important;
+          height: 100% !important;
         }
         
         .fill-layout-horizontal {

data/lib/glimmer/swt/progress_bar_proxy.rb

@@ -26,8 +26,11 @@ module Glimmer
     class ProgressBarProxy < WidgetProxy
       STYLE = <<~CSS
         .ui-progressbar.vertical {
-          /* Not Supported */
-          /* transform: rotate(-90deg); */
+          transform: rotate(-180deg);
+          height: 140px;
+          width: 28px;
+          margin-left: auto;
+          margin-right: auto;
         }
       CSS
       
@@ -40,7 +43,8 @@ module Glimmer
         @vertical = args.detect { |arg| SWTProxy[arg] == SWTProxy[:vertical] }
         @indeterminate = args.detect { |arg| SWTProxy[arg] == SWTProxy[:indeterminate] }
         super(parent, args, block)
-        dom_element.progressbar
+        # initialize manually if vertical
+        dom_element.progressbar if horizontal?
         self.minimum = 0
         self.selection = false if indeterminate?
       end
@@ -59,26 +63,41 @@ module Glimmer
       
       def maximum=(value)
         @maximum = value
-        dom_element.progressbar('option', 'max', @maximum - @minimum)
+        if horizontal?
+          dom_element.progressbar('option', 'max', @maximum - @minimum)
+        end
       end
       
       def selection=(selection_value)
         @selection = selection_value
-        value = @selection ? (@selection - @minimum) : @selection
-        dom_element.progressbar('option', 'value', value)
+        if horizontal?
+          value = @selection ? (@selection - @minimum) : @selection
+          dom_element.progressbar('option', 'value', value)
+        else
+          value = ((@selection - @minimum) / (@maximum - @minimum)) * 100
+          selection_dom_element.css('height', "#{value}%")
+        end
       end
 
       def element
         'div'
       end
       
+      def selection_dom_element
+        dom_element.find('.ui-progressbar-value')
+      end
+      
       def dom
         progress_bar_id = id
         progress_bar_class = name
-        progress_bar_class += ' vertical' if vertical?
+        progress_bar_class += ' vertical ui-progressbar ui-corner-all ui-widget ui-widget-content' if vertical?
         progress_bar_class += ' indeterminate' if indeterminate?
         @dom ||= html {
-          div(id: progress_bar_id, class: progress_bar_class)
+          div(id: progress_bar_id, class: progress_bar_class) {
+            if vertical?
+              div(class: 'ui-progressbar-value ui-corner-left ui-widget-header', style: 'height: 0%;')
+            end
+          }
         }.to_s
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-opal
 version: !ruby/object:Gem::Version
-  version: 0.25.0
+  version: 0.25.4
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-18 00:00:00.000000000 Z
+date: 2021-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: to_collection
   requirement: !ruby/object:Gem::Requirement