glimmer-dsl-libui 0.7.8 → 0.9.0

data/VERSION

@@ -1 +1 @@
-0.7.8
+0.9.0

data/bin/girb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-# Copyright (c) 2020-2021 Andy Maleh
+# Copyright (c) 2021-2023 Andy Maleh
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/bin/glimmer

@@ -0,0 +1,30 @@
+#!/usr/bin/env ruby
+
+# Copyright (c) 2021-2023 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_relative '../lib/glimmer-dsl-libui'
+require_relative '../lib/glimmer/launcher'
+
+# Initialize launcher, consuming ARGV args that are for Glimmer only
+launcher = Glimmer::Launcher.new(ARGV)
+
+launcher.launch

data/docs/examples/GLIMMER-DSL-LIBUI-BASIC-EXAMPLES.md

@@ -25,6 +25,7 @@
   - [Basic Transform](#basic-transform)
   - [Basic Draw Text](#basic-draw-text)
   - [Basic Code Area](#basic-code-area)
+  - [Basic Composite Shape](#basic-composite-shape)
 
 ## Basic Window
 
@@ -2344,36 +2345,20 @@ Mac | Windows | Linux
 
 New [Glimmer DSL for LibUI](https://rubygems.org/gems/glimmer-dsl-libui) Version:
 
-```ruby
-require 'glimmer-dsl-libui'
+## Basic Composite Shape
 
-class BasicCodeArea
-  include Glimmer::LibUI::Application
-  
-  before_body do
-    @code = <<~CODE
-      # Greets target with greeting
-      def greet(greeting: 'Hello', target: 'World')
-        
-        puts "\#{greeting}, \#{target}!"
-      end
-      
-      greet
-      greet(target: 'Robert')
-      greet(greeting: 'Aloha')
-      greet(greeting: 'Aloha', target: 'Nancy')
-      greet(greeting: 'Howdy', target: 'Doodle')
-    CODE
-  end
-  
-  body {
-    window('Basic Code Area', 400, 300) {
-      margined true
-      
-      code_area(language: 'ruby', code: @code)
-    }
-  }
-end
+[examples/basic_composite_shape.rb](/examples/basic_composite_shape.rb)
+
+Run with this command from the root of the project if you cloned the project:
 
-BasicCodeArea.launch
 ```
+ruby -r './lib/glimmer-dsl-libui' examples/basic_composite_shape.rb
+```
+
+Run with this command if you installed the [Ruby gem](https://rubygems.org/gems/glimmer-dsl-libui):
+
+```
+ruby -r glimmer-dsl-libui -e "require 'examples/basic_composite_shape.rb'"
+```
+
+![glimmer-dsl-libui-mac-basic-composite-shape.gif](/images/glimmer-dsl-libui-mac-basic-composite-shape.gif)

data/examples/basic_composite_shape.rb

@@ -0,0 +1,145 @@
+require 'glimmer-dsl-libui'
+
+class BasicCompositeShape
+  include Glimmer::LibUI::Application
+  
+  body {
+    window {
+      title 'Basic Composite Shape'
+      content_size 200, 225
+    
+      @area = area {
+        rectangle(0, 0, 200, 225) {
+          fill :white
+        }
+        
+        7.times do |n|
+          x_location = (rand*125).to_i%200 + (rand*15).to_i
+          y_location = (rand*125).to_i%200 + (rand*15).to_i
+          shape_color = [rand*125 + 130, rand*125 + 130, rand*125 + 130]
+          shape_size = 20+n
+
+          cube(
+            location_x: x_location,
+            location_y: y_location,
+            rectangle_width: shape_size*2,
+            rectangle_height: shape_size,
+            cube_height: shape_size*2,
+            background_color: shape_color,
+            line_thickness: 2
+          ) { |the_shape|
+            on_mouse_up do |area_mouse_event|
+              # Change color on mouse up without dragging
+              if @drag_shape.nil?
+                background_color = [rand(255), rand(255), rand(255)]
+                the_shape.fill = background_color
+              end
+            end
+            
+            on_mouse_drag_start do |area_mouse_event|
+              @drag_shape = the_shape
+              @drag_x = area_mouse_event[:x]
+              @drag_y = area_mouse_event[:y]
+            end
+                        
+            on_mouse_drag do |area_mouse_event|
+              if @drag_shape && @drag_x && @drag_y
+                drag_distance_width = area_mouse_event[:x]  - @drag_x
+                drag_distance_height = area_mouse_event[:y] - @drag_y
+                @drag_shape.x += drag_distance_width
+                @drag_shape.y += drag_distance_height
+                @drag_x = area_mouse_event[:x]
+                @drag_y = area_mouse_event[:y]
+              end
+            end
+            
+            on_mouse_drop do |area_mouse_event|
+              @drag_shape = nil
+              @drag_x = nil
+              @drag_y = nil
+            end
+          }
+        end
+        
+        # this general area on_mouse_drag listener is needed to ensure that dragging a shape
+        # outside of its boundaries would still move the dragged shape
+        on_mouse_drag do |area_mouse_event|
+          if @drag_shape && @drag_x && @drag_y
+            drag_distance_width = area_mouse_event[:x]  - @drag_x
+            drag_distance_height = area_mouse_event[:y] - @drag_y
+            @drag_shape.x += drag_distance_width
+            @drag_shape.y += drag_distance_height
+            @drag_x = area_mouse_event[:x]
+            @drag_y = area_mouse_event[:y]
+          end
+        end
+        
+        on_mouse_drop do |area_mouse_event|
+          @drag_shape = nil
+          @drag_x = nil
+          @drag_y = nil
+        end
+      }
+    }
+  }
+  
+  # method-based custom shape using `shape` keyword as a composite shape containing nested shapes
+  # that are declared with relative positioning
+  def cube(location_x: 0,
+           location_y: 0,
+           rectangle_width: nil,
+           rectangle_height: nil,
+           cube_height: nil,
+           background_color: :brown,
+           line_thickness: 1,
+           &content_block)
+    default_size = 28
+    rectangle_width ||= rectangle_height || cube_height || default_size
+    rectangle_height ||= rectangle_width || cube_height || default_size
+    cube_height ||= rectangle_width || rectangle_height || default_size
+    foreground_color = [0, 0, 0, thickness: line_thickness]
+    
+    # the shape keyword (alias for composite_shape) enables building a composite shape that is treated as one shape
+    # like a cube containing polygons, a polyline, a rectangle, and a line
+    # with the fill and stroke colors getting inherited by all children that do not specify them
+    shape(location_x, location_y) { |the_shape|
+      fill background_color
+      stroke foreground_color
+    
+      bottom = polygon(0, cube_height + rectangle_height / 2.0,
+              rectangle_width / 2.0, cube_height,
+              rectangle_width, cube_height + rectangle_height / 2.0,
+              rectangle_width / 2.0, cube_height + rectangle_height) {
+        # inherits fill property from parent shape if not set
+        # inherits stroke property from parent shape if not set
+      }
+      body = rectangle(0, rectangle_height / 2.0, rectangle_width, cube_height) {
+        # inherits fill property from parent shape if not set
+        # stroke is overridden to ensure a different value from parent
+        stroke thickness: 0
+      }
+      polyline(0, rectangle_height / 2.0 + cube_height,
+               0, rectangle_height / 2.0,
+               rectangle_width, rectangle_height / 2.0,
+               rectangle_width, rectangle_height / 2.0 + cube_height) {
+        # inherits stroke property from parent shape if not set
+      }
+      top = polygon(0, rectangle_height / 2.0,
+              rectangle_width / 2.0, 0,
+              rectangle_width, rectangle_height / 2.0,
+              rectangle_width / 2.0, rectangle_height) {
+        # inherits fill property from parent shape if not set
+        # inherits stroke property from parent shape if not set
+      }
+      line(rectangle_width / 2.0, cube_height + rectangle_height,
+           rectangle_width / 2.0, rectangle_height) {
+        # inherits stroke property from parent shape if not set
+      }
+      
+      content_block&.call(the_shape)
+    }
+  end
+end
+
+BasicCompositeShape.launch
+        

data/examples/button_counter.rb

@@ -6,7 +6,7 @@ class ButtonCounter
   attr_accessor :count
 
   def initialize
-    @count = 0
+    self.count = 0
   end
 
   def launch

data/lib/glimmer/Rakefile

@@ -0,0 +1,26 @@
+# Copyright (c) 2021-2023 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.
+
+# This Rakefile gets used from Glimmer::Launcher when the current directory for running the `glimmer` command
+# does not have a Rakefile (e.g. during scaffolding).
+# It is not needed when running from inside a scaffolded app or gem, or an app with a Rakefile that has
+# `require 'glimmer/rake_task'`
+require 'glimmer/rake_task'

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

@@ -33,8 +33,7 @@ module Glimmer
         end
   
         def interpret(parent, keyword, *args, &block)
-          @@inverted_keyword_aliases = Glimmer::LibUI::ControlProxy::KEYWORD_ALIASES.invert unless defined?(@@inverted_keyword_aliases)
-          keyword = @@inverted_keyword_aliases[keyword] || keyword
+          keyword = Glimmer::LibUI::ControlProxy::KEYWORD_ALIASES[keyword] || keyword
           Glimmer::LibUI::ControlProxy.create(keyword, parent, args, &block)
         end
         

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

@@ -42,6 +42,7 @@ module Glimmer
         end
   
         def interpret(parent, keyword, *args, &block)
+          keyword = Glimmer::LibUI::Shape::KEYWORD_ALIASES[keyword] || keyword
           args = [args] if args.size > 1 && Glimmer::LibUI::Shape.shape_class(keyword).parameters.size == 1
           Glimmer::LibUI::Shape.create(keyword, parent, args, &block)
         end

data/lib/glimmer/launcher.rb

@@ -0,0 +1,231 @@
+# Copyright (c) 2007-2023 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.
+
+if ARGV.include?('--bundler') && File.exist?(File.expand_path('./Gemfile'))
+  require 'bundler'
+  Bundler.setup(:default)
+end
+require 'fileutils'
+require 'os'
+
+module Glimmer
+  # Launcher of glimmer applications and main entry point for the `glimmer` command.
+  class Launcher
+    # TODO update the verbiage below for Glimmer DSL for LibUI
+    TEXT_USAGE = <<~MULTI_LINE_STRING
+      Glimmer DSL for LibUI (Prerequisite-Free Ruby Desktop Development Cross-Platform Native GUI Library) - Ruby Gem: glimmer-dsl-libui v#{File.read(File.expand_path('../../../VERSION', __FILE__))}
+      Usage: glimmer [--bundler] [--pd] [--quiet] [--debug] [--log-level=VALUE] [[ENV_VAR=VALUE]...] [[-ruby-option]...] (application.rb or task[task_args])
+    
+      Runs Glimmer applications and tasks.
+    
+      When applications are specified, they are run using Ruby,
+      automatically preloading the glimmer-dsl-libui Ruby gem.
+    
+      Optionally, extra Glimmer options, Ruby options, and/or environment variables may be passed in.
+    
+      Glimmer options:
+      - "--bundler=GROUP"   : Activates gems in Bundler default group in Gemfile
+      - "--pd=BOOLEAN"      : Requires puts_debuggerer to enable pd method
+      - "--quiet=BOOLEAN"   : Does not announce file path of Glimmer application being launched
+      - "--debug"           : Displays extra debugging information and enables debug logging
+      - "--log-level=VALUE" : Sets Glimmer's Ruby logger level ("ERROR" / "WARN" / "INFO" / "DEBUG"; default is none)
+    
+      Tasks are run via rake. Some tasks take arguments in square brackets (surround with double-quotes if using Zsh).
+    
+      Available tasks are below (if you do not see any, please add `require 'glimmer/rake_task'` to Rakefile and rerun or run rake -T):
+      
+    MULTI_LINE_STRING
+
+    GLIMMER_LIB_GEM = 'glimmer-dsl-libui'
+    GLIMMER_LIB_LOCAL = File.expand_path(File.join('lib', "#{GLIMMER_LIB_GEM}.rb"))
+    GLIMMER_OPTIONS = %w[--log-level --quiet --bundler --pd]
+    GLIMMER_OPTION_ENV_VAR_MAPPING = {
+      '--log-level' => 'GLIMMER_LOGGER_LEVEL'   ,
+      '--bundler'   => 'GLIMMER_BUNDLER_SETUP'  ,
+      '--pd'        => 'PD'  ,
+    }
+    REGEX_RAKE_TASK_WITH_ARGS = /^([^\[]+)\[?([^\]]*)\]?$/
+
+    class << self
+      def is_arm64?
+        host_cpu = OS.host_cpu.downcase
+        host_cpu.include?('aarch64') || host_cpu.include?('arm')
+      end
+      
+      def glimmer_lib
+        unless @glimmer_lib
+          @glimmer_lib = GLIMMER_LIB_GEM
+          if File.exist?(GLIMMER_LIB_LOCAL)
+            @glimmer_lib = GLIMMER_LIB_LOCAL
+            puts "[DEVELOPMENT MODE] (detected #{@glimmer_lib})"
+          end
+        end
+        @glimmer_lib
+      end
+      
+      def dev_mode?
+        glimmer_lib == GLIMMER_LIB_LOCAL
+      end
+
+      def glimmer_option_env_vars(glimmer_options)
+        GLIMMER_OPTION_ENV_VAR_MAPPING.reduce({}) do |hash, pair|
+          glimmer_options[pair.first] ? hash.merge(GLIMMER_OPTION_ENV_VAR_MAPPING[pair.first] => glimmer_options[pair.first]) : hash
+        end
+      end
+
+      def load_env_vars(env_vars)
+        env_vars.each do |key, value|
+          ENV[key] = value
+        end
+      end
+
+      def launch(application, ruby_options: [], env_vars: {}, glimmer_options: {})
+        ruby_options_string = ruby_options.join(' ') + ' ' if ruby_options.any?
+        env_vars = env_vars.merge(glimmer_option_env_vars(glimmer_options))
+        env_vars.each do |k,v|
+          ENV[k] = v
+        end
+        the_glimmer_lib = glimmer_lib
+        require 'puts_debuggerer' if the_glimmer_lib == GLIMMER_LIB_LOCAL
+        is_rake_task = !application.end_with?('.rb')
+        rake_tasks = []
+        if is_rake_task
+          load File.expand_path('./Rakefile') if File.exist?(File.expand_path('./Rakefile')) && caller.join("\n").include?('/bin/glimmer:')
+          require_relative 'rake_task'
+          rake_tasks = Rake.application.tasks.map(&:to_s).map {|t| t.sub('glimmer:', '')}
+           
+          potential_rake_task_parts = application.match(REGEX_RAKE_TASK_WITH_ARGS)
+          application = potential_rake_task_parts[1]
+          rake_task_args = potential_rake_task_parts[2].split(',')
+        end
+        if rake_tasks.include?(application)
+          load_env_vars(glimmer_option_env_vars(glimmer_options))
+          rake_task = "glimmer:#{application}"
+          puts "Running Glimmer rake task: #{rake_task}" if ruby_options_string.to_s.include?('--debug')
+          Rake::Task[rake_task].invoke(*rake_task_args)
+        else
+          puts "Launching Glimmer Application: #{application}" if ruby_options_string.to_s.include?('--debug') || glimmer_options['--quiet'].to_s.downcase != 'true'
+          require the_glimmer_lib
+          load File.expand_path(application)
+        end
+      end
+    end
+    
+    attr_reader :application_paths
+    attr_reader :env_vars
+    attr_reader :glimmer_options
+    attr_reader :ruby_options
+
+    def initialize(raw_options)
+      raw_options << '--quiet' if !caller.join("\n").include?('/bin/glimmer:') && !raw_options.join.include?('--quiet=')
+      raw_options << '--log-level=DEBUG' if raw_options.join.include?('--debug') && !raw_options.join.include?('--log-level=')
+      @application_path = extract_application_path(raw_options)
+      @env_vars = extract_env_vars(raw_options)
+      @glimmer_options = extract_glimmer_options(raw_options)
+      @ruby_options = raw_options
+    end
+
+    def launch
+      if @application_path.nil?
+        display_usage
+      else
+        launch_application
+      end
+    end
+
+    private
+
+    def launch_application
+      self.class.launch(
+        @application_path,
+        ruby_options: @ruby_options,
+        env_vars: @env_vars,
+        glimmer_options: @glimmer_options
+      )
+    end
+
+    def display_usage
+      puts TEXT_USAGE
+      display_tasks
+    end
+    
+    def display_tasks
+      if OS.windows? || Launcher.is_arm64?
+        require 'rake'
+        Rake::TaskManager.record_task_metadata = true
+        require_relative 'rake_task'
+        tasks = Rake.application.tasks
+        task_lines = tasks.reject do |task|
+          task.comment.nil?
+        end.map do |task|
+          max_task_size = tasks.map(&:name_with_args).map(&:size).max + 1
+          task_name = task.name_with_args.sub('glimmer:', '')
+          line = "glimmer #{task_name.ljust(max_task_size)} # #{task.comment}"
+        end
+        puts task_lines.to_a
+      else
+        require 'rake-tui'
+        require 'tty-screen'
+        require_relative 'rake_task'
+        Rake::TUI.run(branding_header: nil, prompt_question: 'Select a Glimmer task to run:') do |task, tasks|
+          max_task_size = tasks.map(&:name_with_args).map(&:size).max + 1
+          task_name = task.name_with_args.sub('glimmer:', '')
+          line = "glimmer #{task_name.ljust(max_task_size)} # #{task.comment}"
+          bound = TTY::Screen.width - 6
+          line.size <= bound ? line : "#{line[0..(bound - 3)]}..."
+        end
+      end
+    end
+
+    # Extract application path (which can also be a rake task, basically a non-arg)
+    def extract_application_path(options)
+      application_path = options.detect do |option|
+        !option.start_with?('-') && !option.include?('=')
+      end.tap do
+        options.delete(application_path)
+      end
+    end
+
+    def extract_env_vars(options)
+      options.select do |option|
+        !option.start_with?('-') && option.include?('=')
+      end.each do |env_var|
+        options.delete(env_var)
+      end.reduce({}) do |hash, env_var_string|
+        match = env_var_string.match(/^([^=]+)=(.+)$/)
+        hash.merge(match[1] => match[2])
+      end
+    end
+
+    def extract_glimmer_options(options)
+      options.select do |option|
+        GLIMMER_OPTIONS.reduce(false) do |result, glimmer_option|
+          result || option.include?(glimmer_option)
+        end
+      end.each do |glimmer_option|
+        options.delete(glimmer_option)
+      end.reduce({}) do |hash, glimmer_option_string|
+        match = glimmer_option_string.match(/^([^=]+)=?(.+)?$/)
+        hash.merge(match[1] => (match[2] || 'true'))
+      end
+    end
+  end
+end

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

@@ -129,6 +129,7 @@ module Glimmer
         
         def build_control
           @libui = ::LibUI::FFI::DrawMatrix.malloc
+          # TODO is there a way to free the memory allocated for this? Or does it get garbage collected automatically?
           if @args.empty?
             set_identity
           else

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

@@ -167,9 +167,9 @@ module Glimmer
         end
         
         def perfect_shape
-          perfect_shape_dependencies = [draw_fill_mode, children]
-          if perfect_shape_dependencies != @perfect_shape_dependencies
-            draw_fill_mode, children = @perfect_shape_dependencies = perfect_shape_dependencies
+          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
             shapes = children.map(&:perfect_shape)
             new_shapes = []
             shapes.each do |shape|
@@ -190,6 +190,10 @@ module Glimmer
           @perfect_shape
         end
         
+        def perfect_shape_dependencies
+          [draw_fill_mode, children.map(&:perfect_shape_dependencies)]
+        end
+        
         private
         
         def build_control

data/lib/glimmer/libui/control_proxy.rb

@@ -35,10 +35,10 @@ module Glimmer
         end
         
         def create(keyword, parent, args, &block)
-          widget_proxy_class(keyword).new(keyword, parent, args, &block).tap {|c| control_proxies << c}
+          control_proxy_class(keyword).new(keyword, parent, args, &block).tap {|c| control_proxies << c}
         end
         
-        def widget_proxy_class(keyword)
+        def control_proxy_class(keyword)
           descendant_keyword_constant_map[keyword] || ControlProxy
         end
         
@@ -96,7 +96,7 @@ module Glimmer
         private
         
         def add_aliases_to_keyword_constant_map(keyword_constant_map)
-          KEYWORD_ALIASES.each do |keyword, alias_keyword|
+          KEYWORD_ALIASES.each do |alias_keyword, keyword|
             keyword_constant_map[alias_keyword] = keyword_constant_map[keyword]
           end
           keyword_constant_map
@@ -106,8 +106,8 @@ module Glimmer
       include DataBindable
       
       KEYWORD_ALIASES = {
-        'msg_box'       => 'message_box',
-        'msg_box_error' => 'message_box_error',
+        'message_box'       => 'msg_box',
+        'message_box_error' => 'msg_box_error',
       }
       
       BOOLEAN_PROPERTIES = %w[

data/lib/glimmer/libui/perfect_shaped.rb

@@ -8,7 +8,7 @@ module Glimmer
       
       def_delegators :perfect_shape,
                      :min_x, :min_y, :max_x, :max_y, :center_point, :center_x, :center_y
-      
+                     
       # Returns if shape contains point on the inside when outline is false (default)
       # or if point is on the outline when outline is true
       # distance_tolerance is used when outline is true to enable a fuzz factor in
@@ -22,6 +22,7 @@ module Glimmer
       # or if shape includes point on the outline when stroked
       def include?(*point)
         if fill.empty?
+          # TODO check if distance_tolerance should be half the thickness in case it is checked against both sides of out and in
           contain?(*point, outline: true, distance_tolerance: ((stroke[:thickness] || 1) - 1))
         else
           contain?(*point)
@@ -60,6 +61,13 @@ module Glimmer
       def perfect_shape
         # No Op
       end
+      
+      # Returns PerfectShape object dependencies to determine if the PerfectShape
+      # object changed or not for caching purposes.
+      # Every shape/path implements this uniquely for its own PerfectShape attribute dependencies
+      def perfect_shape_dependencies
+        # No Op
+      end
     end
   end
 end

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

@@ -51,21 +51,25 @@ module Glimmer
         end
         
         def perfect_shape
-          perfect_shape_dependencies = [x_center, y_center, radius, start_angle, sweep, is_negative]
-          if perfect_shape_dependencies != @perfect_shape_dependencies
-            x_center, y_center, radius, start_angle, sweep, is_negative = @perfect_shape_dependencies = perfect_shape_dependencies
+          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
             sign = is_negative ? 1 : -1
             start = is_negative ? (360 - start_angle) : -1*start_angle
             extent = is_negative ? (360 - sweep) : -1*sweep
             @perfect_shape = PerfectShape::Arc.new(
               type: :open,
-              center_x: x_center, center_y: y_center,
+              center_x: absolute_x_center, center_y: absolute_y_center,
               radius_x: radius, radius_y: radius,
               start: start, extent: extent
             )
           end
           @perfect_shape
         end
+        
+        def perfect_shape_dependencies
+          [absolute_x_center, absolute_y_center, radius, start_angle, sweep, is_negative]
+        end
       end
     end
   end