glimmer-dsl-fx 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee2c82b5a89c8d320b83b272d1c0291b6027ac4c2760276146e180c42ab9801d
-  data.tar.gz: db77449c81eb1c9da2860a55bd89ff5a067326e0f21a34c5041f14c37e0ab0d5
+  metadata.gz: 02d5c6e11384d865fe3ffe75c3512baf4f2c2e6f1f3afef8baeeaca78f72adc3
+  data.tar.gz: f377b9dbad1d072137d044dacbaf63165e535cf2fb8c73181e605ad2903b4554
 SHA512:
-  metadata.gz: 618d244b3abcbcd42571f25cf04ec5ebd261bd78f557d067e8c7b971eeab06009e8e3cd934dc5c5af3f561d209745ba39a9c0a26faf911873f02b392b1375577
-  data.tar.gz: 1f57ea3a301de20a427e0af491a1f43d9e5d731e6621b0e3ddb5604479f32347ee4ede6f9e23f777f02851b099f5c5b363184d2463ad05ae72a2e00248edbcae
+  metadata.gz: b9c5f94b545c2d96abe68eb174144f8eec6e6da913a5c740547c1985a32ad69d34cfa20a7a2546bda9f1389a65c46838196872a1f36ec9948dbe4f0dc3ec727f
+  data.tar.gz: 7fa321097ec377f657cfc833e1be1191f0b7a3786411e9a87c70cc169588c9b16e59b9f66f9f3b0c2357dd347ed11c0fd5fd613d507732b8e9460b5b16588260

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
+## 0.0.2
+
+- Support `Symbol`-style `:opts` in kwargs of controls (e.g. `button('Click', opts: [:frame_raised, :frame_thick, :layout_center_x, :layout_center_y])`)
+
 ## 0.0.1
 
 - Initial version of Glimmer DSL for FX

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 FX 0.0.1
+# [<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 FX 0.0.2
 ## FOX Toolkit Ruby Desktop Development GUI Library
 [![Gem Version](https://badge.fury.io/rb/glimmer-dsl-fx.svg)](http://badge.fury.io/rb/glimmer-dsl-fx)
 [![Join the chat at https://gitter.im/AndyObtiva/glimmer](https://badges.gitter.im/AndyObtiva/glimmer.svg)](https://gitter.im/AndyObtiva/glimmer?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
@@ -21,7 +21,7 @@ Hello, World!
 ```ruby
 app('HelloWorld', 'Glimmer') {
   main_window('Hello, World!') {
-    label('Hello, World!')
+    label('Hello, World!', opts: [:layout_center_x, :layout_center_y])
   }
 }.run
 ```
@@ -76,7 +76,7 @@ gem install glimmer-dsl-fx
 
 Add the following to `Gemfile`:
 ```
-gem 'glimmer-dsl-fx', '~> 0.0.1'
+gem 'glimmer-dsl-fx', '~> 0.0.2'
 ```
 
 And, then run:
@@ -91,7 +91,7 @@ Require the library and mixin the `Glimmer` module to utilize the Glimmer GUI DS
 ```ruby
 app('HelloWorld', 'Glimmer') {
   main_window('Hello, World!') {
-    label('Hello, World!')
+    label('Hello, World!', opts: [:layout_center_x, :layout_center_y])
   }
 }.run
 ```
@@ -107,7 +107,7 @@ class SomeGlimmerApplication
   def launch
     app('HelloWorld', 'Glimmer') {
       main_window('Hello, World!') {
-        label('Hello, World!')
+        label('Hello, World!', opts: [:layout_center_x, :layout_center_y])
       }
     }.run
   end
@@ -256,7 +256,7 @@ class HelloButton
   def launch
     app('HelloButton', 'Glimmer') {
       main_window('Hello, Button!') {
-        @button = button('Click To Increment: 0') {
+        @button = button('Click To Increment: 0', opts: [:frame_raised, :frame_thick, :layout_center_x, :layout_center_y]) {
           on(:command) do
             @counter.count += 1
           end
@@ -289,7 +289,7 @@ girb
 
 This gives you `irb` with the `glimmer-dsl-fx` gem loaded and the `Glimmer` module mixed into the main object for easy experimentation with GUI.
 
-Note: GIRB for Glimmer DSL for FX 0.0.1 is still very rudimentary and does not support entering code for multiple applications, yet only one. You would have to exit and re-enter after each application entered.
+Note: GIRB for Glimmer DSL for FX 0.0.2 is still very rudimentary and does not support entering code for multiple applications, yet only one. You would have to exit and re-enter after each application entered.
 
 Gotcha: On the Mac, when you close a window opened in `girb`, it remains open until you enter `exit`.
 
@@ -364,7 +364,7 @@ class HelloButton
   def launch
     app('HelloButton', 'Glimmer') {
       main_window('Hello, Button!') {
-        @button = button("Click To Increment: 0") {
+        @button = button("Click To Increment: 0", opts: [:frame_raised, :frame_thick, :layout_center_x, :layout_center_y]) {
           on(:command) do
             @count += 1
             @button.text = "Click To Increment: #{@count}"

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/lib/glimmer/fx/control_proxy.rb

@@ -165,9 +165,7 @@ module Glimmer
       
       def window_proxy
         found_proxy = self
-        until found_proxy.nil? || found_proxy.is_a?(WindowProxy)
-          found_proxy = found_proxy.parent_proxy
-        end
+        found_proxy = found_proxy.parent_proxy until found_proxy.nil? || found_proxy.is_a?(WindowProxy)
         found_proxy
       end
 
@@ -208,9 +206,16 @@ module Glimmer
       end
       
       def normalize_args(args)
-        args.map do |arg|
+        result_args = args.map do |arg|
           arg.is_a?(ControlProxy) ? arg.fx : arg
         end
+        kwargs = result_args.last.is_a?(Hash) ? result_args.pop : {}
+        opts = [kwargs.delete(:opts) || kwargs.delete('opts')].flatten.compact
+        opts_value = opts.map do |opt|
+          ::Fox.const_get(opt.upcase.to_sym)
+        end.reduce(:|)
+        kwargs = kwargs.merge(opts: opts_value) unless opts.empty?
+        kwargs.empty? ? result_args : result_args + [kwargs]
       end
     end
   end

data/samples/hello/hello_button.rb

@@ -10,7 +10,7 @@ class HelloButton
   def launch
     app('HelloButton', 'Glimmer') {
       main_window('Hello, Button!') {
-        @button = button("Click To Increment: 0") {
+        @button = button("Click To Increment: 0", opts: [:frame_raised, :frame_thick, :layout_center_x, :layout_center_y]) {
           on(:command) do
             @count += 1
             @button.text = "Click To Increment: #{@count}"

data/samples/hello/hello_world.rb

@@ -4,6 +4,6 @@ include Glimmer
 
 app('HelloWorld', 'Glimmer') {
   main_window('Hello, World!') {
-    label('Hello, World!')
+    label('Hello, World!', opts: [:layout_center_x, :layout_center_y])
   }
 }.run

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-fx
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Andy Maleh