glimmer-dsl-libui 0.4.16 → 0.4.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8acbe91938a88381cab6203cca03222967f2cf9f8b9acce1b1cc9334b7dee8a6
-  data.tar.gz: a769546a4a2ecf9075c6161f8d2705c7a86c85f463c4c297cb9c7f45c8e90d72
+  metadata.gz: 7fc87cc5cdac4adda4a307a3b38ec3255efdacd9a97a667c6840788be005ab80
+  data.tar.gz: 2d57256b28fb43d584949d9316ceaf70ca67999b918ebfca5898aef99f78add4
 SHA512:
-  metadata.gz: 80b750032c8d4c6605f8843ca3ff8cafee74e53c2b1f048c22fe23a830924966441a5c7c8818cca64e0526e3fb26d83f3339ab2b7c7133fa82cc5f5b5be43034
-  data.tar.gz: 81306b073aa159bbd8abc931032da52ac447d0626657bf7dfeff73b49083fb83a23de5e8fd4718dbea5c9209760af00e72cca29845a15735b7a9ff6370ae2340
+  metadata.gz: 3490923e9e595407a17350f337f1a8128a59bba1d7b0b2ce2dde12c1425324b6ca8a7688a307290a79baece9eeda8f54bedb3c2e6eb59dbfc65d9702136b6271
+  data.tar.gz: f935b3d85c167e5697973e77a419ad2d929e3071a5013fba2dd3b04035b5da5d1e5623df10ceefb6535fed428b2f127f42373fb42b54853f61f0834031addb7f

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Change Log
 
+## 0.4.17
+
+- Remove Windows workaround of always adding an extra row at the bottom of `table` as it is no longer necessary after adding a better workaround (on Windows, add & remove row just after constructing `table` to get rid of double-delete glitch)
+- Improved parsing code of examples/cpu_percentage.rb for Windows to make it more resilient
+- Upgrade to glimmer 2.5.3 to silently ignore frozen observables with `observe(*args, ignore_frozen: true)`
+- Added equalizer gem dependency to properly provide equality methods for `Glimmer::LibUI::ControlProxy::ImageProxy`
+
 ## 0.4.16
 
 - Upgrade to glimmer 2.5.1

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 LibUI 0.4.16
+# [<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 LibUI 0.4.17
 ## Prerequisite-Free Ruby Desktop Development GUI Library
 [![Gem Version](https://badge.fury.io/rb/glimmer-dsl-libui.svg)](http://badge.fury.io/rb/glimmer-dsl-libui)
 [![Join the chat at https://gitter.im/AndyObtiva/glimmer](https://badges.gitter.im/AndyObtiva/glimmer.svg)](https://gitter.im/AndyObtiva/glimmer?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
@@ -506,7 +506,7 @@ gem install glimmer-dsl-libui
 Or install via Bundler `Gemfile`:
 
 ```ruby
-gem 'glimmer-dsl-libui', '~> 0.4.16'
+gem 'glimmer-dsl-libui', '~> 0.4.17'
 ```
 
 Test that installation worked by running the [Meta-Example](#examples):
@@ -1795,8 +1795,8 @@ Learn more from data-binding usage in [Login](#login) (4 data-binding versions),
 #### Data-Binding Gotchas
 
 - Never data-bind a control property to an attribute on the same view object with the same exact name (e.g. binding `entry` `text` property to `self` `text` attribute) as it would conflict with it. Instead, data-bind view property to an attribute with a different name on the view object or with the same name, but on a presenter or model object (e.g. data-bind `entry` `text` to `self` `legal_text` attribute or to `contract` model `text` attribute)
-- Data-binding a property utilizes the control's listener associated with the property (e.g. `on_changed` for `entry` `text`), so you cannot hook into the listener directly anymore as that would negate data-binding. Instead, you can add an `after_write: ->(val) {}` option to perform something on trigger of the control listener instead.
-- Data-binding a View control to another View control directly is not a good idea. Instead, data-bind both View controls to the same Presenter/Model attribute, and that keeps them in sync while keeping the code decoupled.
+- Data-binding a property utilizes the control's listener associated with the property (e.g. `on_changed` for `entry` `text`), so although you can add another listener if you want ([Glimmer DSL for LibUI](https://rubygems.org/gems/glimmer-dsl-libui) will happily add your listener to the list of listeners that will get notified by a certain event), sometimes it is recommended that you add an `after_read: ->(val) {}` or `after_write: ->(val) {}` block instead to perform something after data-binding reads from or writes to the Model attribute.
+- Data-binding a View control to another View control directly is not a good practice as it causes tight-coupling. Instead, data-bind both View controls to the same Presenter/Model attribute, and that keeps them in sync while keeping the code decoupled.
 
 ### API Gotchas
 

data/VERSION

@@ -1 +1 @@
-0.4.16
+0.4.17

data/examples/cpu_percentage.rb

@@ -11,7 +11,7 @@ Glimmer::LibUI.timer(1) do
   cpu_percentage_value = nil
   if OS.windows?
     cpu_percentage_raw_value = `wmic cpu get loadpercentage`
-    cpu_percentage_value = cpu_percentage_raw_value.split("\n")[2].to_i
+    cpu_percentage_value = cpu_percentage_raw_value.split("\n").map(&:strip).find {|l| l.match(/^\d+$/)}.to_i
   elsif OS.mac?
     cpu_percentage_value = `ps -A -o %cpu | awk '{s+=$1} END {print s}'`.to_i
   elsif OS.linux?

data/lib/glimmer/libui/control_proxy/column/background_color_column_proxy.rb

@@ -30,6 +30,12 @@ module Glimmer
         #
         # Follows the Proxy Design Pattern
         class BackgroundColorColumnProxy < ControlProxy
+          class << self
+            def default_value
+              :white
+            end
+          end
+          
           include Column
           
           def name

data/lib/glimmer/libui/control_proxy/column/button_column_proxy.rb

@@ -31,6 +31,12 @@ module Glimmer
         #
         # Follows the Proxy Design Pattern
         class ButtonColumnProxy < ControlProxy
+          class << self
+            def default_value
+              ''
+            end
+          end
+          
           include Column
           include EnableableColumn
           

data/lib/glimmer/libui/control_proxy/column/checkbox_column_proxy.rb

@@ -31,6 +31,12 @@ module Glimmer
         #
         # Follows the Proxy Design Pattern
         class CheckboxColumnProxy < ControlProxy
+          class << self
+            def default_value
+              false
+            end
+          end
+          
           include Column
           include EditableColumn
           

data/lib/glimmer/libui/control_proxy/column/checkbox_text_color_column_proxy.rb

@@ -32,6 +32,12 @@ module Glimmer
         #
         # Follows the Proxy Design Pattern
         class CheckboxTextColorColumnProxy < ControlProxy
+          class << self
+            def default_value
+              [false, '', :black]
+            end
+          end
+          
           include Column
           include TripleColumn
           include EditableColumn

data/lib/glimmer/libui/control_proxy/column/checkbox_text_column_proxy.rb

@@ -32,6 +32,12 @@ module Glimmer
         #
         # Follows the Proxy Design Pattern
         class CheckboxTextColumnProxy < ControlProxy
+          class << self
+            def default_value
+              [false, '']
+            end
+          end
+          
           include Column
           include DualColumn
           include EditableColumn

data/lib/glimmer/libui/control_proxy/column/image_column_proxy.rb

@@ -30,6 +30,12 @@ module Glimmer
         #
         # Follows the Proxy Design Pattern
         class ImageColumnProxy < ControlProxy
+          class << self
+            def default_value
+              Glimmer::LibUI::ICON
+            end
+          end
+          
           include Column
         
           private

data/lib/glimmer/libui/control_proxy/column/image_text_color_column_proxy.rb

@@ -32,6 +32,12 @@ module Glimmer
         #
         # Follows the Proxy Design Pattern
         class ImageTextColorColumnProxy < ControlProxy
+          class << self
+            def default_value
+              [Glimmer::LibUI::ICON, '', :black]
+            end
+          end
+          
           include Column
           include TripleColumn
           include EditableColumn

data/lib/glimmer/libui/control_proxy/column/image_text_column_proxy.rb

@@ -32,6 +32,12 @@ module Glimmer
         #
         # Follows the Proxy Design Pattern
         class ImageTextColumnProxy < ControlProxy
+          class << self
+            def default_value
+              [Glimmer::LibUI::ICON, '']
+            end
+          end
+          
           include Column
           include DualColumn
           include EditableColumn

data/lib/glimmer/libui/control_proxy/column/progress_bar_column_proxy.rb

@@ -30,6 +30,12 @@ module Glimmer
         #
         # Follows the Proxy Design Pattern
         class ProgressBarColumnProxy < ControlProxy
+          class << self
+            def default_value
+              0
+            end
+          end
+          
           include Column
               
           private

data/lib/glimmer/libui/control_proxy/column/text_color_column_proxy.rb

@@ -32,6 +32,12 @@ module Glimmer
         #
         # Follows the Proxy Design Pattern
         class TextColorColumnProxy < ControlProxy
+          class << self
+            def default_value
+              ['', :black]
+            end
+          end
+          
           include Column
           include DualColumn
           include EditableColumn

data/lib/glimmer/libui/control_proxy/column/text_column_proxy.rb

@@ -31,6 +31,12 @@ module Glimmer
         #
         # Follows the Proxy Design Pattern
         class TextColumnProxy < ControlProxy
+          class << self
+            def default_value
+              ''
+            end
+          end
+          
           include Column
           include EditableColumn
               

data/lib/glimmer/libui/control_proxy/column.rb

@@ -24,6 +24,13 @@ module Glimmer
     class ControlProxy
       # Common logic for all column proxy objects
       module Column
+        class << self
+          # subclasses may override to provide a valid default value like a blank image for image columns and false for checkbox
+          def default_value
+            nil
+          end
+        end
+
         def initialize(keyword, parent, args, &block)
           @keyword = keyword
           @parent_proxy = parent

data/lib/glimmer/libui/control_proxy/image_proxy.rb

@@ -52,6 +52,7 @@ module Glimmer
         
         include Parent
         prepend Transformable
+        include Equalizer.new(:options, :data)
         
         attr_reader :data, :pixels, :shapes, :options
         

data/lib/glimmer/libui/control_proxy/table_proxy.rb

@@ -90,18 +90,18 @@ module Glimmer
               @cell_rows_observer ||= Glimmer::DataBinding::Observer.proc do |new_cell_rows|
                 if @cell_rows.size < @last_cell_rows.size && @last_cell_rows.include_all?(*@cell_rows)
                   @last_cell_rows.array_diff_indexes(@cell_rows).reverse.each do |row|
-                    ::LibUI.table_model_row_deleted(model, row)
+                    ::LibUI.table_model_row_deleted(model, row) if model && row
                     notify_custom_listeners('on_changed', row, :deleted, @last_cell_rows[row])
                   end
                 elsif @cell_rows.size > @last_cell_rows.size && @cell_rows.include_all?(*@last_cell_rows)
                   @cell_rows.array_diff_indexes(@last_cell_rows).each do |row|
-                    ::LibUI.table_model_row_inserted(model, row)
+                    ::LibUI.table_model_row_inserted(model, row) if model && row
                     notify_custom_listeners('on_changed', row, :inserted, @cell_rows[row])
                   end
                 else
                   @cell_rows.each_with_index do |new_row_data, row|
                     if new_row_data != @last_cell_rows[row]
-                      ::LibUI.table_model_row_changed(model, row)
+                      ::LibUI.table_model_row_changed(model, row) if model && row
                       notify_custom_listeners('on_changed', row, :changed, @cell_rows[row])
                     end
                   end
@@ -109,7 +109,7 @@ module Glimmer
                 @last_last_cell_rows = array_deep_clone(@last_cell_rows)
                 @last_cell_rows = array_deep_clone(@cell_rows)
               end.tap do |cell_rows_observer|
-                cell_rows_observer.observe(self, :cell_rows, recursive: true)
+                cell_rows_observer.observe(self, :cell_rows, recursive: true, ignore_frozen: true)
               end
             end
             @cell_rows
@@ -153,7 +153,7 @@ module Glimmer
             new_value = new_value.to_a if new_value.is_a?(Enumerator)
             if model_binding.binding_options[:column_attributes] || (!new_value.empty? && !new_value.first.is_a?(Array))
               @model_attribute_array_observer_registration&.deregister
-              @model_attribute_array_observer_registration = model_attribute_observer.observe(new_value, @column_attributes)
+              @model_attribute_array_observer_registration = model_attribute_observer.observe(new_value, @column_attributes, ignore_frozen: true)
               model_attribute_observer.add_dependent(model_attribute_observer_registration => @model_attribute_array_observer_registration)
             end
             # TODO look if multiple notifications are happening as a result of observing array and observing model binding
@@ -310,6 +310,15 @@ module Glimmer
           @libui.tap do
             @columns.each {|column| column.respond_to?(:build_control, true) && column.send(:build_control) }
           end
+
+          if !@applied_windows_fix && OS.windows?
+            @applied_windows_fix = true
+            new_row = @columns&.select {|column| column.is_a?(Column)}&.map {|column| column.class.default_value}
+            if new_row
+              @cell_rows << new_row
+              @cell_rows.pop
+            end
+          end
         end
         
         def next_column_index

data/lib/glimmer-dsl-libui.rb

@@ -28,6 +28,7 @@ require 'glimmer'
 # require 'super_module'
 require 'color'
 require 'os'
+require 'equalizer'
 require 'array_include_methods'
 require 'facets/hash/stringify_keys'
 require 'facets/string/underscore'
@@ -46,3 +47,8 @@ Glimmer::Config.excluded_keyword_checkers << lambda do |method_symbol, *args|
 end
 
 ::LibUI.init
+# begin
+#   PutsDebuggerer.printer = lambda { |m| puts m; $stdout.flush}
+# rescue
+  ## No Op if puts_debuggerer is not loaded
+# end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-libui
 version: !ruby/object:Gem::Version
-  version: 0.4.16
+  version: 0.4.17
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-06 00:00:00.000000000 Z
+date: 2021-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.1
+        version: 2.5.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.1
+        version: 2.5.3
 - !ruby/object:Gem::Dependency
   name: os
   requirement: !ruby/object:Gem::Requirement
@@ -86,6 +86,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.0
+- !ruby/object:Gem::Dependency
+  name: equalizer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.0.11
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.0.11
 - !ruby/object:Gem::Dependency
   name: juwelier
   requirement: !ruby/object:Gem::Requirement
@@ -434,7 +448,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.31
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: Glimmer DSL for LibUI