glimmer-dsl-libui 0.4.7 → 0.4.11

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

@@ -64,8 +64,7 @@ module Glimmer
         alias set_selected_item selected_item
         alias selected_item= selected_item
         
-        def data_bind(property, model_binding)
-          super
+        def data_bind_write(property, model_binding)
           case property
           when 'selected'
             handle_listener('on_selected') { model_binding.call(selected) }

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

@@ -65,8 +65,7 @@ module Glimmer
           super
         end
         
-        def data_bind(property, model_binding)
-          super
+        def data_bind_write(property, model_binding)
           handle_listener('on_changed') { model_binding.call(time) } if property == 'time'
         end
       end

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

@@ -39,11 +39,10 @@ module Glimmer
         end
         alias set_items items
         alias items= items
-      end
-      
-      def data_bind(property, model_binding)
-        super
-        handle_listener('on_changed') { model_binding.call(text) } if property == 'text'
+        
+        def data_bind_write(property, model_binding)
+          handle_listener('on_changed') { model_binding.call(text) } if property == 'text'
+        end
       end
     end
   end

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

@@ -28,8 +28,7 @@ module Glimmer
       #
       # Follows the Proxy Design Pattern
       class EntryProxy < ControlProxy
-        def data_bind(property, model_binding)
-          super
+        def data_bind_write(property, model_binding)
           handle_listener('on_changed') { model_binding.call(text) } if property == 'text'
         end
         

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

@@ -65,7 +65,11 @@ module Glimmer
           super
         end
         
-        def data_bind(property, model_binding)
+        def data_bind_read(property, model_binding)
+          # No Op
+        end
+        
+        def data_bind_write(property, model_binding)
           handle_listener('on_changed') { model_binding.call(font) } if property == 'font'
         end
       end

data/lib/glimmer/libui/control_proxy/menu_item_proxy/check_menu_item_proxy.rb

@@ -29,6 +29,10 @@ module Glimmer
         #
         # Follows the Proxy Design Pattern
         class CheckMenuItemProxy < MenuItemProxy
+          def data_bind_write(property, model_binding)
+            handle_listener('on_clicked') { model_binding.call(checked) } if property == 'checked'
+          end
+        
           private
           
           def build_control

data/lib/glimmer/libui/control_proxy/menu_item_proxy/radio_menu_item_proxy.rb

@@ -29,15 +29,23 @@ module Glimmer
         #
         # Follows the Proxy Design Pattern
         class RadioMenuItemProxy < MenuItemProxy
+          def initialize(keyword, parent, args, &block)
+            @last_checked = nil
+            super
+          end
+        
           def checked(value = nil)
-            if !value.nil?
-              if Glimmer::LibUI.integer_to_boolean(value) != checked?
-                super
+            if value.nil?
+              super()
+            else
+              super
+              if Glimmer::LibUI.integer_to_boolean(value, allow_nil: false) != Glimmer::LibUI.integer_to_boolean(@last_checked, allow_nil: false)
                 if Glimmer::LibUI.integer_to_boolean(value)
                   (@parent_proxy.children - [self]).select {|c| c.is_a?(MenuItemProxy)}.each do |menu_item|
                     menu_item.checked = false
                   end
                 end
+                @last_checked = checked
               end
             end
           end
@@ -48,7 +56,7 @@ module Glimmer
           def handle_listener(listener_name, &listener)
             if listener_name.to_s == 'on_clicked'
               radio_listener = Proc.new do
-                self.checked = true if !checked?
+                self.checked = true
                 listener.call(self)
               end
               super(listener_name, &radio_listener)
@@ -57,6 +65,10 @@ module Glimmer
             end
           end
         
+          def data_bind_write(property, model_binding)
+            handle_listener('on_clicked') { model_binding.call(checked) } if property == 'checked'
+          end
+        
           private
           
           def build_control

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

@@ -28,8 +28,7 @@ module Glimmer
       #
       # Follows the Proxy Design Pattern
       class MultilineEntryProxy < ControlProxy
-        def data_bind(property, model_binding)
-          super
+        def data_bind_write(property, model_binding)
           handle_listener('on_changed') { model_binding.call(text) } if property == 'text'
         end
         

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

@@ -39,6 +39,25 @@ module Glimmer
         end
         alias set_items items
         alias items= items
+        
+        def selected_item(value = nil)
+          if value.nil?
+            items[selected]
+          else
+            self.selected = items.index(value) || -1
+          end
+        end
+        alias set_selected_item selected_item
+        alias selected_item= selected_item
+        
+        def data_bind_write(property, model_binding)
+          case property
+          when 'selected'
+            handle_listener('on_selected') { model_binding.call(selected) }
+          when 'selected_item'
+            handle_listener('on_selected') { model_binding.call(selected_item) }
+          end
+        end
       end
     end
   end

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

@@ -28,8 +28,7 @@ module Glimmer
       #
       # Follows the Proxy Design Pattern
       class SliderProxy < ControlProxy
-        def data_bind(property, model_binding)
-          super
+        def data_bind_write(property, model_binding)
           handle_listener('on_changed') { model_binding.call(value) } if property == 'value'
         end
       end

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

@@ -28,8 +28,7 @@ module Glimmer
       #
       # Follows the Proxy Design Pattern
       class SpinboxProxy < ControlProxy
-        def data_bind(property, model_binding)
-          super
+        def data_bind_write(property, model_binding)
           handle_listener('on_changed') { model_binding.call(value) } if property == 'value'
         end
       end

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

@@ -38,7 +38,7 @@ module Glimmer
         
         LISTENERS = ['on_changed', 'on_edited']
         
-        attr_reader :model_handler, :model, :table_params, :columns
+        attr_reader :model_handler, :model, :table_params, :columns, :column_attributes
       
         def initialize(keyword, parent, args, &block)
           @keyword = keyword
@@ -75,6 +75,7 @@ module Glimmer
         
         def destroy
           super
+          @cell_rows_observer&.unobserve(self, :cell_rows, recursive: true)
           @destroyed = true
         end
         
@@ -82,10 +83,11 @@ module Glimmer
           if rows.nil?
             @cell_rows
           else
-            @cell_rows = rows
-            @cell_rows.tap do
-              @last_cell_rows = array_deep_clone(@cell_rows)
-              Glimmer::DataBinding::Observer.proc do |new_cell_rows|
+            if rows != @cell_rows
+              @cell_rows = rows
+              @cell_rows = @cell_rows.to_a if @cell_rows.is_a?(Enumerator)
+              @last_cell_rows ||= array_deep_clone(@cell_rows)
+              @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)
@@ -106,8 +108,11 @@ module Glimmer
                 end
                 @last_last_cell_rows = array_deep_clone(@last_cell_rows)
                 @last_cell_rows = array_deep_clone(@cell_rows)
-              end.observe(self, :cell_rows, recursive: true)
+              end.tap do |cell_rows_observer|
+                cell_rows_observer.observe(self, :cell_rows, recursive: true)
+              end
             end
+            @cell_rows
           end
         end
         alias cell_rows= cell_rows
@@ -119,6 +124,7 @@ module Glimmer
         
         def expand(cell_rows)
           cell_rows.to_a.map do |row|
+            row = @column_attributes.map {|attribute| row.send(attribute) } if @column_attributes&.any? && !row.is_a?(Array)
             row.flatten(1)
           end
         end
@@ -134,6 +140,46 @@ module Glimmer
         alias set_editable editable
         alias editable? editable
         
+        def data_bind_read(property, model_binding)
+          if model_binding.binding_options[:column_attributes].is_a?(Array)
+            @column_attributes = model_binding.binding_options[:column_attributes]
+          else
+            column_attribute_mapping = model_binding.binding_options[:column_attributes].is_a?(Hash) ? model_binding.binding_options[:column_attributes] : {}
+            @column_attributes = columns.map(&:name).map {|column_name| column_attribute_mapping[column_name] || column_name.underscore}
+          end
+          model_attribute_observer = model_attribute_observer_registration = nil
+          model_attribute_observer = Glimmer::DataBinding::Observer.proc do
+            new_value = model_binding.evaluate_property
+            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_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
+            send("#{property}=", new_value) unless @last_cell_rows == new_value
+          end
+          model_attribute_observer_registration = model_attribute_observer.observe(model_binding)
+          model_attribute_observer.call # initial update
+          data_binding_model_attribute_observer_registrations << model_attribute_observer_registration
+          model_attribute_observer
+        end
+        
+        def data_bind_write(property, model_binding)
+          # TODO ensure writing is happening to models if rows are not arrays
+          handle_listener('on_edited') { model_binding.call(cell_rows) } if property == 'cell_rows'
+        end
+        
+        def array_deep_clone(array_or_object)
+          if array_or_object.is_a?(Array)
+            array_or_object.map do |element|
+              array_deep_clone(element)
+            end
+          else
+            array_or_object.clone
+          end
+        end
+        
         private
         
         def build_control
@@ -193,28 +239,56 @@ module Glimmer
             when Column::TextColumnProxy
               column = @columns[column].index
               @cell_rows[row] ||= []
-              @cell_rows[row][column] = ::LibUI.table_value_string(val).to_s
+              if @cell_rows[row].is_a?(Array)
+                @cell_rows[row][column] = ::LibUI.table_value_string(val).to_s
+              else
+                attribute = @column_attributes[column]
+                @cell_rows[row].send("#{attribute}=", ::LibUI.table_value_string(val).to_s)
+              end
             when Column::TextColorColumnProxy
               column = @columns[column].index
               @cell_rows[row] ||= []
-              @cell_rows[row][column] ||= []
-              @cell_rows[row][column][0] = ::LibUI.table_value_string(val).to_s
+              if @cell_rows[row].is_a?(Array)
+                @cell_rows[row][column] ||= []
+                @cell_rows[row][column][0] = ::LibUI.table_value_string(val).to_s
+              else
+                attribute = @column_attributes[column]
+                @cell_rows[row].send("#{attribute}=", []) unless @cell_rows[row].send(attribute)
+                @cell_rows[row].send(attribute)[0] = ::LibUI.table_value_string(val).to_s
+              end
             when :text
               column = @columns[column - 1].index
               @cell_rows[row] ||= []
-              @cell_rows[row][column] ||= []
-              @cell_rows[row][column][1] = ::LibUI.table_value_string(val).to_s
+              if @cell_rows[row].is_a?(Array)
+                @cell_rows[row][column] ||= []
+                @cell_rows[row][column][1] = ::LibUI.table_value_string(val).to_s
+              else
+                attribute = @column_attributes[column]
+                @cell_rows[row].send("#{attribute}=", []) unless @cell_rows[row].send(attribute)
+                @cell_rows[row].send(attribute)[1] = ::LibUI.table_value_string(val).to_s
+              end
             when Column::ButtonColumnProxy
               @columns[column].notify_listeners(:on_clicked, row)
             when Column::CheckboxColumnProxy
               column = @columns[column].index
               @cell_rows[row] ||= []
-              @cell_rows[row][column] = ::LibUI.table_value_int(val).to_i == 1
+              if @cell_rows[row].is_a?(Array)
+                @cell_rows[row][column] = ::LibUI.table_value_int(val).to_i == 1
+              else
+                attribute = @column_attributes[column]
+                @cell_rows[row].send("#{attribute}=", ::LibUI.table_value_int(val).to_i == 1)
+              end
             when Column::CheckboxTextColumnProxy
               column = @columns[column].index
               @cell_rows[row] ||= []
-              @cell_rows[row][column] ||= []
-              @cell_rows[row][column][0] = ::LibUI.table_value_int(val).to_i == 1
+              if @cell_rows[row].is_a?(Array)
+                @cell_rows[row][column] ||= []
+                @cell_rows[row][column][0] = ::LibUI.table_value_int(val).to_i == 1
+              else
+                attribute = @column_attributes[column]
+                @cell_rows[row].send("#{attribute}=", []) unless @cell_rows[row].send(attribute)
+                @cell_rows[row].send(attribute)[0] = ::LibUI.table_value_int(val).to_i == 1
+              end
             end
             on_edited.each {|listener| listener.call(row, @cell_rows[row])}
           end
@@ -238,16 +312,6 @@ module Glimmer
           @next_column_index ||= -1
           @next_column_index += 1
         end
-        
-        def array_deep_clone(array_or_object)
-          if array_or_object.is_a?(Array)
-            array_or_object.map do |element|
-              array_deep_clone(element)
-            end
-          else
-            array_or_object.clone
-          end
-        end
       end
     end
   end

data/lib/glimmer/libui/control_proxy.rb

@@ -126,7 +126,8 @@ module Glimmer
       ]
       
       # libui returns the contained LibUI object
-      attr_reader :parent_proxy, :libui, :args, :keyword, :block
+      attr_reader :parent_proxy, :libui, :args, :keyword, :block, :content_added
+      alias content_added? content_added
       
       def initialize(keyword, parent, args, &block)
         @keyword = keyword
@@ -245,8 +246,8 @@ module Glimmer
           args[0] = Glimmer::LibUI.boolean_to_integer(args.first) if BOOLEAN_PROPERTIES.include?(property) && (args.first.is_a?(TrueClass) || args.first.is_a?(FalseClass))
           args[0] = '' if STRING_PROPERTIES.include?(property) && args.first == nil
           if property.to_s == 'checked'
-            current_value = Glimmer::LibUI.integer_to_boolean(::LibUI.send("#{libui_api_keyword}_checked", @libui))
-            new_value = Glimmer::LibUI.integer_to_boolean(args[0])
+            current_value = Glimmer::LibUI.integer_to_boolean(::LibUI.send("#{libui_api_keyword}_checked", @libui), allow_nil: false)
+            new_value = Glimmer::LibUI.integer_to_boolean(args[0], allow_nil: false)
             ::LibUI.send("#{libui_api_keyword}_set_#{property}", @libui, *args) if new_value != current_value
           else
             ::LibUI.send("#{libui_api_keyword}_set_#{property}", @libui, *args)
@@ -288,6 +289,7 @@ module Glimmer
       end
       
       def destroy
+        data_binding_model_attribute_observer_registrations.each(&:deregister)
         if parent_proxy.nil?
           default_destroy
         else
@@ -337,7 +339,7 @@ module Glimmer
       alias visible= visible
       
       def content(&block)
-        Glimmer::DSL::Engine.add_content(self, Glimmer::DSL::Libui::ControlExpression.new, @keyword, &block)
+        Glimmer::DSL::Engine.add_content(self, Glimmer::DSL::Libui::ControlExpression.new, @keyword, {post_add_content: @content_added}, &block)
       end
       
       private

data/lib/glimmer/libui/data_bindable.rb

@@ -23,16 +23,46 @@ module Glimmer
   module LibUI
     # Parent controls and shapes who have children and add child post_initialize_child
     module DataBindable
-      # Data-binds model to update view.
-      # Subclasses can override to do inverse data-binding by observing view control for property changes and updating model binding accordingly
+      # Sets up read/write (bidirectional) data-binding
+      #
+      # classes are expected to implement `data_bind_write(property, model_binding)` to setup write data-binding
+      # by observing view property for changes and writing to model attribute via model binding accordingly
+      #
+      # classes can override data_bind_read to disable read data-binding in rare scenarios that might need it
+      #
+      # returns model attribute reading observer registration by default
       def data_bind(property, model_binding)
+        data_bind_read(property, model_binding).tap do
+          data_bind_write(property, model_binding) unless model_binding.binding_options[:read_only]
+        end
+      end
+      
+      # Sets up read data-binding (reading from model to update view)
+      #
+      # Default implementation observes model attribute for changes via model binding
+      # and updates view property accordingly
+      def data_bind_read(property, model_binding)
         model_attribute_observer = Glimmer::DataBinding::Observer.proc do
           new_value = model_binding.evaluate_property
           send("#{property}=", new_value) unless send(property) == new_value
         end
-        model_attribute_observer.observe(model_binding)
+        observer_registration = model_attribute_observer.observe(model_binding)
         model_attribute_observer.call # initial update
-        model_attribute_observer
+        data_binding_model_attribute_observer_registrations << observer_registration
+        observer_registration
+      end
+      
+      # Sets up write data-binding (writing to model from view)
+      #
+      # Has no implementation by default. Classes are expected
+      # to implement this method by observing view property
+      # for changes and writing them to model accordingly via model binding
+      def data_bind_write(property, model_binding)
+        # No Op by default
+      end
+      
+      def data_binding_model_attribute_observer_registrations
+        @data_binding_model_attribute_observer_registrations ||= []
       end
     end
   end

data/lib/glimmer/libui/shape.rb

@@ -67,7 +67,8 @@ module Glimmer
       include Parent
       include DataBindable
       
-      attr_reader :parent, :args, :keyword, :block
+      attr_reader :parent, :args, :keyword, :block, :content_added
+      alias content_added? content_added
       
       def initialize(keyword, parent, args, &block)
         @keyword = keyword
@@ -97,7 +98,7 @@ module Glimmer
       end
       
       def content(&block)
-        Glimmer::DSL::Engine.add_content(self, Glimmer::DSL::Libui::ShapeExpression.new, @keyword, &block)
+        Glimmer::DSL::Engine.add_content(self, Glimmer::DSL::Libui::ShapeExpression.new, @keyword, {post_add_content: @content_added}, &block)
         request_auto_redraw
       end
       

data/lib/glimmer-dsl-libui.rb

@@ -30,6 +30,7 @@ require 'color'
 require 'os'
 require 'array_include_methods'
 require 'facets/hash/stringify_keys'
+require 'facets/string/underscore'
 require 'libui'
 
 # Internal requires

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-libui
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  version: 0.4.11
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-29 00:00:00.000000000 Z
+date: 2021-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer
@@ -232,6 +232,7 @@ files:
 - examples/basic_scrolling_area.rb
 - examples/basic_table.rb
 - examples/basic_table_button.rb
+- examples/basic_table_button2.rb
 - examples/basic_table_checkbox.rb
 - examples/basic_table_checkbox_text.rb
 - examples/basic_table_color.rb
@@ -250,6 +251,7 @@ files:
 - examples/color_button2.rb
 - examples/color_the_circles.rb
 - examples/control_gallery.rb
+- examples/cpu_percentage.rb
 - examples/custom_draw_text.rb
 - examples/custom_draw_text2.rb
 - examples/date_time_picker.rb
@@ -266,6 +268,9 @@ files:
 - examples/form2.rb
 - examples/form_table.rb
 - examples/form_table2.rb
+- examples/form_table3.rb
+- examples/form_table4.rb
+- examples/form_table5.rb
 - examples/grid.rb
 - examples/histogram.rb
 - examples/histogram2.rb
@@ -288,6 +293,7 @@ files:
 - examples/snake/model/vertebra.rb
 - examples/snake/presenter/cell.rb
 - examples/snake/presenter/grid.rb
+- examples/snake2.rb
 - examples/tetris.rb
 - examples/tetris/model/block.rb
 - examples/tetris/model/game.rb
@@ -296,6 +302,7 @@ files:
 - examples/tic_tac_toe.rb
 - examples/tic_tac_toe/board.rb
 - examples/tic_tac_toe/cell.rb
+- examples/tic_tac_toe2.rb
 - examples/timer.rb
 - examples/timer2.rb
 - glimmer-dsl-libui.gemspec