glimmer-dsl-tk 0.0.3 → 0.0.7

data/lib/glimmer/tk/button_proxy.rb

@@ -1,5 +1,5 @@
-# Copyright (c) 2020 Andy Maleh
-# 
+# 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
@@ -7,10 +7,10 @@
 # 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
@@ -22,7 +22,7 @@
 require 'glimmer/tk/widget_proxy'
 
 module Glimmer
-  module Tk    
+  module Tk
     # Proxy for Tk::Tile::Button
     #
     # Follows the Proxy Design Pattern

data/lib/glimmer/tk/entry_proxy.rb

@@ -0,0 +1,38 @@
+# 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/tk/widget_proxy'
+
+module Glimmer
+  module Tk
+    # Proxy for Tk::Tile::TEntry
+    #
+    # Follows the Proxy Design Pattern
+    class EntryProxy < WidgetProxy
+      def validatecommand_block=(proc)
+        tk.validatecommand(proc)
+      end
+      def invalidcommand_block=(proc)
+        tk.invalidcommand(proc)
+      end
+    end
+  end
+end

data/lib/glimmer/tk/frame_proxy.rb

@@ -1,5 +1,5 @@
-# Copyright (c) 2020 Andy Maleh
-# 
+# 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
@@ -7,10 +7,10 @@
 # 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
@@ -22,7 +22,7 @@
 require 'glimmer/tk/widget_proxy'
 
 module Glimmer
-  module Tk    
+  module Tk
     # Proxy for Tk::Tile::Frame
     #
     # Follows the Proxy Design Pattern

data/lib/glimmer/tk/label_proxy.rb

@@ -0,0 +1,40 @@
+# 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/tk/widget_proxy'
+
+module Glimmer
+  module Tk
+    # Proxy for Tk::Tile::TLabel
+    #
+    # Follows the Proxy Design Pattern
+    class LabelProxy < WidgetProxy
+      # TODO specify attribute setters
+#       def tk_widget_has_attribute_setter?(attribute)
+#         if ['anchor', 'justify'].include?(attribute.to_s)
+#           true
+#         else
+#           super
+#         end
+#       end
+    end
+  end
+end

data/lib/glimmer/tk/list_proxy.rb

@@ -0,0 +1,60 @@
+# 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/tk/widget_proxy'
+
+module Glimmer
+  module Tk
+    # Custom list widget implementation
+    class ListProxy < WidgetProxy
+      def initialize(underscored_widget_name, parent_proxy, args)
+        super('treeview', parent_proxy, args)
+        @tk.show = 'tree'
+      end
+      
+      def widget_custom_attribute_mapping
+        @widget_custom_attribute_mapping ||= {
+          ::Tk::Tile::Treeview => {
+            'items' => {
+              getter: {name: 'items', invoker: lambda { |widget, args| tk.children('').map(&:text) }},
+              setter: {name: 'items=', invoker: lambda { |widget, args|
+                @tk.delete @tk.children('')
+                args.first.each do |child|
+                  @tk.insert('', 'end', :text => child)
+                end
+              }},
+            },
+            'selection' => {
+              getter: {name: 'selection', invoker: lambda { |widget, args| @tk.selection.map(&:text) }},
+              setter: {name: 'selection=', invoker: lambda { |widget, args|
+                selection_args = args.first.is_a?(Array) ? args.first : [args.first]
+                selection_items = selection_args.map do |arg|
+                  @tk.children('').detect {|item| item.text == arg}
+                end
+                @tk.selection_set(*selection_items)
+              }},
+            },
+          },
+        }
+      end
+    end
+  end
+end

data/lib/glimmer/tk/notebook_proxy.rb

@@ -1,5 +1,5 @@
-# Copyright (c) 2020 Andy Maleh
-# 
+# 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
@@ -7,10 +7,10 @@
 # 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
@@ -22,7 +22,7 @@
 require 'glimmer/tk/widget_proxy'
 
 module Glimmer
-  module Tk    
+  module Tk
     # Proxy for Tk::Tile::Notebook
     #
     # Follows the Proxy Design Pattern

data/lib/glimmer/tk/root_proxy.rb

@@ -1,5 +1,5 @@
-# Copyright (c) 2020 Andy Maleh
-# 
+# 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
@@ -7,10 +7,10 @@
 # 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

data/lib/glimmer/tk/widget_proxy.rb

@@ -1,5 +1,5 @@
-# Copyright (c) 2020 Andy Maleh
-# 
+# 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
@@ -7,10 +7,10 @@
 # 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
@@ -29,7 +29,13 @@ module Glimmer
 
       DEFAULT_INITIALIZERS = {
         'combobox' => lambda do |tk|
-          tk.textvariable = ::TkVariable.new          
+          tk.textvariable = ::TkVariable.new
+        end,
+        'label' => lambda do |tk|
+          tk.textvariable = ::TkVariable.new
+        end,
+        'entry' => lambda do |tk|
+          tk.textvariable = ::TkVariable.new
         end,
       }
       
@@ -44,9 +50,30 @@ module Glimmer
             Glimmer::Tk.const_get(class_name)
           rescue
             Glimmer::Tk::WidgetProxy
-          end        
-        end        
-      end      
+          end
+        end
+        
+        # This supports widgets in and out of basic Tk
+        def tk_widget_class_for(underscored_widget_name)
+          tk_widget_class_basename = underscored_widget_name.camelcase(:upper)
+          potential_tk_widget_class_names = [
+            "::Tk::Tile::#{tk_widget_class_basename}",
+            "::Tk::#{tk_widget_class_basename}",
+            "::Tk#{tk_widget_class_basename}",
+            "::Glimmer::Tk::#{tk_widget_class_basename}Proxy",
+          ]
+          tk_widget_class = nil
+          potential_tk_widget_class_names.each do |tk_widget_name|
+            begin
+              tk_widget_class = eval(tk_widget_name)
+              break
+            rescue RuntimeError, SyntaxError, NameError => e
+              Glimmer::Config.logger.debug e.full_message
+            end
+          end
+          tk_widget_class
+        end
+      end
       
       # Initializes a new Tk Widget
       #
@@ -56,14 +83,9 @@ module Glimmer
         @args = args
         tk_widget_class = self.class.tk_widget_class_for(underscored_widget_name)
         @tk = tk_widget_class.new(@parent_proxy.tk, *args)
-        begin
-          # a common widget initializer
-          @tk.grid
-        rescue => e
-          # catching error just in case a widget doesn't support it
-          Glimmer::Config.logger.debug e.full_message
-        end
-        DEFAULT_INITIALIZERS[underscored_widget_name]&.call(@tk)        
+        # a common widget initializer
+        @tk.grid
+        DEFAULT_INITIALIZERS[underscored_widget_name]&.call(@tk)
         @parent_proxy.post_initialize_child(self)
       end
       
@@ -81,57 +103,63 @@ module Glimmer
         !!tk_widget_class_for(underscored_widget_name)
       end
 
-      # This supports widgets in and out of basic Tk
-      def self.tk_widget_class_for(underscored_widget_name)
-        tk_widget_name = "::Tk::Tile::#{underscored_widget_name.camelcase(:upper)}"        
-        tk_widget_class = eval(tk_widget_name)
-        tk_widget_class
-      rescue SyntaxError, NameError => e
-        puts e.full_message
-        nil
-      rescue => e
-        puts e.full_message
-        nil      
+      def tk_widget_has_attribute_setter?(attribute)
+        result = nil
+        begin
+          # TK Widget currently doesn't support respond_to? properly, so I have to resort to this trick for now
+          @tk.send(attribute_setter(attribute), @tk.send(attribute))
+          result = true
+        rescue => e
+          result = false
+        end
+        result
       end
       
-      def tk_widget_has_attribute?(attribute_name)
+      def tk_widget_has_attribute_getter_setter?(attribute)
         result = nil
-        begin     
-          # TK Widget currently doesn't support respond_to? properly, so I have to resort to this trick for now   
-          @tk.send(attribute_setter(attribute_name), @tk.send(attribute_name))
+        begin
+          # TK Widget currently doesn't support respond_to? properly, so I have to resort to this trick for now
+          @tk.send(attribute, @tk.send(attribute))
           result = true
         rescue => e
           result = false
         end
-        result      
+        result
       end
       
-      def has_attribute?(attribute_name, *args)
-        tk_widget_has_attribute?(attribute_name) || respond_to?(attribute_setter(attribute_name), args)
+      def has_attribute?(attribute, *args)
+        (widget_custom_attribute_mapping[tk.class] && widget_custom_attribute_mapping[tk.class][attribute.to_s]) ||
+          tk_widget_has_attribute_setter?(attribute) ||
+          tk_widget_has_attribute_getter_setter?(attribute) ||
+          respond_to?(attribute_setter(attribute), args)
       end
 
-      def set_attribute(attribute_name, *args)
-        widget_custom_attribute = widget_custom_attribute_mapping[tk.class] && widget_custom_attribute_mapping[tk.class][attribute_name.to_s]
+      def set_attribute(attribute, *args)
+        widget_custom_attribute = widget_custom_attribute_mapping[tk.class] && widget_custom_attribute_mapping[tk.class][attribute.to_s]
         if widget_custom_attribute
           widget_custom_attribute[:setter][:invoker].call(@tk, args)
-        elsif tk_widget_has_attribute?(attribute_name)
-          @tk.send(attribute_setter(attribute_name), *args) unless @tk.send(attribute_name) == args.first
+        elsif tk_widget_has_attribute_setter?(attribute)
+          @tk.send(attribute_setter(attribute), *args) unless @tk.send(attribute) == args.first
+        elsif tk_widget_has_attribute_getter_setter?(attribute)
+          @tk.send(attribute, *args) unless @tk.send(attribute) == args.first
         else
-          send(attribute_setter(attribute_name), args)
+          send(attribute_setter(attribute), args)
         end
       end
 
-      def get_attribute(attribute_name)
-        widget_custom_attribute = widget_custom_attribute_mapping[tk.class] && widget_custom_attribute_mapping[tk.class][attribute_name.to_s]
+      def get_attribute(attribute)
+        widget_custom_attribute = widget_custom_attribute_mapping[tk.class] && widget_custom_attribute_mapping[tk.class][attribute.to_s]
         if widget_custom_attribute
           widget_custom_attribute[:getter][:invoker].call(@tk, args)
+        elsif tk_widget_has_attribute_getter_setter?(attribute)
+          @tk.send(attribute)
         else
-          @tk.send(attribute_name)
+          send(attribute)
         end
-      end      
+      end
 
-      def attribute_setter(attribute_name)
-        "#{attribute_name}="
+      def attribute_setter(attribute)
+        "#{attribute}="
       end
       
       def widget_custom_attribute_mapping
@@ -142,13 +170,25 @@ module Glimmer
               setter: {name: 'text=', invoker: lambda { |widget, args| @tk.textvariable&.value = args.first }},
             },
           },
+          ::Tk::Tile::TLabel => {
+            'text' => {
+              getter: {name: 'text', invoker: lambda { |widget, args| @tk.textvariable&.value }},
+              setter: {name: 'text=', invoker: lambda { |widget, args| @tk.textvariable&.value = args.first }},
+            },
+          },
+          ::Tk::Tile::TEntry => {
+            'text' => {
+              getter: {name: 'text', invoker: lambda { |widget, args| @tk.textvariable&.value }},
+              setter: {name: 'text=', invoker: lambda { |widget, args| @tk.textvariable&.value = args.first unless @text_variable_edit }},
+            },
+          },
         }
       end
       
-      def widget_property_listener_installers
-        @tk_widget_property_listener_installers ||= {
+      def widget_attribute_listener_installers
+        @tk_widget_attribute_listener_installers ||= {
           ::Tk::Tile::TCombobox => {
-            :text => lambda do |observer|
+            'text' => lambda do |observer|
               if observer.is_a?(Glimmer::DataBinding::ModelBinding)
                 model = observer.model
                 options_model_property = observer.property_name + '_options'
@@ -158,29 +198,51 @@ module Glimmer
                 observer.call(@tk.textvariable.value)
               }
             end,
-          }
+          },
+          ::Tk::Tile::TEntry => {
+            'text' => lambda do |observer|
+              tk.validate = 'key'
+              tk.validatecommand { |new_tk_variable|
+                @text_variable_edit = new_tk_variable.value != @tk.textvariable.value
+                if @text_variable_edit
+                  observer.call(new_tk_variable.value)
+                  @text_variable_edit = nil
+                  true
+                else
+                  false
+                end
+              }
+            end,
+          },
         }
       end
       
-      def add_observer(observer, property_name)
-        property_listener_installers = @tk.class.ancestors.map {|ancestor| widget_property_listener_installers[ancestor]}.compact
-        widget_listener_installers = property_listener_installers.map{|installer| installer[property_name.to_s.to_sym]}.compact if !property_listener_installers.empty?
+      def add_observer(observer, attribute)
+        attribute_listener_installers = @tk.class.ancestors.map {|ancestor| widget_attribute_listener_installers[ancestor]}.compact
+        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      
+      end
 
       def content(&block)
         Glimmer::DSL::Engine.add_content(self, Glimmer::DSL::Tk::WidgetExpression.new, &block)
       end
 
       def method_missing(method, *args, &block)
-        tk.send(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]
+          get_attribute(method)
+        elsif widget_custom_attribute_mapping[tk.class] && widget_custom_attribute_mapping[tk.class][method.sub(/=$/, '')] && method.end_with?('=') && block.nil?
+          set_attribute(method.sub(/=$/, ''), *args)
+        else
+          tk.send(method, *args, &block)
+        end
       rescue => e
         Glimmer::Config.logger.debug {"Neither WidgetProxy nor #{tk.class.name} can handle the method ##{method}"}
-        super
+        super(method.to_sym, *args, &block)
       end
       
       def respond_to?(method, *args, &block)
-        super || 
+        super ||
           tk.respond_to?(method, *args, &block)
       end
     end