glimmer-dsl-swt 4.22.2.1 → 4.22.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 38c5a6fcb0bc02d02b4b2b4566e86bcdcfc037730b344bc0868afca2bbaf045d
-  data.tar.gz: b0c616c16900822130ee36452d88e36070bf293668f54ded34b9a1798842cb97
+  metadata.gz: 3de6dce288c5d0febfd7cdaa37195daf13284c7ff6f175442a4642f71b499fe7
+  data.tar.gz: 33e0fc58526098b0fa74c4bbc6779845b34b5052c3ddcb33d40e6f9d6548f2aa
 SHA512:
-  metadata.gz: dc5a5d28f744a77d10e29e96fe28e641a02463c610431ae2fbdfe0c662a9399cd08ac942669d6c85e55069e67a6c45d98fc94c84d9a7e7b58bf4ab107d14d82b
-  data.tar.gz: 2b91cdab4cd1ee9919ad1b635314a625e9335153a34e7d792a645e91df2fe66e1348ed7d39659ebf5c02859621a768fd31cce1674ae24a2911c60c47c6fc9dab
+  metadata.gz: 65b37079de93d70fcdde14ea4fada7cd2feeb1aa1fb22ee7dd0dedf08d873966183de876d510492a07707812b2414193c1003a83804636aeb021cd7b229195d0
+  data.tar.gz: b7c347ae41ee4b0fc170fc910e20bcbf4e58aed1e9d8a31416a66f1253e3a7d40b3d3fe79354549b301023401bf952af15873caf89525c29103da3b447010902

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change Log
 
+## 4.22.2.2
+
+- Snake elaborate sample
+- Fixed `timer_exec(time_in_millis) {}` expresion
+
 ## 4.22.2.1
 
 - Upgrade to glimmer 2.6.0

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 SWT 4.22.2.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 SWT 4.22.2.2
 ## JRuby Desktop Development GUI Framework
 [![Gem Version](https://badge.fury.io/rb/glimmer-dsl-swt.svg)](http://badge.fury.io/rb/glimmer-dsl-swt)
 [![Travis CI](https://travis-ci.com/AndyObtiva/glimmer-dsl-swt.svg?branch=master)](https://travis-ci.com/github/AndyObtiva/glimmer-dsl-swt)
@@ -17,17 +17,20 @@ Featured in JRuby Cookbook](http://shop.oreilly.com/product/9780596519650.do) an
 
 ![Eclipse SWT RCP NASA Mars Rover](/images/glimmer-eclipse-swt-rcp-nasa-mars-rover.png)
 
-[Glimmer DSL for SWT](https://rubygems.org/gems/glimmer-dsl-swt) 4.22.2.1 includes [SWT 4.22](https://download.eclipse.org/eclipse/downloads/drops4/R-4.22-202111241800/), which was released on November 24, 2021. Gem version numbers are in sync with the SWT library versions. The first two digits represent the SWT version number. The last two digits represent the minor and patch versions of Glimmer DSL for SWT.
+[Glimmer DSL for SWT](https://rubygems.org/gems/glimmer-dsl-swt) 4.22.2.2 includes [SWT 4.22](https://download.eclipse.org/eclipse/downloads/drops4/R-4.22-202111241800/), which was released on November 24, 2021. Gem version numbers are in sync with the SWT library versions. The first two digits represent the SWT version number. The last two digits represent the minor and patch versions of Glimmer DSL for SWT.
 
 **Starting in version 4.20.0.0, [Glimmer DSL for SWT](https://rubygems.org/gems/glimmer-dsl-swt) comes with the new [***Shine***](/docs/reference/GLIMMER_GUI_DSL_SYNTAX.md#shine) syntax** for highly intuitive and visually expressive View/Model Attribute Mapping, relying on `<=>` for bidirectional (two-way) data-binding and `<=` for unidirectional (one-way) data-binding, providing an alternative to the `bind` keyword.
 
 Please help make [Glimmer DSL for SWT](https://rubygems.org/gems/glimmer-dsl-swt) better by providing feedback and [contributing](#contributing) whenever possible. Any feature suggestions that are accepted could be implemented within weeks if not days.
 
-Other [Glimmer](https://rubygems.org/gems/glimmer) DSL gems you might be interested in:
+Other [Glimmer](https://github.com/AndyObtiva/glimmer) DSL gems you might be interested in:
 - [glimmer-dsl-opal](https://github.com/AndyObtiva/glimmer-dsl-opal): Glimmer DSL for Opal (Pure Ruby Web GUI and Auto-Webifier of Desktop Apps)
 - [glimmer-dsl-libui](https://github.com/AndyObtiva/glimmer-dsl-libui): Glimmer DSL for LibUI (Prerequisite-Free Ruby Desktop Development GUI Library)
 - [glimmer-dsl-tk](https://github.com/AndyObtiva/glimmer-dsl-tk): Glimmer DSL for Tk (MRI Ruby Desktop Development GUI Library)
 - [glimmer-dsl-gtk](https://github.com/AndyObtiva/glimmer-dsl-gtk): Glimmer DSL for GTK (Ruby-GNOME Desktop Development GUI Library)
+- [glimmer-dsl-fx](https://github.com/AndyObtiva/glimmer-dsl-fx): Glimmer DSL for FX (FOX Toolkit Ruby Desktop Development GUI Library)
+- [glimmer-dsl-jfx](https://github.com/AndyObtiva/glimmer-dsl-jfx): Glimmer DSL for JFX (JRuby JavaFX Desktop Development GUI Library)
+- [glimmer-dsl-swing](https://github.com/AndyObtiva/glimmer-dsl-swing): Glimmer DSL for Swing (JRuby Swing Desktop Development GUI Library)
 - [glimmer-dsl-xml](https://github.com/AndyObtiva/glimmer-dsl-xml): Glimmer DSL for XML (& HTML)
 - [glimmer-dsl-css](https://github.com/AndyObtiva/glimmer-dsl-css): Glimmer DSL for CSS
 
@@ -325,7 +328,7 @@ jgem install glimmer-dsl-swt
 
 Or this command if you want a specific version:
 ```
-jgem install glimmer-dsl-swt -v 4.22.2.1
+jgem install glimmer-dsl-swt -v 4.22.2.2
 ```
 
 `jgem` is JRuby's version of `gem` command.
@@ -353,7 +356,7 @@ Note: if you're using activerecord or activesupport, keep in mind that Glimmer u
 
 Add the following to `Gemfile`:
 ```
-gem 'glimmer-dsl-swt', '~> 4.22.2.1'
+gem 'glimmer-dsl-swt', '~> 4.22.2.2'
 ```
 
 And, then run:
@@ -376,7 +379,7 @@ glimmer
 ```
 
 ```
-Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.22.2.1
+Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.22.2.2
       
 Usage: glimmer [--bundler] [--pd] [--quiet] [--debug] [--log-level=VALUE] [[ENV_VAR=VALUE]...] [[-jruby-option]...] (application.rb or task[task_args]) [[application2.rb]...]
 

data/VERSION

@@ -1 +1 @@
-4.22.2.1
+4.22.2.2

data/docs/reference/GLIMMER_SAMPLES.md

@@ -79,6 +79,7 @@
     - [Metronome](#metronome)
     - [Weather](#weather)
     - [Quarto](#quarto)
+    - [Snake](#snake)
   - [External Samples](#external-samples)
     - [Glimmer Calculator](#glimmer-calculator)
     - [Gladiator](#gladiator)
@@ -1375,6 +1376,20 @@ Quarto
 
 ![Quarto](/images/glimmer-quarto.png)
 
+#### Snake
+
+This is the classic Snake game, which demonstrates MVP (Model-View-Presenter) and data-binding written [test-first](/spec/samples/elaborate/snake/model/game_spec.rb).
+
+Code:
+
+[samples/elaborate/snake.rb](/samples/elaborate/snake.rb)
+
+Snake
+
+![Snake](/images/glimmer-snake.png)
+
+![Snake Video](/images/glimmer-snake.gif)
+
 ### External Samples
 
 #### Glimmer Calculator

data/lib/glimmer/dsl/swt/exec_expression.rb

@@ -36,8 +36,7 @@ module Glimmer
   
         def can_interpret?(parent, keyword, *args, &block)
           keyword == exec_operation and
-            block_given? and
-            args.empty?
+            block_given?
         end
   
         def interpret(parent, keyword, *args, &block)

data/samples/elaborate/snake/model/apple.rb

@@ -0,0 +1,33 @@
+class Snake
+  module Model
+    class Apple
+      attr_reader :game
+      attr_accessor :row, :column
+      
+      def initialize(game)
+        @game = game
+      end
+      
+      # generates a new location from scratch or via dependency injection of what cell is (for testing purposes)
+      def generate(initial_row: nil, initial_column: nil)
+        if initial_row && initial_column
+          self.row, self.column = initial_row, initial_column
+        else
+          self.row, self.column = @game.height.times.zip(@game.width.times).reject do |row, column|
+            @game.snake.vertebrae.map {|v| [v.row, v.column]}.include?([row, column])
+          end.sample
+        end
+      end
+      
+      def remove
+        self.row = nil
+        self.column = nil
+      end
+    
+      # inspect is overridden to prevent printing very long stack traces
+      def inspect
+        "#{super[0, 120]}... >"
+      end
+    end
+  end
+end

data/samples/elaborate/snake/model/game.rb

@@ -0,0 +1,68 @@
+require 'fileutils'
+
+require_relative 'snake'
+require_relative 'apple'
+
+class Snake
+  module Model
+    class Game
+      WIDTH_DEFAULT = 20
+      HEIGHT_DEFAULT = 20
+      FILE_HIGH_SCORE = File.expand_path(File.join(Dir.home, '.glimmer-snake'))
+      
+      attr_reader :width, :height
+      attr_accessor :snake, :apple, :over, :score, :high_score, :paused
+      alias over? over
+      alias paused? paused
+      
+      def initialize(width = WIDTH_DEFAULT, height = HEIGHT_DEFAULT)
+        @width = width
+        @height = height
+        @snake = Snake.new(self)
+        @apple = Apple.new(self)
+        FileUtils.touch(FILE_HIGH_SCORE)
+        @high_score = File.read(FILE_HIGH_SCORE).to_i rescue 0
+      end
+      
+      def score=(new_score)
+        @score = new_score
+        self.high_score = @score if @score > @high_score
+      end
+      
+      def high_score=(new_high_score)
+        @high_score = new_high_score
+        File.write(FILE_HIGH_SCORE, @high_score.to_s)
+      rescue => e
+        puts e.full_message
+      end
+      
+      def start
+        self.over = false
+        self.score = 0
+        self.snake.generate
+        self.apple.generate
+      end
+      
+      def pause
+        self.paused = true
+      end
+      
+      def resume
+        self.paused = false
+      end
+      
+      def toggle_pause
+        unless paused?
+          pause
+        else
+          resume
+        end
+      end
+      
+      # inspect is overridden to prevent printing very long stack traces
+      def inspect
+        "#{super[0, 75]}... >"
+      end
+    end
+  end
+end

data/samples/elaborate/snake/model/snake.rb

@@ -0,0 +1,95 @@
+require_relative 'vertebra'
+  
+class Snake
+  module Model
+    class Snake
+      SCORE_EAT_APPLE = 50
+      RIGHT_TURN_MAP = {
+        north: :east,
+        east: :south,
+        south: :west,
+        west: :north
+      }
+      LEFT_TURN_MAP = RIGHT_TURN_MAP.invert
+      
+      attr_accessor :collided
+      alias collided? collided
+      
+      attr_reader :game
+      # vertebrae and joins are ordered from tail to head
+      attr_accessor :vertebrae
+      
+      def initialize(game)
+        @game = game
+      end
+      
+      # generates a new snake location and orientation from scratch or via dependency injection of what head_cell and orientation are (for testing purposes)
+      def generate(initial_row: nil, initial_column: nil, initial_orientation: nil)
+        self.collided = false
+        initial_vertebra = Vertebra.new(snake: self, row: initial_row, column: initial_column, orientation: initial_orientation)
+        self.vertebrae = [initial_vertebra]
+      end
+      
+      def length
+        @vertebrae.length
+      end
+      
+      def head
+        @vertebrae.last
+      end
+      
+      def tail
+        @vertebrae.first
+      end
+      
+      def remove
+        self.vertebrae.clear
+        self.joins.clear
+      end
+      
+      def move
+        @old_tail = tail.dup
+        @new_head = head.dup
+        case @new_head.orientation
+        when :east
+          @new_head.column = (@new_head.column + 1) % @game.width
+        when :west
+          @new_head.column = (@new_head.column - 1) % @game.width
+        when :south
+          @new_head.row = (@new_head.row + 1) % @game.height
+        when :north
+          @new_head.row = (@new_head.row - 1) % @game.height
+        end
+        if @vertebrae.map {|v| [v.row, v.column]}.include?([@new_head.row, @new_head.column])
+          self.collided = true
+          @game.over = true
+        else
+          @vertebrae.append(@new_head)
+          @vertebrae.delete(tail)
+          if head.row == @game.apple.row && head.column == @game.apple.column
+            grow
+            @game.apple.generate
+          end
+        end
+      end
+      
+      def turn_right
+        head.orientation = RIGHT_TURN_MAP[head.orientation]
+      end
+      
+      def turn_left
+        head.orientation = LEFT_TURN_MAP[head.orientation]
+      end
+      
+      def grow
+        @game.score += SCORE_EAT_APPLE
+        @vertebrae.prepend(@old_tail)
+      end
+      
+      # inspect is overridden to prevent printing very long stack traces
+      def inspect
+        "#{super[0, 150]}... >"
+      end
+    end
+  end
+end

data/samples/elaborate/snake/model/vertebra.rb

@@ -0,0 +1,22 @@
+class Snake
+  module Model
+    class Vertebra
+      ORIENTATIONS = %i[north east south west]
+      # orientation is needed for snake occuppied cells (but not apple cells)
+      attr_reader :snake
+      attr_accessor :row, :column, :orientation
+      
+      def initialize(snake: , row: , column: , orientation: )
+        @row = row || rand(snake.game.height)
+        @column = column || rand(snake.game.width)
+        @orientation = orientation || ORIENTATIONS.sample
+        @snake = snake
+      end
+      
+      # inspect is overridden to prevent printing very long stack traces
+      def inspect
+        "#{super[0, 150]}... >"
+      end
+    end
+  end
+end

data/samples/elaborate/snake/presenter/cell.rb

@@ -0,0 +1,27 @@
+class Snake
+  module Presenter
+    class Cell
+      COLOR_CLEAR = :white
+      COLOR_SNAKE = :green
+      COLOR_APPLE = :red
+    
+      attr_reader :row, :column, :grid
+      attr_accessor :color
+      
+      def initialize(grid: ,row: ,column: )
+        @row = row
+        @column = column
+        @grid = grid
+      end
+      
+      def clear
+        self.color = COLOR_CLEAR unless color == COLOR_CLEAR
+      end
+      
+      # inspect is overridden to prevent printing very long stack traces
+      def inspect
+        "#{super[0, 150]}... >"
+      end
+    end
+  end
+end

data/samples/elaborate/snake/presenter/grid.rb

@@ -0,0 +1,49 @@
+require 'glimmer'
+require_relative '../model/game'
+require_relative 'cell'
+
+class Snake
+  module Presenter
+    class Grid
+      include Glimmer
+      
+      attr_reader :game, :cells
+      
+      def initialize(game = Model::Game.new)
+        @game = game
+        @cells = @game.height.times.map do |row|
+          @game.width.times.map do |column|
+            Cell.new(grid: self, row: row, column: column)
+          end
+        end
+        observe(@game.snake, :vertebrae) do |new_vertebrae|
+          occupied_snake_positions = @game.snake.vertebrae.map {|v| [v.row, v.column]}
+          @cells.each_with_index do |row_cells, row|
+            row_cells.each_with_index do |cell, column|
+              if [@game.apple.row, @game.apple.column] == [row, column]
+                cell.color = Cell::COLOR_APPLE
+              elsif occupied_snake_positions.include?([row, column])
+                cell.color = Cell::COLOR_SNAKE
+              else
+                cell.clear
+              end
+            end
+          end
+        end
+      end
+      
+      def clear
+        @cells.each do |row_cells|
+          row_cells.each do |cell|
+            cell.clear
+          end
+        end
+      end
+      
+      # inspect is overridden to prevent printing very long stack traces
+      def inspect
+        "#{super[0, 75]}... >"
+      end
+    end
+  end
+end

data/samples/elaborate/snake.rb

@@ -0,0 +1,103 @@
+require 'glimmer-dsl-swt'
+
+require_relative 'snake/presenter/grid'
+
+class Snake
+  include Glimmer::UI::CustomShell
+  
+  CELL_SIZE = 15
+  SNAKE_MOVE_DELAY = 100 # millis
+  
+  before_body do
+    @game = Model::Game.new
+    @grid = Presenter::Grid.new(@game)
+    @game.start
+    @keypress_queue = []
+    
+    display {
+      on_swt_keydown do |key_event|
+        if key_event.keyCode == 32
+          @game.toggle_pause
+        else
+          @keypress_queue << key_event.keyCode
+        end
+      end
+    }
+  end
+  
+  after_body do
+    register_observers
+  end
+  
+  body {
+    shell(:no_resize) {
+      grid_layout(@game.width, true) {
+        margin_width 0
+        margin_height 0
+        horizontal_spacing 0
+        vertical_spacing 0
+      }
+    
+      # data-bind window title to game score, converting it to a title string on read from the model
+      text <= [@game, :score, on_read: -> (score) {"Snake (Score: #{@game.score})"}]
+      minimum_size @game.width * CELL_SIZE, @game.height * CELL_SIZE
+      
+      @game.height.times do |row|
+        @game.width.times do |column|
+          canvas {
+            layout_data {
+              width_hint CELL_SIZE
+              height_hint CELL_SIZE
+            }
+            
+            rectangle(0, 0, CELL_SIZE, CELL_SIZE) {
+              background <= [@grid.cells[row][column], :color] # data-bind square fill to grid cell color
+            }
+          }
+        end
+      end
+    }
+  }
+  
+  def register_observers
+    observe(@game, :over) do |game_over|
+      async_exec do
+        if game_over
+          message_box {
+            text 'Game Over!'
+            message "Score: #{@game.score} | High Score: #{@game.high_score}"
+          }.open
+          @game.start
+        end
+      end
+    end
+    
+    timer_exec(SNAKE_MOVE_DELAY, &method(:move_snake))
+  end
+  
+  def move_snake
+    unless @game.paused? || @game.over?
+      process_queued_keypress
+      @game.snake.move
+    end
+    timer_exec(SNAKE_MOVE_DELAY, &method(:move_snake))
+  end
+  
+  def process_queued_keypress
+    # key press queue ensures one turn per snake move to avoid a double-turn resulting in instant death (due to snake illogically going back against itself)
+    key = @keypress_queue.shift
+    if [@game.snake.head.orientation, key] == [:north, swt(:arrow_right)] ||
+       [@game.snake.head.orientation, key] == [:east, swt(:arrow_down)] ||
+       [@game.snake.head.orientation, key] == [:south, swt(:arrow_left)] ||
+       [@game.snake.head.orientation, key] == [:west, swt(:arrow_up)]
+      @game.snake.turn_right
+    elsif [@game.snake.head.orientation, key] == [:north, swt(:arrow_left)] ||
+          [@game.snake.head.orientation, key] == [:west, swt(:arrow_down)] ||
+          [@game.snake.head.orientation, key] == [:south, swt(:arrow_right)] ||
+          [@game.snake.head.orientation, key] == [:east, swt(:arrow_up)]
+      @game.snake.turn_left
+    end
+  end
+end
+
+Snake.launch

data/samples/elaborate/tetris.rb

@@ -54,7 +54,7 @@ class Tetris
     Display.app_name = 'Glimmer Tetris'
 
     display {
-      on_swt_keydown { |key_event|
+      on_swt_keydown do |key_event|
         case key_event.keyCode
         when swt(:arrow_down), 's'.bytes.first
           if OS.mac?
@@ -88,16 +88,16 @@ class Tetris
             game.rotate!(:left)
           end
         end
-      }
+      end
 
       # if running in app mode, set the Mac app about dialog (ignored in platforms)
-      on_about {
+      on_about do
         show_about_dialog
-      }
+      end
       
-      on_quit {
+      on_quit do
         exit(0)
-      }
+      end
     }
   end
   

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-swt
 version: !ruby/object:Gem::Version
-  version: 4.22.2.1
+  version: 4.22.2.2
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-25 00:00:00.000000000 Z
+date: 2022-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -582,6 +582,13 @@ files:
 - samples/elaborate/quarto/view/message_box_panel.rb
 - samples/elaborate/quarto/view/piece.rb
 - samples/elaborate/quarto/view/selected_piece_area.rb
+- samples/elaborate/snake.rb
+- samples/elaborate/snake/model/apple.rb
+- samples/elaborate/snake/model/game.rb
+- samples/elaborate/snake/model/snake.rb
+- samples/elaborate/snake/model/vertebra.rb
+- samples/elaborate/snake/presenter/cell.rb
+- samples/elaborate/snake/presenter/grid.rb
 - samples/elaborate/stock_ticker.rb
 - samples/elaborate/tetris.rb
 - samples/elaborate/tetris/model/block.rb