glimmer-dsl-tk 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7048451aa588f11c433d93073beb1a3eda6d03877e076ed9a3c23d432746e492
-  data.tar.gz: 4797910066441f8d0bf8960ca5bc3732ea39d6b0bd4103a3246349921a133bde
+  metadata.gz: 2f18bce2ab82f0e85d106d99e6508490b69172f1039e38d0e0208cf6a5ca70e6
+  data.tar.gz: '0779ed4a739d7ffa4e7c6d6b2556fe365741715165ff5c1bf7f9bc6456ba3443'
 SHA512:
-  metadata.gz: 3d25ea1d5a2c22ecc11fcc526cf264c207e21bbb018a1e05627aee01d6ce50aa8f9ce94a7fc57f0546221c0db9ab9bba46dc91a10c9ab0329de73bf7c9d56241
-  data.tar.gz: eccf58d86c03fb9b0383180025a7cc30d31f9b2dd98cfa36d422592170fbe01266d4a0487e020e241e69637e17754361207524a51a487b62494cd963fc6fb829
+  metadata.gz: 7cd74eff8e24f8152aa11c562fe410bc46a6d45193e7797afff970113eabd6604f3e0adee55882fc9b2e019bd36185ed95befc56f8376925c5292b7383814fa2
+  data.tar.gz: 98ba6609fd143106c4f9a66a5ed006742c53775bdb155bfe98be6b905aeecec8fb61690e9642113f7790c19d31006ef3fe4309a9d6b71bc703a02517a577128f

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Change Log
 
+## 0.0.8
+
+- Fix issue #5 (https://github.com/AndyObtiva/glimmer-dsl-tk/issues/5)
+- Support `iconphoto` attribute on `root` widget, intelligently accepting a direct image path or `TkPhotoImage` object
+- Set `root` `iconphoto` attribute to Glimmer icon by default if not set in an application.
+- Provide `iconphoto` code example in README
+- Upgrade to glimmer 2.1.1
+
 ## 0.0.7
 
 - Upgraded to tk 0.4.0

data/README.md

@@ -1,6 +1,5 @@
-# [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=85 />](https://github.com/AndyObtiva/glimmer) Glimmer DSL for Tk 0.0.7
+# [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=85 />](https://github.com/AndyObtiva/glimmer) Glimmer DSL for Tk 0.0.8
 ## MRI Ruby Desktop Development GUI Library
-GUI Library
 [![Gem Version](https://badge.fury.io/rb/glimmer-dsl-tk.svg)](http://badge.fury.io/rb/glimmer-dsl-tk)
 [![Coverage Status](https://coveralls.io/repos/github/AndyObtiva/glimmer-dsl-tk/badge.svg?branch=master)](https://coveralls.io/github/AndyObtiva/glimmer-dsl-tk?branch=master)
 [![Maintainability](https://api.codeclimate.com/v1/badges/ce2853efdbecf6ebdc73/maintainability)](https://codeclimate.com/github/AndyObtiva/glimmer-dsl-tk/maintainability)
@@ -37,10 +36,10 @@ root {
 }.open
 ```
 
-Run (with the [glimmer-dsl-tk](https://rubygems.org/gems/glimmer-dsl-tk) gem installed):
+Run with [glimmer-dsl-tk](https://rubygems.org/gems/glimmer-dsl-tk) gem installed:
 
 ```
-ruby -r glimmer-dsl-tk -e "require '../samples/hello/hello_world.rb'"
+ruby -r glimmer-dsl-tk -e "require 'samples/hello/hello_world'"
 ```
 
 Glimmer app:
@@ -61,9 +60,10 @@ Other [Glimmer](https://github.com/AndyObtiva/glimmer) DSL gems:
 - [Ruby](https://www.ruby-lang.org/en/): On Windows, obtain from the Ruby [download page](https://www.ruby-lang.org/en/downloads/). On the Mac and Linux, it is more convenient to just use [RVM](http://rvm.io) and follow the [RVM Tk instructions](https://rvm.io/integration/tk).
 
 For example, on the Mac, you can:
-- Install the ActiveTcl Mac package from [ActiveState.com](ActiveState.com)
+- Install the ActiveTcl Mac package from [ActiveState.com](https://activestate.com)
 - Install [RVM](https://rvm.io/) by running `\curl -sSL https://get.rvm.io | bash -s stable` (and run `curl -sSL https://rvm.io/pkuczynski.asc | gpg --import -` if needed for mentioned security reasons)
 - Run: `rvm install 2.7.1 --enable-shared --enable-pthread --with-tk --with-tcl`
+- Run: `gem install tk -v0.4.0`
 
 Afterwards, if you open `irb`, you should be able to run `require 'tk'` successfully.
 
@@ -80,7 +80,7 @@ gem install glimmer-dsl-tk
 
 Add the following to `Gemfile`:
 ```
-gem 'glimmer-dsl-tk', '~> 0.0.7'
+gem 'glimmer-dsl-tk', '~> 0.0.8'
 ```
 
 And, then run:
@@ -166,6 +166,36 @@ root {
 }.open
 ```
 
+### Smart Defaults and Convensions
+
+#### Grid Layout
+
+`grid` layout is the default on most widgets (which support it).
+
+#### Icon Photo
+
+The `iconphoto` attribute on `root` is set to the Glimmer icon by default if no icon photo is supplied.
+
+Otherwise, [Glimmer DSL for Tk](https://rubygems.org/gems/glimmer-dsl-tk) is smart enough to accept an image path directly (no need to wrap with `TkPhotoImage`)
+
+Example with direct image path (you may copy/paste in [`girb`](#girb-glimmer-irb)):
+
+```ruby
+root {
+  title 'Title'
+  iconphoto 'icons/glimmer.png'
+}.open
+```
+
+Example with `TkPhotoImage` object (you may copy/paste in [`girb`](#girb-glimmer-irb)):
+
+```ruby
+root {
+  title 'Title'
+  iconphoto TkPhotoImage.new(file: 'icons/glimmer.png')
+}.open
+```
+
 ## The Grid Geometry Manager
 
 The Grid Geometry Manager is supported via the `grid` keyword just as per the [Tk documentation](https://tkdocs.com/tutorial/grid.html), except by nesting under the widget it concerns.
@@ -324,10 +354,16 @@ root {
 }.open
 ```
 
-Run (with the [glimmer-dsl-tk](https://rubygems.org/gems/glimmer-dsl-tk) gem installed):
+Run with [glimmer-dsl-tk](https://rubygems.org/gems/glimmer-dsl-tk) gem installed:
+
+```
+ruby -r glimmer-dsl-tk -e "require 'samples/hello/hello_world'"
+```
+
+Alternatively, run from cloned project without [glimmer-dsl-tk](https://rubygems.org/gems/glimmer-dsl-tk) gem installed:
 
 ```
-ruby -r glimmer-dsl-tk -e "require '../samples/hello/hello_world.rb'"
+ruby -e "require './lib/glimmer-dsl-tk'; require './samples/hello/hello_world'"
 ```
 
 Glimmer app:
@@ -360,10 +396,16 @@ root {
 }.open
 ```
 
-Run (with the [glimmer-dsl-tk](https://rubygems.org/gems/glimmer-dsl-tk) gem installed):
+Run with [glimmer-dsl-tk](https://rubygems.org/gems/glimmer-dsl-tk) gem installed:
+
+```
+ruby -r glimmer-dsl-tk -e "require 'samples/hello/hello_tab'"
+```
+
+Alternatively, run from cloned project without [glimmer-dsl-tk](https://rubygems.org/gems/glimmer-dsl-tk) gem installed:
 
 ```
-ruby -r glimmer-dsl-tk -e "require '../samples/hello/hello_tab.rb'"
+ruby -e "require './lib/glimmer-dsl-tk'; require './samples/hello/hello_tab'"
 ```
 
 Glimmer app:
@@ -395,10 +437,16 @@ root {
 # ... more code follows
 ```
 
-Run (with the [glimmer-dsl-tk](https://rubygems.org/gems/glimmer-dsl-tk) gem installed):
+Run with [glimmer-dsl-tk](https://rubygems.org/gems/glimmer-dsl-tk) gem installed:
 
 ```
-ruby -r glimmer-dsl-tk -e "require '../samples/hello/hello_combo.rb'"
+ruby -r glimmer-dsl-tk -e "require 'samples/hello/hello_combo'"
+```
+
+Alternatively, run from cloned project without [glimmer-dsl-tk](https://rubygems.org/gems/glimmer-dsl-tk) gem installed:
+
+```
+ruby -e "require './lib/glimmer-dsl-tk'; require './samples/hello/hello_combo'"
 ```
 
 Glimmer app:
@@ -429,10 +477,16 @@ root {
 # ... more code follows
 ```
 
-Run (with the [glimmer-dsl-tk](https://rubygems.org/gems/glimmer-dsl-tk) gem installed):
+Run with [glimmer-dsl-tk](https://rubygems.org/gems/glimmer-dsl-tk) gem installed:
 
 ```
-ruby -r glimmer-dsl-tk -e "require '../samples/hello/hello_list_single_selection.rb'"
+ruby -r glimmer-dsl-tk -e "require 'samples/hello/hello_list_single_selection'"
+```
+
+Alternatively, run from cloned project without [glimmer-dsl-tk](https://rubygems.org/gems/glimmer-dsl-tk) gem installed:
+
+```
+ruby -e "require './lib/glimmer-dsl-tk'; require './samples/hello/hello_list_single_selection'"
 ```
 
 Glimmer app:
@@ -461,10 +515,16 @@ root {
 # ... more code follows
 ```
 
-Run (with the [glimmer-dsl-tk](https://rubygems.org/gems/glimmer-dsl-tk) gem installed):
+Run with [glimmer-dsl-tk](https://rubygems.org/gems/glimmer-dsl-tk) gem installed:
+
+```
+ruby -r glimmer-dsl-tk -e "require 'samples/hello/hello_list_multi_selection'"
+```
+
+Alternatively, run from cloned project without [glimmer-dsl-tk](https://rubygems.org/gems/glimmer-dsl-tk) gem installed:
 
 ```
-ruby -r glimmer-dsl-tk -e "require '../samples/hello/hello_list_multi_selection.rb'"
+ruby -e "require './lib/glimmer-dsl-tk'; require './samples/hello/hello_list_multi_selection'"
 ```
 
 Glimmer app:
@@ -535,10 +595,16 @@ Glimmer code (from [samples/hello/hello_computed.rb](samples/hello/hello_compute
 # ... more code follows
 ```
 
-Run (with the [glimmer-dsl-tk](https://rubygems.org/gems/glimmer-dsl-tk) gem installed):
+Run with [glimmer-dsl-tk](https://rubygems.org/gems/glimmer-dsl-tk) gem installed:
+
+```
+ruby -r glimmer-dsl-tk -e "require 'samples/hello/hello_computed'"
+```
+
+Alternatively, run from cloned project without [glimmer-dsl-tk](https://rubygems.org/gems/glimmer-dsl-tk) gem installed:
 
 ```
-ruby -r glimmer-dsl-tk -e "require '../samples/hello/hello_computed.rb'"
+ruby -e "require './lib/glimmer-dsl-tk'; require './samples/hello/hello_computed'"
 ```
 
 Glimmer app:

data/VERSION

@@ -1 +1 @@
-0.0.7
+0.0.8

data/lib/glimmer/dsl/tk/root_expression.rb

@@ -40,6 +40,11 @@ module Glimmer
           args = [parent] + args unless parent.nil?
           Glimmer::Tk::RootProxy.new(*args)
         end
+        
+        def add_content(parent, keyword, *args, &block)
+          super
+          parent.post_add_content
+        end
       end
     end
   end

data/lib/glimmer/dsl/tk/widget_expression.rb

@@ -41,7 +41,7 @@ module Glimmer
           Glimmer::Tk::WidgetProxy.create(keyword, parent, args, &block)
         end
         
-        def add_content(parent, &block)
+        def add_content(parent, keyword, *args, &block)
           super
           parent.post_add_content
         end

data/lib/glimmer/tk/root_proxy.rb

@@ -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

@@ -116,15 +116,7 @@ module Glimmer
       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)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-tk
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-15 00:00:00.000000000 Z
+date: 2021-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.3
+        version: 2.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.3
+        version: 2.1.1
 - !ruby/object:Gem::Dependency
   name: tk
   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
@@ -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