rack-rewrite-dynamic 0.0.4 → 0.0.5

data/lib/rack/rewrite/dynamic/base.rb

@@ -1,3 +1,4 @@
+require 'uri'
 module Rack
   class Rewrite
     module Dynamic
@@ -38,11 +39,16 @@ module Rack
           if slug
             route_generator_klass.route_for slug
           else
-            rack_env['REQUEST_URI'] || rack_env['PATH_INFO']
+            original_path(rack_env)
           end
         end
         def original_path(rack_env)
-          rack_env['REQUEST_URI'] || rack_env['PATH_INFO']
+          if rack_env['REQUEST_URI']
+            uri = URI.parse(rack_env['REQUEST_URI'])
+            "#{uri.path}#{'?'+uri.query if uri.query}"
+          else
+            rack_env['PATH_INFO']
+          end
         end
       end
     end

data/lib/rack/rewrite/dynamic/filter_rewrite.rb

@@ -27,9 +27,9 @@ module Rack
                 slugs.each do |s|
                   add_filter_param(filter_params, s)
                 end
+                return "/#{@opts[:target]}?#{filter_params.to_query}" if filter_params.length > 0
               end
-
-              return "/#{@opts[:target]}?#{filter_params.to_query}" if filter_params.length > 0
+              original_path(rack_env)
             end
             original_path(rack_env)
           end

data/lib/rack/rewrite/dynamic/version.rb

@@ -1,7 +1,7 @@
 module Rack
   class Rewrite
     module Dynamic
-      VERSION = "0.0.4"
+      VERSION = "0.0.5"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-rewrite-dynamic
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-03 00:00:00.000000000 Z
+date: 2013-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack-rewrite
@@ -119,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: SEO urls based on slugs