glimmer-dsl-swt 4.20.13.6 → 4.20.13.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d49b7c8377c625821d745fe902daa4f2120a2f913aac28cc180a541b4d5e7b2
-  data.tar.gz: fa0600350138e85e73ddd25487890357080f0a7c5bf3d329b374239690ac9cec
+  metadata.gz: 982e9293313f88fc19f63d148e0b59b1dcda227e25bc47d9eb07377359b90084
+  data.tar.gz: c90ad4be0b5ebf2aaa28b5b0376934e518f7fbe878a3ecb4a37982fa5feac554
 SHA512:
-  metadata.gz: d29652357d6e5cbcb667b69584f6bc50551d5a04733e799522945ec38a36456c6d2dadbe48c44f0646b46edeebc95f43f5b37e56701b6067fa18cf17adf65c64
-  data.tar.gz: 383f1cbae1582175c8047f25e6a03889f46099cda58d9c885d6a5a820bfc2fc3675e19cc3bda4f6760f8dd905814a69dafa54d230b62f7f9a2a7937e88a2b2b1
+  metadata.gz: 6946dfd8d245a2ef28df3df0c7eb3b74213f4c912c69a6de5ce0bd4f42d7b69f87671df845a816c532d6b580bd0f9da535639368aba6ed0abd76d689c66ded07
+  data.tar.gz: c630515458b13ab4b08c6c662c27759c9a0adb8903e5f0a5e20aba958792d3949f48ae47d9849ffddbe52d4a7b33887955979d76ffe6223871cc51e8f844c443

data/CHANGELOG.md

@@ -1,5 +1,22 @@
 # Change Log
 
+### 4.20.13.10
+
+- Update Glimmer Style Guide, scaffolding, and samples to have `before_body` and `after_body` in custom widgets/shells/shapes always take a `do; end` block since they contain logic not visuals
+
+### 4.20.13.9
+
+- Update Klondike Solitaire to have playing card suit symbols and avoid clipping of cards on the boundaries
+
+### 4.20.13.8
+
+- Glimmer Klondike Solitaire elaborate sample
+
+### 4.20.13.7
+
+- Support accepting ImageProxy objects in Canvas Shape DSL (not just image paths)
+- Fix issue in ImageProxy not flattening args before selecting file path
+
 ### 4.20.13.6
 
 - Ensure a dragged shape can be dropped back into a parent it originally belonged to without it counting as a drop into itself.

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.6
+# [<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.10
 ## 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.6 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.10 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.6
+jgem install glimmer-dsl-swt -v 4.20.13.10
 ```
 
 `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.6'
+gem 'glimmer-dsl-swt', '~> 4.20.13.10'
 ```
 
 And, then run:
@@ -375,7 +375,7 @@ glimmer
 ```
 
 ```
-Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.20.13.6
+Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.20.13.10
       
 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.6
+4.20.13.10

data/docs/reference/GLIMMER_SAMPLES.md

@@ -62,6 +62,7 @@
     - [Tic Tac Toe](#tic-tac-toe)
     - [Contact Manager](#contact-manager)
     - [Glimmer Tetris](#glimmer-tetris)
+    - [Klondike Solitaire](#klondike-solitaire)
     - [Mandelbrot Fractal](#mandelbrot-fractal)
     - [Stock Ticker](#stock-ticker)
     - [Metronome](#metronome)
@@ -1098,6 +1099,18 @@ Code:
 
 ![Tetris Help Menu](/images/glimmer-tetris-help-menu.png)
 
+#### Klondike Solitaire
+
+This sample demonstrates how to build an interactive card game with MVC architecture, custom-shell/custom-widgets, data-binding, observers, and drag & drop.
+
+Code:
+
+[samples/elaborate/klondike_solitaire.rb](/samples/elaborate/klondike_solitaire.rb)
+
+![Tetris](/images/glimmer-klondike-solitaire.png)
+
+![Tetris](/images/glimmer-klondike-solitaire-played.png)
+
 #### Mandelbrot Fractal
 
 This sample demonstrates how to render canvas graphics with multi-threaded processing taking advantage of all CPU cores and doing background processing of images.

data/docs/reference/GLIMMER_STYLE_GUIDE.md

@@ -10,6 +10,7 @@
 - Widget listeners are always declared starting with `on_` prefix and affixing listener event method name afterwards in underscored lowercase form. Their multi-line blocks rely on the `do; end` style.
 - Widget listeners are always followed by a block using curly braces (Only when declared in DSL. When invoked on widget object directly outside of GUI declarations, standard Ruby conventions apply)
 - Data-binding is done via `bind` keyword, which always takes arguments wrapped in parentheses
-- Custom widget `body`, `before_body`, and `after_body` blocks open their blocks and close them with curly braces.
+- Custom widget/shell/shape `body` blocks open and close with curly braces.
+- Custom widget/shell/shape `before_body` and `after_body` blocks are declared as `do; end` blocks.
 - Custom widgets receive additional keyword arguments called options, which come after the SWT styles.
 - Pure logic multi-line blocks that do not constitute GUI DSL view elements (such as `Thread.new`, `loop`, `each` and `observe` blocks) rely on the `do; end` style to clearly separate logic code from view code.

data/lib/glimmer/rake_task/scaffold.rb

@@ -607,7 +607,7 @@ module Glimmer
           
           if %i[gem app desktopify].include?(shell_type)
             custom_shell_file_content += <<-MULTI_LINE_STRING
-      before_body {
+      before_body do
         Display.app_name = '#{shell_type == :gem ? human_name(custom_shell_name) : human_name(namespace)}'
         Display.app_version = VERSION
         @display = display {
@@ -618,13 +618,13 @@ module Glimmer
             #{shell_type == :desktopify ? 'display_about_dialog' : 'display_preferences_dialog'}
           }
         }
-      }
+      end
             MULTI_LINE_STRING
           else
             custom_shell_file_content += <<-MULTI_LINE_STRING
-      # before_body {
+      # before_body do
       #
-      # }
+      # end
             MULTI_LINE_STRING
           end
     
@@ -632,9 +632,9 @@ module Glimmer
   
       ## Use after_body block to setup observers for widgets in body
       #
-      # after_body {
+      # after_body do
       #
-      # }
+      # end
   
       ## Add widget content inside custom shell body
       ## Top-most widget must be a shell or another custom shell
@@ -767,15 +767,15 @@ end
       ## Use before_body block to pre-initialize variables to use in body
       #
       #
-      # before_body {
+      # before_body do
       #
-      # }
+      # end
   
       ## Use after_body block to setup observers for widgets in body
       #
-      # after_body {
+      # after_body do
       #
-      # }
+      # end
   
       ## Add widget content under custom widget body
       ##
@@ -817,15 +817,15 @@ end
       ## Use before_body block to pre-initialize variables to use in body
       #
       #
-      # before_body {
+      # before_body do
       #
-      # }
+      # end
   
       ## Use after_body block to setup observers for shapes in body
       #
-      # after_body {
+      # after_body do
       #
-      # }
+      # end
   
       ## Add shape content under custom shape body
       #

data/lib/glimmer/swt/custom/code_text.rb

@@ -121,7 +121,7 @@ module Glimmer
           @line_numbers_styled_text_proxy.content(&block)
         end
         
-        before_body {
+        before_body do
           require 'rouge'
           require 'ext/rouge/themes/glimmer'
           @swt_style = swt_style == 0 ? [:border, :multi, :v_scroll, :h_scroll] : swt_style
@@ -132,11 +132,11 @@ module Glimmer
             @lines_width = lines[:width]
           end
           @dsl_mode = true
-        }
+        end
         
-        after_body {
+        after_body do
           @dsl_mode = nil
-        }
+        end
         
         body {
           if lines

data/lib/glimmer/swt/custom/shape.rb

@@ -405,7 +405,7 @@ module Glimmer
           end
           if @name == 'image'
             if @args.first.is_a?(::String)
-              @args[0] = ImageProxy.new(@args[0])
+              @args[0] = ImageProxy.create(@args[0])
             end
             if @args.first.is_a?(ImageProxy)
               @image = @args[0] = @args[0].swt_image

data/lib/glimmer/swt/image_proxy.rb

@@ -74,8 +74,8 @@ module Glimmer
         end
         options = @args.last.is_a?(Hash) ? @args.delete_at(-1) : {}
         options[:swt_image] = @args.first if @args.size == 1 && @args.first.is_a?(Image)
-        @file_path = @args.first if @args.first.is_a?(String)
         @args = @args.first if @args.size == 1 && @args.first.is_a?(Array)
+        @file_path = @args.first if @args.first.is_a?(String)
         if options&.keys&.include?(:swt_image)
           @swt_image = options[:swt_image]
           @original_image_data = @image_data = @swt_image.image_data

data/samples/elaborate/calculator.rb

@@ -15,7 +15,7 @@ class Calculator
 
   attr_reader :presenter
 
-  before_body {
+  before_body do
     @presenter = Model::Presenter.new
     
     Display.setAppName('Glimmer Calculator')
@@ -30,7 +30,7 @@ class Calculator
         display_about_dialog
       }
     }
-  }
+  end
 
   body {
     shell {

data/samples/elaborate/contact_manager.rb

@@ -26,10 +26,10 @@ require_relative "contact_manager/contact_manager_presenter"
 class ContactManager
   include Glimmer::UI::CustomShell
 
-  before_body {
+  before_body do
     @contact_manager_presenter = ContactManagerPresenter.new
     @contact_manager_presenter.list
-  }
+  end
 
   body {
     shell {

data/samples/elaborate/klondike_solitaire.rb

@@ -0,0 +1,93 @@
+require 'glimmer-dsl-swt'
+
+require_relative 'klondike_solitaire/model/game'
+
+require_relative 'klondike_solitaire/view/action_panel'
+require_relative 'klondike_solitaire/view/tableau'
+
+class KlondikeSolitaire
+  include Glimmer::UI::CustomShell
+  
+  PLAYING_CARD_WIDTH = 50
+  PLAYING_CARD_HEIGHT = 80
+  PLAYING_CARD_SPACING = 5
+  MARGIN = 15
+  TABLEAU_WIDTH = 2*MARGIN + 7*(PLAYING_CARD_WIDTH + PLAYING_CARD_SPACING)
+  TABLEAU_HEIGHT = 400
+
+  before_body do
+    @game = Model::Game.new
+    Display.app_name = 'Glimmer Klondike Solitaire'
+    @display = display {
+      on_about {
+        display_about_dialog
+      }
+      on_preferences {
+        display_about_dialog
+      }
+    }
+  end
+
+  body {
+    shell(:no_resize) {
+      row_layout(:vertical) {
+        fill true
+        center true
+        margin_width 0
+        margin_height 0
+        margin_top 15
+      }
+      minimum_size TABLEAU_WIDTH, TABLEAU_HEIGHT
+      text "Glimmer Klondike Solitaire"
+      background :dark_green
+    
+      action_panel(game: @game)
+      tableau(game: @game) {
+        layout_data {
+          width TABLEAU_WIDTH
+          height TABLEAU_HEIGHT
+        }
+      }
+      
+      menu_bar {
+        menu {
+          text '&Game'
+          menu_item {
+            text '&Restart'
+            accelerator (OS.mac? ? :command : :ctrl), :r
+            
+            on_widget_selected {
+              @game.restart!
+            }
+          }
+          menu_item {
+            text 'E&xit'
+            accelerator :alt, :f4
+            
+            on_widget_selected {
+              body_root.close
+            }
+          }
+        }
+        menu {
+          text '&Help'
+          menu_item {
+            text '&About...'
+            on_widget_selected {
+              display_about_dialog
+            }
+          }
+        }
+      }
+    }
+  }
+
+  def display_about_dialog
+    message_box(body_root) {
+      text 'About'
+      message "Glimmer Klondike Solitaire\nGlimmer DSL for SWT Elaborate Sample"
+    }.open
+  end
+end
+
+KlondikeSolitaire.launch

data/samples/elaborate/klondike_solitaire/model/column_pile.rb

@@ -0,0 +1,60 @@
+class KlondikeSolitaire
+  module Model
+    class ColumnPile
+      include Glimmer::DataBinding::ObservableModel
+      attr_reader :count
+    
+      def initialize(game, count)
+        @game = game
+        @count = count
+        reset!
+      end
+      
+      def reset!
+        playing_cards.clear
+        populate!(count.times.map { @game.deck.pop })
+        notify_observers(:playing_cards)
+      end
+    
+      # this method does not validate
+      def populate!(new_playing_cards)
+        new_playing_cards.each_with_index do |playing_card, index|
+          playing_card.hidden = true if index < (new_playing_cards.size - 1)
+          playing_cards.push(playing_card)
+        end
+      end
+      
+      # this method validates that playing card fits at the bottom of the column (opposite color and one number smaller)
+      # throws an error if it does not fit
+      def add!(new_playing_card)
+        bottom_card = playing_cards.last
+        if (playing_cards.empty? && new_playing_card.rank == 13) ||
+            (new_playing_card.color != bottom_card.color && new_playing_card.rank == (bottom_card.rank - 1))
+          playing_cards.push(new_playing_card)
+        else
+          raise "Cannot add #{new_playing_card} to #{self}"
+        end
+      end
+      
+      def remove!(card)
+        remove_cards_starting_at(playing_cards.index(card)).tap do |result|
+          playing_cards.last&.hidden = false
+        end
+      end
+      
+      def remove_cards_starting_at(index)
+        removed_cards = playing_cards[index...playing_cards.size]
+        playing_cards[index...playing_cards.size] = []
+        removed_cards
+      end
+      
+      def playing_cards
+        @playing_cards ||= []
+      end
+      
+      def to_s
+        "Column Pile #{count} (#{playing_cards.map {|card| "#{card.rank}#{card.suit.to_s[0].upcase}"}.join(" | ")})"
+      end
+    end
+  end
+end

data/samples/elaborate/klondike_solitaire/model/dealing_pile.rb

@@ -0,0 +1,33 @@
+class KlondikeSolitaire
+  module Model
+    class DealingPile
+      DEALING_INITIAL_COUNT = 24
+      
+      def initialize(game)
+        @game = game
+        reset!
+      end
+      
+      def reset!
+        playing_cards.clear
+        DEALING_INITIAL_COUNT.times { playing_cards << @game.deck.pop }
+      end
+
+      def deal!
+        playing_card = playing_cards.shift
+        if playing_card.nil?
+          @game.dealt_pile.playing_cards.each do |a_playing_card|
+            playing_cards << a_playing_card
+          end
+          @game.dealt_pile.playing_cards.clear
+        else
+          @game.dealt_pile.push!(playing_card)
+        end
+    end
+      
+      def playing_cards
+        @playing_cards ||= []
+      end
+    end
+  end
+end