lackie 0.1.5 → 0.1.6

data/features/remote_control.feature

@@ -25,11 +25,12 @@ Feature: Remote Control
     When  I tell the lackie to log "yipee"
     Then  I should see a result with the value "yipee"
     
-  Scenario: Send Command Without Expecting A Result
-    When  I tell the lackie to send the command "window.foo = '123'"
-    Then  I should see a result with the value "OK"
+  Scenario: Reload The Browser
     When  I tell the lackie to execute "window.foo = 99"
-    Then  I should see a result with the value "99"
+		When  I tell the lackie to execute "Lackie.reload()"
+    Then  I should see a result with the value "reloading"
+    When  I tell the lackie to execute "typeof window.foo"
+		Then  I should see a result with the value "undefined"
 
   Scenario: Await Result
     When  I tell the lackie to execute "setTimeout(function() { window.foo = 666 }, 500)"

data/features/step_definitions/lackie_steps.rb

@@ -7,6 +7,7 @@ When /^I tell the lackie to log "([^\"]*)"$/ do |message|
 end
 
 When /^I tell the lackie to execute "([^\"]*)"$/ do |script|
+  @error = nil
   begin
     @response = remote_control.exec(script)
   rescue => e
@@ -14,11 +15,8 @@ When /^I tell the lackie to execute "([^\"]*)"$/ do |script|
   end
 end
 
-When /^I tell the lackie to send the command "([^"]*)"$/ do |script|
-  @response = remote_control.send_command(script)
-end
-
 When /^I await the result of "([^"]*)" to equal "([^"]*)"$/ do |script, value|
+  @error = nil
   begin
     @response = remote_control.await(script, :timeout_seconds => 1) do |current_value|
       current_value.to_s == value
@@ -29,6 +27,7 @@ When /^I await the result of "([^"]*)" to equal "([^"]*)"$/ do |script, value|
 end
 
 Then /^I should see a result with the value "([^\"]*)"$/ do |value|
+  @error.should == nil
   @response.to_s.should == value
 end
 

data/lib/lackie/javascript/surrender.js

@@ -3,50 +3,25 @@ Lackie = {
   enabled: true,
   baseUrl: "/lackie",
 
-  createXMLHttpRequest: function() {
-    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) {
+    Lackie.get("/yield", function(body) {
+      if (body.indexOf('Lackie.reload()') == 0) {
+        Lackie.reload();
         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);
+      Lackie.execute(body);
+    });
   },
-
+  
   result: function(value) {
-    var xhReq = Lackie.createXMLHttpRequest();
     var params = JSON.stringify(value);
-    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;
+    Lackie.post("/result", params, function() {
+      Lackie.wip = false;
+    });
   },
 
   execute: function(command) {
@@ -59,7 +34,14 @@ Lackie = {
     }
     Lackie.result(result);
   },
-
+  
+  reload: function() {
+    Lackie.enabled = false;
+    Lackie.post("/result", '{ "value": "reloading" }', function() {
+      window.location.reload(true);
+    });
+  },
+  
   log: function(message) {
     var logElement = document.getElementById("LackieLog");
     if (logElement) {
@@ -68,6 +50,59 @@ Lackie = {
     return message;
   },
   
+  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;
+        }
+        bodyCallback(xhReq.responseText);
+      };
+      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;
+        }
+        callback();
+      };
+      xhReq.setRequestHeader("Content-type", "application/json");
+      xhReq.setRequestHeader("Content-length", params.length);
+      xhReq.setRequestHeader("Connection", "close");
+      xhReq.send(params);
+    });
+  },
+  
+  createXMLHttpRequest: function() {
+    try {
+      return new XMLHttpRequest();
+    } catch(e) {}
+    try {
+      return new ActiveXObject("Msxml2.XMLHTTP");
+    } catch(e) {}
+    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/poller.rb

@@ -14,7 +14,7 @@ module Lackie
         @sleeper.sleep @interval_seconds
         seconds_waited += @interval_seconds
       end
-      raise TimeoutError.new("Timed out after #{@timeout_seconds} seconds awaiting #{outcome}")
+      raise TimeoutError.new("Timed out after #{timeout_seconds} seconds awaiting #{outcome}")
     end
   end
   

data/lib/lackie/rack/middleware.rb

@@ -20,7 +20,7 @@ module Lackie
       end
       
       def surrender(request)
-        @result = nil
+        #@result = nil
         js(@surrender.script)
       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.5'
+  VERSION = '0.1.6'
 end
 
 require 'lackie/remote_control'

metadata

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