Test and fix the PlayersController. #1 #14

app/controllers/players_controller.rb

@@ -2,6 +2,7 @@
 
 class PlayersController < ApplicationController
   before_filter :create_player_client
+  attr_accessor :client
 
   def show
     render :json => @status
@@ -19,7 +20,7 @@ def update
   private
 
   def create_player_client
-    @player = Client.new
+    @player = @client || Client.new
     @player.ok?
 
     @status = @player.status

app/models/client.rb

@@ -5,28 +5,32 @@
 class Client
   include Mpg123Player
   include Configurable
+  include ActiveSupport::BufferedLogger::Severity
 
+  attr_accessor :asynchronous
   attr_reader :error
 
   def initialize
     configure
+    @asynchronous = false
   end
 
   # Issue a command to the server and wait for the remote process to handle it, within the currently configured
   # +command_timeout+.
   def command string, parameter = nil
     cmd = PlayerCommand.create!(:action => string, :parameter => parameter)
+    return if @asynchronous
 
     Rails.logger.silence(WARN) do
       wait_time = 0
       until wait_time >= @command_timeout
         wait_time += sleep(@command_poll)
-        return true unless PlayerCommand.exist?(cmd.id)
+        return unless PlayerCommand.exists?(cmd.id)
       end
     end
 
     # Timed out waiting for command acceptance
-    false
+    @error = "Timed out submitting command #{string}."
   end
 
   # Status

test/functional/players_controller_test.rb

@@ -1,5 +1,33 @@
 require 'test_helper'
+require 'active_support/json'
+
+require 'mpg123player/common'
 
 class PlayersControllerTest < ActionController::TestCase
 
+  class TestClient < Client
+    def initialize
+      super
+      @status = Mpg123Player::Status.stopped
+      @asynchronous = true
+    end
+
+    def ok?
+      true
+    end
+  end
+
+  test "issue commands through the client" do
+    @controller.client = TestClient.new
+
+    post :update, { :command => 'volume', :parameter => '70' }
+
+    assert_response :success
+    assert @response.body.blank?
+
+    @c = PlayerCommand.flush_queue[0]
+    assert_equal 'volume', @c.action
+    assert_equal '70', @c.parameter
+  end
+
 end