jacs 0.1.4 → 0.1.5

data/lib/actionjabber.rb

@@ -9,13 +9,12 @@ module ActionJabber
         @@request = request
         @@routes.each do |route|
           if route.first == request.path
-            instance_eval do
-              result = route.last.call
-              self.reset!
-              return result
-            end
+            desired_route = route
+            break
           end
         end
+        self.reset!
+        return desired_route.call
       end
       def request
         @@request
@@ -41,7 +40,9 @@ module ActionJabber
           path_parts = parts.last.split('?', 2)
           request = Request.new(hash, from, path_parts.first, ((path_parts.length == 2) ? path_parts.last : ''))
           #begin
-            response = {:status => 200, :data => ''}.merge @controller.route!(request)
+            controller_response = @controller.route!(request)
+            puts controller_response.inspect
+            response = {:status => 200, :data => ''}.merge(controller_response)
             respond_to request, :status => response[:status], :data => response[:data]
           #rescue
           #  respond_to request, :status => 500

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Dirk Gadsden