Clean up the example application.

tristandunn · Jan 11, 2014 · 90efc89 · 90efc89
1 parent 9a21943
commit 90efc89
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 9 deletions.
diff --git a/features/support/application.rb b/features/support/application.rb
@@ -1,8 +1,5 @@
-require "pusher"
 require "sinatra"
 
-Pusher.url = "http://PUSHER_API_KEY:PUSHER_API_SECRET@localhost:8081/apps/PUSHER_APP_ID"
-
 class Sinatra::Application
   set :root,          Proc.new { File.join(File.dirname(__FILE__), "application") }
   set :views,         Proc.new { File.join(root, "views") }
@@ -15,13 +12,19 @@ class Sinatra::Application
   end
 
   post "/pusher/auth" do
-    data    = nil
-    channel = Pusher[params[:channel_name]]
+    channel  = Pusher[params[:channel_name]]
+    response = channel.authenticate(params[:socket_id], channel_data)
+
+    MultiJson.dump(response)
+  end
+
+  protected
 
-    if params[:channel_name] =~ /^presence-/
-      data = { user_id: params[:socket_id], user_info: { name: "Alan Turing" } }
-    end
+  def channel_data
+    return unless params[:channel_name] =~ /^presence-/
 
-    MultiJson.dump(channel.authenticate(params[:socket_id], data))
+    { user_id:   params[:socket_id],
+      user_info: { name: "Alan Turing" }
+    }
   end
 end
diff --git a/features/support/pusher-fake.rb b/features/support/pusher-fake.rb
@@ -1,3 +1,5 @@
+Pusher.url = "http://PUSHER_API_KEY:PUSHER_API_SECRET@localhost:8081/apps/PUSHER_APP_ID"
+
 Thread.new { PusherFake::Server.start }.tap do |thread|
   at_exit { thread.exit }
 end