glimmer-dsl-tk 0.0.18 → 0.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa03163d6b0577d65e67d245b810079da4ddd6aca50cde649963e9448defe1ee
-  data.tar.gz: 3d2cadbe0dff5e003ada1938a461785b11d5899d671d12f998b0c783983fa4dc
+  metadata.gz: 9b35ad7e7ce829ab16c8ded93da64a71120483982e1799afddf538ff0726d686
+  data.tar.gz: 6a5eec2b8c52f7df03d1f324780cc3b209b2969fe04ab64dc33efc8a1b3d05e7
 SHA512:
-  metadata.gz: 6160cea03e0e6ed6e1511271cd780db176ba569b2774e9a304749e612ec242ad65d611dce0c475f29dfe3f9dce869bee8c660825a90fff0b3a0f5315cf7fbb47
-  data.tar.gz: abc75b8c436416257770b9af8e38470bbf4ab53f448a281c6626fa56ef7617ffee4d551038fa9618b00d33cd63f9c8cf19f51b311406497e1ce99a54ba22d2f0
+  metadata.gz: 3b462e07684dc68a0c15096ea80cd5a516ac9332a1ba21f2235e85b5343b174561446d62633aa2dfc280557ff01531872fd3a033aafc1bf0eec6386b8b4d9901
+  data.tar.gz: 79dba86d404165e841ad94d034799bf3ba10e52fc286bdaa2af3d85b80d0ada8a075396f229e2de498fcea61274722cb8dacd762e68fb7243a9754b57e6221fe

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Change Log
 
+## 0.0.20
+
+- Hello, Root! sample
+- Support `root` `width`, `height`, `x`, `y` attributes
+- Support `root` attribute: `resizable`
+- Support `root` attribute: `minsize`
+- Support `root` attribute: `maxsize`
+- Set minimum width/height on `root` (190 pixels)
+
 ## 0.0.18
 
 - Hello, Frame! sample

data/README.md

@@ -1,4 +1,4 @@
-# [<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.18
+# [<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.20
 ## MRI Ruby Desktop Development GUI Library
 [![Gem Version](https://badge.fury.io/rb/glimmer-dsl-tk.svg)](http://badge.fury.io/rb/glimmer-dsl-tk)
 [![Ruby](https://github.com/AndyObtiva/glimmer-dsl-tk/actions/workflows/ruby.yml/badge.svg)](https://github.com/AndyObtiva/glimmer-dsl-tk/actions/workflows/ruby.yml)
@@ -94,6 +94,7 @@ Other [Glimmer](https://github.com/AndyObtiva/glimmer) DSL gems:
     - [Hello, World!](#hello-world)
     - [Hello, Button!](#hello-button)
     - [Hello, Frame!](#hello-frame)
+    - [Hello, Root!](#hello-root)
     - [Hello, Notebook!](#hello-notebook)
     - [Hello, Label!](#hello-label)
     - [Hello, Message Box!](#hello-message-box)
@@ -137,7 +138,7 @@ gem install glimmer-dsl-tk
 
 Add the following to `Gemfile`:
 ```
-gem 'glimmer-dsl-tk', '~> 0.0.18'
+gem 'glimmer-dsl-tk', '~> 0.0.20'
 ```
 
 And, then run:
@@ -645,6 +646,39 @@ Glimmer app:
 
 ![glimmer dsl tk screenshot sample hello frame](images/glimmer-dsl-tk-screenshot-sample-hello-frame.png)
 
+### Hello, Root!
+
+Glimmer code (from [samples/hello/hello_frame.rb](samples/hello/hello_frame.rb)):
+
+```ruby
+require 'glimmer-dsl-tk'
+
+include Glimmer
+
+root {
+  title 'Hello, Root!'
+  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
+}.open
+```
+
+Run with [glimmer-dsl-tk](https://rubygems.org/gems/glimmer-dsl-tk) gem installed:
+
+```
+ruby -r glimmer-dsl-tk -e "require 'samples/hello/hello_root'"
+```
+
+Alternatively, run from cloned project without [glimmer-dsl-tk](https://rubygems.org/gems/glimmer-dsl-tk) gem installed:
+
+```
+ruby -r ./lib/glimmer-dsl-tk.rb ./samples/hello/hello_root.rb
+```
+
 ### Hello, Notebook!
 
 Glimmer code (from [samples/hello/hello_notebook.rb](samples/hello/hello_notebook.rb)):

data/VERSION

@@ -1 +1 @@
-0.0.18
+0.0.20

data/lib/glimmer/tk/root_proxy.rb

@@ -27,8 +27,13 @@ module Glimmer
     #
     # Follows the Proxy Design Pattern
     class RootProxy < WidgetProxy
+      REGEX_GEOMETRY = /[x+-]/
+      DEFAULT_WIDTH = 190
+      DEFAULT_HEIGHT = 95
+      
       def initialize(*args)
         @tk = ::TkRoot.new
+        @tk.minsize = DEFAULT_WIDTH, DEFAULT_HEIGHT
       end
 
       def post_add_content
@@ -43,19 +48,114 @@ module Glimmer
         Glimmer::DSL::Engine.add_content(self, Glimmer::DSL::Tk::RootExpression.new, keyword, *args, &block)
       end
       
+      def has_attribute?(attribute, *args)
+        %w[width height x y].include?(attribute.to_s) || super
+      end
+      
       def set_attribute(attribute, *args)
-        if attribute.to_s == 'iconphoto'
+        case attribute.to_s
+        when 'iconphoto'
           args[0..-1] = [image_argument(args)]
           super
+        when 'width'
+          @width = args.first.to_i
+          self.geometry = "#{args.first.to_i}x#{@height || DEFAULT_HEIGHT}#{x_sign}#{abs_x}#{y_sign}#{abs_y}"
+        when 'height'
+          @height = args.first.to_i
+          self.geometry = "#{@width || DEFAULT_WIDTH}x#{args.first.to_i}#{x_sign}#{abs_x}#{y_sign}#{abs_y}"
+        when 'x'
+          self.geometry = "#{@width || DEFAULT_WIDTH}x#{@height || DEFAULT_HEIGHT}#{args.first.to_i > 0 ? '+' : '-'}#{args.first.to_i.abs}#{y_sign}#{abs_y}"
+        when 'y'
+          self.geometry = "#{@width || DEFAULT_WIDTH}x#{@height || DEFAULT_HEIGHT}#{x_sign}#{abs_x}#{args.first.to_i > 0 ? '+' : '-'}#{args.first.to_i.abs}"
+        when 'resizable'
+          if args.size == 1 && !args.first.is_a?(Array)
+            self.resizable = [args.first]*2
+          else
+            super
+          end
         else
           super
         end
       end
-
+      
+      def get_attribute(attribute)
+        attribute = attribute.to_s
+        case attribute
+        when 'width'
+          geometry.split(REGEX_GEOMETRY)[0].to_i
+        when 'height'
+          geometry.split(REGEX_GEOMETRY)[1].to_i
+        when 'x'
+          sign_number(x_sign, geometry.split(REGEX_GEOMETRY)[2].to_i)
+        when 'y'
+          sign_number(y_sign, geometry.split(REGEX_GEOMETRY)[3].to_i)
+        else
+          super
+        end
+      end
+      
+      def width
+        get_attribute(:width)
+      end
+      
+      def height
+        get_attribute(:height)
+      end
+      
+      def x
+        get_attribute(:x)
+      end
+      
+      def y
+        get_attribute(:y)
+      end
+      
+      def width=(value)
+        set_attribute(:width, value)
+      end
+      
+      def height=(value)
+        set_attribute(:height, value)
+      end
+      
+      def x=(value)
+        set_attribute(:x, value)
+      end
+      
+      def y=(value)
+        set_attribute(:y, value)
+      end
+      
       # Starts Tk mainloop
       def start_event_loop
         ::Tk.mainloop
       end
+      
+      private
+      
+      def sign_number(sign, number)
+        "#{sign}1".to_i * number
+      end
+      
+      def abs_x
+        geometry.split(REGEX_GEOMETRY)[2].to_i
+      end
+      
+      def abs_y
+        geometry.split(REGEX_GEOMETRY)[3].to_i
+      end
+      
+      def x_sign
+        geometry_signs[0]
+      end
+      
+      def y_sign
+        geometry_signs[1]
+      end
+      
+      def geometry_signs
+        geometry.chars.select {|char| char.match(/[+-]/)}
+      end
     end
   end
 end

data/lib/glimmer/tk/widget_proxy.rb

@@ -153,7 +153,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)

data/samples/hello/hello_root.rb

@@ -0,0 +1,35 @@
+# 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 {
+  title 'Hello, Root!'
+  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
+}.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.20
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-11 00:00:00.000000000 Z
+date: 2021-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer
@@ -66,20 +66,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.5.0
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.12'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.12'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -142,6 +128,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
@@ -220,6 +220,7 @@ files:
 - samples/hello/hello_list_single_selection.rb
 - samples/hello/hello_message_box.rb
 - samples/hello/hello_notebook.rb
+- samples/hello/hello_root.rb
 - samples/hello/hello_world.rb
 - samples/hello/images/denmark.png
 - samples/hello/images/finland.png