glimmer-dsl-libui 0.4.2 → 0.4.3

data/examples/login3.rb

@@ -0,0 +1,65 @@
+require 'glimmer-dsl-libui'
+
+class Login
+  include Glimmer
+  
+  attr_accessor :username, :password
+  attr_reader :logged_in
+  
+  def logged_in=(value)
+    @logged_in = value
+    self.logged_out = !value # calling logged_out= method notifies logged_out observers
+  end
+  
+  def logged_out=(value)
+    self.logged_in = !value unless logged_in == !value
+  end
+  
+  def logged_out
+    !logged_in
+  end
+  
+  def launch
+    window('Login') {
+      margined true
+      
+      vertical_box {
+        form {
+          entry {
+            label 'Username:'
+            text <=> [self, :username]
+            enabled <= [self, :logged_out]
+          }
+          
+          password_entry {
+            label 'Password:'
+            text <=> [self, :password]
+            enabled <= [self, :logged_out]
+          }
+        }
+        
+        horizontal_box {
+          button('Login') {
+            enabled <= [self, :logged_out]
+            
+            on_clicked do
+              self.logged_in = true
+            end
+          }
+          
+          button('Logout') {
+            enabled <= [self, :logged_in]
+            
+            on_clicked do
+              self.logged_in = false
+              self.username = ''
+              self.password = ''
+            end
+          }
+        }
+      }
+    }.show
+  end
+end
+
+Login.new.launch

data/examples/login4.rb

@@ -0,0 +1,61 @@
+require 'glimmer-dsl-libui'
+
+class Login
+  include Glimmer
+  
+  attr_accessor :username, :password
+  attr_reader :logged_in
+  
+  def logged_in=(value)
+    @logged_in = value
+    notify_observers(:logged_out) # manually notify observers of logged_out upon logged_in changes; this method comes automatically from enhancement as Glimmer::DataBinding::ObservableModel via data-binding
+  end
+  
+  def logged_out
+    !logged_in
+  end
+  
+  def launch
+    window('Login') {
+      margined true
+      
+      vertical_box {
+        form {
+          entry {
+            label 'Username:'
+            text <=> [self, :username]
+            enabled <= [self, :logged_out]
+          }
+          
+          password_entry {
+            label 'Password:'
+            text <=> [self, :password]
+            enabled <= [self, :logged_out]
+          }
+        }
+        
+        horizontal_box {
+          button('Login') {
+            enabled <= [self, :logged_out]
+            
+            on_clicked do
+              self.logged_in = true
+            end
+          }
+          
+          button('Logout') {
+            enabled <= [self, :logged_in]
+            
+            on_clicked do
+              self.logged_in = false
+              self.username = ''
+              self.password = ''
+            end
+          }
+        }
+      }
+    }.show
+  end
+end
+
+Login.new.launch

data/examples/login5.rb

@@ -0,0 +1,43 @@
+require 'glimmer-dsl-libui'
+
+include Glimmer
+
+window('Login') {
+  margined true
+  
+  vertical_box {
+    form {
+      @username_entry = entry {
+        label 'Username:'
+      }
+      
+      @password_entry = password_entry {
+        label 'Password:'
+      }
+    }
+    
+    horizontal_box {
+      @login_button = button('Login') {
+        on_clicked do
+          @username_entry.enabled = false
+          @password_entry.enabled = false
+          @login_button.enabled = false
+          @logout_button.enabled = true
+        end
+      }
+      
+      @logout_button = button('Logout') {
+        enabled false
+        
+        on_clicked do
+          @username_entry.text = ''
+          @password_entry.text = ''
+          @username_entry.enabled = true
+          @password_entry.enabled = true
+          @login_button.enabled = true
+          @logout_button.enabled = false
+        end
+      }
+    }
+  }
+}.show

data/examples/meta_example.rb

@@ -7,8 +7,11 @@ class MetaExample
   
   ADDITIONAL_BASIC_EXAMPLES = ['Color Button', 'Font Button', 'Form', 'Date Time Picker', 'Simple Notepad']
   
+  attr_accessor :code_text
+  
   def initialize
     @selected_example_index = examples_with_versions.index(basic_examples_with_versions.first)
+    @code_text = File.read(file_path_for(selected_example))
   end
   
   def examples
@@ -89,7 +92,7 @@ class MetaExample
                   on_selected do
                     @selected_example_index = examples_with_versions.index(basic_examples_with_versions[@basic_example_radio_buttons.selected])
                     example = selected_example
-                    @code_entry.text = File.read(file_path_for(example))
+                    self.code_text = File.read(file_path_for(example))
                     @version_spinbox.value = 1
                   end
                 }
@@ -108,7 +111,7 @@ class MetaExample
                   on_selected do
                     @selected_example_index = examples_with_versions.index(advanced_examples_with_versions[@advanced_example_radio_buttons.selected])
                     example = selected_example
-                    @code_entry.text = File.read(file_path_for(example))
+                    self.code_text = File.read(file_path_for(example))
                     @version_spinbox.value = 1
                   end
                 }
@@ -134,7 +137,7 @@ class MetaExample
                 else
                   version_number = @version_spinbox.value == 1 ? '' : @version_spinbox.value
                   example = "#{selected_example}#{version_number}"
-                  @code_entry.text = File.read(file_path_for(example))
+                  self.code_text = File.read(file_path_for(example))
                 end
               end
             }
@@ -149,7 +152,7 @@ class MetaExample
                   parent_dir = File.join(Dir.home, '.glimmer-dsl-libui', 'examples')
                   FileUtils.mkdir_p(parent_dir)
                   example_file = File.join(parent_dir, "#{selected_example.underscore}.rb")
-                  File.write(example_file, @code_entry.text)
+                  File.write(example_file, code_text)
                   example_supporting_directory = File.expand_path(selected_example.underscore, __dir__)
                   FileUtils.cp_r(example_supporting_directory, parent_dir) if Dir.exist?(example_supporting_directory)
                   FileUtils.cp_r(File.expand_path('../icons', __dir__), File.dirname(parent_dir))
@@ -164,14 +167,14 @@ class MetaExample
             }
             button('Reset') {
               on_clicked do
-                @code_entry.text = File.read(file_path_for(selected_example))
+                self.code_text = File.read(file_path_for(selected_example))
               end
             }
           }
         }
         
         @code_entry = non_wrapping_multiline_entry {
-          text File.read(file_path_for(selected_example))
+          text <=> [self, :code_text]
         }
       }
     }.show

data/examples/method_based_custom_keyword.rb

@@ -5,15 +5,11 @@ include Glimmer
 
 Address = Struct.new(:street, :p_o_box, :city, :state, :zip_code)
 
-def form_field(model, property)
-  property = property.to_s
+def form_field(model, attribute)
+  attribute = attribute.to_s
   entry { |e|
-    label property.underscore.split('_').map(&:capitalize).join(' ')
-    text model.send(property).to_s
-
-    on_changed do
-      model.send("#{property}=", e.text)
-    end
+    label attribute.underscore.split('_').map(&:capitalize).join(' ')
+    text <=> [model, attribute]
   }
 end
 
@@ -28,15 +24,12 @@ def address_form(address)
 end
 
 def label_pair(model, attribute, value)
-  name_label = nil
-  value_label = nil
   horizontal_box {
-    name_label = label(attribute.to_s.underscore.split('_').map(&:capitalize).join(' '))
-    value_label = label(value.to_s)
+    label(attribute.to_s.underscore.split('_').map(&:capitalize).join(' '))
+    label(value.to_s) {
+      text <= [model, attribute]
+    }
   }
-  observe(model, attribute) do
-    value_label.text = model.send(attribute)
-  end
 end
 
 def address(address)

data/examples/method_based_custom_keyword2.rb

@@ -0,0 +1,97 @@
+require 'glimmer-dsl-libui'
+require 'facets'
+
+include Glimmer
+
+Address = Struct.new(:street, :p_o_box, :city, :state, :zip_code)
+
+def form_field(model, property)
+  property = property.to_s
+  entry { |e|
+    label property.underscore.split('_').map(&:capitalize).join(' ')
+    text model.send(property).to_s
+
+    on_changed do
+      model.send("#{property}=", e.text)
+    end
+  }
+end
+
+def address_form(address)
+  form {
+    form_field(address, :street)
+    form_field(address, :p_o_box)
+    form_field(address, :city)
+    form_field(address, :state)
+    form_field(address, :zip_code)
+  }
+end
+
+def label_pair(model, attribute, value)
+  name_label = nil
+  value_label = nil
+  horizontal_box {
+    name_label = label(attribute.to_s.underscore.split('_').map(&:capitalize).join(' '))
+    value_label = label(value.to_s)
+  }
+  observe(model, attribute) do
+    value_label.text = model.send(attribute)
+  end
+end
+
+def address(address)
+  vertical_box {
+    address.each_pair do |attribute, value|
+      label_pair(address, attribute, value)
+    end
+  }
+end
+
+address1 = Address.new('123 Main St', '23923', 'Denver', 'Colorado', '80014')
+address2 = Address.new('2038 Park Ave', '83272', 'Boston', 'Massachusetts', '02101')
+
+window('Method-Based Custom Keyword') {
+  margined true
+  
+  horizontal_box {
+    vertical_box {
+      label('Address 1') {
+        stretchy false
+      }
+      
+      address_form(address1)
+      
+      horizontal_separator {
+        stretchy false
+      }
+      
+      label('Address 1 (Saved)') {
+        stretchy false
+      }
+      
+      address(address1)
+    }
+    
+    vertical_separator {
+      stretchy false
+    }
+    
+    vertical_box {
+      label('Address 2') {
+        stretchy false
+      }
+      
+      address_form(address2)
+      
+      horizontal_separator {
+        stretchy false
+      }
+      
+      label('Address 2 (Saved)') {
+        stretchy false
+      }
+      
+      address(address2)
+    }
+  }
+}.show

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

@@ -30,16 +30,14 @@ module Glimmer
       class DataBindingExpression < Expression
         def can_interpret?(parent, keyword, *args, &block)
           args.size == 1 and
-            args[0].is_a?(DataBinding::ModelBinding)
+            args[0].is_a?(DataBinding::ModelBinding) and
+            parent.respond_to?(:data_bind)
         end
   
         def interpret(parent, keyword, *args, &block)
+          property = keyword
           model_binding = args[0]
-          model_attribute_observer = Glimmer::DataBinding::Observer.proc do
-            parent.send("#{keyword}=", model_binding.evaluate_property)
-          end
-          model_attribute_observer.observe(model_binding)
-          model_attribute_observer.call # initial update
+          parent.data_bind(property, model_binding)
         end
       end
     end

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

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

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

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

data/lib/glimmer/libui/control_proxy.rb

@@ -332,6 +332,18 @@ module Glimmer
       alias set_visible visible
       alias visible= visible
       
+      # 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
+      def data_bind(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)
+        model_attribute_observer.call # initial update
+        model_attribute_observer
+      end
+      
       def content(&block)
         Glimmer::DSL::Engine.add_content(self, Glimmer::DSL::Libui::ControlExpression.new, @keyword, &block)
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-libui
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-26 00:00:00.000000000 Z
+date: 2021-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer
@@ -223,6 +223,7 @@ files:
 - examples/basic_draw_text.rb
 - examples/basic_draw_text2.rb
 - examples/basic_entry.rb
+- examples/basic_entry2.rb
 - examples/basic_image.rb
 - examples/basic_image2.rb
 - examples/basic_image3.rb
@@ -257,12 +258,19 @@ files:
 - examples/editable_table.rb
 - examples/font_button.rb
 - examples/form.rb
+- examples/form2.rb
 - examples/form_table.rb
+- examples/form_table2.rb
 - examples/grid.rb
 - examples/histogram.rb
 - examples/login.rb
+- examples/login2.rb
+- examples/login3.rb
+- examples/login4.rb
+- examples/login5.rb
 - examples/meta_example.rb
 - examples/method_based_custom_keyword.rb
+- examples/method_based_custom_keyword2.rb
 - examples/midi_player.rb
 - examples/simple_notepad.rb
 - examples/snake.rb