lackie 0.1.6 → 0.1.7

data/lib/lackie.rb

@@ -2,7 +2,7 @@ lib = File.dirname(__FILE__)
 $:.unshift(lib) unless $:.include?(lib) || $:.include?(File.expand_path(lib))
 
 module Lackie
-  VERSION = '0.1.6'
+  VERSION = '0.1.7'
 end
 
 require 'lackie/remote_control'

data/lib/lackie/javascript/surrender.js

@@ -8,12 +8,9 @@ Lackie = {
       return;
     }
     Lackie.get("/yield", function(body) {
-      if (body.indexOf('Lackie.reload()') == 0) {
-        Lackie.reload();
-        return;
-      }
+      var json = JSON.parse(body);
       Lackie.wip = true;
-      Lackie.execute(body);
+      Lackie.execute(json.command, json.id);
     });
   },
   
@@ -24,20 +21,25 @@ Lackie = {
     });
   },
 
-  execute: function(command) {
+  execute: function(command, id) {
+    if (command.indexOf('Lackie.reload()') == 0) {
+      Lackie.reload(id);
+      return;
+    }
+    
     var result;
     try {
-      result = { 'value': eval(command) };
+      result = { id: id, value: eval(command) };
     }
     catch(e) {
-      result = { 'error': e.toString() };
+      result = { id: id, error: e.toString() };
     }
     Lackie.result(result);
   },
   
-  reload: function() {
+  reload: function(id) {
     Lackie.enabled = false;
-    Lackie.post("/result", '{ "value": "reloading" }', function() {
+    Lackie.post("/result", '{ "id": ' + id + ', "value": "reloading" }', function() {
       window.location.reload(true);
     });
   },
@@ -51,32 +53,50 @@ Lackie = {
   },
   
   get: function(path, bodyCallback) {
-    Lackie.usingAjax(function(xhReq) {
-      xhReq.open("GET", Lackie.url(path), true);
-      xhReq.onreadystatechange = function () {
-        if (xhReq.readyState != 4 || xhReq.status != 200) {
-          return;
+    var xhReq = Lackie.createXMLHttpRequest();
+    function readyStateChange() {
+        if (xhReq.readyState != 4) {
+            return;
         }
-        bodyCallback(xhReq.responseText);
-      };
-      xhReq.send(null);
-    });
+        var body = xhReq.responseText;
+        var status = xhReq.status;
+        Lackie.disposeXMLHttpRequest(xhReq);
+        if (status == 200) {
+            bodyCallback(body);
+        }
+    }
+    xhReq.open("GET", Lackie.url(path), true);
+    xhReq.onreadystatechange = readyStateChange;
+    xhReq.send(null);
   },
-  
-  post: function(path, params, callback) {
-    Lackie.usingAjax(function(xhReq) {
-      xhReq.open("POST", Lackie.url(path), true);
-      xhReq.onreadystatechange = function () {
-        if (xhReq.readyState != 2 || xhReq.status != 200) {
-          return;
+
+  post: function(path, json, callback) {
+    var xhReq = Lackie.createXMLHttpRequest();
+    function readyStateChange() {
+        if (xhReq.readyState != 4) {
+            return;
         }
-        callback();
-      };
-      xhReq.setRequestHeader("Content-type", "application/json");
-      xhReq.setRequestHeader("Content-length", params.length);
-      xhReq.setRequestHeader("Connection", "close");
-      xhReq.send(params);
-    });
+        var status = xhReq.status;
+        Lackie.disposeXMLHttpRequest(xhReq);
+        if (status == 200) {
+            callback();
+        }
+    }
+    xhReq.open("POST", Lackie.url(path), true);
+    xhReq.setRequestHeader("Content-type", "application/json");
+    xhReq.setRequestHeader("Content-length", json.length);
+    xhReq.setRequestHeader("Connection", "close");
+    xhReq.onreadystatechange = readyStateChange;
+    xhReq.send(json);
+  },
+
+  
+  disposeXMLHttpRequest: function(xhReq) {
+    try {
+      if (typeof xhReq.destroy == 'function') {
+        xhReq.destroy();
+	  }
+    } catch(e) {}
   },
   
   createXMLHttpRequest: function() {
@@ -89,20 +109,6 @@ Lackie = {
     throw new Error("XMLHttpRequest not supported");
   },
   
-  usingAjax: function(callback) {
-    var xhReq = Lackie.createXMLHttpRequest();
-    try {
-        callback(xhReq);
-    }
-    finally {
-      try {
-        if (typeof xhReq.destroy == 'function')
-          xhReq.destroy();
-        delete xhReq;
-      } catch(e) {}
-    }
-  },
-  
   url: function(path) {
     var now = new Date();
     return Lackie.baseUrl + path + '?' + now.getTime().toString();

data/lib/lackie/rack/middleware.rb

@@ -1,13 +1,15 @@
 require 'lackie/javascript'
+require 'lackie/rack/logger'
 
 module Lackie
   module Rack
     class Middleware
-      def initialize(app)
-        @app = app
+      def initialize(app, logger=NilLogger.new)
+        @app, @logger = app, logger
         @command = nil
         @result = nil
         @surrender = Lackie::JavaScript::Surrender.new
+        @command_id = 0
       end                
 
       def call(env)
@@ -20,13 +22,15 @@ module Lackie
       end
       
       def surrender(request)
-        #@result = nil
+        @logger.log("surrendered to #{request.user_agent}")
         js(@surrender.script)
       end
       
       def eval(request)
         @result = nil
         @command = request.body.read.to_s
+        @command_id += 1
+        @logger.log("eval " + command_json(@command))
         plain("OK")
       end
       
@@ -36,7 +40,7 @@ module Lackie
         else
           cmd = @command
           @command = nil
-          js(cmd)
+          js(command_json(cmd))
         end
       end
       
@@ -50,6 +54,10 @@ module Lackie
       
       private
       
+      def command_json(cmd)
+        { :command => cmd, :id => @command_id }.to_json
+      end
+      
       def get_result(request)
         if @result.nil?
           not_found
@@ -61,7 +69,15 @@ module Lackie
       end
       
       def set_result(request)
-        @result = request.body.read.to_s
+        begin
+          r = JSON.parse(request.body.read.to_s)
+        rescue
+          return bad_request
+        end
+        if r['id'].to_i == @command_id
+          @result = r.to_json
+          @logger.log("result #{@result}")
+        end
         plain("OK")
       end
       
@@ -84,6 +100,10 @@ module Lackie
       def not_found
         [404, {'Content-Type' => 'text/plain'}, ['Not Found']]
       end
+      
+      def bad_request
+        [400, {'Content-Type' => 'text/plain'}, ['Bad Request']]
+      end
     end
   end
 end

data/spec/lackie/rack/middleware_spec.rb

@@ -5,14 +5,14 @@ module Lackie
   module Rack
     describe Middleware do
       before do
-        Lackie::JavaScript::Surrender.should_receive(:new).and_return(mock("surrender", :script => "yowzer"))
+        Lackie::JavaScript::Surrender.stub!(:new).and_return(mock("surrender", :script => "yowzer"))
         @app = mock("app")
         @env = mock("env")
         @middleware = Middleware.new(@app)
       end
       
       def request(options)
-        @request = mock("Request: #{options.inspect}", options)
+        @request = mock("Request: #{options.inspect}", options.merge(:user_agent => "some-user-agent"))
         ::Rack::Request.stub!(:new).with(@env).and_return(@request)
         @middleware.call(@env)
       end
@@ -42,19 +42,45 @@ module Lackie
       end
       
       describe "POST /lackie/eval with the body 'foo()'" do
-        describe "followed by GET /lackie/yield" do
+        describe "then GET /lackie/yield" do
           it "returns 'foo()' as the response body" do
             post("/lackie/eval", "foo()")
-            get("/lackie/yield").should == [200, {"Content-Type"=>"text/javascript"}, ["foo()"]]
+            get("/lackie/yield").should == [200, {"Content-Type"=>"text/javascript"},
+              ['{"command":"foo()","id":1}'] ]
           end
           
-          describe "followed by GET /lackie/yield" do
-            it "returns '' as the response body" do
+          describe "then GET /lackie/yield" do
+            it "returns not found" do
               post("/lackie/eval", "foo()")
               get("/lackie/yield")
               get("/lackie/yield").should == [404, {"Content-Type"=>"text/plain"}, ["Not Found"]]
             end
           end
+          
+          describe "then POST /lackie/eval with the body 'bar()'" do
+            describe "then POST /lackie/result with the body 'foo-result'" do
+              describe "then GET /lackie/result" do
+                it "returns 404 not found" do
+                  post("/lackie/eval", "foo()")
+                  post("/lackie/eval", "bar()")
+                  post("/lackie/result", { :id => 1, :value => "foo-result" }.to_json)
+                  get("/lackie/result").should == [404, {'Content-Type' => 'text/plain'}, ["Not Found"]]
+                end
+                describe "then POST /lackie/result with the body 'bar-result'" do
+                  describe "then GET /lackie/result" do
+                    it "returns the value 'bar-result'" do
+                      post("/lackie/eval", "foo()")
+                      post("/lackie/eval", "bar()")
+                      post("/lackie/result", { :id => 1, :value => "foo-result" }.to_json)
+                      post("/lackie/result", { :id => 2, :value => "bar-result" }.to_json)
+                      result_body = JSON.parse(get("/lackie/result").last.first)
+                      result_body["value"].should == "bar-result"
+                    end
+                  end
+                end
+              end
+            end
+          end
         end
       end
       
@@ -64,11 +90,23 @@ module Lackie
         end        
       end
       
-      describe "POST /lackie/result with 'yippee'" do
-        describe "followed by GET /lackie/result" do
+      describe "POST /lackie/result with valid json in the body" do
+        describe "then GET /lackie/result" do
           it "gets 'bar' as the response body" do
-            post("/lackie/result", "'bar'")
-            get("/lackie/result").should == [200, {"Content-Type"=>"application/json"}, ["'bar'"]]
+            post("/lackie/eval", "happy")
+            json_string = { :value => "go lucky", :id => 1 }.to_json
+            post("/lackie/result", json_string)
+            result_body = JSON.parse(get("/lackie/result").last.first)
+            result_body["id"].should == 1
+            result_body["value"].should == "go lucky"
+          end
+        end
+      end
+      
+      describe "POST /lackie/result with invalid json in the body" do
+        describe "then GET /lackie/result" do
+          it "returns 400 Bad Request" do
+            post("/lackie/result", "crunch").should == [400, {"Content-Type"=>'text/plain'}, ["Bad Request"]]
           end
         end
       end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: lackie
 version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: false
+  hash: 21
+  prerelease: 
   segments: 
   - 0
   - 1
-  - 6
-  version: 0.1.6
+  - 7
+  version: 0.1.7
 platform: ruby
 authors: 
 - Josh Chisholm
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-26 00:00:00 +00:00
+date: 2011-01-28 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -194,10 +194,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.4.1
 signing_key: 
 specification_version: 3
-summary: lackie-0.1.6
+summary: lackie-0.1.7
 test_files: 
 - features/remote_control.feature
 - features/step_definitions/lackie_steps.rb