glimmer-dsl-libui 0.4.9 → 0.4.13

data/examples/tic_tac_toe2.rb

@@ -0,0 +1,84 @@
+
+require 'glimmer-dsl-libui'
+
+require_relative "tic_tac_toe/board"
+
+class TicTacToe
+  include Glimmer
+
+  def initialize
+    @tic_tac_toe_board = Board.new
+  end
+  
+  def launch
+    create_gui
+    register_observers
+    @main_window.show
+  end
+  
+  def register_observers
+    observe(@tic_tac_toe_board, :game_status) do |game_status|
+      display_win_message if game_status == Board::WIN
+      display_draw_message if game_status == Board::DRAW
+    end
+    
+    3.times.map do |row|
+      3.times.map do |column|
+        observe(@tic_tac_toe_board[row + 1, column + 1], :sign) do |sign| # board model is 1-based
+          @cells[row][column].string = sign
+        end
+      end
+    end
+  end
+
+  def create_gui
+    @main_window = window('Tic-Tac-Toe', 180, 180) {
+      resizable false
+      
+      @cells = []
+      vertical_box {
+        padded false
+        
+        3.times.map do |row|
+          @cells << []
+          horizontal_box {
+            padded false
+            
+            3.times.map do |column|
+              area {
+                square(0, 0, 60) {
+                  stroke :black, thickness: 2
+                }
+                text(23, 19) {
+                  @cells[row] << string('') {
+                    font family: 'Arial', size: OS.mac? ? 20 : 16
+                  }
+                }
+                on_mouse_up do
+                  @tic_tac_toe_board.mark(row + 1, column + 1) # board model is 1-based
+                end
+              }
+            end
+          }
+        end
+      }
+    }
+  end
+
+  def display_win_message
+    display_game_over_message("Player #{@tic_tac_toe_board.winning_sign} has won!")
+  end
+
+  def display_draw_message
+    display_game_over_message("Draw!")
+  end
+
+  def display_game_over_message(message_text)
+    Glimmer::LibUI.queue_main do
+      msg_box('Game Over', message_text)
+      @tic_tac_toe_board.reset!
+    end
+  end
+end
+
+TicTacToe.new.launch

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/column/background_color_column_proxy.rb

@@ -31,6 +31,10 @@ module Glimmer
         # Follows the Proxy Design Pattern
         class BackgroundColorColumnProxy < ControlProxy
           include Column
+          
+          def name
+            'Background Color'
+          end
         end
       end
     end

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

@@ -34,6 +34,22 @@ module Glimmer
       #
       # Follows the Proxy Design Pattern
       class ImageProxy < ControlProxy
+        class << self
+          # creates or returns existing instance for passed in arguments if parent is nil and block is nil
+          def create(keyword, parent, args, &block)
+            if parent.nil? && block.nil?
+              instances[args] ||= new(keyword, parent, args.dup, &block)
+            else
+              new(keyword, parent, args, &block)
+            end
+          end
+          
+          def instances
+            @@instances = {} unless defined? @@instances
+            @@instances
+          end
+        end
+        
         include Parent
         prepend Transformable
         

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.select {|column| column.is_a?(Column)}.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
@@ -162,11 +208,13 @@ module Glimmer
             when Column::TextColumnProxy, Column::ButtonColumnProxy, Column::TextColorColumnProxy, :text
               ::LibUI.new_table_value_string((expanded_cell_rows[row] && expanded_cell_rows[row][column]).to_s)
             when Column::ImageColumnProxy, Column::ImageTextColumnProxy, Column::ImageTextColorColumnProxy
-              if OS.windows? && row == cell_rows.count
-                ::LibUI.new_table_value_image((expanded_cell_rows[row - 1] && (expanded_cell_rows[row - 1][column].respond_to?(:libui) ? expanded_cell_rows[row - 1][column].libui : expanded_cell_rows[row - 1][column])))
-              else
-                ::LibUI.new_table_value_image((expanded_cell_rows[row] && (expanded_cell_rows[row][column].respond_to?(:libui) ? expanded_cell_rows[row][column].libui : expanded_cell_rows[row][column])))
-              end
+              # TODO refactor to eliminate redundancy and share similar code
+              row = row - 1 if OS.windows? && row == cell_rows.count
+              img = expanded_cell_rows[row][column]
+              img = ControlProxy::ImageProxy.create('image', nil, img) if img.is_a?(Array)
+              img = ControlProxy::ImageProxy.create('image', nil, [img]) if img.is_a?(String)
+              img = img.respond_to?(:libui) ? img.libui : img
+              ::LibUI.new_table_value_image(img)
             when Column::CheckboxColumnProxy, Column::CheckboxTextColumnProxy, Column::CheckboxTextColorColumnProxy
               ::LibUI.new_table_value_int(((expanded_cell_rows[row] && (expanded_cell_rows[row][column] == 1 || expanded_cell_rows[row][column].to_s.strip.downcase == 'true' ? 1 : 0))) || 0)
             when Column::ProgressBarColumnProxy
@@ -193,28 +241,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 +314,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/libui.rb

@@ -63,7 +63,7 @@ module Glimmer
           value[:b] = value.delete(:blue) if value[:blue]
           value[:a] = value.delete(:alpha) if value[:alpha]
           value
-        elsif value.is_a?(String) && !value.start_with?('0x') && !value.downcase.match(/^((([1-9a-f]){6})|(([1-9a-f]){3}))$/)
+        elsif value.is_a?(String) && !value.start_with?('0x') && !value.start_with?('#') && !value.downcase.match(/^((([1-9a-f]){6})|(([1-9a-f]){3}))$/)
           color = Color::RGB.extract_colors(value).first
           color.nil? ? {} : {
             r: color.red,
@@ -79,11 +79,11 @@ module Glimmer
     
       def hex_to_rgb(value)
         if value.is_a?(String)
+          value = "0x#{value[1..-1]}" if value.start_with?('#')
           if !value.start_with?('0x')
             value = value.chars.map {|char| [char, char]}.flatten.join if value.length == 3
             value = "0x#{value}"
           end
-          value = "0x#{value[1..-1]}" if value.start_with?('#')
           value = value.to_i(16)
         end
         if value.is_a?(Integer)

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.9
+  version: 0.4.13
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-30 00:00:00.000000000 Z
+date: 2021-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer
@@ -232,14 +232,18 @@ 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
 - examples/basic_table_color2.rb
+- examples/basic_table_color3.rb
 - examples/basic_table_image.rb
 - examples/basic_table_image2.rb
+- examples/basic_table_image3.rb
 - examples/basic_table_image_text.rb
 - examples/basic_table_image_text2.rb
+- examples/basic_table_image_text3.rb
 - examples/basic_table_progress_bar.rb
 - examples/basic_transform.rb
 - examples/basic_transform2.rb
@@ -250,6 +254,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 +271,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 +296,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 +305,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