rewritten 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 176780637c69e65f8bfdddb6da0611fbf870cd18
-  data.tar.gz: 523eddc494f2a72228ccf4486e5b137861fbc051
+  metadata.gz: 209d70c9a3b200f7541f26509e60f3606869fd94
+  data.tar.gz: a1bb41ce3c1da38d98912211b9e894f50f987d95
 SHA512:
-  metadata.gz: b3de980c77f3a47bf75293fbe7c24e000d530321db0465b392a6b37c44c04c326a6765af8981bc48461f0f893b6fdbf0c29b068bbd80b1108f34739a6a504076
-  data.tar.gz: 83649e1157f994f1d1bceaf763bfc89ddab740de1e6c1268d708ec95ba3fdbcbd0ff7d8063327b5e5b42c5e5a8cdae9974f5486726fc5b06609dce7295400e97
+  metadata.gz: ca36c2bd7e90bb093adabd289195c197477ef3a89feb6782e46f559054889ee2cd06f08f96dd8849e54bd68c078eff307e23f4e504c2c949d52c341e2954dc14
+  data.tar.gz: cd854f0f45cf703d7310881c9cf9bf1a91bddd1d628df6ab62a95ff899462984fd88458dc1fa3bfc9815215cab2290c8b74a7c34628910aee15db7a35e12c671

data/lib/rewritten/version.rb

@@ -1,4 +1,4 @@
 module Rewritten
-  VERSION = "0.8.1"
+  VERSION = "0.8.2"
 end
 

data/lib/rewritten.rb

@@ -6,7 +6,6 @@ require 'rack/url'
 require 'rack/record'
 require 'rack/html'
 require 'rack/subdomain'
-require 'pry'
 
 module Rewritten
   include Helpers

data/test/rack/rewritten_url_test.rb

@@ -12,8 +12,8 @@ describe Rack::Rewritten::Url do
       'rack.url_scheme' => 'http'}.merge(overrides)
   end
   
-  def request_url(url)
-    call_args.merge('REQUEST_URI' => url, 'PATH_INFO' => url )
+  def request_url(url, params={})
+    call_args.merge({'REQUEST_URI' => url, 'PATH_INFO' => url}.merge(params) )
   end
 
   before {
@@ -40,14 +40,14 @@ describe Rack::Rewritten::Url do
     end
 
     it "must 301 redirect from old translation to latest translation" do
-      ret = @rack.call( call_args.merge('REQUEST_URI' => '/foo/bar', 'PATH_INFO' => '/foo/bar' ))
+      ret = @rack.call request_url('/foo/bar')
       @app.verify
       ret[0].must_equal 301
       ret[1]['Location'].must_equal "http://www.example.org/foo/baz"
     end
 
     it "must keep the query parameters in the 301 redirect" do
-      ret = @rack.call( call_args.merge('REQUEST_URI' => '/foo/bar', 'PATH_INFO' => '/foo/bar', 'QUERY_STRING' => 'w=1' ))
+      ret = @rack.call request_url('/foo/bar', 'QUERY_STRING' => 'w=1')
       @app.verify
       ret[0].must_equal 301
       ret[1]['Location'].must_equal "http://www.example.org/foo/baz?w=1"
@@ -55,7 +55,7 @@ describe Rack::Rewritten::Url do
 
     it "must stay on latest translation" do
       @app.expect :call, [200, {'Content-Type' => 'text/plain'},[""]], [Hash]
-      ret = @rack.call( call_args.merge('REQUEST_URI' => '/foo/baz', 'PATH_INFO' => '/foo/baz' ))
+      ret = @rack.call request_url('/foo/baz')
       @app.verify
       ret[0].must_equal 200
     end
@@ -64,7 +64,7 @@ describe Rack::Rewritten::Url do
 
       it "must not redirect from resource url to nice url by default" do
         @app.expect :call, [200, {'Content-Type' => 'text/plain'},[""]], [Hash]
-        ret = @rack.call( call_args.merge('REQUEST_URI' => '/products/1', 'PATH_INFO' => '/products/1' ))
+        ret = @rack.call request_url('/products/1')
         @app.verify
         ret[0].must_equal 200
       end
@@ -74,7 +74,7 @@ describe Rack::Rewritten::Url do
           self.translate_backwards = true
         end
 
-        ret = @rack.call( call_args.merge('REQUEST_URI' => '/products/1', 'PATH_INFO' => '/products/1' ))
+        ret = @rack.call request_url('/products/1')
         @app.verify
         ret[0].must_equal 301
         ret[1]['Location'].must_equal "http://www.example.org/foo/baz"
@@ -105,7 +105,7 @@ describe Rack::Rewritten::Url do
       end
 
       it "must redirect for other entries" do
-        ret = @rack.call( request_url('/no/flags') )
+        ret = @rack.call request_url('/no/flags')
         @app.verify
         ret[0].must_equal 301
         ret[1]['Location'].must_equal "http://www.example.org/final/line"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rewritten
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Kai Rubarth
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-13 00:00:00.000000000 Z
+date: 2013-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis-namespace