glimmer-dsl-tk 0.0.5 → 0.0.9

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
@@ -27,11 +27,14 @@ module Glimmer
     #
     # Follows the Proxy Design Pattern
     class RootProxy < WidgetProxy
-
       def initialize(*args)
         @tk = ::TkRoot.new
       end
 
+      def post_add_content
+        set_attribute('iconphoto', File.expand_path('../../../icons/glimmer.png', __dir__)) if @tk.iconphoto.nil?
+      end
+      
       def open
         start_event_loop
       end
@@ -39,6 +42,17 @@ module Glimmer
       def content(&block)
         Glimmer::DSL::Engine.add_content(self, Glimmer::DSL::Tk::RootExpression.new, &block)
       end
+      
+      def set_attribute(attribute, *args)
+        if attribute.to_s == 'iconphoto'
+          if args.size == 1 && args.first.is_a?(String)
+            args[0] = ::TkPhotoImage.new(file: args.first)
+          end
+          super
+        else
+          super
+        end
+      end
 
       # Starts Tk mainloop
       def start_event_loop

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,13 +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          
+          tk.textvariable = ::TkVariable.new
         end,
         'entry' => lambda do |tk|
-          tk.textvariable = ::TkVariable.new          
+          tk.textvariable = ::TkVariable.new
         end,
       }
       
@@ -50,17 +50,17 @@ module Glimmer
             Glimmer::Tk.const_get(class_name)
           rescue
             Glimmer::Tk::WidgetProxy
-          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::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|
@@ -69,11 +69,11 @@ module Glimmer
               break
             rescue RuntimeError, SyntaxError, NameError => e
               Glimmer::Config.logger.debug e.full_message
-            end            
+            end
           end
           tk_widget_class
         end
-      end      
+      end
       
       # Initializes a new Tk Widget
       #
@@ -81,11 +81,11 @@ module Glimmer
       def initialize(underscored_widget_name, parent_proxy, args)
         @parent_proxy = parent_proxy
         @args = args
-        tk_widget_class = self.class.tk_widget_class_for(underscored_widget_name)        
+        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
-        DEFAULT_INITIALIZERS[underscored_widget_name]&.call(@tk)        
+        DEFAULT_INITIALIZERS[underscored_widget_name]&.call(@tk)
         @parent_proxy.post_initialize_child(self)
       end
       
@@ -105,32 +105,24 @@ module Glimmer
 
       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   
+        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      
+        result
       end
       
       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, @tk.send(attribute))
-          result = true
-        rescue => e
-          result = false
-        end
-        result      
+        @tk.respond_to?(attribute)
       end
       
       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) || 
+        (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
 
@@ -221,7 +213,7 @@ module Glimmer
         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)
@@ -242,7 +234,7 @@ module Glimmer
       end
       
       def respond_to?(method, *args, &block)
-        super || 
+        super ||
           tk.respond_to?(method, *args, &block)
       end
     end

data/lib/glimmer-dsl-tk.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/samples/hello/hello_combo.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
@@ -21,10 +21,10 @@
 
 require 'glimmer-dsl-tk'
 
-class Person 
+class Person
   attr_accessor :country, :country_options
 
-  def initialize   
+  def initialize
     self.country_options=["", "Canada", "US", "Mexico"]
     self.country = "Canada"
   end
@@ -43,12 +43,12 @@ class HelloCombo
     root {
       title 'Hello, Combo!'
       
-      combobox { |proxy|
-        state 'readonly'       
+      combobox {
+        state 'readonly'
         text bind(person, :country)
       }
       
-      button { |proxy|
+      button {
         text "Reset Selection"
         command {
           person.reset_country

data/samples/hello/hello_computed.rb

@@ -1,3 +1,24 @@
+# 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'
 
 require_relative 'hello_computed/contact'
@@ -17,7 +38,7 @@ class HelloComputed
     root {
       title 'Hello, Computed!'
       
-      frame {        
+      frame {
         grid column: 0, row: 0, padx: 5, pady: 5
         
         label {

data/samples/hello/hello_list_multi_selection.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/samples/hello/hello_list_single_selection.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
@@ -21,7 +21,7 @@
 
 require 'glimmer-dsl-tk'
 
-class Person 
+class Person
   attr_accessor :country, :country_options
 
   def initialize
@@ -40,7 +40,7 @@ class HelloListSingleSelection
   def launch
     person = Person.new
     
-    root {      
+    root {
       title 'Hello, List Single Selection!'
       
       list {

data/samples/hello/hello_tab.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
@@ -25,7 +25,7 @@ class HelloTab
   include Glimmer
   
   def launch
-    root {      
+    root {
       title 'Hello, Tab!'
        
       notebook {

data/samples/hello/hello_world.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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-tk
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.9
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-15 00:00:00.000000000 Z
+date: 2021-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.3
+        version: 2.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.3
+        version: 2.1.2
 - !ruby/object:Gem::Dependency
   name: tk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -120,14 +120,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.13.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.13.1
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -170,7 +170,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.0
-description: Glimmer DSL for Tk (Ruby Desktop GUI)
+description: Glimmer DSL for Tk (Ruby Desktop Development GUI Library)
 email: andy.am@gmail.com
 executables:
 - girb
@@ -186,6 +186,7 @@ files:
 - VERSION
 - bin/girb
 - bin/girb_runner.rb
+- icons/glimmer.png
 - lib/glimmer-dsl-tk.rb
 - lib/glimmer/data_binding/tk/list_selection_binding.rb
 - lib/glimmer/data_binding/tk/widget_binding.rb
@@ -220,6 +221,7 @@ post_install_message:
 rdoc_options: []
 require_paths:
 - lib
+- "."
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -231,7 +233,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: Glimmer DSL for Tk