lackie 0.1.2 → 0.1.3

data/lib/lackie/javascript/surrender.js

@@ -1,65 +1,76 @@
 Lackie = {
   wip: false,
   enabled: true,
-	baseUrl: "/lackie",
-  
+  baseUrl: "/lackie",
+
   createXMLHttpRequest: function() {
-  	try { return new XMLHttpRequest(); } catch(e) {}
-  	try { return new ActiveXObject("Msxml2.XMLHTTP"); } catch (e) {}
-  	throw new Error("XMLHttpRequest not supported");
+    try {
+      return new XMLHttpRequest();
+    } catch(e) {}
+    try {
+      return new ActiveXObject("Msxml2.XMLHTTP");
+    } catch(e) {}
+    throw new Error("XMLHttpRequest not supported");
   },
-  
+
   yield: function() {
     if (Lackie.wip || !Lackie.enabled) {
       return;
     }
     var xhReq = Lackie.createXMLHttpRequest();
-  	function readyStateChange() {
-  		if (xhReq.readyState != 4 || xhReq.status==404)  { return; }
-  		Lackie.wip = true;
-  		try {
-  		  Lackie.execute(xhReq.responseText);
-  		}
-  		finally {
-  		  try {
-  		    xhReq.destroy();
-  		    xhReq = null;
-  		  } catch(e) {}
-  		}
-  	}
-  	xhReq.open("GET", Lackie.baseUrl + "/yield", true);
-  	xhReq.onreadystatechange = readyStateChange;
-  	xhReq.send(null);
+    function readyStateChange() {
+      if (xhReq.readyState != 4 || xhReq.status == 404) {
+        return;
+      }
+      Lackie.wip = true;
+      try {
+        Lackie.execute(xhReq.responseText);
+      }
+      finally {
+        try {
+          xhReq.destroy();
+          xhReq = null;
+        } catch(e) {}
+      }
+    }
+    xhReq.open("GET", Lackie.url("/yield"), true);
+    xhReq.onreadystatechange = readyStateChange;
+    xhReq.send(null);
   },
-  
+
   result: function(value) {
     var xhReq = Lackie.createXMLHttpRequest();
     var params = JSON.stringify(value);
-  	xhReq.open("POST", Lackie.baseUrl + "/result", true);
-  	xhReq.setRequestHeader("Content-type", "application/json");
+    xhReq.open("POST", Lackie.url("/result"), true);
+    xhReq.setRequestHeader("Content-type", "application/json");
     xhReq.setRequestHeader("Content-length", params.length);
     xhReq.setRequestHeader("Connection", "close");
-  	xhReq.send(params);
-  	Lackie.wip = false;
+    xhReq.send(params);
+    Lackie.wip = false;
   },
-  
+
   execute: function(command) {
     var result;
     try {
       result = { 'value': eval(command) };
     }
-    catch (e) {
+    catch(e) {
       result = { 'error': e.toString() };
     }
     Lackie.result(result);
   },
-  
+
   log: function(message) {
     var logElement = document.getElementById("LackieLog");
     if (logElement) {
       logElement.innerHTML += '<div class="message">' + message + '</div>';
     }
     return message;
+  },
+  
+  url: function(path) {
+    var now = new Date();
+    return Lackie.baseUrl + path + '?' + now.getTime().toString();
   }
 }
 

data/lib/lackie/remote_control.rb

@@ -39,7 +39,7 @@ module Lackie
     
     def retrieve_result_body
       begin
-        RestClient.get("http://#{@host}:#{@port}/lackie/result").body
+        RestClient.get("http://#{@host}:#{@port}/lackie/result?#{Time.now.to_i}").body
       rescue RestClient::ResourceNotFound
         nil
       end

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.2'
+  VERSION = '0.1.3'
 end
 
 require 'lackie/remote_control'

data/spec/lackie/remote_control_spec.rb

@@ -4,6 +4,7 @@ require 'lackie/javascript'
 module Lackie
   describe RemoteControl do
     before(:each) do
+      Time.stub!(:now).and_return(mock("now", :to_i => "cachebust"))
       @poller = Poller.new(:sleeper => mock("sleeper", :sleep => true))
       Poller.stub!(:new).and_return(@poller)
       @rc = RemoteControl.new("host", 555, @poller)
@@ -26,13 +27,23 @@ module Lackie
         lambda { raise RestClient::ResourceNotFound },
         lambda { mock("poll_response", :body => '{"value":"bar"}') }
       ]
-      RestClient.stub!(:get).with("http://host:555/lackie/result").and_return {
+      RestClient.stub!(:get).with("http://host:555/lackie/result?cachebust").and_return {
         responses.shift.call
       }
       @rc.exec("foo").should == "bar"
       responses.should be_empty
     end
     
+    it "cache-busts calls to GET /lackie/result" do
+      now = mock("now")
+      Time.should_receive(:now).and_return(now)
+      now.should_receive(:to_i).and_return("letmego")
+      RestClient.should_receive(:get).with("http://host:555/lackie/result?letmego").and_return(
+        mock("response", :body => '{"value":"123"}')
+      )
+      @rc.exec("foo")
+    end
+    
     it "waits for a default number of seconds" do
       @poller.should_receive(:await).with("result of command:\nfoo", {}).and_yield
       @rc.exec("foo")

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: lackie
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Josh Chisholm
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-06 00:00:00 +00:00
+date: 2011-01-12 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -197,7 +197,7 @@ rubyforge_project:
 rubygems_version: 1.4.1
 signing_key: 
 specification_version: 3
-summary: lackie-0.1.2
+summary: lackie-0.1.3
 test_files: 
 - features/remote_control.feature
 - features/step_definitions/lackie_steps.rb