glimmer-dsl-opal 0.24.0 → 0.25.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f974d9526112e11c32284c5fbcd30e08226aafa3f799c08ccd67deabddf9f0ac
-  data.tar.gz: e77d826d4afb7a359a24f2a87dc49672e7d17e4da265feef11c278403370d468
+  metadata.gz: 7730a7073849e1cb3cf05073368a974a7cc493fa44621b3fd58d180e76c25c89
+  data.tar.gz: 7588d6730c8f81b27e8aff908bfe3c7f4daff093c004661abbb0c4fb0a2b4756
 SHA512:
-  metadata.gz: 9295b9a8da3867580a975a43cc61708d635de4f03d30fae6d07913d9147783c2372fe1fe9f673d0f8bfe20988684579b0aaeaa6fbebcec189c4111bba3b62935
-  data.tar.gz: 5ea143577dc7c59c8c8b5d423f0a17580c71bcbefb29cd200c770e8078ca78cca75f29de4354801b38a2a440365285832f96a48ec50290afbe941b865aa73f14
+  metadata.gz: f50d2e39e990b86392e4fc719737b19337083380c874e426186dbbfe9ad7b60445a76fa93a8f5cf6d5055576f60209423b940e5efce3fee28f5081a99a61c2a3
+  data.tar.gz: 70634d53b24b7a82fcc8ca50b6b502d8b8b4260d204e89682a953e9bdbae81c7688867c8552082f323b1526170cd40a7a85222f637f8d8fb765c2658ce306e29

data/CHANGELOG.md

@@ -1,5 +1,25 @@
 # Change Log
 
+## 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
+- Hello, Progress Bar! sample without `:vertical` SWT style
+
 ## 0.24.0
 
 - `widget#print` method

data/README.md

@@ -143,7 +143,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.3 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)
@@ -187,6 +187,8 @@ Other [Glimmer](https://github.com/AndyObtiva/glimmer) DSL gems:
       - [Hello, Arrow!](#hello-arrow)
       - [Hello, Message Box!](#hello-message-box)
       - [Hello, Pop Up Context Menu!](#hello-pop-up-context-menu)
+      - [Hello, Print!](#hello-print)
+      - [Hello, Progress Bar!](#hello-progress-bar)
       - [Hello, Menu Bar!](#hello-menu-bar)
       - [Hello, Dialog!](#hello-dialog)
     - [Elaborate Samples](#elaborate-samples)
@@ -262,9 +264,9 @@ Add the following to `Gemfile`:
 ```
 gem 'opal', '1.0.4'
 gem 'opal-rails', '1.1.2'
-gem 'opal-async', '~> 1.2.0'
+gem 'opal-async', '~> 1.3.0'
 gem 'opal-jquery', '~> 0.4.4'
-gem 'glimmer-dsl-opal', '~> 0.24.0'
+gem 'glimmer-dsl-opal', '~> 0.25.3'
 gem 'glimmer-dsl-xml', '~> 1.2.0', require: false
 gem 'glimmer-dsl-css', '~> 1.2.0', require: false
 
@@ -1833,6 +1835,54 @@ You should see "Hello, Message Box!"
 ![Glimmer DSL for Opal Hello Message Box](images/glimmer-dsl-opal-hello-message-box.png)
 ![Glimmer DSL for Opal Hello Message Box Dialog](images/glimmer-dsl-opal-hello-message-box-dialog.png)
 
+#### Hello, Print!
+
+Add the following require statement to `app/assets/javascripts/application.rb`
+
+```ruby
+require 'glimmer-dsl-opal/samples/hello/hello_print'
+```
+
+Glimmer app on the desktop (using [`glimmer-dsl-swt`](https://github.com/AndyObtiva/glimmer-dsl-swt) gem):
+
+![Glimmer DSL for SWT Hello Print](https://github.com/AndyObtiva/glimmer-dsl-swt/raw/master/images/glimmer-hello-print.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, Print!"
+
+#### Hello, Progress Bar!
+
+Add the following require statement to `app/assets/javascripts/application.rb`
+
+```ruby
+require 'glimmer-dsl-opal/samples/hello/hello_progress_bar'
+```
+
+Glimmer app on the desktop (using [`glimmer-dsl-swt`](https://github.com/AndyObtiva/glimmer-dsl-swt) gem):
+
+![Glimmer DSL for SWT Hello Progress Bar](https://github.com/AndyObtiva/glimmer-dsl-swt/raw/master/images/glimmer-hello-progress-bar.gif)
+
+Glimmer app on the web (using `glimmer-dsl-opal` gem):
+
+Start the Rails server:
+```
+rails s
+```
+
+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.24.0
+0.25.3

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_progress_bar.rb

@@ -0,0 +1,126 @@
+# 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 HelloProgressBar
+  include Glimmer::UI::CustomShell
+  
+  class ProgressModel
+    attr_accessor :minimum, :maximum, :selection, :delay
+  end
+        
+  before_body do
+    @progress_model = ProgressModel.new
+    @progress_model.minimum = 0
+    @progress_model.maximum = 100
+    @progress_model.selection = 0
+    @progress_model.delay = 0.01
+  end
+
+  body {
+    shell {
+      grid_layout(4, true)
+      
+      text 'Hello, Progress Bar!'
+      
+      progress_bar(:indeterminate) {
+        layout_data(:fill, :center, true, false) {
+          horizontal_span 4
+        }
+      }
+      
+      label {
+        text 'Minimum'
+      }
+      
+      label {
+        text 'Maximum'
+      }
+      
+      label {
+        text 'Selection'
+      }
+      
+      label {
+        text 'Delay in Seconds'
+      }
+      
+      spinner {
+        selection <=> [@progress_model, :minimum]
+      }
+      
+      spinner {
+        selection <=> [@progress_model, :maximum]
+      }
+      
+      spinner {
+        selection <=> [@progress_model, :selection]
+      }
+        
+      spinner {
+        digits 2
+        minimum 1
+        maximum 200
+        selection <=> [@progress_model, :delay, on_read: ->(v) {v.to_f*100.0}, on_write: ->(v) {v.to_f/100.0}]
+      }
+          
+      progress_bar {
+        layout_data(:fill, :center, true, false) {
+          horizontal_span 4
+        }
+        minimum <= [@progress_model, :minimum]
+        maximum <= [@progress_model, :maximum]
+        selection <= [@progress_model, :selection]
+      }
+      
+      # :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]
+      }
+      
+      button {
+        layout_data(:fill, :center, true, false) {
+          horizontal_span 4
+        }
+        text "Start"
+        
+        on_widget_selected do
+          # if a previous thread is running, then kill first
+          # (killing is not dangerous since it is only a thread about updating progress)
+          @current_thread&.kill
+          @current_thread = Thread.new do
+            @progress_model.selection = @progress_model.minimum
+            (@progress_model.minimum..@progress_model.maximum).to_a.each do |n|
+              @progress_model.selection = n
+              sleep(@progress_model.delay)
+            end
+          end
+        end
+      }
+    }
+  }
+end
+
+HelloProgressBar.launch

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

@@ -0,0 +1,105 @@
+# 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 'glimmer/swt/widget_proxy'
+
+module Glimmer
+  module SWT
+    class ProgressBarProxy < WidgetProxy
+      STYLE = <<~CSS
+        .ui-progressbar.vertical {
+          transform: rotate(-180deg);
+          height: 140px;
+          width: 28px;
+          margin-left: auto;
+          margin-right: auto;
+        }
+      CSS
+      
+      attr_reader :vertical, :indeterminate, :maximum, :selection
+      attr_accessor :state, :minimum #ignored, only there for API compatibility
+      alias vertical? vertical
+      alias indeterminate? indeterminate
+      
+      def initialize(parent, args, block)
+        @vertical = args.detect { |arg| SWTProxy[arg] == SWTProxy[:vertical] }
+        @indeterminate = args.detect { |arg| SWTProxy[arg] == SWTProxy[:indeterminate] }
+        super(parent, args, block)
+        # initialize manually if vertical
+        dom_element.progressbar if horizontal?
+        self.minimum = 0
+        self.selection = false if indeterminate?
+      end
+      
+      def horizontal
+        !vertical
+      end
+      alias horizontal? horizontal
+      
+      def minimum=(value)
+        @minimum = value
+        # re-update maximum and selection since they depend on minimum
+        self.maximum = @maximum if @maximum
+        self.selection = @selection if @selection
+      end
+      
+      def maximum=(value)
+        @maximum = value
+        if horizontal?
+          dom_element.progressbar('option', 'max', @maximum - @minimum)
+        end
+      end
+      
+      def selection=(selection_value)
+        @selection = selection_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 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) {
+            if vertical?
+              div(class: 'ui-progressbar-value ui-corner-left ui-widget-header', style: 'height: 0%;')
+            end
+          }
+        }.to_s
+      end
+    end
+  end
+end

data/lib/glimmer/swt/widget_proxy.rb

@@ -1037,6 +1037,7 @@ require 'glimmer/swt/table_column_proxy'
 require 'glimmer/swt/table_item_proxy'
 require 'glimmer/swt/table_proxy'
 require 'glimmer/swt/text_proxy'
+require 'glimmer/swt/progress_bar_proxy'
 require 'glimmer/swt/radio_proxy'
 require 'glimmer/swt/scale_proxy'
 require 'glimmer/swt/scrolled_composite_proxy'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-opal
 version: !ruby/object:Gem::Version
-  version: 0.24.0
+  version: 0.25.3
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-18 00:00:00.000000000 Z
+date: 2021-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: to_collection
   requirement: !ruby/object:Gem::Requirement
@@ -309,6 +309,7 @@ files:
 - lib/glimmer-dsl-opal/samples/hello/hello_message_box.rb
 - lib/glimmer-dsl-opal/samples/hello/hello_pop_up_context_menu.rb
 - lib/glimmer-dsl-opal/samples/hello/hello_print.rb
+- lib/glimmer-dsl-opal/samples/hello/hello_progress_bar.rb
 - lib/glimmer-dsl-opal/samples/hello/hello_radio.rb
 - lib/glimmer-dsl-opal/samples/hello/hello_radio_group.rb
 - lib/glimmer-dsl-opal/samples/hello/hello_scale.rb
@@ -422,6 +423,7 @@ files:
 - lib/glimmer/swt/menu_proxy.rb
 - lib/glimmer/swt/message_box_proxy.rb
 - lib/glimmer/swt/point.rb
+- lib/glimmer/swt/progress_bar_proxy.rb
 - lib/glimmer/swt/property_owner.rb
 - lib/glimmer/swt/radio_proxy.rb
 - lib/glimmer/swt/row_layout_proxy.rb