glimmer-dsl-swt 4.20.13.7 → 4.20.13.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e20d1ff3e84168b2937444cf859e28249a859789adbd3d24993e0087a51addf5
-  data.tar.gz: 272ffc7415a569b4ef635da5919128399c19cd2077c11b280e34357d37b1ac09
+  metadata.gz: 59508a178a1694489ba4ec995672f08a0997b01c8ebaeb39cecd2db250d0f88b
+  data.tar.gz: 9610a96bf71aa15a581dedda77f9c11942286f1ff5f7ac96369624c97a798f28
 SHA512:
-  metadata.gz: 1057ae99a81ceb633ff2ed436ef150036ab3475ca663a4b0514173f6af1e136ec0a4a822898ef3c320b4f285180d65ef1c254a245959e219667e12beca1353a6
-  data.tar.gz: 7d62cc987fe8bbd20972d33ef7a7331844635f28f3d19273d99e4305ded7bdb60f1cb2d2b021d27f598f916fb501689017ff90208864026e5345a219778b7717
+  metadata.gz: 1f2219231093b33e6c32637dd2a6ee2249e3c64daf3f92355c57ab170d15c6bfd4930d540c3703c0a4c926ff9e6c322ddc4dd119938be9bc23ccf19935c84675
+  data.tar.gz: 98c6a6e4b2f26fde8d9741eb04054866c145366c27a728343f71f6f960c5eba411fa127167101da055d96241b3c66fb7c7d8dbba91256fa9688d694165158cdc

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
+### 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)

data/VERSION

@@ -1 +1 @@
-4.20.13.7
+4.20.13.8

data/samples/elaborate/klondike_solitaire.rb

@@ -0,0 +1,86 @@
+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
+
+  ## Add options like the following to configure CustomShell by outside consumers
+  #
+  # options :title, :background_color
+  # option :width, default: 320
+  # option :height, default: 240
+
+  ## Use before_body block to pre-initialize variables to use in body
+  #
+  #
+  before_body {
+    @game = Model::Game.new
+    Display.app_name = 'Glimmer Klondike Solitaire'
+    @display = display {
+      on_about {
+        display_about_dialog
+      }
+      on_preferences {
+        display_about_dialog
+      }
+    }
+  }
+
+  ## Use after_body block to setup observers for widgets in body
+  #
+  # after_body {
+  #
+  # }
+
+  ## Add widget content inside custom shell body
+  ## Top-most widget must be a shell or another custom shell
+  #
+  body {
+    shell(:no_resize) {
+      row_layout(:vertical) {
+        fill true
+        center true
+      }
+      minimum_size 400, 400
+      text "Glimmer Klondike Solitaire"
+      background :dark_green
+    
+      action_panel(game: @game)
+      tableau(game: @game) {
+        layout_data {
+          width 380
+          height 400
+        }
+      }
+      
+      menu_bar {
+        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

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

@@ -0,0 +1,25 @@
+class KlondikeSolitaire
+  module Model
+    class DealtPile
+      def initialize(game)
+        @game = game
+      end
+      
+      def reset!
+        playing_cards.clear
+      end
+    
+      def push!(playing_card)
+        playing_cards.push(playing_card)
+      end
+      
+      def remove!(card)
+        playing_cards.delete(card)
+      end
+      
+      def playing_cards
+        @playing_cards ||= []
+      end
+    end
+  end
+end

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

@@ -0,0 +1,40 @@
+class KlondikeSolitaire
+  module Model
+    class FoundationPile
+      attr_reader :suit
+    
+      def initialize(game, suit)
+        @game = game
+        @suit = suit
+        reset!
+      end
+      
+      def reset!
+        playing_cards.clear
+      end
+    
+      # adds a card
+      # validates if it is a card that belongs to the suit
+      def add!(playing_card)
+        if playing_card.suit == suit &&
+          (
+            (playing_cards.empty? && playing_card.rank == 1) ||
+            playing_card.rank == (playing_cards.last.rank + 1)
+          )
+          playing_cards.push(playing_card)
+        else
+          raise "Cannot add #{playing_card} to #{self}"
+        end
+      end
+      
+      def playing_cards
+        @playing_cards ||= []
+      end
+            
+      def to_s
+        "Foundation Pile #{suit} (#{playing_cards.map {|card| "#{card.rank}#{card.suit.to_s[0].upcase}"}.join(" | ")})"
+      end
+      
+    end
+  end
+end

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

@@ -0,0 +1,37 @@
+require_relative 'playing_card'
+require_relative 'dealt_pile'
+require_relative 'dealing_pile'
+require_relative 'column_pile'
+require_relative 'foundation_pile'
+
+class KlondikeSolitaire
+  module Model
+    class Game
+      COLUMN_PILE_COUNT = 7
+        
+      attr_reader :deck, :dealing_pile, :dealt_pile, :column_piles, :foundation_piles
+      
+      def initialize
+        @deck = new_deck
+        @dealt_pile = DealtPile.new(self)
+        @dealing_pile = DealingPile.new(self)
+        @column_piles = COLUMN_PILE_COUNT.times.map {|n| ColumnPile.new(self, n + 1)}
+        @foundation_piles = PlayingCard::SUITS.map {|suit| FoundationPile.new(self, suit)}
+      end
+                  
+      def restart!
+        @deck = new_deck
+        @dealt_pile.reset!
+        @dealing_pile.reset!
+        @column_piles.each(&:reset!)
+        @foundation_piles.each(&:reset!)
+      end
+        
+      private
+      
+      def new_deck
+        PlayingCard.deck.shuffle
+      end
+    end
+  end
+end

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

@@ -0,0 +1,50 @@
+class KlondikeSolitaire
+  module Model
+    class PlayingCard
+      SUITS = [:spades, :hearts, :clubs, :diamonds]
+      BLACK_SUITS = [:spades, :clubs]
+      RED_SUITS = [:hearts, :diamonds]
+      RANK_COUNT = 13
+      
+      class << self
+        def deck
+          suit_decks.flatten
+        end
+        
+        def suit_decks
+          SUITS.map do |suit|
+            suit_deck(suit)
+          end
+        end
+        
+        def suit_deck(suit)
+          1.upto(RANK_COUNT).map do |rank|
+            new(rank, suit)
+          end
+        end
+      end
+      
+      attr_reader :rank, :suit
+      attr_accessor :hidden
+      alias hidden? hidden
+      
+      def initialize(rank, suit, hidden = false)
+        @rank = rank
+        @suit = suit
+        @hidden = hidden
+      end
+      
+      def color
+        if BLACK_SUITS.include?(suit)
+          :black
+        elsif RED_SUITS.include?(suit)
+          :red
+        end
+      end
+      
+      def to_s
+        "Playing Card #{rank}#{suit.to_s[0].upcase}"
+      end
+    end
+  end
+end

data/samples/elaborate/klondike_solitaire/view/action_panel.rb

@@ -0,0 +1,30 @@
+class KlondikeSolitaire
+  module View
+    class ActionPanel
+      include Glimmer::UI::CustomWidget
+
+      option :game
+      
+      body {
+        composite {
+          grid_layout(1, false) {
+            margin_width 0
+            margin_height 0
+          }
+          
+          background :dark_green
+          
+          button {
+            layout_data :center, :center, true, false
+            
+            text 'Restart Game'
+            
+            on_widget_selected {
+              game.restart!
+            }
+          }
+        }
+      }
+    end
+  end
+end

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

@@ -0,0 +1,66 @@
+require_relative '../model/column_pile'
+
+require_relative 'playing_card'
+
+class KlondikeSolitaire
+  module View
+    class ColumnPile
+      include Glimmer::UI::CustomShape
+  
+      IMAGE_EMPTY = image(50, 80) {
+        rectangle(0, 0, 50, 80) {
+          background :dark_green
+          
+          rectangle(0, 0, 49, 79, 15, 15) {
+            foreground :gray
+          }
+        }
+      }
+      
+      options :pile_x, :pile_y, :model
+      
+      after_body {
+        observe(model, 'playing_cards.last.hidden') do
+          build_column_pile(model.playing_cards)
+        end
+        build_column_pile(model.playing_cards)
+      }
+      
+      body {
+        shape(pile_x, pile_y) {
+          on_drop do |drop_event|
+            begin
+              card_shape = drop_event.dragged_shape.get_data('custom_shape')
+              card = card_shape.model
+              model.add!(card)
+              card_parent_pile = card_shape.parent_pile
+              card_source_model = card_parent_pile.model
+              cards = card_source_model.remove!(card)
+              if cards.is_a?(Array) # if it is a column pile
+                cards[1..-1].each do |card|
+                  model.add!(card)
+                end
+              end
+              drop_event.dragged_shape.dispose
+            rescue => e
+#               pd e
+              drop_event.doit = false
+            end
+          end
+        }
+      }
+  
+      def build_column_pile(playing_cards)
+        body_root.shapes.to_a.each(&:dispose)
+        current_parent = body_root
+        playing_cards.each_with_index do |card, i|
+          current_parent.content {
+            current_parent = playing_card(card_x: 0, card_y: 20, model: card, parent_pile: self) {
+              drag_source true unless card.hidden?
+            }.body_root
+          }
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,36 @@
+require_relative '../model/dealing_pile'
+
+require_relative 'empty_playing_card'
+require_relative 'hidden_playing_card'
+
+class KlondikeSolitaire
+  module View
+    class DealingPile
+      include Glimmer::UI::CustomShape
+      
+      options :pile_x, :pile_y, :model
+      
+      after_body {
+        observe(model, 'playing_cards.empty?') do |empty_value|
+          body_root.shapes.to_a.each(&:dispose)
+          if empty_value
+            body_root.content {
+              empty_playing_card
+            }
+          else
+            body_root.content {
+              hidden_playing_card
+            }
+          end
+        end
+      }
+  
+      body {
+        shape(pile_x, pile_y) {
+          hidden_playing_card
+        }
+      }
+  
+    end
+  end
+end

data/samples/elaborate/klondike_solitaire/view/dealt_pile.rb

@@ -0,0 +1,38 @@
+require_relative '../model/dealt_pile'
+
+require_relative 'empty_playing_card'
+require_relative 'playing_card'
+
+class KlondikeSolitaire
+  module View
+    class DealtPile
+      include Glimmer::UI::CustomShape
+      
+      options :pile_x, :pile_y, :model
+      
+      after_body do
+        observe(model, 'playing_cards.empty?') do |empty_value|
+          if empty_value
+            body_root.shapes.to_a.dup.each(&:dispose)
+            body_root.content {
+              empty_playing_card
+            }
+          else
+            body_root.content {
+              playing_card(model: model.playing_cards.last, parent_pile: self) {
+                drag_source true
+              }
+            }
+          end
+        end
+      end
+  
+      body {
+        shape(pile_x, pile_y) {
+          empty_playing_card
+        }
+      }
+                                
+    end
+  end
+end

data/samples/elaborate/klondike_solitaire/view/empty_playing_card.rb

@@ -0,0 +1,25 @@
+class KlondikeSolitaire
+  module View
+    class EmptyPlayingCard
+      include Glimmer::UI::CustomShape
+      
+      option :suit
+  
+      body {
+        rectangle(0, 0, 49, 79, 15, 15) {
+          foreground :gray
+          
+          if suit
+            text {
+              string suit.to_s[0].upcase
+              x :default
+              y :default
+              is_transparent true
+            }
+          end
+        }
+      }
+  
+    end
+  end
+end

data/samples/elaborate/klondike_solitaire/view/foundation_pile.rb

@@ -0,0 +1,59 @@
+require_relative '../model/playing_card'
+require_relative '../model/foundation_pile'
+
+class KlondikeSolitaire
+  module View
+    class FoundationPile
+      include Glimmer::UI::CustomShape
+      
+      options :pile_x, :pile_y, :game, :suit
+      
+      attr_accessor :current_image, :model
+      
+      before_body {
+        self.current_image = image(50, 80) {empty_playing_card(suit: suit)}
+        self.model = game.foundation_piles[Model::PlayingCard::SUITS.index(suit)]
+      }
+  
+      after_body {
+        observe(model, 'playing_cards.last') do |last_card|
+          if last_card
+            body_root.content {
+              playing_card(model: last_card)
+            }
+          else
+            body_root.clear_shapes
+            body_root.content {
+              empty_playing_card(suit: suit)
+            }
+          end
+        end
+      }
+      
+      body {
+        shape(pile_x, pile_y) {
+          empty_playing_card(suit: suit)
+          
+          on_drop do |drop_event|
+            begin
+              # TODO make sure one cannot drag a column pile of cards here
+              card_shape = drop_event.dragged_shape.get_data('custom_shape')
+              card = card_shape.model
+              card_parent_pile = card_shape.parent_pile
+              card_source_model = card_parent_pile.model
+              raise 'Cannot accept multiple cards' if card_source_model.playing_cards.index(card) != (card_source_model.playing_cards.size - 1)
+              model.add!(card)
+              card_source_model.remove!(card)
+              drop_event.dragged_shape.dispose
+            rescue => e
+#               pd e
+              drop_event.doit = false
+            end
+          end
+        }
+      }
+    end
+    
+  end
+  
+end

data/samples/elaborate/klondike_solitaire/view/hidden_playing_card.rb

@@ -0,0 +1,19 @@
+class KlondikeSolitaire
+  module View
+    class HiddenPlayingCard
+      include Glimmer::UI::CustomShape
+  
+      body {
+        rectangle(0, 0, 49, 79, 15, 15) {
+          background :red
+          
+          # border
+          rectangle(0, 0, 49, 79, 15, 15) {
+            foreground :black
+          }
+        }
+      }
+  
+    end
+  end
+end

data/samples/elaborate/klondike_solitaire/view/playing_card.rb

@@ -0,0 +1,35 @@
+class KlondikeSolitaire
+  module View
+    class PlayingCard
+      include Glimmer::UI::CustomShape
+  
+      options :card_x, :card_y, :model, :parent_pile
+      
+      before_body {
+        self.card_x ||= 0
+        self.card_y ||= 0
+      }
+  
+      body {
+        rectangle(card_x, card_y, 49, 79, 15, 15) {
+          background model.hidden ? :red : :white
+          
+          # border
+          rectangle(0, 0, 49, 79, 15, 15) {
+            foreground :black
+          }
+          
+          unless model.hidden?
+            text {
+              string model ? "#{model.rank} #{model.suit.to_s[0].upcase}" : ""
+              x 5
+              y 5
+              foreground model ? model.color : :transparent
+            }
+          end
+        }
+      }
+  
+    end
+  end
+end

data/samples/elaborate/klondike_solitaire/view/tableau.rb

@@ -0,0 +1,41 @@
+require_relative 'dealing_pile'
+require_relative 'dealt_pile'
+require_relative 'column_pile'
+require_relative 'foundation_pile'
+
+require_relative '../model/game'
+
+class KlondikeSolitaire
+  module View
+    class Tableau
+      include Glimmer::UI::CustomWidget
+      
+      option :game
+      
+      body {
+        canvas {
+          background :dark_green
+          
+          # row 1
+          @foundation_piles = Model::PlayingCard::SUITS.each_with_index.map do |suit, i|
+            foundation_pile(pile_x: i*(PLAYING_CARD_WIDTH + PLAYING_CARD_SPACING), pile_y: 0, game: game, suit: suit)
+          end
+          @dealt_pile = dealt_pile(pile_x: 5*(PLAYING_CARD_WIDTH + PLAYING_CARD_SPACING), pile_y: 0, model: game.dealt_pile)
+          @dealing_pile = dealing_pile(pile_x: 6*(PLAYING_CARD_WIDTH + PLAYING_CARD_SPACING), pile_y: 0, model: game.dealing_pile)
+          
+          # row 2
+          @column_piles = 7.times.map do |n|
+            column_pile(pile_x: n*(PLAYING_CARD_WIDTH + PLAYING_CARD_SPACING), pile_y: PLAYING_CARD_HEIGHT + PLAYING_CARD_SPACING, model: game.column_piles[n])
+          end
+          
+          on_mouse_up do |event|
+            if @dealing_pile.body_root.include?(event.x, event.y)
+              game.dealing_pile.deal!
+            end
+          end
+        }
+      }
+  
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-swt
 version: !ruby/object:Gem::Version
-  version: 4.20.13.7
+  version: 4.20.13.8
 platform: ruby
 authors:
 - Andy Maleh
@@ -545,6 +545,22 @@ files:
 - samples/elaborate/contact_manager/contact.rb
 - samples/elaborate/contact_manager/contact_manager_presenter.rb
 - samples/elaborate/contact_manager/contact_repository.rb
+- samples/elaborate/klondike_solitaire.rb
+- samples/elaborate/klondike_solitaire/model/column_pile.rb
+- samples/elaborate/klondike_solitaire/model/dealing_pile.rb
+- samples/elaborate/klondike_solitaire/model/dealt_pile.rb
+- samples/elaborate/klondike_solitaire/model/foundation_pile.rb
+- samples/elaborate/klondike_solitaire/model/game.rb
+- samples/elaborate/klondike_solitaire/model/playing_card.rb
+- samples/elaborate/klondike_solitaire/view/action_panel.rb
+- samples/elaborate/klondike_solitaire/view/column_pile.rb
+- samples/elaborate/klondike_solitaire/view/dealing_pile.rb
+- samples/elaborate/klondike_solitaire/view/dealt_pile.rb
+- samples/elaborate/klondike_solitaire/view/empty_playing_card.rb
+- samples/elaborate/klondike_solitaire/view/foundation_pile.rb
+- samples/elaborate/klondike_solitaire/view/hidden_playing_card.rb
+- samples/elaborate/klondike_solitaire/view/playing_card.rb
+- samples/elaborate/klondike_solitaire/view/tableau.rb
 - samples/elaborate/login.rb
 - samples/elaborate/mandelbrot_fractal.rb
 - samples/elaborate/meta_sample.rb