lackie 0.1.8 → 0.1.9

data/lib/lackie/cache_buster.rb

@@ -0,0 +1,8 @@
+module Lackie
+  class CacheBuster
+    def self.unique_string
+      @@unique_number ||= 0
+      (@@unique_number += 1).to_s
+    end
+  end
+end

data/lib/lackie/remote_control.rb

@@ -1,6 +1,7 @@
 require 'restclient'
 require 'json'
 require 'lackie/poller'
+require 'lackie/cache_buster'
 
 module Lackie
   class RemoteControl
@@ -17,15 +18,6 @@ module Lackie
       poll_for_result(command, options)
     end
     
-    def send_command(command)
-      url = "http://#{@host}:#{@port}/lackie/eval"
-      begin
-        RestClient.post(url, command)
-      rescue => e
-        raise ConnectionError.new(url, e) 
-      end
-    end
-    
     def await(expression, options={})
       result = nil
       begin
@@ -43,6 +35,15 @@ module Lackie
     end
     
     private
+
+    def send_command(command)
+      url = "http://#{@host}:#{@port}/lackie/eval"
+      begin
+        RestClient.post(url, command)
+      rescue => e
+        raise ConnectionError.new(url, e) 
+      end
+    end
     
     def poll_for_result(command, options={})
       body = nil
@@ -55,7 +56,7 @@ module Lackie
     
     def retrieve_result_body
       begin
-        RestClient.get("http://#{@host}:#{@port}/lackie/result?#{Time.now.to_i}").body
+        RestClient.get("http://#{@host}:#{@port}/lackie/result?#{CacheBuster.unique_string}").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.8'
+  VERSION = '0.1.9'
 end
 
 require 'lackie/remote_control'

data/spec/lackie/cache_buster_spec.rb

@@ -0,0 +1,10 @@
+require 'spec_helper'
+require 'lackie/cache_buster'
+
+module Lackie
+  describe CacheBuster do
+    it "returns unique strings" do
+      (1..99).map { |i| CacheBuster.unique_string }.uniq.size.should == 99
+    end
+  end
+end

data/spec/lackie/remote_control_spec.rb

@@ -4,7 +4,7 @@ require 'lackie/javascript'
 module Lackie
   describe RemoteControl do
     before(:each) do
-      Time.stub!(:now).and_return(mock("now", :to_i => "cachebust"))
+      CacheBuster.stub!(:unique_string).and_return("cachebust")
       @poller = Poller.new(:sleeper => mock("sleeper", :sleep => true))
       Poller.stub!(:new).and_return(@poller)
       @rc = RemoteControl.new("host", 555, @poller)
@@ -35,9 +35,7 @@ module Lackie
     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")
+      CacheBuster.should_receive(:unique_string).and_return("letmego")
       RestClient.should_receive(:get).with("http://host:555/lackie/result?letmego").and_return(
         mock("response", :body => '{"value":"123"}')
       )

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: lackie
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 0
   - 1
-  - 8
-  version: 0.1.8
+  - 9
+  version: 0.1.9
 platform: ruby
 authors: 
 - Josh Chisholm
@@ -151,6 +151,7 @@ files:
 - features/support/example_app/app.html
 - lackie.gemspec
 - lib/lackie.rb
+- lib/lackie/cache_buster.rb
 - lib/lackie/javascript.rb
 - lib/lackie/javascript/json2.js
 - lib/lackie/javascript/surrender.js
@@ -160,6 +161,7 @@ files:
 - lib/lackie/rack/logger.rb
 - lib/lackie/rack/middleware.rb
 - lib/lackie/remote_control.rb
+- spec/lackie/cache_buster_spec.rb
 - spec/lackie/javascript/surrender_spec.rb
 - spec/lackie/poller_spec.rb
 - spec/lackie/rack/logging_spec.rb
@@ -199,7 +201,7 @@ rubyforge_project:
 rubygems_version: 1.4.1
 signing_key: 
 specification_version: 3
-summary: lackie-0.1.8
+summary: lackie-0.1.9
 test_files: 
 - features/remote_control.feature
 - features/step_definitions/lackie_steps.rb
@@ -207,6 +209,7 @@ test_files:
 - features/support/env.rb
 - features/support/example_app.rb
 - features/support/example_app/app.html
+- spec/lackie/cache_buster_spec.rb
 - spec/lackie/javascript/surrender_spec.rb
 - spec/lackie/poller_spec.rb
 - spec/lackie/rack/logging_spec.rb