rewritten 0.15.1 → 0.15.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1210f162d2a424e8819906e76dbc1a823928768
-  data.tar.gz: 0a3856a7e3dbf5877613bf1c7660f4475fd10d8a
+  metadata.gz: b7a6bb53aa68bfdf91a14ddb75bc1c84626d4722
+  data.tar.gz: f0b6c9dc59ae890105a08d8e718da649903949f4
 SHA512:
-  metadata.gz: ab7065074780644d85c84ee8a8747fd5b0a290cf8a2aa0d6c4a521e44cd6e8158e2200defc42cd7a6a53938ab4d106b066931bc76c55047aa3d2ef09ddd2dec8
-  data.tar.gz: db4d6bc68a2e8b2bf8c177b45a28ac12f798d5c4872259611cf0b9943fb6725f9299723ce22f4b7dd8bde3ab4d46e5e20610621ca22a9473500d2713de09958c
+  metadata.gz: 943f60c79e3c96113f0fb4cd6556cdbb079c1cd34caa476ca46065c2529096c3661c8a7d1a0cc5bc31d6be293694bffa3da898b5bc4b689eb2e05b7e4a9ac933
+  data.tar.gz: 135a2c929eaaedd54cd8558797885632eb42a22d806732c0dc221f8d984f20f31a870bc20bdadacbd42e023be8645267f7d7f7be51614b0f8d7faaffc21905f3

data/HISTORY.rdoc

@@ -1,3 +1,7 @@
+== 0.15.2 
+
+  * Fixes nested parameters
+
 == 0.15.0
 
   * Support external targets in redirects

data/lib/rack/url.rb

@@ -50,8 +50,7 @@ module Rack
           if (current_path == req.path_info) or (::Rewritten.base_from(req.path_info) == current_path) or ::Rewritten.has_flag?(path, 'L')
             # if this is the current path, rewrite path and parameters
             tpath, tparams = split_to_path_params(to)
-
-            env['QUERY_STRING'] = Rack::Utils.build_query(tparams.merge(req.params))
+            env['QUERY_STRING'] = Rack::Utils.build_nested_query(tparams.merge(req.params))
             req.path_info = tpath + ::Rewritten.appendix(req.path_info)
             @app.call(req.env)
           else
@@ -77,7 +76,7 @@ module Rack
 
       def split_to_path_params(path_and_query)
         path, query_string = path_and_query.split('?').push('')[0..1]
-        [path, Rack::Utils.parse_query(query_string)] 
+        [path, Rack::Utils.parse_query(query_string)]
       end
 
       private

data/lib/rewritten/version.rb

@@ -1,4 +1,4 @@
 module Rewritten
-  VERSION = "0.15.1"
+  VERSION = "0.15.2"
 end
 

data/test/rack/rewritten_url_test.rb

@@ -12,7 +12,7 @@ describe Rack::Rewritten::Url do
       'rack.input' => '',
       'rack.url_scheme' => 'http'}.merge(overrides)
   end
-  
+
   def request_url(url, params={})
     call_args.merge({'REQUEST_URI' => url, 'PATH_INFO' => url}.merge(params) )
   end
@@ -83,12 +83,12 @@ describe Rack::Rewritten::Url do
 
     describe "partial translation" do
 
-      before do 
+      before do
         @request_str = '/foo/baz/with_tail'
         @env = request_url(@request_str)
-        Rewritten.translate_partial = true 
-      end 
-      
+        Rewritten.translate_partial = true
+      end
+
       after do
         Rewritten.translate_partial = false
       end
@@ -104,7 +104,7 @@ describe Rack::Rewritten::Url do
       end
 
       it "must translate partials if enabled" do
-        Rewritten.translate_partial = true 
+        Rewritten.translate_partial = true
         @app.expect :call, [200, {'Content-Type' => 'text/html'},[]], [Hash]
         ret = @rack.call @env
         @app.verify
@@ -123,7 +123,7 @@ describe Rack::Rewritten::Url do
         @env['PATH_INFO'].must_equal url
       end
 
-    
+
       it "won't translate segments not by separated by slashes" do
         @app.expect :call, [200, {'Content-Type' => 'text/plain'},[""]], [Hash]
         ret = @rack.call @env=request_url('/foo/bazzling')
@@ -151,7 +151,7 @@ describe Rack::Rewritten::Url do
     end
 
     describe "caps behavior" do
-      
+
       it "must diferentiate caps" do
         @app.expect :call, [200, {'Content-Type' => 'text/plain'},[""]], [Hash]
         ret = @rack.call request_url('/Foo/Bar')
@@ -240,7 +240,7 @@ describe Rack::Rewritten::Url do
 
     it "must set PATH_INFO to /products/2" do
       @rack.call(@initial_args)
-      @initial_args['PATH_INFO'].must_equal "/products/2" 
+      @initial_args['PATH_INFO'].must_equal "/products/2"
     end
 
     it "must set QUERY_STRING to w=1" do
@@ -254,9 +254,15 @@ describe Rack::Rewritten::Url do
       @initial_args['QUERY_STRING'].split('&').sort.must_equal ['s=1', 'w=1']
     end
 
+    it "must merge nested rails style QUERY parameters" do
+      @initial_args.merge!('QUERY_STRING' => 'x[id]=1')
+      @rack.call(@initial_args)
+      @initial_args['QUERY_STRING'].split('&').sort.map{|s| URI.unescape(s)}.must_equal ['w=1', 'x[id]=1']
+    end
+
+
   end
 
 
 
 end
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rewritten
 version: !ruby/object:Gem::Version
-  version: 0.15.1
+  version: 0.15.2
 platform: ruby
 authors:
 - Kai Rubarth
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-03 00:00:00.000000000 Z
+date: 2015-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis-namespace
@@ -238,7 +238,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: rewritten
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: A redis-based URL rewriting engine