cachable_url 0.0.1 → 1.0.0

data/cachable_url.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.authors     = ["Tom Lea"]
   s.email       = ["commit@tomlea.co.uk"]
   s.homepage    = "http://tomlea.co.uk"
-  s.summary     = %q{Hide query strings so caches can't see them.'}
+  s.summary     = %q{Hide query strings so caches can't see them.}
   s.description = %q{Replace all '?'s in URLs with '%1F' (the ASCII unit separator char), and a middleware to undo it before your rack app sees.}
 
   s.rubyforge_project = "cachable_url"

data/lib/cachable_url.rb

@@ -2,10 +2,10 @@ require "cachable_url/version"
 
 module CachableUrl
   def self.encode(url)
-    url.gsub('?', '%1F')
+    url.gsub('?', '%1f') if url
   end
 
   def self.decode(url)
-    url.gsub('%1F', '?')
+    url.gsub('%1f', '?') if url
   end
 end

data/lib/cachable_url/middleware.rb

@@ -1,6 +1,6 @@
 require "cachable_url"
 
-class CachableUrl::Midleware
+class CachableUrl::Middleware
   def initialize(app)
     @app = app
   end
@@ -8,10 +8,11 @@ class CachableUrl::Midleware
   def call(env)
     if env["QUERY_STRING"] == ''
       env = env.clone
-      path, query = env["PATH_INFO"].split("%1F", 2)
+      path, query = env["PATH_INFO"].split("%1f", 2)
       query = CachableUrl.decode(query || "")
       env["PATH_INFO"] = path
       env["QUERY_STRING"] = query
+      env["REQUEST_URI"] = CachableUrl.decode(env["REQUEST_URI"])
       @app.call(env)
     else
       @app.call(env)

data/lib/cachable_url/version.rb

@@ -1,3 +1,3 @@
 module CachableUrl
-  VERSION = "0.0.1"
+  VERSION = "1.0.0"
 end

data/spec/encoder_spec.rb

@@ -22,4 +22,16 @@ describe CachableUrl do
 
   end
 
+  describe ".encode(nil)" do
+    it "is nil" do
+      CachableUrl.encode(nil).should be_nil
+    end
+  end
+
+  describe ".decode(nil)" do
+    it "is nil" do
+      CachableUrl.decode(nil).should be_nil
+    end
+  end
+
 end

data/spec/middleware_spec.rb

@@ -1,42 +1,47 @@
 require "spec_helper"
 
-describe CachableUrl::Midleware do
+describe CachableUrl::Middleware do
   include Rack::Test::Methods
 
   let(:requests_received){ [] }
 
   def app
     logger_app = lambda{|env| requests_received << env; [200, {"Content-Type" => 'text/plain'}, ["Hello world"]] }
-    CachableUrl::Midleware.new(logger_app)
+    CachableUrl::Middleware.new(logger_app)
+  end
+
+  def get_with_env(path)
+    get(path, {}, "REQUEST_URI" => path)
   end
 
   it "should pass through requests with query strings" do
-    get "/fooooooo%1F?foo=bar"
+    get_with_env "/fooooooo%1f?foo=bar"
   
     requests_received.size.should == 1
     requests_received.last["QUERY_STRING"].should == "foo=bar"
-    requests_received.last["PATH_INFO"].should == "/fooooooo%1F"
+    requests_received.last["PATH_INFO"].should == "/fooooooo%1f"
   end
 
   it "should decode requests with no query strings" do
-    get "/fooooooo%1Ffoo=bar"
+    get_with_env "/fooooooo%1ffoo=bar"
     
     requests_received.size.should == 1
     requests_received.last["QUERY_STRING"].should == "foo=bar"
     requests_received.last["PATH_INFO"].should == "/fooooooo"
+    requests_received.last["REQUEST_URI"].should == "/fooooooo?foo=bar"
   end
 
   it "should decode requests with no query strings to the same thing as the query string based request" do
-    get "/fooooooo%1Ffoo=bar"
-    get "/fooooooo?foo=bar"
+    get_with_env "/fooooooo%1ffoo=bar"
+    get_with_env "/fooooooo?foo=bar"
     
     requests_received.size.should == 2
-    a,b = clense_responses(*requests_received.last(2))
+    a,b = cleanse_responses(*requests_received.last(2))
     a.should == b
   end
 
   protected
-  def clense_responses(*args)
+  def cleanse_responses(*args)
     args.map{|r|
       r.delete_if{|key, value|
         ["rack.input", "rack.errors"].include? key

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cachable_url
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 23
   prerelease: 
   segments: 
+  - 1
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  version: 1.0.0
 platform: ruby
 authors: 
 - Tom Lea
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-20 00:00:00 Z
+date: 2012-02-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement 
@@ -111,7 +111,7 @@ rubyforge_project: cachable_url
 rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
-summary: Hide query strings so caches can't see them.'
+summary: Hide query strings so caches can't see them.
 test_files: 
 - spec/encoder_spec.rb
 - spec/middleware_spec.rb