glimmer-dsl-swt 4.20.13.13 → 4.20.13.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73c5a7ba90a7c91df55ac716b815e08e71b9ff13294ebf44e4c6587aa67080f2
-  data.tar.gz: 889670d6eba956aaf4cc267c8a70cf36283379369a51bed85b5b5dd2aadd2762
+  metadata.gz: 9e7f58c70a78eb8867dd0116be71fb75a3a369deeb7f5676c673dde098304d55
+  data.tar.gz: '078a62bf56f74b1e156ef520d39c37e15b2324367bd813d0dd6a2a3f66e52e2d'
 SHA512:
-  metadata.gz: 455e0b8626d4782e9ec122de48eae8ffec9688b2a724de11c858c4833925389ca3e2a46285e47e30b50e0fe414ccbe74f5dd869bbcbe03986e682dd5a1aad991
-  data.tar.gz: 4ae13e2fedaa551c03ff3b8919bfe9ffa4faf31b7b6b393ba37b91e1fb54c179703da2c3d5283446122a7867eb970373ed191289ad2ace0e92880058b633f573
+  metadata.gz: 4bb4fc88a86497ce00a50735ee2c189d9fdfb1698e8fa568e1ddad2565809d40e8602bf309fd29efc933481fe3f7d142c50ba80ee7d571dd2eb7c6d0e4dba405
+  data.tar.gz: c43f3edbc949886f21029c429229b73b4f5c08a89af9f7ad42a02539de8a8bc842eff606ccd090609fe05802cc9685499390bd1997f813be714e730ba2f8f801

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
+### 4.20.13.14
+
+- Connect 4 elaborate sample
+
 ### 4.20.13.13
 
 - Parking elaborate sample

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.20.13.13
+# [<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.20.13.14
 ## 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)
@@ -15,7 +15,7 @@
 [<img src="https://covers.oreillystatic.com/images/9780596519650/lrg.jpg" width=105 /><br />
 Featured in JRuby Cookbook](http://shop.oreilly.com/product/9780596519650.do) and [Chalmers/Gothenburg University Software Engineering Master's Lecture Material](http://www.cse.chalmers.se/~bergert/slides/guest_lecture_DSLs.pdf)
 
-[Glimmer DSL for SWT](https://rubygems.org/gems/glimmer-dsl-swt) 4.20.13.13 includes [SWT 4.20](https://download.eclipse.org/eclipse/downloads/drops4/R-4.20-202106111600/), which was released on June 11, 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. Note that SWT now supports AARCH64 on Mac and Linux, but it is not fully tested in Glimmer DSL for SWT yet, so deem its support experimental for the time being without guarantees for functionality until declared otherwise (report any issues you may encounter).
+[Glimmer DSL for SWT](https://rubygems.org/gems/glimmer-dsl-swt) 4.20.13.14 includes [SWT 4.20](https://download.eclipse.org/eclipse/downloads/drops4/R-4.20-202106111600/), which was released on June 11, 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. Note that SWT now supports AARCH64 on Mac and Linux, but it is not fully tested in Glimmer DSL for SWT yet, so deem its support experimental for the time being without guarantees for functionality until declared otherwise (report any issues you may encounter).
 
 **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 (keep in mind that it is still a beta, so default back to `bind` whenever needed).
 
@@ -326,7 +326,7 @@ jgem install glimmer-dsl-swt
 
 Or this command if you want a specific version:
 ```
-jgem install glimmer-dsl-swt -v 4.20.13.13
+jgem install glimmer-dsl-swt -v 4.20.13.14
 ```
 
 `jgem` is JRuby's version of `gem` command.
@@ -354,7 +354,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.20.13.13'
+gem 'glimmer-dsl-swt', '~> 4.20.13.14'
 ```
 
 And, then run:
@@ -375,7 +375,7 @@ glimmer
 ```
 
 ```
-Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.20.13.13
+Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.20.13.14
       
 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.20.13.13
+4.20.13.14

data/docs/reference/GLIMMER_SAMPLES.md

@@ -60,6 +60,7 @@
     - [User Profile](#user-profile)
     - [Login](#login)
     - [Tic Tac Toe](#tic-tac-toe)
+    - [Connect 4](#connect-4)
     - [Contact Manager](#contact-manager)
     - [Game of Life](#game-of-life)
     - [Glimmer Tetris](#glimmer-tetris)
@@ -1045,6 +1046,34 @@ Code:
 ![Tic Tac Toe In Progress](/images/glimmer-tic-tac-toe-in-progress.png)
 ![Tic Tac Toe Game Over](/images/glimmer-tic-tac-toe-game-over.png)
 
+#### Connect 4
+
+This sample demonstrates a widget/shape hybrid MVC application, including GUI layout and data-binding.
+
+Code:
+
+[samples/elaborate/connect4.rb](/samples/elaborate/connect4.rb)
+
+Connect 4
+
+![Connect 4](/images/glimmer-connect4.png)
+
+Connect 4 - About To Drop
+
+![Connect 4 About To Drop](/images/glimmer-connect4-about-to-drop.png)
+
+Connect 4 - Dropped Coin
+
+![Connect 4 Dropped Coin](/images/glimmer-connect4-dropped-coin.png)
+
+Connect 4 - Player 1 Wins
+
+![Connect 4 Player 1 Wins](/images/glimmer-connect4-player1-wins.png)
+
+Connect 4 - Game Over Message Box
+
+![Connect 4 Game Over Message Box](/images/glimmer-connect4-game-over-dialog.png)
+
 #### Contact Manager
 
 This sample demonstrates table data-binding, sorting, filtering, GUI layout, MVP pattern, and test-driven development (has [specs](https://github.com/AndyObtiva/glimmer-dsl-swt/blob/master/spec/samples/elaborate/contact_manager/contact_manager_presenter_spec.rb)).
@@ -1075,7 +1104,7 @@ Contact Manager - Edit Done
 
 #### Game of Life
 
-This sample demonstrates how to build an interactive canvas-based visualization of Conway's Game of Life (test-first), taking advantage of data-binding and multi-threading.
+This sample demonstrates how to build an interactive canvas-based visualization of Conway's Game of Life ([test-first](https://github.com/AndyObtiva/glimmer-dsl-swt/blob/master/spec/samples/elaborate/game_of_life/model/grid_spec.rb)), taking advantage of data-binding and multi-threading.
 
 Code:
 

data/samples/elaborate/connect4.rb

@@ -0,0 +1,118 @@
+# 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 'glimmer-dsl-swt'
+
+require_relative 'connect4/model/grid'
+
+class Connect4
+  include Glimmer::UI::CustomShell
+  
+  WIDTH = 7
+  HEIGHT = 6
+  COLOR_BACKGROUND = rgb(63, 104, 212)
+  COLOR_EMPTY_SLOT = :white
+  COLOR_COIN1 = rgb(236, 223, 56)
+  COLOR_COIN2 = rgb(176, 11, 23)
+  
+  attr_accessor :current_player_color
+  
+  before_body do
+    @grid = Model::Grid.new(WIDTH, HEIGHT)
+    select_player_color
+  end
+    
+  after_body do
+    observe(@grid, :current_player) do
+      select_player_color
+    end
+
+    observe(@grid, :game_over) do |game_over_value|
+      if game_over_value
+        game_over_message = case game_over_value
+        when true
+          "Game over!\nDraw!"
+        when 1
+          "Game over!\nPlayer 1 (yellow) wins!"
+        when 2
+          "Game over!\nPlayer 2 (red) wins!"
+        end
+        
+        message_box {
+          text 'Game Over!'
+          message game_over_message
+        }.open
+        
+        @grid.restart!
+      end
+    end
+  end
+  
+  body {
+    shell(:no_resize) {
+      grid_layout(7, true)
+
+      text 'Glimmer Connect 4'
+      background COLOR_BACKGROUND
+      
+      HEIGHT.times do |row_index|
+        WIDTH.times do |column_index|
+          canvas {
+            layout_data {
+              width_hint 50
+              height_hint 50
+            }
+            
+            background :transparent
+            
+            the_oval = oval(0, 0, 50, 50) {
+              background <= [@grid.slot_rows[row_index][column_index], :value, on_read: ->(v) { v == 0 ? COLOR_EMPTY_SLOT : (v == 1 ? COLOR_COIN1 : COLOR_COIN2)}]
+            }
+            
+            if row_index == 0
+              entered = false
+              on_mouse_enter do
+                entered = true
+                the_oval.background = current_player_color if @grid.slot_rows[row_index][column_index].value == 0
+              end
+              
+              on_mouse_exit do
+                entered = false
+                the_oval.background = COLOR_EMPTY_SLOT if @grid.slot_rows[row_index][column_index].value == 0
+              end
+              
+              on_mouse_up do
+                @grid.insert!(column_index)
+                the_oval.background = current_player_color if entered && @grid.slot_rows[row_index][column_index].value == 0
+              end
+            end
+          }
+        end
+      end
+    }
+  }
+  
+  def select_player_color
+    self.current_player_color = @grid.current_player == 1 ? COLOR_COIN1 : COLOR_COIN2
+  end
+end
+
+Connect4.launch

data/samples/elaborate/connect4/model/grid.rb

@@ -0,0 +1,173 @@
+# 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_relative 'slot'
+
+class Connect4
+  module Model
+    class Grid
+      attr_reader :width, :height, :slot_rows
+      attr_accessor :current_player, :game_over
+    
+      def initialize(width, height)
+        @width = width
+        @height = height
+        build_slots
+        start!
+      end
+      
+      def start!
+        self.game_over = false
+        self.current_player = 1
+        reset_slots
+      end
+      alias restart! start!
+      
+      def insert!(column_index)
+        found_row_index = bottom_most_free_row_index(column_index)
+        raise "Illegal move at #{column_index}" if found_row_index == -1
+        @slot_rows[found_row_index][column_index].value = @current_player
+        self.current_player = @current_player%2 + 1
+        evaluate_game_over
+      end
+      
+      # returns bottom most free row index
+      # returns -1 if none
+      def bottom_most_free_row_index(column_index)
+        found_row_index = @slot_rows.size - 1
+        found_row_index -= 1 until found_row_index == -1 || @slot_rows[found_row_index][column_index].value == 0
+        found_row_index
+      end
+      
+      private
+      
+      def build_slots
+        @slot_rows = height.times.map do |row_index|
+          width.times.map do |column_index|
+            Slot.new(self)
+          end
+        end
+      end
+      
+      def reset_slots
+        @slot_rows.flatten.each {|s| s.value = 0}
+      end
+      
+      def evaluate_game_over
+        evaluate_horizontal_win
+        evaluate_vertical_win
+        evaluate_sw_ne_diagonal_win
+        evaluate_se_nw_diagonal_win
+        self.game_over ||= true if @slot_rows.flatten.map(&:value).all? {|v| v > 0}
+      end
+      
+      def evaluate_horizontal_win
+        connections = nil
+        last_slot_value = nil
+        height.times do |row_index|
+          connections = nil
+          last_slot_value = nil
+          width.times do |column_index|
+            slot = @slot_rows[row_index][column_index]
+            if slot.value.to_i > 0 && slot.value == last_slot_value
+              connections += 1
+            else
+              last_slot_value = slot.value
+              connections = 1
+            end
+            break if connections == 4
+          end
+          break if connections == 4
+        end
+        self.game_over = last_slot_value if connections == 4
+      end
+      
+      def evaluate_vertical_win
+        connections = nil
+        last_slot_value = nil
+        width.times do |column_index|
+          connections = nil
+          last_slot_value = nil
+          height.times do |row_index|
+            slot = @slot_rows[row_index][column_index]
+            if slot.value.to_i > 0 && slot.value == last_slot_value
+              connections += 1
+            else
+              last_slot_value = slot.value
+              connections = 1
+            end
+            break if connections == 4
+          end
+          break if connections == 4
+        end
+        self.game_over = last_slot_value if connections == 4
+      end
+      
+      def evaluate_sw_ne_diagonal_win
+        sw_ne_coordinates = [
+          [[3, 0], [2, 1], [1, 2], [0, 3]],
+          [[4, 0], [3, 1], [2, 2], [1, 3], [0, 4]],
+          [[5, 0], [4, 1], [3, 2], [2, 3], [1, 4], [0, 5]],
+          [[5, 1], [4, 2], [3, 3], [2, 4], [1, 5], [0, 6]],
+          [[5, 2], [4, 3], [3, 4], [2, 5], [1, 6]],
+          [[5, 3], [4, 4], [3, 5], [2, 6]],
+        ]
+        evaluate_diagonal_win(sw_ne_coordinates)
+      end
+      
+      def evaluate_se_nw_diagonal_win
+        sw_ne_coordinates = [
+          [[0, 3], [1, 4], [2, 5], [3, 6]],
+          [[0, 2], [1, 3], [2, 4], [3, 5], [4, 6]],
+          [[0, 1], [1, 2], [2, 3], [3, 4], [4, 5], [5, 6]],
+          [[0, 0], [1, 1], [2, 2], [3, 3], [4, 4], [5, 5]],
+          [[1, 0], [2, 1], [3, 2], [4, 3], [5, 4]],
+          [[2, 0], [3, 1], [4, 2], [5, 3]],
+        ]
+        evaluate_diagonal_win(sw_ne_coordinates)
+      end
+      
+      def evaluate_diagonal_win(diagonal_coordinates)
+        connections = nil
+        last_slot_value = nil
+        diagonal_coordinates.each do |group|
+          connections = nil
+          last_slot_value = nil
+          group.each do |row_index, column_index|
+            slot = @slot_rows[row_index][column_index]
+            if slot.value.to_i > 0 && slot.value == last_slot_value
+              connections += 1
+            else
+              last_slot_value = slot.value
+              connections = 1
+            end
+            break if connections == 4
+          end
+          break if connections == 4
+        end
+        self.game_over = last_slot_value if connections == 4
+      end
+    
+    end
+    
+  end
+  
+end

data/samples/elaborate/connect4/model/slot.rb

@@ -0,0 +1,36 @@
+# 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 Connect4
+  module Model
+    class Slot
+      attr_reader :grid
+      
+      # value 0 means empty, 1 means player 1 coin, and 2 means player 2 coin
+      attr_accessor :value
+    
+      def initialize(grid)
+        @value = 0
+        @grid = grid
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-swt
 version: !ruby/object:Gem::Version
-  version: 4.20.13.13
+  version: 4.20.13.14
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-02 00:00:00.000000000 Z
+date: 2021-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -541,6 +541,9 @@ files:
 - samples/elaborate/calculator/model/command/operation/subtract.rb
 - samples/elaborate/calculator/model/command/point.rb
 - samples/elaborate/calculator/model/presenter.rb
+- samples/elaborate/connect4.rb
+- samples/elaborate/connect4/model/grid.rb
+- samples/elaborate/connect4/model/slot.rb
 - samples/elaborate/contact_manager.rb
 - samples/elaborate/contact_manager/contact.rb
 - samples/elaborate/contact_manager/contact_manager_presenter.rb