gameworks 1.0.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df917ca798961d763e0a0767a16e65754d6d6153
-  data.tar.gz: 4a5afc01de838e342c9fee794ba576741ee3002a
+  metadata.gz: 8af89aede594bc27285d2a3c08d9e02257a6b184
+  data.tar.gz: d12c91d8de8d29b506f03c1450c0e68059a73854
 SHA512:
-  metadata.gz: 82b73405e851e4e98a1758a2b42e2baf122243c8b93b611f7c57579bf0f3d75d5e558cc2b16e6250670ec6e2c7749768420e4d5046ed13cbaec32d257ca2b645
-  data.tar.gz: 45115aec3dd59ea486da297686beaede76c34c3b08020605df97022dabe379d3b9c17ab3e1c0893580465f517ec9653f23f9d056efbcfb80a3d53f41bebb64d7
+  metadata.gz: 8cc7293bf7d3b9db2bfc1b0876124d0bf96dcf6484a3b00d965ae0852179a1fb4dc8734d206b2361445eebc3ad0acc0c4a1030f58da3d50bc45cceb85b814e9c
+  data.tar.gz: 51bf5e753319b8726d6fd22d4838703d0466fc4126037eec5b5bb3c6fd2ed646dc46ac8823ca04d3975ebd402d33110e5222c368176d756b5678dafdedf08c3c

data/README

@@ -21,9 +21,11 @@ name of the new player. the game engine may extend this.
 == Player (response)
 
   {name: <string>,
-   score: <integer> or 'disqualified'}
+   score: <integer>,
+   disqualified: <boolean>}
 
-name and current score of the player. the game engine may extend this.
+name, current score, and disqualified status of the player. the game engine may
+extend this.
 
 == New Game (request)
 

data/lib/gameworks/game.rb

@@ -110,6 +110,8 @@ module Gameworks
       active_players.each do |player|
         token = generate_uuid
         @turns[token] = player
+        # This may no longer be necessary, since we abort the players' fuses
+        # when they submit turns in #add_move.
         @fuses[player].abort if @fuses[player]
         @fuses[player] = Gameworks::Fuse.new(TURN_TIME_LIMIT) { disqualify(player) }
         player.signal_turn(token)
@@ -121,6 +123,8 @@ module Gameworks
     end
 
     def add_move(payload, player)
+      @fuses[player].abort
+
       move, error = build_move(payload, player)
       return false, error unless move
       legal, error = move_legal?(move, player)
@@ -145,7 +149,7 @@ module Gameworks
     end
 
     def disqualify(player)
-      player.score = 'disqualified'
+      player.disqualify!
       update_observers
       if @players.select { |p| !p.disqualified? }.size < 2
         end_game

data/lib/gameworks/player.rb

@@ -4,6 +4,7 @@ module Gameworks
   class Player
     attr_reader :name
     attr_accessor :score
+    attr_reader :disqualified
 
     def initialize(payload={})
       unless payload.is_a?(Hash) &&
@@ -15,6 +16,7 @@ module Gameworks
 
       @name = payload['name']
       @score = 0
+      @disqualified = false
 
       # used for evented "block until it's my turn". the game will push a token
       # on this queue when it's the player's turn, or will push a nil when the
@@ -26,8 +28,10 @@ module Gameworks
       !@invalid
     end
 
-    def disqualified?
-      @score == 'disqualified'
+    alias_method :disqualified?, :disqualified
+
+    def disqualify!
+      @disqualified = true
     end
 
     def signal_turn(token)
@@ -39,8 +43,9 @@ module Gameworks
     end
 
     def as_json(for_player=nil)
-      { :name  => @name,
-        :score => @score }
+      { name:         name,
+        score:        score,
+        disqualified: disqualified }
     end
 
     def to_json(for_player=nil)

data/lib/gameworks/version.rb

@@ -1,3 +1,3 @@
 module Gameworks
-  VERSION = "1.0.1"
+  VERSION = "2.0.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gameworks
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Brian Palmer