Merge pull request #11 from frodsan/fix-server-thread

Use instance variables for request/response data.

lib/facebook/messenger/server.rb

@@ -6,48 +6,46 @@ module Messenger
     # This module holds the server that processes incoming messages from the
     # Facebook Messenger Platform.
     class Server
-      class << self
-        def call(env)
-          @request = Rack::Request.new(env)
-          @response = Rack::Response.new
-
-          case @request.request_method
-          when 'GET' then verify
-          when 'POST' then receive
-          else method_not_allowed
-          end
-        end
+      def self.call(env)
+        new.call(env)
+      end
 
-        def verify
-          verify_token = Facebook::Messenger.config.verify_token
+      def call(env)
+        @request = Rack::Request.new(env)
+        @response = Rack::Response.new
 
-          if @request.params['hub.verify_token'] == verify_token
-            @response.write @request.params['hub.challenge']
-          else
-            @response.write 'Error; wrong verify token'
-          end
-
-          @response.finish
+        case
+        when @request.get? then verify
+        when @request.post? then receive
+        else @response.status = 405
         end
 
-        def receive
-          hash = JSON.parse(@request.body.read)
-          # Facebook may batch several items in the 'entry' array during
-          # periods of high load.
-          hash['entry'].each do |entry|
-            # Facebook may batch several items in the 'messaging' array during
-            # periods of high load.
-            entry['messaging'].each do |messaging|
-              Facebook::Messenger::Bot.receive(messaging)
-            end
-          end
+        @response.finish
+      end
 
-          @response.finish
+      def verify
+        if @request['hub.verify_token'] == verify_token
+          @response.write @request['hub.challenge']
+        else
+          @response.write 'Error; wrong verify token'
         end
+      end
+
+      def verify_token
+        Facebook::Messenger.config.verify_token
+      end
 
-        def method_not_allowed
-          @response.status = 405
-          @response.finish
+      def receive
+        hash = JSON.parse(@request.body.read)
+
+        # Facebook may batch several items in the 'entry' array during
+        # periods of high load.
+        hash['entry'].each do |entry|
+          # Facebook may batch several items in the 'messaging' array during
+          # periods of high load.
+          entry['messaging'].each do |messaging|
+            Facebook::Messenger::Bot.receive(messaging)
+          end
         end
       end
     end