glimmer-dsl-libui 0.11.5 → 0.11.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c7045c2016a37ef9423c6d3e8f2a8480b0b1590e98afc56a2587a4a7d304e30
-  data.tar.gz: 41699750c28cb881e8c9335280c01836044e89ef31964ec149e052155662ea3c
+  metadata.gz: e595d6ac3d153abe32d9148d5984261d1c6673f1e501ab3f280e139e268d75ee
+  data.tar.gz: caf883ace7e4a19e5a7f3ee288ad4726ad84b5b79a722320855591c21421d793
 SHA512:
-  metadata.gz: 076d9bc4874bd8328110afd687aa334da3408e9b7dd87937bb7e8eec84591b872bf09e977327de91c27f67e8d342bc4a70e764f87ad61d00fce30bd2cf4daa99
-  data.tar.gz: 640f1392dd961fb5387d04bddada7baef42120ae75d91a6ee362be928ce89966f52688887b996986fb46ed08c5b434d863f726cf56fff5b6ade52bf2a45f087c
+  metadata.gz: cdfca8b76f1b14b0fa2c88bb5ef8262b946158e68ba55cc5777bb908d14c7ae0698d3438ef2bcf3c5db0767987ca64613a24344c59badf831dfec3766c8fcabf
+  data.tar.gz: 5dd802c7de992b79055d616431b8d43d817fc06186d1c14852d3e6e8eecdad18b16af69d89e63f33a558c907a56e7bf6d240387ec405fff58efec36cea4fa89b

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Change Log
 
+## 0.11.6
+
+- Organize scaffolded application menus under a `menu_bar` method
+- Avoid loading `facets` gem completely in scaffold and list tasks, yet load used part of facets only ('facets/string/titlecase')
+- Avoid loading `perfect-shape` gem until area canvas graphics are used
+- Avoid loading `color` gem until used by `Glimmer::LibUI.interpret_color` method
+- Fix issue with `listener_expression.rb` failing for `TextProxy` due to not having `can_handle_listener?` method.
+- Fix issue with `TextProxy.can_handle_listener?` crashing when `text` is nested under `area` `on_draw`
+
 ## 0.11.5
 
 - Support table explicit data-binding with a model attribute that returns an Enumerator (instead of an Array)

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 LibUI 0.11.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 LibUI 0.11.6
 ## Prerequisite-Free Ruby Desktop Development Cross-Platform Native GUI Library  ([Fukuoka Award Winning](http://www.digitalfukuoka.jp/topics/187?locale=ja))
 ### The Quickest Way From Zero To GUI
 [![Gem Version](https://badge.fury.io/rb/glimmer-dsl-libui.svg)](http://badge.fury.io/rb/glimmer-dsl-libui)
@@ -433,7 +433,7 @@ gem install glimmer-dsl-libui
 Or install via Bundler `Gemfile`:
 
 ```ruby
-gem 'glimmer-dsl-libui', '~> 0.11.5'
+gem 'glimmer-dsl-libui', '~> 0.11.6'
 ```
 
 Test that installation worked by running the [Glimmer Meta-Example](#examples):

data/VERSION

@@ -1 +1 @@
-0.11.5
+0.11.6

data/lib/glimmer/dsl/libui/listener_expression.rb

@@ -34,6 +34,7 @@ module Glimmer
             parent.is_a?(Glimmer::LibUI::CustomShape)
           ) and
             block_given? and
+            parent.respond_to?(:can_handle_listener?) and
             parent.can_handle_listener?(keyword)
         end
   

data/lib/glimmer/libui/control_proxy/path_proxy.rb

@@ -167,6 +167,7 @@ module Glimmer
         end
         
         def perfect_shape
+          require 'perfect-shape'
           the_perfect_shape_dependencies = perfect_shape_dependencies
           if the_perfect_shape_dependencies != @perfect_shape_dependencies
             draw_fill_mode, _ = @perfect_shape_dependencies = the_perfect_shape_dependencies

data/lib/glimmer/libui/control_proxy/text_proxy.rb

@@ -174,7 +174,7 @@ module Glimmer
         end
       
         def can_handle_listener?(listener_name)
-          area_proxy.can_handle_listener?(listener_name)
+          area_proxy&.can_handle_listener?(listener_name)
         end
         
         def handle_listener(listener_name, &listener)
@@ -184,6 +184,7 @@ module Glimmer
         end
         
         def perfect_shape
+          require 'perfect-shape'
           the_perfect_shape_dependencies = perfect_shape_dependencies
           if the_perfect_shape_dependencies != @perfect_shape_dependencies
             absolute_x, absolute_y, width, height = @perfect_shape_dependencies = the_perfect_shape_dependencies

data/lib/glimmer/libui/shape/arc.rb

@@ -51,6 +51,7 @@ module Glimmer
         end
         
         def perfect_shape
+          require 'perfect-shape'
           the_perfect_shape_dependencies = perfect_shape_dependencies
           if the_perfect_shape_dependencies != @perfect_shape_dependencies
             absolute_x_center, absolute_y_center, radius, start_angle, sweep, is_negative = @perfect_shape_dependencies = the_perfect_shape_dependencies

data/lib/glimmer/libui/shape/bezier.rb

@@ -62,6 +62,7 @@ module Glimmer
         end
         
         def perfect_shape
+          require 'perfect-shape'
           the_perfect_shape_dependencies = perfect_shape_dependencies
           if the_perfect_shape_dependencies != @perfect_shape_dependencies
             absolute_x, absolute_y, absolute_c1_x, absolute_c1_y, absolute_c2_x, absolute_c2_y, absolute_end_x, absolute_end_y = @perfect_shape_dependencies = the_perfect_shape_dependencies

data/lib/glimmer/libui/shape/circle.rb

@@ -51,6 +51,7 @@ module Glimmer
         end
         
         def perfect_shape
+          require 'perfect-shape'
           the_perfect_shape_dependencies = perfect_shape_dependencies
           if the_perfect_shape_dependencies != @perfect_shape_dependencies
             absolute_x_center, absolute_y_center, radius = @perfect_shape_dependencies = the_perfect_shape_dependencies

data/lib/glimmer/libui/shape/composite_shape.rb

@@ -87,6 +87,7 @@ module Glimmer
         end
         
         def perfect_shape
+          require 'perfect-shape'
           perfect_shape_dependencies = [x, y, children.map(&:perfect_shape_dependencies)]
           if perfect_shape_dependencies != @perfect_shape_dependencies
             x, y, _ = @perfect_shape_dependencies = perfect_shape_dependencies

data/lib/glimmer/libui/shape/figure.rb

@@ -58,6 +58,7 @@ module Glimmer
         end
                 
         def perfect_shape
+          require 'perfect-shape'
           the_perfect_shape_dependencies = perfect_shape_dependencies
           if the_perfect_shape_dependencies != @perfect_shape_dependencies
             absolute_x, absolute_y, closed, draw_fill_mode, children = @perfect_shape_dependencies = the_perfect_shape_dependencies

data/lib/glimmer/libui/shape/line.rb

@@ -61,6 +61,7 @@ module Glimmer
         end
         
         def perfect_shape
+          require 'perfect-shape'
           the_perfect_shape_dependencies = perfect_shape_dependencies
           if the_perfect_shape_dependencies != @perfect_shape_dependencies
             absolute_x, absolute_y, absolute_end_x, absolute_end_y = @perfect_shape_dependencies = the_perfect_shape_dependencies

data/lib/glimmer/libui/shape/polybezier.rb

@@ -45,6 +45,7 @@ module Glimmer
         end
         
         def perfect_shape
+          require 'perfect-shape'
           the_perfect_shape_dependencies = perfect_shape_dependencies
           if the_perfect_shape_dependencies != @perfect_shape_dependencies
             absolute_point_array = @perfect_shape_dependencies = the_perfect_shape_dependencies

data/lib/glimmer/libui/shape/polygon.rb

@@ -46,6 +46,7 @@ module Glimmer
         end
         
         def perfect_shape
+          require 'perfect-shape'
           the_perfect_shape_dependencies = perfect_shape_dependencies
           if the_perfect_shape_dependencies != @perfect_shape_dependencies
             absolute_point_array = @perfect_shape_dependencies = the_perfect_shape_dependencies

data/lib/glimmer/libui/shape/polyline.rb

@@ -45,6 +45,7 @@ module Glimmer
         end
         
         def perfect_shape
+          require 'perfect-shape'
           the_perfect_shape_dependencies = perfect_shape_dependencies
           if the_perfect_shape_dependencies != @perfect_shape_dependencies
             absolute_point_array = @perfect_shape_dependencies = the_perfect_shape_dependencies

data/lib/glimmer/libui/shape/rectangle.rb

@@ -39,6 +39,7 @@ module Glimmer
         end
         
         def perfect_shape
+          require 'perfect-shape'
           the_perfect_shape_dependencies = perfect_shape_dependencies
           if the_perfect_shape_dependencies != @perfect_shape_dependencies
             absolute_x, absolute_y, width, height = @perfect_shape_dependencies = the_perfect_shape_dependencies

data/lib/glimmer/libui/shape/square.rb

@@ -41,6 +41,7 @@ module Glimmer
         end
         
         def perfect_shape
+          require 'perfect-shape'
           the_perfect_shape_dependencies = perfect_shape_dependencies
           if the_perfect_shape_dependencies != @perfect_shape_dependencies
             @perfect_shape_dependencies = the_perfect_shape_dependencies

data/lib/glimmer/libui/shape.rb

@@ -182,6 +182,7 @@ module Glimmer
         return unless respond_to?(:point_array)
         
         point_array = self.point_array || []
+        require 'perfect-shape'
         point_array = PerfectShape::MultiPoint.normalize_point_array(point_array)
         point_array.map do |point|
           if composite_shape

data/lib/glimmer/libui.rb

@@ -92,6 +92,7 @@ module Glimmer
           value[:a] = value.delete(:alpha) if value[:alpha]
           value
         elsif value.is_a?(String) && !value.start_with?('0x') && !value.start_with?('#') && !value.downcase.match(/^((([1-9a-f]){6})|(([1-9a-f]){3}))$/)
+          require 'color'
           color = Color::RGB.extract_colors(value).first
           color.nil? ? {} : {
             r: color.red,
@@ -194,6 +195,7 @@ module Glimmer
       end
       
       def x11_colors
+        require 'color'
         Color::RGB.constants.reject {|c| c.to_s.upcase == c.to_s}.map(&:to_s).map(&:underscore).map(&:to_sym)
       end
       

data/lib/glimmer/rake_task/list.rb

@@ -19,8 +19,8 @@
 # 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 'facets'
 require 'text-table'
+require 'facets/string/titlecase'
 
 module Glimmer
   module RakeTask

data/lib/glimmer/rake_task/scaffold.rb

@@ -21,7 +21,7 @@
 
 require 'fileutils'
 require 'os'
-require 'facets'
+require 'facets/string/titlecase'
 
 # TODO refactor to nest under RakeTask namespace
 
@@ -578,32 +578,7 @@ require '#{window_type == :app ? current_dir_name : namespace}/model/greeting'
             custom_window_file_content += <<-MULTI_LINE_STRING
       before_body do
         @greeting = Model::Greeting.new
-        
-        menu('File') {
-          menu_item('Preferences...') {
-            on_clicked do
-              display_preferences_dialog
-            end
-          }
-          
-          # Enables quitting with CMD+Q on Mac with Mac Quit menu item
-          quit_menu_item if OS.mac?
-        }
-        menu('Help') {
-          if OS.mac?
-            about_menu_item {
-              on_clicked do
-                display_about_dialog
-              end
-            }
-          end
-          
-          menu_item('About') {
-            on_clicked do
-              display_about_dialog
-            end
-          }
-        }
+        menu_bar
       end
             MULTI_LINE_STRING
           elsif window_type == :gem
@@ -670,6 +645,39 @@ require '#{window_type == :app ? current_dir_name : namespace}/model/greeting'
       }
           MULTI_LINE_STRING
           
+          if %i[app].include?(window_type)
+            custom_window_file_content += <<-MULTI_LINE_STRING
+  
+      def menu_bar
+        menu('File') {
+          menu_item('Preferences...') {
+            on_clicked do
+              display_preferences_dialog
+            end
+          }
+          
+          # Enables quitting with CMD+Q on Mac with Mac Quit menu item
+          quit_menu_item if OS.mac?
+        }
+        menu('Help') {
+          if OS.mac?
+            about_menu_item {
+              on_clicked do
+                display_about_dialog
+              end
+            }
+          end
+          
+          menu_item('About') {
+            on_clicked do
+              display_about_dialog
+            end
+          }
+        }
+      end
+            MULTI_LINE_STRING
+          end
+          
           if %i[gem app].include?(window_type)
             custom_window_file_content += <<-MULTI_LINE_STRING
   

data/lib/glimmer-dsl-libui.rb

@@ -23,11 +23,9 @@ $LOAD_PATH.unshift(File.expand_path('..', __FILE__))
 
 # External requires
 require 'glimmer'
-require 'perfect-shape'
 # require 'logging'
 require 'puts_debuggerer' if (ENV['PD'] || ENV['pd']).to_s.downcase == 'true'
 # require 'super_module'
-require 'color'
 require 'os'
 require 'equalizer'
 require 'array_include_methods'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-libui
 version: !ruby/object:Gem::Version
-  version: 0.11.5
+  version: 0.11.6
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-29 00:00:00.000000000 Z
+date: 2023-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer