glimmer-dsl-libui 0.4.8 → 0.4.12

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/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.8
+  version: 0.4.12
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-29 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