route_downcaser 1.0.1 → 1.1.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YWRjOGIwNDZmMzcyODY2NDExNTUyYmRkYWZlNDEwNjI4ZDA1NWE2OA==
-  data.tar.gz: !binary |-
-    YjkxZmI2MDk3MDEyODJiOTI1N2ViMjZlYTA3YWY5ZmMzYzUyZTRhYg==
+SHA1:
+  metadata.gz: 80487f0b652b00f07ebcf03598a66e2c03f97540
+  data.tar.gz: 10c96abacc02b01dbefa2867133a7a6a0460fec1
 SHA512:
-  metadata.gz: !binary |-
-    MTAzYzJmYTc5ZTBhOGZmNTFhYzNkYjBkOTI2NjdiMGRiYTc1MWNlY2E4ODhk
-    MWRiN2M5YmZhOGJiZmQ4ZWJkYmNjNzhkMTRlMGNiMDdjM2I5NzE2ZjUzOTA3
-    MTc3ZDVhZmY2NmIzZjkzMjM2YzZiOGVmOTAwOGUyZjcyMjJmMzA=
-  data.tar.gz: !binary |-
-    NWZlZjJiMzM2MWEwNDA4ZDFjMWNlYTczODQxNTM1NmMxOGQxOGE4OGUyZmY3
-    MTEzMzMyY2I5YTBmODBiODU4MWRmOGUyMGQ5OGI5MzMzZTI1ODJkNGUzMGZi
-    NTNjMTA5MWMzYzMxZGI3NjZmMmQyYTI2MjIzNTNjNjlhMzg0MmM=
+  metadata.gz: f3d0aa4181a49067a556d33b0f3ebf3ddace5e25a0adf4c714b2162f5b34c144191b4139f8d09a8dd7a306e0c5f729bbf43c3840d68c5ffedaa254aac33eaead
+  data.tar.gz: 3129784c5b341d4aedc92f03cf08a3d5e71614f55acc12b8f293995f005bb982fae5054e11a5f90ceb28cd7b88f4ee074a375bb9424191b38136b90416fa6b4d

data/README.rdoc

@@ -100,6 +100,10 @@ All it really does is to take the path and downcase it before dispatching. Query
 
 == Changelog
 
+=== 1.1.0
+
+Refactored main code and tests for much better structure
+
 === 1.0.1
 
 Refactored parts of the code to work with Rails 4.2.0

data/lib/route_downcaser/downcase_route_middleware.rb

@@ -1,55 +1,78 @@
 module RouteDowncaser
+
   class DowncaseRouteMiddleware
     def initialize(app)
       @app = app
     end
 
     def call(env)
-      env = env.clone
-      if env['REQUEST_URI']
-        if RouteDowncaser.redirect == true && !exclude_patterns_match?(env['REQUEST_URI'])
-          if path(env) != path(env).downcase
-            return [301, {'Location' => downcased_uri(env), 'Content-Type' => 'text/html'}, []]
-          end
-        else
-          env['REQUEST_URI'] = downcased_uri(env)
-        end
+      new_env = env.clone
+
+      # Don't touch anything, if uri/path is part of exclude_patterns
+      if exclude_patterns_match?(new_env['REQUEST_URI']) or exclude_patterns_match?(new_env['PATH_INFO'])
+        @app.call(new_env)
+        return
       end
 
-      if exclude_patterns_match?(env['PATH_INFO'])
-        pieces = env['PATH_INFO'].split('/')
-        env['PATH_INFO'] = pieces.slice(0..-2).join('/').downcase + '/' + pieces.last
-      elsif env['PATH_INFO']
-        env['PATH_INFO'] = env['PATH_INFO'].downcase
+      # Downcase request_uri and/or path_info if applicable
+      if new_env['REQUEST_URI'].present?
+        new_env['REQUEST_URI'] = downcased_uri(new_env['REQUEST_URI'])
       end
 
-      @app.call(env)
+      if new_env['PATH_INFO'].present?
+        new_env['PATH_INFO'] = downcased_uri(new_env['PATH_INFO'])
+      end
+
+      # If redirect configured, then return redirect request,
+      # if either request_uri or path_info has changed
+      if RouteDowncaser.redirect
+        if new_env["REQUEST_URI"].present? and new_env["REQUEST_URI"] != env["REQUEST_URI"]
+          return redirect_header(new_env["REQUEST_URI"])
+        end
+
+        if new_env["PATH_INFO"].present? and new_env["PATH_INFO"] != env["PATH_INFO"]
+          return redirect_header(new_env["PATH_INFO"])
+        end
+      end
+
+      # Default just move to next chain in Rack callstack
+      # calling with downcased uri if needed
+      @app.call(new_env)
     end
 
     private
 
-    def uri_items(env)
-      env['REQUEST_URI'].split('?')
+    def exclude_patterns_match?(uri)
+      uri.match(Regexp.union(RouteDowncaser.exclude_patterns)) if uri and RouteDowncaser.exclude_patterns
     end
 
-    def path(env)
-      uri_items(env).first
+    def downcased_uri(uri)
+      if has_querystring?(uri)
+        "#{path(uri).downcase}?#{querystring(uri)}"
+      else
+        path(uri).downcase
+      end
     end
 
-    def querystring?(env)
-      uri_items(env).length > 1
+    def path(uri)
+      uri_items(uri).first
     end
 
-    def downcased_uri(env)
-      if querystring?(env)
-        "#{path(env).downcase!}?#{uri_items(env)[1]}"
-      else
-        path(env).downcase!
-      end
+    def querystring(uri)
+      uri_items(uri).last
     end
 
-    def exclude_patterns_match?(uri)
-      uri.match(Regexp.union(RouteDowncaser.exclude_patterns)) if uri
+    def has_querystring?(uri)
+      uri_items(uri).length > 1
+    end
+
+    def uri_items(uri)
+      uri.split('?')
+    end
+
+    def redirect_header(uri)
+      [301, {'Location' => uri, 'Content-Type' => 'text/html'}, []]
     end
   end
+
 end

data/lib/route_downcaser/version.rb

@@ -1,3 +1,3 @@
 module RouteDowncaser
-  VERSION = "1.0.1"
+  VERSION = "1.1.0"
 end