jerk 0.0.3 → 0.0.4

data/jerk.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |gem|
   gem.email         = ["corey.atx@gmail.com"]
   gem.description   = %q{Jerk is insensitive, particularly about URL casing.}
   gem.summary       = %q{Jerk is middleware that prevents any uppercase URLs from making it through in the path of a URL.}
-  gem.homepage      = ""
+  gem.homepage      = "http://github.com/jonesdilworth/jerk"
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

data/lib/jerk.rb

@@ -13,6 +13,19 @@ module Jerk
     end
 
     def each(&block); end
+
+    def url_without_query_string(env)
+      req = Rack::Request.new(env)
+      req.base_url + req.script_name + req.path_info
+    end
+
+    def downcased_url(env)
+      if env['QUERY_STRING'].empty?
+        url_without_query_string(env).downcase
+      else
+        url_without_query_string(env).downcase + "?#{env['QUERY_STRING']}"
+      end
+    end
   end
 
   ### DEFAULT
@@ -21,11 +34,8 @@ module Jerk
     include Base
 
     def call(env)
-      path = env['PATH_INFO']
-      query_string = env['QUERY_STRING'].empty? ? nil : env['QUERY_STRING']
-
-      if path[/[A-Z]/]
-        [301, { Location: [path.downcase, query_string].compact.join('?') }, self]
+      if url_without_query_string(env)[/[A-Z]/]
+        [301, { Location: downcased_url(env) }, self]
       else
         super
       end
@@ -37,7 +47,9 @@ module Jerk
     include Base
 
     def call(env)
-      env['PATH_INFO'].downcase!
+      env['HOST'].to_s.downcase!
+      env['SCRIPT_NAME'].to_s.downcase!
+      env['PATH_INFO'].to_s.downcase!
       super
     end
   end

data/lib/jerk/version.rb

@@ -1,3 +1,3 @@
 module Jerk
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jerk
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-15 00:00:00.000000000 Z
+date: 2013-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -43,7 +43,7 @@ files:
 - lib/jerk.rb
 - lib/jerk/railtie.rb
 - lib/jerk/version.rb
-homepage: ''
+homepage: http://github.com/jonesdilworth/jerk
 licenses: []
 post_install_message: 
 rdoc_options: []