glimmer-dsl-libui 0.4.0 → 0.4.4

data/examples/login2.rb

@@ -0,0 +1,55 @@
+require 'glimmer-dsl-libui'
+
+class Login
+  include Glimmer
+  
+  attr_accessor :username, :password, :logged_in
+  
+  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, computed_by: :logged_in] # computed_by option ensures being notified of changes to logged_in
+          }
+          
+          password_entry {
+            label 'Password:'
+            text <=> [self, :password]
+            enabled <= [self, :logged_out, computed_by: :logged_in]
+          }
+        }
+        
+        horizontal_box {
+          button('Login') {
+            enabled <= [self, :logged_out, computed_by: :logged_in]
+            
+            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/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
@@ -40,7 +43,7 @@ class MetaExample
   end
   
   def version_count_for(example)
-    Dir.glob(File.join(File.expand_path('.', __dir__), "#{example.underscore}*.rb")).select {|file| file.match(/\d\.rb$/)}.count + 1
+    Dir.glob(File.join(File.expand_path('.', __dir__), "#{example.underscore}*.rb")).select {|file| file.match(/#{example.underscore}\d\.rb$/)}.count + 1
   end
   
   def glimmer_dsl_libui_file
@@ -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]
+    }
   }
-  Glimmer::DataBinding::Observer.proc do
-    value_label.text = model.send(attribute)
-  end.observe(model, attribute)
 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/examples/snake/presenter/grid.rb

@@ -1,10 +1,12 @@
-require 'glimmer/data_binding/observer'
+require 'glimmer'
 require_relative '../model/game'
 require_relative 'cell'
 
 class Snake
   module Presenter
     class Grid
+      include Glimmer
+      
       attr_reader :game, :cells
       
       def initialize(game = Model::Game.new)
@@ -14,7 +16,7 @@ class Snake
             Cell.new(grid: self, row: row, column: column)
           end
         end
-        Glimmer::DataBinding::Observer.proc do |new_vertebrae|
+        observe(@game.snake, :vertebrae) do |new_vertebrae|
           occupied_snake_positions = @game.snake.vertebrae.map {|v| [v.row, v.column]}
           @cells.each_with_index do |row_cells, row|
             row_cells.each_with_index do |cell, column|
@@ -27,7 +29,7 @@ class Snake
               end
             end
           end
-        end.observe(@game.snake, :vertebrae)
+        end
       end
       
       def clear

data/examples/snake.rb

@@ -1,12 +1,12 @@
 require 'glimmer-dsl-libui'
-require 'glimmer/data_binding/observer'
 
 require_relative 'snake/presenter/grid'
 
 class Snake
+  include Glimmer
+  
   CELL_SIZE = 15
   SNAKE_MOVE_DELAY = 0.1
-  include Glimmer
   
   def initialize
     @game = Model::Game.new
@@ -38,7 +38,7 @@ class Snake
   def create_gui
     @main_window = window {
       # data-bind window title to game score, converting it to a title string on read from the model
-      title <= [@game, :score, on_read: -> (score) {"Glimmer Snake (Score: #{@game.score})"}]
+      title <= [@game, :score, on_read: -> (score) {"Snake (Score: #{@game.score})"}]
       content_size @game.width * CELL_SIZE, @game.height * CELL_SIZE
       resizable false
       
@@ -52,7 +52,7 @@ class Snake
             @game.width.times do |column|
               area {
                 square(0, 0, CELL_SIZE) {
-                  fill <= [@grid.cells[row][column], :color]
+                  fill <= [@grid.cells[row][column], :color] # data-bind square fill to grid cell color
                 }
                 
                 on_key_up do |area_key_event|

data/examples/tetris.rb

@@ -42,7 +42,7 @@ class Tetris
   end
   
   def register_observers
-    Glimmer::DataBinding::Observer.proc do |game_over|
+    observe(@game, :game_over) do |game_over|
       if game_over
         @pause_menu_item.enabled = false
         show_game_over_dialog
@@ -50,11 +50,11 @@ class Tetris
         @pause_menu_item.enabled = true
         start_moving_tetrominos_down
       end
-    end.observe(@game, :game_over)
+    end
     
     Model::Game::PLAYFIELD_HEIGHT.times do |row|
       Model::Game::PLAYFIELD_WIDTH.times do |column|
-        Glimmer::DataBinding::Observer.proc do |new_color|
+        observe(@game.playfield[row][column], :color) do |new_color|
           Glimmer::LibUI.queue_main do
             color = Glimmer::LibUI.interpret_color(new_color)
             block = @playfield_blocks[row][column]
@@ -65,13 +65,13 @@ class Tetris
             block[:left_bevel_edge].fill = {r: color[:r] - BEVEL_CONSTANT, g: color[:g] - BEVEL_CONSTANT, b: color[:b] - BEVEL_CONSTANT}
             block[:border_square].stroke = new_color == Model::Block::COLOR_CLEAR ? COLOR_GRAY : color
           end
-        end.observe(@game.playfield[row][column], :color)
+        end
       end
     end
     
     Model::Game::PREVIEW_PLAYFIELD_HEIGHT.times do |row|
       Model::Game::PREVIEW_PLAYFIELD_WIDTH.times do |column|
-        Glimmer::DataBinding::Observer.proc do |new_color|
+        observe(@game.preview_playfield[row][column], :color) do |new_color|
           Glimmer::LibUI.queue_main do
             color = Glimmer::LibUI.interpret_color(new_color)
             block = @preview_playfield_blocks[row][column]
@@ -82,27 +82,27 @@ class Tetris
             block[:left_bevel_edge].fill = {r: color[:r] - BEVEL_CONSTANT, g: color[:g] - BEVEL_CONSTANT, b: color[:b] - BEVEL_CONSTANT}
             block[:border_square].stroke = new_color == Model::Block::COLOR_CLEAR ? COLOR_GRAY : color
           end
-        end.observe(@game.preview_playfield[row][column], :color)
+        end
       end
     end
 
-    Glimmer::DataBinding::Observer.proc do |new_score|
+    observe(@game, :score) do |new_score|
       Glimmer::LibUI.queue_main do
         @score_label.text = new_score.to_s
       end
-    end.observe(@game, :score)
+    end
 
-    Glimmer::DataBinding::Observer.proc do |new_lines|
+    observe(@game, :lines) do |new_lines|
       Glimmer::LibUI.queue_main do
         @lines_label.text = new_lines.to_s
       end
-    end.observe(@game, :lines)
+    end
 
-    Glimmer::DataBinding::Observer.proc do |new_level|
+    observe(@game, :level) do |new_level|
       Glimmer::LibUI.queue_main do
         @level_label.text = new_level.to_s
       end
-    end.observe(@game, :level)
+    end
   end
   
   def menu_bar

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/attributed_string.rb

@@ -23,10 +23,13 @@ require 'glimmer/libui/control_proxy'
 require 'glimmer/libui/control_proxy/area_proxy'
 require 'glimmer/libui/parent'
 require 'glimmer/libui/control_proxy/transformable'
+require 'glimmer/libui/data_bindable'
 
 module Glimmer
   module LibUI
     class AttributedString
+      include DataBindable
+      
       attr_reader :keyword, :parent_proxy, :args
       attr_accessor :block