glimmer-dsl-tk 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ce8665311ec56974f2f930183c6cd2ad4b2867436ddffbdf66984659f0e830f
-  data.tar.gz: 13ddbe796e17917d0e392fc61e7c96443f430e4f403ff9730cd6b92e24b424aa
+  metadata.gz: d17b887519b4dcbc1d9730240835fa918d81902268ea4c8607a2528696b6c5fd
+  data.tar.gz: df8da719382108710096f6026e362c32fff92fb15b720ba43bceb5d12b688f04
 SHA512:
-  metadata.gz: b005addc832a5f0af7aeb0285d41dc8e52b40d61088ea16272657c65ddcdbaa92c6af09cb11fd5fb34de6de1b10a11f2d6d0e31d9f2b1a279a0fbaa14fd17b21
-  data.tar.gz: 2a154821ce05f1f53d0bbd8c3336daea2b4c2ee709753f9b3872015f839a1e5a41747666171481ef658d4e682f43e137659b692089a641520b20f5b95f0d1e8f
+  metadata.gz: c7384362360e983fd820843b0c9ceccad79a39e96a152aea42ae414327b2b4665c8b2af1470a7ee5da69695968daec98fb7b52c34d68b732934b3efeb59f0073
+  data.tar.gz: c809eecf36d5c60e81ade4beb39ed52260cd1b0e1fb9a8ee6ac97fd7d9bc68e315d17fd2e49fad6eb39e452fefe1551d627fa2381ac3b1594d3cdbe0efa8905c

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## 0.0.12
+
+- Upgrade to glimmer 2.3.0
+- Support Shine syntax for data-binding
+- Update all data-binding samples to use Shine syntax for data-binding
+
 ## 0.0.11
 
 - Add preliminary support for `treeview` (no data-binding) with `columns`, `show`, and `heading_configure` attributes/methods

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.11
+# [<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.12
 ## 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)
 [![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)
@@ -46,7 +46,7 @@ Glimmer app:
 
 ![glimmer dsl tk screenshot sample hello world](images/glimmer-dsl-tk-screenshot-sample-hello-world.png)
 
-NOTE: Glimmer DSL for Tk is in alpha mode. Please help make better by contributing, adopting for small or low risk projects, and providing feedback. It is still an early alpha, so the more feedback and issues you report the better.
+NOTE: Glimmer DSL for Tk is currently in early alpha mode (incomplete). Please help make better by contributing, adopting for small or low risk projects, and providing feedback. It is still an early alpha, so the more feedback and issues you report the better.
 
 Other [Glimmer](https://github.com/AndyObtiva/glimmer) DSL gems:
 - [glimmer-dsl-swt](https://github.com/AndyObtiva/glimmer-dsl-swt): Glimmer DSL for SWT (JRuby Desktop Development GUI Framework)
@@ -81,7 +81,7 @@ gem install glimmer-dsl-tk
 
 Add the following to `Gemfile`:
 ```
-gem 'glimmer-dsl-tk', '~> 0.0.11'
+gem 'glimmer-dsl-tk', '~> 0.0.12'
 ```
 
 And, then run:
@@ -211,7 +211,7 @@ Example:
         entry {
           grid column: 1, row: 2
           width 15
-          text bind(@contact, :year_of_birth)
+          text <=> [@contact, :year_of_birth]
         }
 ```
 
@@ -219,7 +219,7 @@ More details can be found in the [Hello, Computed!](#hello-computed) sample belo
 
 ## Bidirectional Data-Binding
 
-Glimmer supports bidirectional data-binding via the `bind` keyword, which takes a model and an attribute.
+Glimmer supports Shine syntax bidirectional data-binding via the `<=>` operator (read-write) and unidirectional data-binding via the `<=` operator (read-only), which takes a model and an attribute (the `bind` keyword may also be used as the old-style of data-binding).
 
 ### Combo Data-Binding
 
@@ -230,7 +230,7 @@ This assumes a `Person` model with a `country` attribute representing their curr
 ```ruby
   combobox {
     state 'readonly'
-    text bind(person, :country)
+    text <=> [person, :country]
   }
 ```
 
@@ -252,7 +252,7 @@ This assumes a `Person` model with a `country` attribute representing their curr
 ```ruby
   list {
     selectmode 'browse'
-    text bind(person, :country)
+    text <=> [person, :country]
   }
 ```
 
@@ -273,7 +273,7 @@ This assumes a `Person` model with a `provinces` attribute representing their cu
 
 ```ruby
   list {
-    text bind(person, :provinces)
+    text <=> [person, :provinces]
   }
 ```
 
@@ -292,7 +292,7 @@ This assumes a `Person` model with a `country` attribute.
 
 ```ruby
   label {
-    text bind(person, :country)
+    text <=> [person, :country]
   }
 ```
 
@@ -310,7 +310,7 @@ This assumes a `Person` model with a `country` attribute.
 
 ```ruby
   entry {
-    text bind(person, :country)
+    text <=> [person, :country]
   }
 ```
 
@@ -425,7 +425,7 @@ root {
   
   combobox { |proxy|
     state 'readonly'
-    text bind(person, :country)
+    text <=> [person, :country]
   }
   
   button { |proxy|
@@ -466,7 +466,7 @@ root {
   
   list {
     selectmode 'browse'
-    selection bind(person, :country)
+    selection <=> [person, :country]
   }
   
   button {
@@ -504,7 +504,7 @@ root {
   title 'Hello, List Multi Selection!'
   
   list {
-    selection bind(person, :provinces)
+    selection <=> [person, :provinces]
   }
   
   button {
@@ -551,7 +551,7 @@ Glimmer code (from [samples/hello/hello_computed.rb](samples/hello/hello_compute
         entry {
           grid column: 1, row: 0
           width 15
-          text bind(@contact, :first_name)
+          text <=> [@contact, :first_name]
         }
         
         label {
@@ -561,7 +561,7 @@ Glimmer code (from [samples/hello/hello_computed.rb](samples/hello/hello_compute
         entry {
           grid column: 1, row: 1
           width 15
-          text bind(@contact, :last_name)
+          text <=> [@contact, :last_name]
         }
         
         label {
@@ -571,7 +571,7 @@ Glimmer code (from [samples/hello/hello_computed.rb](samples/hello/hello_compute
         entry {
           grid column: 1, row: 2
           width 15
-          text bind(@contact, :year_of_birth)
+          text <=> [@contact, :year_of_birth]
         }
         
         label {
@@ -580,7 +580,7 @@ Glimmer code (from [samples/hello/hello_computed.rb](samples/hello/hello_compute
         }
         label {
           grid column: 1, row: 3, sticky: 'w'
-          text bind(@contact, :name, computed_by: [:first_name, :last_name])
+          text <=> [@contact, :name, computed_by: [:first_name, :last_name]]
         }
         
         label {
@@ -589,7 +589,7 @@ Glimmer code (from [samples/hello/hello_computed.rb](samples/hello/hello_compute
         }
         label {
           grid column: 1, row: 4, sticky: 'w'
-          text bind(@contact, :age, on_write: :to_i, computed_by: [:year_of_birth])
+          text <=> [@contact, :age, on_write: :to_i, computed_by: [:year_of_birth]]
         }
       }
     }.open

data/VERSION

@@ -1 +1 @@
-0.0.11
+0.0.12

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

@@ -40,6 +40,7 @@ module Glimmer
           data_binding
           block_attribute
           attribute
+          shine_data_binding
           widget
         ]
       )

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

@@ -0,0 +1,43 @@
+# Copyright (c) 2007-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/expression'
+require 'glimmer/data_binding/model_binding'
+require 'glimmer/data_binding/tk/widget_binding'
+require 'glimmer/data_binding/shine'
+
+module Glimmer
+  module DSL
+    module Tk
+      class ShineDataBindingExpression < Expression
+        def can_interpret?(parent, keyword, *args, &block)
+          args.size == 0 and
+            block.nil? and
+            (parent.respond_to?(:has_attribute?) and parent.has_attribute?(keyword))
+        end
+  
+        def interpret(parent, keyword, *args, &block)
+          Glimmer::DataBinding::Shine.new(parent, keyword)
+        end
+      end
+    end
+  end
+end

data/lib/glimmer/tk/root_proxy.rb

@@ -40,7 +40,7 @@ module Glimmer
       end
 
       def content(&block)
-        Glimmer::DSL::Engine.add_content(self, Glimmer::DSL::Tk::RootExpression.new, &block)
+        Glimmer::DSL::Engine.add_content(self, Glimmer::DSL::Tk::RootExpression.new, keyword, *args, &block)
       end
       
       def set_attribute(attribute, *args)

data/lib/glimmer/tk/widget_proxy.rb

@@ -25,20 +25,6 @@ module Glimmer
     #
     # Follows the Proxy Design Pattern
     class WidgetProxy
-      attr_reader :parent_proxy, :tk, :args
-
-      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,
-      }
-      
       class << self
         def create(keyword, parent, args)
           widget_proxy_class(keyword).new(keyword, parent, args)
@@ -75,12 +61,27 @@ module Glimmer
         end
       end
       
+      attr_reader :parent_proxy, :tk, :args, :keyword
+
+      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)
         @parent_proxy = parent_proxy
         @args = args
+        @keyword = 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
@@ -216,7 +217,7 @@ module Glimmer
       end
 
       def content(&block)
-        Glimmer::DSL::Engine.add_content(self, Glimmer::DSL::Tk::WidgetExpression.new, &block)
+        Glimmer::DSL::Engine.add_content(self, Glimmer::DSL::Tk::WidgetExpression.new, keyword, *args, &block)
       end
 
       def method_missing(method, *args, &block)

data/samples/hello/hello_combo.rb

@@ -45,7 +45,7 @@ class HelloCombo
       
       combobox {
         state 'readonly'
-        text bind(person, :country)
+        text <=> [person, :country]
       }
       
       button {

data/samples/hello/hello_computed.rb

@@ -48,7 +48,7 @@ class HelloComputed
         entry {
           grid column: 1, row: 0
           width 15
-          text bind(@contact, :first_name)
+          text <=> [@contact, :first_name]
         }
         
         label {
@@ -58,7 +58,7 @@ class HelloComputed
         entry {
           grid column: 1, row: 1
           width 15
-          text bind(@contact, :last_name)
+          text <=> [@contact, :last_name]
         }
         
         label {
@@ -68,7 +68,7 @@ class HelloComputed
         entry {
           grid column: 1, row: 2
           width 15
-          text bind(@contact, :year_of_birth)
+          text <=> [@contact, :year_of_birth]
         }
         
         label {
@@ -77,7 +77,7 @@ class HelloComputed
         }
         label {
           grid column: 1, row: 3, sticky: 'w'
-          text bind(@contact, :name, computed_by: [:first_name, :last_name])
+          text <=> [@contact, :name, computed_by: [:first_name, :last_name]]
         }
         
         label {
@@ -86,7 +86,7 @@ class HelloComputed
         }
         label {
           grid column: 1, row: 4, sticky: 'w'
-          text bind(@contact, :age, on_write: :to_i, computed_by: [:year_of_birth])
+          text <=> [@contact, :age, on_write: :to_i, computed_by: :year_of_birth]
         }
       }
     }.open

data/samples/hello/hello_list_multi_selection.rb

@@ -54,7 +54,7 @@ class HelloListMultiSelection
       title 'Hello, List Multi Selection!'
       
       list {
-        selection bind(person, :provinces)
+        selection <=> [person, :provinces]
       }
       
       button {

data/samples/hello/hello_list_single_selection.rb

@@ -45,7 +45,7 @@ class HelloListSingleSelection
       
       list {
         selectmode 'browse'
-        selection bind(person, :country)
+        selection <=> [person, :country]
       }
       
       button {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-tk
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-29 00:00:00.000000000 Z
+date: 2021-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer
@@ -198,6 +198,7 @@ files:
 - lib/glimmer/dsl/tk/dsl.rb
 - lib/glimmer/dsl/tk/list_selection_data_binding_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/entry_proxy.rb
@@ -235,7 +236,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.2.28
 signing_key:
 specification_version: 4
 summary: Glimmer DSL for Tk