glimmer-dsl-opal 0.19.1 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 505a28c0305b2de67ee6c7329e17695df9739d5e922881d5a47b32080c1afebd
-  data.tar.gz: df6ede1e94dc15f1723dba789eac315b42cc9ef33160a4ae9031bdb9cd46077b
+  metadata.gz: 531f953f5ec4fe36dfa9a7bc8e7a98e5155c8dced489215e74b6679543feff1b
+  data.tar.gz: 3e429ff4bac544027a49e458c75b670adf0d3f6110da692f151da6153511e889
 SHA512:
-  metadata.gz: ffdde267cad7d55b92f887b71eb511c404bccf7aafa6a9196a0886baf07905535c855016387e394a7ed32a3e322ca31e0bf33fe3e9660de4df0e142a4ed20703
-  data.tar.gz: d319b58fa27fab0a6921a8f86748c71589ba898912de24bc72bad5a8ae9e1f4c7fc9fb2721d77269c3f7e235f2a47faf188c17017ded20d804fc144568292199
+  metadata.gz: 2822a5d9881c20c06c31b4a1115cf08a1cc5e79db5da15ca2cf8491a9f1c9e7114ccb8380e94af27b55f14e7e533a2247890cd11ea06bd2d8a82b7038c9e628d
+  data.tar.gz: ea93b2b373f4aea2c742c09d1e05752899c91ba62d12b5e5cde96492631984cf49e70fcbc8d744ea516ac2bbd42fc00bd58d84b0cc8f297cb04d0d6a45d34210

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change Log
 
+## 0.20.0
+
+- Support `spinner` widget (leaving out automatic insertion of decimal point when digits are specified)
+- Hello, Spinner! sample
+
 ## 0.19.1
 
 - Fix widget `font` property support for both `:bold` and `:italic` styles at the same time

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.19.1 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.20.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))
 
 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)
@@ -261,7 +261,7 @@ gem 'opal', '1.0.4'
 gem 'opal-rails', '1.1.2'
 gem 'opal-async', '~> 1.2.0'
 gem 'opal-jquery', '~> 0.4.4'
-gem 'glimmer-dsl-opal', '~> 0.19.1'
+gem 'glimmer-dsl-opal', '~> 0.20.0'
 gem 'glimmer-dsl-xml', '~> 1.2.0', require: false
 gem 'glimmer-dsl-css', '~> 1.2.0', require: false
 
@@ -799,6 +799,31 @@ You should see "Hello, Arrow!"
 
 ![Glimmer DSL for Opal Hello Arrow](images/glimmer-dsl-opal-hello-arrow-item-selected.png)
 
+#### Hello, Spinner!
+
+Add the following require statement to `app/assets/javascripts/application.rb`
+
+```ruby
+require 'glimmer-dsl-opal/samples/hello/hello_spinner'
+```
+
+Glimmer app on the desktop (using [`glimmer-dsl-swt`](https://github.com/AndyObtiva/glimmer-dsl-swt) gem):
+
+![Glimmer DSL for SWT Hello Spinner](https://github.com/AndyObtiva/glimmer-dsl-swt/raw/master/images/glimmer-hello-spinner.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, Spinner!"
+
+![Glimmer DSL for Opal Hello Spinner](images/glimmer-dsl-opal-hello-spinner.png)
+
 #### Hello, Browser!
 
 Add the following require statement to `app/assets/javascripts/application.rb`

data/VERSION

@@ -1 +1 @@
-0.19.1
+0.20.0

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

@@ -0,0 +1,78 @@
+# Copyright (c) 2007-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 HelloSpinner
+  class Person
+    attr_accessor :donation
+  end
+  
+  include Glimmer::UI::CustomShell
+  
+  before_body do
+    @person = Person.new
+    @person.donation = 500 # in cents
+  end
+  
+  body {
+    shell {
+      grid_layout
+      
+      text 'Hello, Spinner!'
+      
+      label {
+        text 'Please select the amount you would like to donate to the poor:'
+      }
+      
+      composite {
+        grid_layout 3, false
+        
+        label {
+          layout_data {
+            width_hint 240
+          }
+          text 'Amount:'
+          font style: :bold
+        }
+        
+        label {
+          text '$'
+        }
+        
+        spinner {
+          digits 2 # digits after the decimal point
+          minimum 100 # minimum value (including digits after the decimal point)
+          maximum 15000 # maximum value (including digits after the decimal point)
+          increment 500 # increment on up and down (including digits after the decimal point)
+          page_increment 5000 # page increment on page up and page down (including digits after the decimal point)
+          selection <=> [@person, :donation] # selection must be set last if other properties are configured to ensure value is within bounds
+        }
+        
+        label {
+          layout_data(:fill, :center, true, false)
+          text <=> [@person, :donation, on_read: ->(value) { "Thank you for your donation of $#{"%.2f" % (value.to_f / 100.0)}"}]
+        }
+
+      }
+    }
+  }
+end
+
+HelloSpinner.launch

data/lib/glimmer/swt/c_tab_item_proxy.rb

@@ -52,8 +52,8 @@ module Glimmer
       def font=(value)
         @font = value.is_a?(FontProxy) ? value : FontProxy.new(self, value)
         tab_dom_element.css('font-family', @font.name) unless @font.nil?
-        tab_dom_element.css('font-style', 'italic') if @font&.style == :italic || @font&.style&.to_a&.include?(:italic)
-        tab_dom_element.css('font-weight', 'bold') if @font&.style == :bold || @font&.style&.to_a&.include?(:bold)
+        tab_dom_element.css('font-style', 'italic') if @font&.style == :italic || [@font&.style].flatten.compact.include?(:italic)
+        tab_dom_element.css('font-weight', 'bold') if @font&.style == :bold || [@font&.style].flatten.compact.include?(:bold)
         tab_dom_element.css('font-size', "#{@font.height}px") unless @font.nil?
       end
       

data/lib/glimmer/swt/spinner_proxy.rb

@@ -0,0 +1,173 @@
+require 'glimmer/swt/widget_proxy'
+
+module Glimmer
+  module SWT
+    class SpinnerProxy < WidgetProxy
+      attr_reader :minimum, :maximum, :increment, :page_increment, :digits
+    
+      def initialize(parent, args, block)
+        super(parent, args, block)
+        @increment = 1
+        @digits = 0
+        dom_element.spinner
+      end
+
+      def selection=(value)
+        old_value = @selection.to_f
+        if @selection.nil?
+          @selection = value.to_f / divider
+        else
+          @selection = value.to_f
+        end
+        # TODO do not apply digits if last change was done by keyboard not spinner
+#         if @digits.to_i > 0
+#           new_value = "%0.#{@digits.to_i}f" % @selection
+#           dom_element.value = new_value if value.to_f != old_value.to_f
+#         else
+          dom_element.value = @selection if value.to_f != old_value.to_f
+#         end
+      end
+      
+      def selection
+        @selection && @selection * divider
+      end
+      
+      def text=(value)
+        self.selection = value.to_f
+      end
+      
+      def text
+        self.selection.to_s
+      end
+      
+      def minimum=(value)
+        @minimum = value.to_f / divider
+        dom_element.spinner('option', 'min', @minimum)
+      end
+      
+      def maximum=(value)
+        @maximum = value.to_f / divider
+        dom_element.spinner('option', 'max', @maximum)
+      end
+      
+      def increment=(value)
+        @increment = value.to_f / divider
+        dom_element.spinner('option', 'step', @increment)
+      end
+      
+      def page_increment=(value)
+        @page_increment = value.to_f / (@increment * divider)
+        dom_element.spinner('option', 'page', @page_increment)
+      end
+      
+      def divider
+        ('1' + '0'*@digits.to_i).to_f
+      end
+      
+      def digits=(value)
+        @digits = value
+        dom_element.spinner('option', 'numberFormat', "n") if @digits.to_i > 0
+      end
+      
+      def element
+        'input'
+      end
+      
+      def observation_request_to_event_mapping
+        {
+          'on_widget_selected' => [
+            {
+              event: 'change',
+              event_handler: -> (event_listener) {
+                -> (event) {
+                  self.selection = event.target.value
+                  event_listener.call(event)
+                }
+              }
+            },
+            {
+              event: 'spinstop',
+              event_handler: -> (event_listener) {
+                -> (event) {
+                  self.selection = event.target.value
+                  event_listener.call(event)
+                }
+              }
+            },
+          ],
+          'on_modify_text' => {
+            event: 'keyup',
+            event_handler: -> (event_listener) {
+              -> (event) {
+                # TODO consider unifying this event handler with on_key_pressed by relying on its result instead of hooking another keyup event
+                if @last_key_pressed_event.nil? || @last_key_pressed_event.doit
+                  self.text = event.target.value
+                  event_listener.call(event)
+                else
+                  # TODO Fix doit false, it's not stopping input
+                  event.prevent
+                  event.prevent_default
+                  event.stop_propagation
+                  event.stop_immediate_propagation
+                end
+              }
+            }
+          },
+          'on_key_pressed' => {
+            event: 'keydown',
+            event_handler: -> (event_listener) {
+              -> (event) {
+                @last_key_pressed_event = event
+                self.text = event.target.value
+                # TODO generalize this solution to all widgets that support key presses
+                # TODO support event.location once DOM3 is supported by opal-jquery
+                event.define_singleton_method(:keyCode) {event.which}
+                event.define_singleton_method(:key_code, &event.method(:keyCode))
+                event.define_singleton_method(:character) {event.which.chr}
+                event.define_singleton_method(:stateMask) do
+                  state_mask = 0
+                  state_mask |= SWTProxy[:alt] if event.alt_key
+                  state_mask |= SWTProxy[:ctrl] if event.ctrl_key
+                  state_mask |= SWTProxy[:shift] if event.shift_key
+                  state_mask |= SWTProxy[:command] if event.meta_key
+                  state_mask
+                end
+                event.define_singleton_method(:state_mask, &event.method(:stateMask))
+                doit = true
+                event.define_singleton_method(:doit=) do |value|
+                  doit = value
+                end
+                event.define_singleton_method(:doit) { doit }
+                event_listener.call(event)
+                
+                  # TODO Fix doit false, it's not stopping input
+                unless doit
+                  event.prevent
+                  event.prevent_default
+                  event.stop_propagation
+                  event.stop_immediate_propagation
+                end
+                
+                doit
+              }
+            }
+          },
+        }
+      end
+      
+      def dom
+        text_text = @text
+        text_id = id
+        text_style = css
+        text_class = name
+        # TODO support password field
+        options = {type: 'text', id: text_id, style: text_style, class: text_class, value: text_text, style: 'min-width: 27px;'}
+        options = options.merge('disabled': 'disabled') unless @enabled
+        options = options.merge(type: 'password') if has_style?(:password)
+        @dom ||= html {
+          input(options)
+        }.to_s
+      end
+    end
+  end
+end

data/lib/glimmer/swt/widget_proxy.rb

@@ -237,8 +237,8 @@ module Glimmer
       def font=(value)
         @font = value.is_a?(FontProxy) ? value : FontProxy.new(self, value)
         dom_element.css('font-family', @font.name) unless @font.nil?
-        dom_element.css('font-style', 'italic') if @font&.style == :italic || @font&.style&.to_a&.include?(:italic)
-        dom_element.css('font-weight', 'bold') if @font&.style == :bold || @font&.style&.to_a&.include?(:bold)
+        dom_element.css('font-style', 'italic') if @font&.style == :italic || [@font&.style].flatten.compact.include?(:italic)
+        dom_element.css('font-weight', 'bold') if @font&.style == :bold || [@font&.style].flatten.compact.include?(:bold)
         dom_element.css('font-size', "#{@font.height}px") unless @font.nil?
       end
       
@@ -851,6 +851,13 @@ module Glimmer
 #               }
 #             end,
 #           },
+          SpinnerProxy => {
+            :selection => lambda do |observer|
+              on_widget_selected { |selection_event|
+                observer.call(selection)
+              }
+            end
+          },
           TextProxy => {
             :text => lambda do |observer|
               on_modify_text { |modify_event|
@@ -984,6 +991,7 @@ require 'glimmer/swt/table_proxy'
 require 'glimmer/swt/text_proxy'
 require 'glimmer/swt/radio_proxy'
 require 'glimmer/swt/scrolled_composite_proxy'
+require 'glimmer/swt/spinner_proxy'
 require 'glimmer/swt/styled_text_proxy'
 
 require 'glimmer/dsl/opal/widget_expression'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-opal
 version: !ruby/object:Gem::Version
-  version: 0.19.1
+  version: 0.20.0
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-15 00:00:00.000000000 Z
+date: 2021-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer
@@ -307,6 +307,7 @@ files:
 - lib/glimmer-dsl-opal/samples/hello/hello_pop_up_context_menu.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_spinner.rb
 - lib/glimmer-dsl-opal/samples/hello/hello_tab.rb
 - lib/glimmer-dsl-opal/samples/hello/hello_table.rb
 - lib/glimmer-dsl-opal/samples/hello/hello_table/baseball_park.png
@@ -420,6 +421,7 @@ files:
 - lib/glimmer/swt/row_layout_proxy.rb
 - lib/glimmer/swt/scrolled_composite_proxy.rb
 - lib/glimmer/swt/shell_proxy.rb
+- lib/glimmer/swt/spinner_proxy.rb
 - lib/glimmer/swt/style_constantizable.rb
 - lib/glimmer/swt/styled_text_proxy.rb
 - lib/glimmer/swt/swt_proxy.rb