glimmer-dsl-opal 0.25.2 → 0.26.1

data/lib/glimmer/swt/table_item_proxy.rb

@@ -59,26 +59,6 @@ module Glimmer
         @text_array ||= []
       end
 
-      def get_data(key = nil)
-        if key.nil?
-          @data
-        else
-          data_hash[key]
-        end
-      end
-      
-      def set_data(key = nil, data_value)
-        if key.nil?
-          @data = data_value
-        else
-          data_hash[key] = data_value
-        end
-      end
-      
-      def data_hash
-        @data_hash ||= {}
-      end
-      
       def parent_path
         parent.items_path
       end

data/lib/glimmer/swt/table_proxy.rb

@@ -61,6 +61,10 @@ module Glimmer
                   on_focus_lost {
                     table_proxy.finish_edit!
                   }
+                  on_modify_text do |event|
+                    # No Op, just record @text changes on key up
+                    # TODO find a better solution than this in the future
+                  end
                   on_key_pressed { |key_event|
                     if key_event.keyCode == swt(:cr)
                       table_proxy.finish_edit!

data/lib/glimmer/swt/widget_proxy.rb

@@ -31,6 +31,8 @@ module Glimmer
       include Glimmer
       include PropertyOwner
       
+      Event = Struct.new(:widget, keyword_init: true)
+      
       SWT_CURSOR_TO_CSS_CURSOR_MAP = {
         wait: 'wait',
         sizenwse: 'nwse-resize',
@@ -140,7 +142,6 @@ module Glimmer
         # TODO consider changing children to an array (why is it a Set if order matters?)
         @children = Set.new # TODO consider moving to composite
         @enabled = true
-        @data = {}
         DEFAULT_INITIALIZERS[self.class.underscored_widget_name(self).to_s.to_sym]&.call(self)
         @parent.post_initialize_child(self) # TODO rename to post_initialize_child to be closer to glimmer-dsl-swt terminology
       end
@@ -172,18 +173,30 @@ module Glimmer
         end
       end
       
-      def set_data(key=nil, value)
-        @data[key] = value
+      def set_data(key = nil, value)
+        if key.nil?
+          @data = value
+        else
+          swt_data[key] = value
+        end
       end
       alias setData set_data
       alias data= set_data
       
-      def get_data(key=nil)
-        @data[key]
+      def get_data(key = nil)
+        if key.nil?
+          @data
+        else
+          swt_data[key]
+        end
       end
       alias getData get_data
       alias data get_data
       
+      def swt_data
+        @swt_data ||= {}
+      end
+      
       def css_classes
         dom_element.attr('class').to_s.split
       end
@@ -192,9 +205,9 @@ module Glimmer
         remove_all_listeners
         Document.find(path).remove
         parent&.post_dispose_child(self)
-        # TODO fire on_widget_disposed listener
 #         children.each(:dispose) # TODO enable this safely
         @disposed = true
+        listeners_for('widget_disposed').each {|listener| listener.call(Event.new(widget: self))}
       end
       
       def remove_all_listeners
@@ -733,6 +746,14 @@ module Glimmer
         @event_handling_suspended
       end
       
+      def listeners
+        @listeners ||= {}
+      end
+      
+      def listeners_for(listener_event)
+        listeners[listener_event.to_s] ||= []
+      end
+      
       def can_handle_observation_request?(observation_request)
         # TODO sort this out for Opal
         observation_request = observation_request.to_s
@@ -747,6 +768,15 @@ module Glimmer
       end
       
       def handle_observation_request(keyword, original_event_listener)
+        case keyword
+        when 'on_widget_disposed'
+          listeners_for(keyword.sub(/^on_/, '')) << original_event_listener.to_proc
+        else
+          handle_javascript_observation_request(keyword, original_event_listener)
+        end
+      end
+      
+      def handle_javascript_observation_request(keyword, original_event_listener)
         return unless effective_observation_request_to_event_mapping.keys.include?(keyword)
         event = nil
         delegate = nil
@@ -886,6 +916,18 @@ module Glimmer
 #               }
 #             end,
 #           },
+          MenuItemProxy => {
+            :selection => lambda do |observer|
+              on_widget_selected { |selection_event|
+                # TODO look into validity of this and perhaps move toggle logic to MenuItemProxy
+                if check?
+                  observer.call(!selection)
+                else
+                  observer.call(selection)
+                end
+              }
+            end
+          },
           ScaleProxy => {
             :selection => lambda do |observer|
               on_widget_selected { |selection_event|
@@ -1021,7 +1063,6 @@ require 'glimmer/swt/combo_proxy'
 require 'glimmer/swt/c_combo_proxy'
 require 'glimmer/swt/checkbox_proxy'
 require 'glimmer/swt/composite_proxy'
-require 'glimmer/swt/dialog_proxy'
 require 'glimmer/swt/date_time_proxy'
 require 'glimmer/swt/group_proxy'
 require 'glimmer/swt/label_proxy'

data/lib/glimmer/ui/custom_shell.rb

@@ -67,6 +67,8 @@ module Glimmer
       
       def initialize(parent, args, options, &content)
         super(parent, args, options, &content)
+        body_root.set_data('custom_shell', self)
+        body_root.set_data('custom_window', self)
         raise Error, 'Invalid custom shell body root! Must be a shell or another custom shell.' unless body_root.is_a?(Glimmer::SWT::ShellProxy) || body_root.is_a?(Glimmer::UI::CustomShell)
       end
 

data/lib/glimmer/ui/custom_widget.rb

@@ -158,6 +158,7 @@ module Glimmer
       
 
       attr_reader :body_root, :parent, :options, :swt_style
+      alias parent_proxy parent
 
       def initialize(parent, args, options, &content)
         @parent = parent
@@ -177,6 +178,7 @@ module Glimmer
         body_block = self.class.instance_variable_get("@body_block")
         raise Glimmer::Error, 'Invalid custom widget for having no body! Please define body block!' if body_block.nil?
         @body_root = instance_exec(&body_block)
+        @parent ||= @body_root.parent
         raise Glimmer::Error, 'Invalid custom widget for having an empty body! Please fill body block!' if @body_root.nil?
         execute_hooks('after_body')
       end

data/lib/glimmer-dsl-opal/samples/elaborate/login.rb

@@ -19,8 +19,6 @@
 # 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-swt'
-
 class LoginPresenter
 
   attr_accessor :user_name
@@ -64,10 +62,10 @@ end
 
 class Login
   include Glimmer::UI::CustomShell
-  
-  before_body {
+
+  before_body do
     @presenter = LoginPresenter.new
-  }
+  end
 
   body {
     shell {

data/lib/glimmer-dsl-opal/samples/elaborate/tetris/model/block.rb

@@ -0,0 +1,48 @@
+# 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.
+
+class Tetris
+  module Model
+    class Block
+      COLOR_CLEAR = :white
+    
+      attr_accessor :color
+      
+      # Initializes with color. Default color (gray) signifies an empty block
+      def initialize(color = COLOR_CLEAR)
+        @color = color
+      end
+      
+      # Clears block color. `quietly` option indicates if it should not notify observers by setting value quietly via variable not attribute writer.
+      def clear
+        self.color = COLOR_CLEAR unless self.color == COLOR_CLEAR
+      end
+      
+      def clear?
+        self.color == COLOR_CLEAR
+      end
+      
+      def occupied?
+        !clear?
+      end
+    end
+  end
+end

data/lib/glimmer-dsl-opal/samples/elaborate/tetris/model/game.rb

@@ -0,0 +1,275 @@
+# 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 'fileutils'
+require 'json'
+require 'glimmer/data_binding/observer'
+require 'glimmer/config'
+
+require_relative 'block'
+require_relative 'tetromino'
+require_relative 'past_game'
+
+class Tetris
+  module Model
+    class Game
+      PLAYFIELD_WIDTH = 10
+      PLAYFIELD_HEIGHT = 20
+      PREVIEW_PLAYFIELD_WIDTH = 4
+      PREVIEW_PLAYFIELD_HEIGHT = 2
+      SCORE_MULTIPLIER = {1 => 40, 2 => 100, 3 => 300, 4 => 1200}
+      
+      attr_reader :playfield_width, :playfield_height
+      attr_accessor :game_over, :paused, :preview_tetromino, :lines, :score, :level, :high_scores, :added_high_score, :show_high_scores, :up_arrow_action
+      alias game_over? game_over
+      alias paused? paused
+      alias added_high_score? added_high_score
+      
+      def initialize(playfield_width = PLAYFIELD_WIDTH, playfield_height = PLAYFIELD_HEIGHT)
+        @playfield_width = playfield_width
+        @playfield_height = playfield_height
+        @high_scores = []
+        @show_high_scores = false
+        @up_arrow_action = :rotate_left
+      end
+      
+      def game_in_progress?
+        !game_over? && !paused?
+      end
+      
+      def start!
+        self.show_high_scores = false
+        self.paused = false
+        self.level = 1
+        self.score = 0
+        self.lines = 0
+        reset_playfield
+        reset_preview_playfield
+        reset_tetrominoes
+        preview_next_tetromino!
+        consider_adding_tetromino
+        self.game_over = false
+      end
+      alias restart! start!
+      
+      def game_over!
+        add_high_score!
+        self.game_over = true
+      end
+      
+      def clear_high_scores!
+        high_scores.clear
+      end
+      
+      def add_high_score!
+        self.added_high_score = true
+        high_scores.prepend(PastGame.new("Player #{high_scores.count + 1}", score, lines, level))
+      end
+      
+      def tetris_dir
+        @tetris_dir ||= File.join(File.expand_path('~'), '.glimmer-tetris')
+      end
+      
+      def tetris_high_score_file
+        File.join(tetris_dir, "high_scores.txt")
+      end
+      
+      def down!(instant: false)
+        return unless game_in_progress?
+        current_tetromino.down!(instant: instant)
+        game_over! if current_tetromino.row <= 0 && current_tetromino.stopped?
+      end
+      
+      def right!
+        return unless game_in_progress?
+        current_tetromino.right!
+      end
+      
+      def left!
+        return unless game_in_progress?
+        current_tetromino.left!
+      end
+      
+      def rotate!(direction)
+        return unless game_in_progress?
+        current_tetromino.rotate!(direction)
+      end
+      
+      def current_tetromino
+        tetrominoes.last
+      end
+    
+      def tetrominoes
+        @tetrominoes ||= reset_tetrominoes
+      end
+      
+      # Returns blocks in the playfield
+      def playfield
+        @playfield ||= @original_playfield = @playfield_height.times.map {
+          @playfield_width.times.map {
+            Block.new
+          }
+        }
+      end
+      
+      # Executes a hypothetical scenario without truly changing playfield permanently
+      def hypothetical(&block)
+        @playfield = hypothetical_playfield
+        block.call
+        @playfield = @original_playfield
+      end
+      
+      # Returns whether currently executing a hypothetical scenario
+      def hypothetical?
+        @playfield != @original_playfield
+      end
+      
+      def hypothetical_playfield
+        @playfield_height.times.map { |row|
+          @playfield_width.times.map { |column|
+            playfield[row][column].clone
+          }
+        }
+      end
+      
+      def preview_playfield
+        @preview_playfield ||= PREVIEW_PLAYFIELD_HEIGHT.times.map {|row|
+          PREVIEW_PLAYFIELD_WIDTH.times.map {|column|
+            Block.new
+          }
+        }
+      end
+      
+      def preview_next_tetromino!
+        self.preview_tetromino = Tetromino.new(self)
+      end
+      
+      def calculate_score!(eliminated_lines)
+        new_score = SCORE_MULTIPLIER[eliminated_lines] * (level + 1)
+        self.score += new_score
+      end
+      
+      def level_up!
+        self.level += 1 if lines >= self.level*10
+      end
+      
+      def delay
+        [1.1 - (level.to_i * 0.1), 0.001].max
+      end
+      
+      def instant_down_on_up=(value)
+        self.up_arrow_action = :instant_down if value
+      end
+      
+      def instant_down_on_up
+        self.up_arrow_action == :instant_down
+      end
+      
+      def rotate_right_on_up=(value)
+        self.up_arrow_action = :rotate_right if value
+      end
+      
+      def rotate_right_on_up
+        self.up_arrow_action == :rotate_right
+      end
+      
+      def rotate_left_on_up=(value)
+        self.up_arrow_action = :rotate_left if value
+      end
+      
+      def rotate_left_on_up
+        self.up_arrow_action == :rotate_left
+      end
+      
+      def reset_tetrominoes
+        @tetrominoes = []
+      end
+      
+      def reset_playfield
+        playfield.each do |row|
+          row.each do |block|
+            block.clear
+          end
+        end
+      end
+      
+      def reset_preview_playfield
+        preview_playfield.each do |row|
+          row.each do |block|
+            block.clear
+          end
+        end
+      end
+      
+      def consider_adding_tetromino
+        if tetrominoes.empty? || current_tetromino.stopped?
+          preview_tetromino.launch!
+          preview_next_tetromino!
+        end
+      end
+      
+      def consider_eliminating_lines
+        eliminated_lines = 0
+        playfield.each_with_index do |row, playfield_row|
+          if row.all? {|block| !block.clear?}
+            eliminated_lines += 1
+            shift_blocks_down_above_row(playfield_row)
+          end
+        end
+        if eliminated_lines > 0
+          self.lines += eliminated_lines
+          level_up!
+          calculate_score!(eliminated_lines)
+        end
+      end
+            
+      def playfield_remaining_heights(tetromino = nil)
+        @playfield_width.times.map do |playfield_column|
+          bottom_most_block = tetromino.bottom_most_block_for_column(playfield_column)
+          (playfield.each_with_index.detect do |row, playfield_row|
+            !row[playfield_column].clear? &&
+            (
+              tetromino.nil? ||
+              bottom_most_block.nil? ||
+              (playfield_row > tetromino.row + bottom_most_block[:row_index])
+            )
+          end || [nil, @playfield_height])[1]
+        end.to_a
+      end
+      
+      private
+      
+      def shift_blocks_down_above_row(row)
+        row.downto(0) do |playfield_row|
+           playfield[playfield_row].each_with_index do |block, playfield_column|
+             previous_row = playfield[playfield_row - 1]
+             previous_block = previous_row[playfield_column]
+             block.color = previous_block.color unless block.color == previous_block.color
+           end
+        end
+        playfield[0].each(&:clear)
+      end
+      
+    end
+  
+  end
+
+end