Merge pull request #5 from taylorfinnell/support-show-types

support game types

Author: taylorfinnell

shard.yml

@@ -1,10 +1,10 @@
 name: hqtrivia
-version: 0.2.5
+version: 0.2.6
 
 authors:
   - Taylor Finnell <[email protected]>
 
-crystal: 0.26.0
+crystal: 0.27.0
 
 license: MIT
 

spec/hqtrivia/show_coordinator_spec.cr

@@ -2,16 +2,66 @@ require "../../spec_helper"
 
 module HqTrivia
   describe ShowCoordinator do
-    it "yields the show if it is active" do
-      coordinator = LocalCoordinator.new("us", active: true)
+    it "yields if show is active and no game type is set" do
+      coordinator = LocalCoordinator.new("us")
+      coordinator.show = Model::Show.new(active: true, show_id: 123,
+        start_time: Time.utc_now, prize: 666, show_type: "hq-us")
+
+      show_coord = ShowCoordinator.new(coordinator)
+      show_coord.on_show do |show|
+        show.should be_a(Model::Show)
+      end
+    end
+
+    it "yields if show is active and game type matches trivia" do
+      coordinator = LocalCoordinator.new("us", game_type: "trivia")
+      coordinator.show = Model::Show.new(active: true, show_id: 123,
+        start_time: Time.utc_now, prize: 666, show_type: "hq-us", game_type: "trivia")
+
+      show_coord = ShowCoordinator.new(coordinator)
+      show_coord.on_show do |show|
+        show.should be_a(Model::Show)
+      end
+    end
+
+    it "yields if show is active and game type matches words" do
+      coordinator = LocalCoordinator.new("us", game_type: "words")
+      coordinator.show = Model::Show.new(active: true, show_id: 123,
+        start_time: Time.utc_now, prize: 666, show_type: "hq-us", game_type: "words")
+
       show_coord = ShowCoordinator.new(coordinator)
       show_coord.on_show do |show|
         show.should be_a(Model::Show)
       end
     end
 
+    it "does not yield if game_type does not match" do
+      coordinator = LocalCoordinator.new("us", game_type: "trivia")
+      coordinator.show = Model::Show.new(active: true, show_id: 123,
+        start_time: Time.utc_now, prize: 666, show_type: "hq-us", game_type: "words")
+
+      show_coord = ShowCoordinator.new(coordinator)
+      show_coord.on_show(blocking: false) do |show|
+        raise "bad"
+      end
+    end
+
+    it "yields the show if it is active" do
+      coordinator = LocalCoordinator.new("us")
+      coordinator.show = Model::Show.new(active: true, show_id: 123,
+        start_time: Time.utc_now, prize: 666, show_type: "hq-us", game_type: "words")
+
+      show_coord = ShowCoordinator.new(coordinator)
+      show_coord.on_show(blocking: false) do |show|
+        show.should be_a(Model::Show)
+      end
+    end
+
     it "does not yield the show if it is inactive" do
-      coordinator = LocalCoordinator.new("us", active: false)
+      coordinator = LocalCoordinator.new("us")
+      coordinator.show = Model::Show.new(active: false, show_id: 123,
+        start_time: Time.utc_now, prize: 666, show_type: "hq-us", game_type: "words")
+
       show_coord = ShowCoordinator.new(coordinator)
       show_coord.on_show(blocking: false) do |show|
         raise "bad"

spec/hqtrivia_spec.cr

@@ -2,15 +2,19 @@ require "./spec_helper"
 
 describe HqTrivia do
   it "yields active shows" do
-    coordinator = HqTrivia::LocalCoordinator.new("us", active: true)
+    coordinator = HqTrivia::LocalCoordinator.new("us")
+    coordinator.show = HqTrivia::Model::Show.new(active: true, show_id: 123,
+      start_time: Time.utc_now, prize: 666, show_type: "hq-us", game_type: "trivia")
 
     HqTrivia.on_show(coordinator) do |show|
       show.should be_a(HqTrivia::Model::Show)
     end
   end
 
   it "does not yield inactive shows" do
-    coordinator = HqTrivia::LocalCoordinator.new("us", active: false)
+    coordinator = HqTrivia::LocalCoordinator.new("us")
+    coordinator.show = HqTrivia::Model::Show.new(active: false, show_id: 123,
+      start_time: Time.utc_now, prize: 666, show_type: "hq-us", game_type: "trivia")
 
     HqTrivia.on_show(coordinator, blocking: false) do |show|
       raise "should not have yielded"

src/hqtrivia/bot.cr

@@ -35,6 +35,12 @@ module HqTrivia
       @show.prize
     end
 
+    # The type of game, currently "trivia" or "words"
+    def game_type
+      @coordinator.game_type
+    end
+
+    # The country that is playing this game
     def country
       @coordinator.country
     end

src/hqtrivia/model/show.cr

@@ -11,10 +11,11 @@ module HqTrivia
         broadcast:  Broadcast?,
         prize:      Int32?,
         show_type:  {type: String?, key: "showType"},
+        game_type:  {type: String?, key: "gameType"},
       })
 
       def initialize(@active : Bool, @show_id : Int32?, @start_time : Time?,
-                     @prize : Int32, @show_type : String?)
+                     @prize : Int32, @show_type : String?, @game_type : String? = nil)
       end
 
       def socket_url

src/hqtrivia/show_coordinator.cr

@@ -10,7 +10,7 @@ module HqTrivia
       while show = @coordinator.current_show
         HqTrivia.logger.debug("Show: #{show.to_json}")
 
-        if show.active
+        if show.active && (@coordinator.game_type.nil? || @coordinator.game_type == show.game_type)
           return yield show
         elsif !blocking
           break

src/hqtrivia/show_coordinator/coordinator.cr

@@ -1,8 +1,9 @@
 module HqTrivia
   abstract class Coordinator
     getter country
+    getter game_type
 
-    def initialize(@country : String)
+    def initialize(@country : String, @game_type : String? = nil)
     end
 
     abstract def current_show

src/hqtrivia/show_coordinator/local_coordinator.cr

@@ -1,11 +1,11 @@
 module HqTrivia
   class LocalCoordinator < Coordinator
-    def initialize(@country : String, @active = false)
-    end
+    @show : Model::Show?
+
+    property show
 
     def current_show
-      Model::Show.new(active: @active, show_id: 123,
-        start_time: Time.utc_now, prize: 666, show_type: "hq-us")
+      @show
     end
   end
 end

src/hqtrivia/version.cr

@@ -1,4 +1,4 @@
 module HqTrivia
   # Current HqTrivia version
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 end