glimmer-dsl-libui 0.4.10 → 0.4.11

data/examples/form_table5.rb

@@ -0,0 +1,94 @@
+require 'glimmer-dsl-libui'
+
+include Glimmer
+
+data = [
+  ['Lisa Sky', 'lisa@sky.com', '720-523-4329', 'Denver', 'CO'],
+  ['Jordan Biggins', 'jordan@biggins.com', '617-528-5399', 'Boston', 'MA'],
+  ['Mary Glass', 'mary@glass.com', '847-589-8788', 'Elk Grove Village', 'IL'],
+  ['Darren McGrath', 'darren@mcgrath.com', '206-539-9283', 'Seattle', 'WA'],
+  ['Melody Hanheimer', 'melody@hanheimer.com', '213-493-8274', 'Los Angeles', 'CA'],
+]
+
+window('Contacts', 600, 600) { |w|
+  margined true
+  
+  vertical_box {
+    form {
+      stretchy false
+      
+      @name_entry = entry {
+        label 'Name'
+      }
+      
+      @email_entry = entry {
+        label 'Email'
+      }
+      
+      @phone_entry = entry {
+        label 'Phone'
+      }
+      
+      @city_entry = entry {
+        label 'City'
+      }
+      
+      @state_entry = entry {
+        label 'State'
+      }
+    }
+    
+    button('Save Contact') {
+      stretchy false
+      
+      on_clicked do
+        new_row = [@name_entry.text, @email_entry.text, @phone_entry.text, @city_entry.text, @state_entry.text]
+        if new_row.include?('')
+          msg_box_error(w, 'Validation Error!', 'All fields are required! Please make sure to enter a value for all fields.')
+        else
+          data << new_row # automatically inserts a row into the table due to implicit data-binding
+          @unfiltered_data = data.dup
+          @name_entry.text = ''
+          @email_entry.text = ''
+          @phone_entry.text = ''
+          @city_entry.text = ''
+          @state_entry.text = ''
+        end
+      end
+    }
+    
+    search_entry { |se|
+      stretchy false
+      
+      on_changed do
+        filter_value = se.text
+        @unfiltered_data ||= data.dup
+        # Unfilter first to remove any previous filters
+        data.replace(@unfiltered_data) # affects table indirectly through implicit data-binding
+        # Now, apply filter if entered
+        unless filter_value.empty?
+          data.filter! do |row_data| # affects table indirectly through implicit data-binding
+            row_data.any? do |cell|
+              cell.to_s.downcase.include?(filter_value.downcase)
+            end
+          end
+        end
+      end
+    }
+    
+    table {
+      text_column('Name')
+      text_column('Email')
+      text_column('Phone')
+      text_column('City')
+      text_column('State')
+
+      editable true
+      cell_rows data # implicit data-binding to raw data Array of Arrays
+      
+      on_changed do |row, type, row_data|
+        puts "Row #{row} #{type}: #{row_data}"
+      end
+    }
+  }
+}.show

data/examples/meta_example.rb

@@ -25,11 +25,11 @@ class MetaExample
   end
   
   def basic_examples
-    examples.select {|example| example.start_with?('Basic') || ADDITIONAL_BASIC_EXAMPLES.include?(example) }
+    examples.select {|example| example.start_with?('Basic') || ADDITIONAL_BASIC_EXAMPLES.include?(example) }.sort
   end
   
   def advanced_examples
-    examples - basic_examples
+    (examples - basic_examples).sort
   end
   
   def examples_with_versions
@@ -69,12 +69,12 @@ class MetaExample
       command = "#{RbConfig.ruby} -r #{glimmer_dsl_libui_file} #{example} 2>&1"
       result = ''
       IO.popen(command) do |f|
-        sleep(0.0001) # yield to main thread
+        sleep(0.00001) # yield to main thread
         f.each_line do |line|
           result << line
           puts line
           $stdout.flush # for Windows
-          sleep(0.0001) # yield to main thread
+          sleep(0.00001) # yield to main thread
         end
       end
       Glimmer::LibUI.queue_main { msg_box('Error Running Example', result) } if result.downcase.include?('error')
@@ -104,6 +104,7 @@ class MetaExample
                     example = selected_example
                     self.code_text = File.read(file_path_for(example))
                     @version_spinbox.value = 1
+                    @advanced_example_radio_buttons.selected = -1
                   end
                 }
                 
@@ -124,6 +125,7 @@ class MetaExample
                     example = selected_example
                     self.code_text = File.read(file_path_for(example))
                     @version_spinbox.value = 1
+                    @basic_example_radio_buttons.selected = -1
                   end
                 }
                 

data/lib/glimmer/dsl/libui/control_expression.rb

@@ -39,8 +39,9 @@ module Glimmer
         end
         
         def add_content(parent, keyword, *args, &block)
+          options = args.last.is_a?(Hash) ? args.last : {post_add_content: true}
           super
-          parent&.post_add_content
+          parent&.post_add_content if options[:post_add_content]
         end
       end
     end

data/lib/glimmer/dsl/libui/shape_expression.rb

@@ -47,10 +47,10 @@ module Glimmer
         end
         
         def add_content(parent, keyword, *args, &block)
+          options = args.last.is_a?(Hash) ? args.last : {post_add_content: true}
           super
-          parent.post_add_content
+          parent&.post_add_content if options[:post_add_content]
         end
-        
       end
     end
   end

data/lib/glimmer/dsl/libui/string_expression.rb

@@ -46,7 +46,8 @@ module Glimmer
         end
         
         def add_content(parent, keyword, *args, &block)
-          parent.post_add_content(block)
+          options = args.last.is_a?(Hash) ? args.last : {post_add_content: true}
+          parent&.post_add_content(block) if options[:post_add_content]
         end
       end
     end

data/lib/glimmer/libui/attributed_string.rb

@@ -30,8 +30,9 @@ module Glimmer
     class AttributedString
       include DataBindable
       
-      attr_reader :keyword, :parent_proxy, :args
+      attr_reader :keyword, :parent_proxy, :args, :content_added
       attr_accessor :block
+      alias content_added? content_added
     
       def initialize(keyword, parent_proxy, args, &block)
         @keyword = keyword
@@ -205,7 +206,7 @@ module Glimmer
       end
       
       def content(&block)
-        Glimmer::DSL::Engine.add_content(self, Glimmer::DSL::Libui::StringExpression.new, @keyword, &block)
+        Glimmer::DSL::Engine.add_content(self, Glimmer::DSL::Libui::StringExpression.new, @keyword, {post_add_content: true}, &block)
       end
     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
@@ -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

@@ -30,7 +30,7 @@ module Glimmer
       #
       # classes can override data_bind_read to disable read data-binding in rare scenarios that might need it
       #
-      # returns model attribute reading observer by default
+      # 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]
@@ -46,9 +46,10 @@ module Glimmer
           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)
@@ -59,6 +60,10 @@ module Glimmer
       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
 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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-libui
 version: !ruby/object:Gem::Version
-  version: 0.4.10
+  version: 0.4.11
 platform: ruby
 authors:
 - Andy Maleh
@@ -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
@@ -267,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