gameworks 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8af89aede594bc27285d2a3c08d9e02257a6b184
-  data.tar.gz: d12c91d8de8d29b506f03c1450c0e68059a73854
+  metadata.gz: 10a8ee8b5768eec3e315cf623d160995d9b321c7
+  data.tar.gz: 12daacb5259d91a5b299c1289c2ebfc77981a46c
 SHA512:
-  metadata.gz: 8cc7293bf7d3b9db2bfc1b0876124d0bf96dcf6484a3b00d965ae0852179a1fb4dc8734d206b2361445eebc3ad0acc0c4a1030f58da3d50bc45cceb85b814e9c
-  data.tar.gz: 51bf5e753319b8726d6fd22d4838703d0466fc4126037eec5b5bb3c6fd2ed646dc46ac8823ca04d3975ebd402d33110e5222c368176d756b5678dafdedf08c3c
+  metadata.gz: b606bae8289aef66caf94c308b27a94cfeb02f1bb999d4a8e91b93cea38061cee95be9b3a880a368f25526a054a7c5efae6147847a726f01735a122bd67eff17
+  data.tar.gz: 41cb36e64d04fb488324834bdba461a2eda9de821b8d3fe8b0dc8d847143d27881bfdfc669ed615a7c06446eede468827a1afe7ecfc027ee0e33b7b2cb7697a0

data/lib/gameworks/game.rb

@@ -12,7 +12,7 @@ module Gameworks
     STATE_IN_PLAY = 'in play'
     STATE_COMPLETED = 'completed'
 
-    attr_reader :players, :state, :id, :delay_time, :notifier
+    attr_reader :players, :state, :id, :delay_time, :moves, :notifier
 
     def initialize(payload={})
       @notifier = Notifier.new
@@ -23,6 +23,7 @@ module Gameworks
       @observers = {}
       @fuses = {}
       @id = generate_uuid.split('-').first
+      @moves = {}
     end
 
     def register_observer(cb)
@@ -37,7 +38,7 @@ module Gameworks
         cb.call(delta(snapshot).to_json)
         cb.succeed if end_game
       end
-      notifier.push(self, delta(initial_snapshot).to_json)
+      notifier.push(self, to_json)
     end
 
     def snapshot_for_observer(token)
@@ -49,16 +50,13 @@ module Gameworks
       snapshot
     end
 
-    def initial_snapshot
-      @initial_snapshot ||= snapshot
-    end
-
     def player_changed?(player, snapshot, for_player=nil)
       player.score != snapshot.player_scores[player]
     end
 
     def delta(snapshot, for_player=nil)
-      { :players => @players.select{ |p| player_changed?(p, snapshot, for_player) }.map{ |p| p.as_json(for_player) },
+      { :id => id,
+        :players => @players.select{ |p| player_changed?(p, snapshot, for_player) }.map{ |p| p.as_json(for_player) },
         :state   => @state }
     end
 
@@ -107,6 +105,7 @@ module Gameworks
     end
 
     def signal_turns
+      moves.clear
       active_players.each do |player|
         token = generate_uuid
         @turns[token] = player
@@ -127,13 +126,16 @@ module Gameworks
 
       move, error = build_move(payload, player)
       return false, error unless move
+
       legal, error = move_legal?(move, player)
       return false, error unless legal
-      legal, error = process_move(move, player)
-      return false, error unless legal
+
+      moves[player] = move
+      process_move(move, player)
+
       ignore_disqualified_players
       update_observers
-      return true
+      true
     end
 
     def build_move(payload, player)
@@ -148,15 +150,19 @@ module Gameworks
       raise NotImplementedError
     end
 
+    def waiting_on_moves?
+      (active_players - moves.keys).any?
+    end
+
     def disqualify(player)
       player.disqualify!
       update_observers
       if @players.select { |p| !p.disqualified? }.size < 2
         end_game
-      else
-        update_observers
-        end_turn
+      elsif !waiting_on_moves?
+        signal_turns
       end
+      # else do nothing; waiting for other players
     end
 
     def end_game
@@ -175,7 +181,8 @@ module Gameworks
     end
 
     def as_json(for_player=nil)
-      { :players => @players.map{ |player| player.as_json(for_player) },
+      { :id      => id,
+        :players => @players.map{ |player| player.as_json(for_player) },
         :state   => @state }
     end
 

data/lib/gameworks/player.rb

@@ -1,7 +1,9 @@
 require 'eventmachine'
+require 'securerandom'
 
 module Gameworks
   class Player
+    attr_reader :id
     attr_reader :name
     attr_accessor :score
     attr_reader :disqualified
@@ -14,6 +16,7 @@ module Gameworks
         return
       end
 
+      @id = SecureRandom.uuid.to_s.split('-').first
       @name = payload['name']
       @score = 0
       @disqualified = false
@@ -43,7 +46,8 @@ module Gameworks
     end
 
     def as_json(for_player=nil)
-      { name:         name,
+      { id:           id,
+        name:         name,
         score:        score,
         disqualified: disqualified }
     end

data/lib/gameworks/servlet/add_player.rb

@@ -14,6 +14,7 @@ module Gameworks
             player.wait_for_turn do |turn_token|
               request[:async_cb].call [ 200, {
                 'Content-Type' => 'application/json',
+                'X-Player-ID' => player.id,
                 'X-Turn-Token' => turn_token
               }, [game.to_json(player)] ]
             end

data/lib/gameworks/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gameworks
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Brian Palmer
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-09 00:00:00.000000000 Z
+date: 2015-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake