glimmer-dsl-tk 0.0.18 → 0.0.23

data/lib/glimmer/tk/widget_proxy.rb

@@ -26,8 +26,8 @@ module Glimmer
     # Follows the Proxy Design Pattern
     class WidgetProxy
       class << self
-        def create(keyword, parent, args)
-          widget_proxy_class(keyword).new(keyword, parent, args)
+        def create(keyword, parent, args, &block)
+          widget_proxy_class(keyword).new(keyword, parent, args, &block)
         end
         
         def widget_proxy_class(keyword)
@@ -61,38 +61,31 @@ module Glimmer
         end
       end
       
-      attr_reader :parent_proxy, :tk, :args, :keyword
+      attr_reader :parent_proxy, :tk, :args, :keyword, :children
 
-      DEFAULT_INITIALIZERS = {
-        'combobox' => lambda do |tk|
-          tk.textvariable = ::TkVariable.new
-        end,
-        'label' => lambda do |tk|
-          tk.textvariable = ::TkVariable.new
-        end,
-        'entry' => lambda do |tk|
-          tk.textvariable = ::TkVariable.new
-        end,
-      }
-            
       # Initializes a new Tk Widget
       #
       # Styles is a comma separate list of symbols representing Tk styles in lower case
-      def initialize(underscored_widget_name, parent_proxy, args)
+      def initialize(underscored_widget_name, parent_proxy, args, &block)
         @parent_proxy = parent_proxy
         @args = args
         @keyword = underscored_widget_name
+        @block = block
         tk_widget_class = self.class.tk_widget_class_for(underscored_widget_name)
         @tk = tk_widget_class.new(@parent_proxy.tk, *args)
         # a common widget initializer
-        @tk.grid unless @tk.is_a?(::Tk::Toplevel)
-        DEFAULT_INITIALIZERS[underscored_widget_name]&.call(@tk)
+        initialize_defaults
         @parent_proxy.post_initialize_child(self)
+        post_add_content if @block.nil?
+      end
+      
+      def children
+        @children ||= []
       end
       
       # Subclasses may override to perform post initialization work on an added child
       def post_initialize_child(child)
-        # No Op by default
+        children << child
       end
 
       # Subclasses may override to perform post add_content work
@@ -140,11 +133,17 @@ module Glimmer
         end
       end
       
+      def has_attributes_attribute?(attribute)
+        attribute = attribute.sub(/\?$/, '').sub(/=$/, '')
+        @tk.respond_to?(:attributes) && @tk.attributes.keys.include?(attribute.to_s)
+      end
+      
       def has_attribute?(attribute, *args)
         (widget_custom_attribute_mapping[tk.class] and widget_custom_attribute_mapping[tk.class][attribute.to_s]) or
           tk_widget_has_attribute_setter?(attribute) or
           tk_widget_has_attribute_getter_setter?(attribute) or
           has_state?(attribute) or
+          has_attributes_attribute?(attribute) or
           respond_to?(attribute_setter(attribute), args)
       end
 
@@ -153,7 +152,13 @@ module Glimmer
         if widget_custom_attribute
           widget_custom_attribute[:setter][:invoker].call(@tk, args)
         elsif tk_widget_has_attribute_setter?(attribute)
-          @tk.send(attribute_setter(attribute), *args) unless @tk.send(attribute) == args.first
+          unless args.size == 1 && @tk.send(attribute) == args.first
+            if args.size == 1
+              @tk.send(attribute_setter(attribute), *args)
+            else
+              @tk.send(attribute_setter(attribute), args)
+            end
+          end
         elsif tk_widget_has_attribute_getter_setter?(attribute)
           @tk.send(attribute, *args)
         elsif has_state?(attribute)
@@ -163,6 +168,9 @@ module Glimmer
           else
             @tk.tile_state("!#{attribute}")
           end
+        elsif has_attributes_attribute?(attribute)
+          attribute = attribute.sub(/=$/, '')
+          @tk.attributes(attribute, args.first)
         else
           send(attribute_setter(attribute), args)
         end
@@ -176,6 +184,10 @@ module Glimmer
           @tk.send(attribute)
         elsif has_state?(attribute)
           @tk.tile_instate(attribute.sub(/\?$/, ''))
+        elsif has_attributes_attribute?(attribute)
+          result = @tk.attributes[attribute.sub(/\?$/, '')]
+          result = result == 1 if result.is_a?(Integer)
+          result
         else
           send(attribute)
         end
@@ -186,6 +198,7 @@ module Glimmer
       end
       
       def widget_custom_attribute_mapping
+        # TODO consider extracting to modules/subclasses
         @widget_custom_attribute_mapping ||= {
           ::Tk::Tile::TButton => {
             'image' => {
@@ -193,6 +206,30 @@ module Glimmer
               setter: {name: 'image=', invoker: lambda { |widget, args| @tk.image = image_argument(args) }},
             },
           },
+          ::Tk::Tile::TCheckbutton => {
+            'image' => {
+              getter: {name: 'image', invoker: lambda { |widget, args| @tk.image }},
+              setter: {name: 'image=', invoker: lambda { |widget, args| @tk.image = image_argument(args) }},
+            },
+            'variable' => {
+              getter: {name: 'variable', invoker: lambda { |widget, args| @tk.variable&.value.to_s == @tk.onvalue.to_s }},
+              setter: {name: 'variable=', invoker: lambda { |widget, args| @tk.variable&.value = args.first.is_a?(Integer) ? args.first : (args.first ? 1 : 0) }},
+            },
+          },
+          ::Tk::Tile::TRadiobutton => {
+            'image' => {
+              getter: {name: 'image', invoker: lambda { |widget, args| @tk.image }},
+              setter: {name: 'image=', invoker: lambda { |widget, args| @tk.image = image_argument(args) }},
+            },
+            'text' => {
+              getter: {name: 'text', invoker: lambda { |widget, args| @tk.text }},
+              setter: {name: 'text=', invoker: lambda { |widget, args| @tk.value = @tk.text = args.first }},
+            },
+            'variable' => {
+              getter: {name: 'variable', invoker: lambda { |widget, args| @tk.variable&.value == @tk.value }},
+              setter: {name: 'variable=', invoker: lambda { |widget, args| @tk.variable&.value = args.first ? @tk.value : @tk.variable&.value }},
+            },
+          },
           ::Tk::Tile::TCombobox => {
             'text' => {
               getter: {name: 'text', invoker: lambda { |widget, args| @tk.textvariable&.value }},
@@ -215,11 +252,25 @@ module Glimmer
               setter: {name: 'text=', invoker: lambda { |widget, args| @tk.textvariable&.value = args.first unless @text_variable_edit }},
             },
           },
+          ::Tk::Root => {
+            'text' => {
+              getter: {name: 'text', invoker: lambda { |widget, args| @tk.title }},
+              setter: {name: 'text=', invoker: lambda { |widget, args| @tk.title = args.first }},
+            },
+          },
         }
       end
       
       def widget_attribute_listener_installers
+        # TODO consider extracting to modules/subclasses
         @tk_widget_attribute_listener_installers ||= {
+          ::Tk::Tile::TCheckbutton => {
+            'variable' => lambda do |observer|
+              @tk.command {
+                observer.call(@tk.variable.value.to_s == @tk.onvalue.to_s)
+              }
+            end,
+          },
           ::Tk::Tile::TCombobox => {
             'text' => lambda do |observer|
               if observer.is_a?(Glimmer::DataBinding::ModelBinding)
@@ -247,6 +298,14 @@ module Glimmer
               }
             end,
           },
+          ::Tk::Tile::TRadiobutton => {
+            'variable' => lambda do |observer|
+              @tk.command {
+                pd @tk.variable.value, @tk.value
+                observer.call(@tk.variable.value == @tk.value)
+              }
+            end,
+          },
         }
       end
       
@@ -271,16 +330,28 @@ module Glimmer
         widget_listener_installers = attribute_listener_installers.map{|installer| installer[attribute.to_s]}.compact if !attribute_listener_installers.empty?
         widget_listener_installers.to_a.first&.call(observer)
       end
-
+      
+      def handle_listener(listener_name, &listener)
+        listener_name = listener_name.to_s
+        begin
+          @tk.bind(listener_name, &listener)
+        rescue => e
+          Glimmer::Config.logger.debug {e.full_message}
+          listener_name = "<#{listener_name}" if !listener_name.start_with?('<')
+          listener_name = "#{listener_name}>" if !listener_name.end_with?('>')
+          @tk.bind(listener_name, &listener)
+        end
+      end
+      
       def content(&block)
         Glimmer::DSL::Engine.add_content(self, Glimmer::DSL::Tk::WidgetExpression.new, keyword, *args, &block)
       end
 
       def method_missing(method, *args, &block)
         method = method.to_s
-        if args.empty? && block.nil? && ((widget_custom_attribute_mapping[tk.class] && widget_custom_attribute_mapping[tk.class][method]) || has_state?(method))
+        if args.empty? && block.nil? && ((widget_custom_attribute_mapping[tk.class] && widget_custom_attribute_mapping[tk.class][method]) || has_state?(method) || has_attributes_attribute?(method))
           get_attribute(method)
-        elsif method.end_with?('=') && block.nil? && ((widget_custom_attribute_mapping[tk.class] && widget_custom_attribute_mapping[tk.class][method.sub(/=$/, '')]) || has_state?(method))
+        elsif method.end_with?('=') && block.nil? && ((widget_custom_attribute_mapping[tk.class] && widget_custom_attribute_mapping[tk.class][method.sub(/=$/, '')]) || has_state?(method) || has_attributes_attribute?(method))
           set_attribute(method.sub(/=$/, ''), *args)
         else
           tk.send(method, *args, &block)
@@ -294,6 +365,14 @@ module Glimmer
         super ||
           tk.respond_to?(method, *args, &block)
       end
+      
+      private
+      
+      def initialize_defaults
+        @tk.grid unless @tk.is_a?(::Tk::Toplevel)
+      end
     end
   end
 end
+
+Dir[File.expand_path('./*_proxy.rb', __dir__)].each {|f| require f}

data/lib/glimmer-dsl-tk.rb

@@ -27,6 +27,7 @@ require 'glimmer'
 require 'puts_debuggerer' if ENV['pd'].to_s.downcase == 'true'
 # require 'super_module'
 require 'tk'
+require 'os'
 
 # Internal requires
 # require 'ext/glimmer/config'

data/samples/hello/hello_checkbutton.rb

@@ -0,0 +1,131 @@
+# Copyright (c) 2020-2021 Andy Maleh
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+require 'glimmer-dsl-tk'
+
+class HelloCheckbutton
+  class Person
+    attr_accessor :skiing, :snowboarding, :snowmobiling, :snowshoeing, :snow_activities, :snow_activities_alternate
+    
+    def initialize
+      reset_activities!
+      individual_observer = Glimmer::DataBinding::Observer.proc do
+        unless @updating_group
+          @updating_individual = true
+          if skiing && snowboarding && snowmobiling && snowshoeing
+            self.snow_activities = true
+            self.snow_activities_alternate = false
+          elsif skiing || snowboarding || snowmobiling || snowshoeing
+            self.snow_activities = true
+            self.snow_activities_alternate = true
+          else
+            self.snow_activities = false
+            self.snow_activities_alternate = false
+          end
+          @updating_individual = false
+        end
+      end
+      individual_observer.observe(self, :skiing)
+      individual_observer.observe(self, :snowboarding)
+      individual_observer.observe(self, :snowmobiling)
+      individual_observer.observe(self, :snowshoeing)
+      
+      group_observer = Glimmer::DataBinding::Observer.proc do
+        unless @updating_individual
+          @updating_group = true
+          self.skiing = self.snow_activities
+          self.snowboarding = self.snow_activities
+          self.snowmobiling = self.snow_activities
+          self.snowshoeing = self.snow_activities
+          @updating_group = false
+        end
+      end
+      group_observer.observe(self, :snow_activities)
+    end
+    
+    def reset_activities!
+      self.snow_activities = true
+      self.snow_activities_alternate = true
+      self.skiing = false
+      self.snowboarding = true
+      self.snowmobiling = false
+      self.snowshoeing = false
+    end
+  end
+  
+  include Glimmer
+  
+  def initialize
+    @person = Person.new
+  end
+  
+  def launch
+    root {
+      title 'Hello, Checkbutton!'
+      background '#ececec' if OS.mac?
+      
+      label {
+        text 'Check all snow activities you are interested in:'
+        font 'caption'
+      }
+      
+      frame {
+        checkbutton {
+          text 'Snow Activities'
+          variable <=> [@person, :snow_activities]
+          alternate <=> [@person, :snow_activities_alternate] # binds half-checked state
+        }
+        
+        frame {
+          checkbutton {
+            text 'Skiing'
+            variable <=> [@person, :skiing]
+          }
+          
+          checkbutton {
+            text 'Snowboarding'
+            variable <=> [@person, :snowboarding]
+          }
+          
+          checkbutton {
+            text 'Snowmobiling'
+            variable <=> [@person, :snowmobiling]
+          }
+          
+          checkbutton {
+            text 'Snowshoeing'
+            variable <=> [@person, :snowshoeing]
+          }
+        }
+      }
+      
+      button {
+        text 'Reset Activities'
+        
+        command do
+          @person.reset_activities!
+        end
+      }
+    }.open
+  end
+end
+
+HelloCheckbutton.new.launch

data/samples/hello/hello_notebook.rb

@@ -27,7 +27,7 @@ class HelloNotebook
   def launch
     root {
       title 'Hello, Notebook!'
-       
+      
       notebook {
         frame(text: 'English') {
           label {

data/samples/hello/hello_radiobutton.rb

@@ -0,0 +1,87 @@
+require 'glimmer-dsl-tk'
+
+class HelloRadiobutton
+  class Person
+    attr_accessor :male, :female, :child, :teen, :adult, :senior
+    
+    def initialize
+      reset!
+    end
+    
+    def reset!
+      self.male = true
+      self.female = nil
+      self.child = nil
+      self.teen = nil
+      self.adult = true
+      self.senior = nil
+    end
+  end
+  
+  include Glimmer
+  
+  def initialize
+    @person = Person.new
+  end
+  
+  def launch
+    root {
+      title 'Hello, Radio!'
+      background '#ececec' if OS.mac?
+      
+      label {
+        text 'Gender:'
+        font 'caption'
+      }
+      
+      frame {
+        radiobutton {
+          text 'Male'
+          variable <=> [@person, :male]
+        }
+        
+        radiobutton {
+          text 'Female'
+          variable <=> [@person, :female]
+        }
+      }
+      
+      label {
+        text 'Age Group:'
+        font 'caption'
+      }
+      
+      frame {
+        radiobutton {
+          text 'Child'
+          variable <=> [@person, :child]
+        }
+
+        radiobutton {
+          text 'Teen'
+          variable <=> [@person, :teen]
+        }
+
+        radiobutton {
+          text 'Adult'
+          variable <=> [@person, :adult]
+        }
+
+        radiobutton {
+          text 'Senior'
+          variable <=> [@person, :senior]
+        }
+      }
+      
+      button {
+        text 'Reset'
+        
+        command do
+          @person.reset!
+        end
+      }
+    }.open
+  end
+end
+
+HelloRadiobutton.new.launch

data/samples/hello/hello_root.rb

@@ -0,0 +1,48 @@
+# Copyright (c) 2020-2021 Andy Maleh
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+require 'glimmer-dsl-tk'
+
+include Glimmer
+
+root { |r|
+  title 'Hello, Root!'
+  iconphoto File.expand_path('../../icons/glimmer.png', __dir__)
+  width 400
+  height 200
+  x -150
+  y 300
+  resizable true # same as `resizable true, true`, meaning cannot resize horizontally and vertically
+  minsize 200, 100
+  maxsize 600, 400
+  background 'lightgrey'
+  alpha 0.85 # on the mac, you can set `transparent true` as well
+  topmost true
+  
+  on('OPEN_WINDOW') do # custom event that runs right after Tk.mainloop
+    message_box(parent: r, title: 'Hi', message: 'Hi')
+  end
+  
+  on('DELETE_WINDOW') do |event| # alias for WM_DELETE_WINDOW protocol event
+    message_box(parent: r, title: 'Bye', message: 'Bye')
+    exit(0)
+  end
+}.open

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-tk
 version: !ruby/object:Gem::Version
-  version: 0.0.18
+  version: 0.0.23
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-11 00:00:00.000000000 Z
+date: 2021-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer
@@ -39,47 +39,53 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.13.1
 - !ruby/object:Gem::Dependency
-  name: tk
+  name: os
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 1.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 1.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: tk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.0
-  type: :development
+        version: 0.4.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
-  name: rdoc
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: 3.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: 3.5.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -142,6 +148,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.8.23
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.5.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.5.1
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -198,19 +218,27 @@ files:
 - lib/glimmer/dsl/tk/dsl.rb
 - lib/glimmer/dsl/tk/list_selection_data_binding_expression.rb
 - lib/glimmer/dsl/tk/message_box_expression.rb
+- lib/glimmer/dsl/tk/on_expression.rb
 - lib/glimmer/dsl/tk/root_expression.rb
 - lib/glimmer/dsl/tk/shine_data_binding_expression.rb
 - lib/glimmer/dsl/tk/widget_expression.rb
 - lib/glimmer/tk/button_proxy.rb
+- lib/glimmer/tk/checkbutton_proxy.rb
+- lib/glimmer/tk/combobox_proxy.rb
+- lib/glimmer/tk/commandable.rb
 - lib/glimmer/tk/entry_proxy.rb
 - lib/glimmer/tk/frame_proxy.rb
 - lib/glimmer/tk/label_proxy.rb
 - lib/glimmer/tk/list_proxy.rb
 - lib/glimmer/tk/notebook_proxy.rb
+- lib/glimmer/tk/radiobutton_proxy.rb
 - lib/glimmer/tk/root_proxy.rb
+- lib/glimmer/tk/text_variable_owner.rb
 - lib/glimmer/tk/treeview_proxy.rb
+- lib/glimmer/tk/variable_owner.rb
 - lib/glimmer/tk/widget_proxy.rb
 - samples/hello/hello_button.rb
+- samples/hello/hello_checkbutton.rb
 - samples/hello/hello_combobox.rb
 - samples/hello/hello_computed.rb
 - samples/hello/hello_computed/contact.rb
@@ -220,6 +248,8 @@ files:
 - samples/hello/hello_list_single_selection.rb
 - samples/hello/hello_message_box.rb
 - samples/hello/hello_notebook.rb
+- samples/hello/hello_radiobutton.rb
+- samples/hello/hello_root.rb
 - samples/hello/hello_world.rb
 - samples/hello/images/denmark.png
 - samples/hello/images/finland.png
@@ -250,7 +280,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.28
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: Glimmer DSL for Tk