route_downcaser 1.2.3 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a5efc21342424589e2db66e54ef1b758ce9747805c98d2ccadaa86f163b8111
-  data.tar.gz: b56e8a49da5fcb869b2609683e97d4ee7bd647d7cc4b4d8498c8659a6dd622e8
+  metadata.gz: 7726460c1e166c885efb556d78a0f91bee3dee42fd38adce7b5be19115cda0dd
+  data.tar.gz: af90e28fb8775a805b436173748c75698c515583dc8a5a1a0ac50757c7b2f08f
 SHA512:
-  metadata.gz: e3286854a140421f292623de5b4cf6bd954b1ade7fd552a45f67e7c990111a44d2537bca9562932ebaa744f8b95f3021de6d7398e81fe4933b3ebe5212c7bc78
-  data.tar.gz: 1108ddc8f75a27577154a63b93dc8f32e80c8895a20d9df79df5cfaf929d9259563360f427786238d024f01c9300c9524454761d5b35ba60e04d4c4297613fb7
+  metadata.gz: c703a3c12c20eeaa948284c6969b7f0b48a60074cd893e9000df26668b2a6576d028aecfba92490bf6c3d7a89610ae6eb0c70123d925eac8e0a76ffef5bd21e6
+  data.tar.gz: 90446388282474f65f74fdf27257518ea672806810f58a257830910827dab46cab7df2e51ab348a55e7179a0cbdf07ea78c44ff75a08f860d272581cc754063e

data/README.rdoc

@@ -1,14 +1,14 @@
 = RouteDowncaser
 
-{<img src="https://travis-ci.org/substancelab/route_downcaser.svg?branch=master" alt="Build Status" />}[https://travis-ci.org/substancelab/route_downcaser] {<img src="https://codeclimate.com/github/substancelab/route_downcaser/badges/gpa.svg" />}[https://codeclimate.com/github/substancelab/route_downcaser]
-
 Makes routing in Rails case-insensitive (and other Rack-servers like Sinatra)
 
 This gem hooks into the Rack middleware of Rails. This way all paths are downcased before dispatching to Rails' routing mechanism. Querystring parameters and asset paths are not changed in any way.
 
 == Requirements
 
-This gem is tested with 5.0.x, 5.1.x, 5.2.x. It reportedly also works with Sinata, although I do not use Sinatra myself. Sinatra test-cases will be most welcome.
+This gem is tested with 5.2.x, 6.x, 7.x. It reportedly also works with Sinatra, although I do not use Sinatra myself. Sinatra test-cases will be most welcome.
+
+It has previously worked - and I presume still works - in Rails 5.0.x and 5.1.x.
 
 If you want this functionality in a Rails 2.x-3.0 application, please refer to {this blog post}[http://gehling.dk/2010/02/how-to-make-rails-routing-case-insensitive]. If you need it for Rails 3.1.x or 4.x version 1.2.2 should serve you just fine.
 

data/Rakefile

@@ -1,33 +1,35 @@
 #!/usr/bin/env rake
+# frozen_string_literal: true
+
 begin
-  require 'bundler/setup'
+  require "bundler/setup"
 rescue LoadError
-  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
+  puts "You must `gem install bundler` and `bundle install` to run rake tasks"
 end
 begin
-  require 'rdoc/task'
+  require "rdoc/task"
 rescue LoadError
-  require 'rdoc/rdoc'
-  require 'rake/rdoctask'
+  require "rdoc/rdoc"
+  require "rake/rdoctask"
   RDoc::Task = Rake::RDocTask
 end
 
 RDoc::Task.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'RouteDowncaser'
-  rdoc.options << '--line-numbers'
-  rdoc.rdoc_files.include('README.rdoc')
-  rdoc.rdoc_files.include('lib/**/*.rb')
+  rdoc.rdoc_dir = "rdoc"
+  rdoc.title = "RouteDowncaser"
+  rdoc.options << "--line-numbers"
+  rdoc.rdoc_files.include("README.rdoc")
+  rdoc.rdoc_files.include("lib/**/*.rb")
 end
 
 Bundler::GemHelper.install_tasks
 
-require 'rake/testtask'
+require "rake/testtask"
 
 Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
+  t.libs << "lib"
+  t.libs << "test"
+  t.pattern = "test/**/*_test.rb"
   t.verbose = false
 end
 

data/lib/route_downcaser/configuration.rb

@@ -1,25 +1,29 @@
-module RouteDowncaser::Configuration
-  def configuration
-    yield self
-  end
-
-  def define_setting(name, default = nil)
-    class_variable_set("@@#{name}", default)
+# frozen_string_literal: true
 
-    define_class_method "#{name}=" do |value|
-      class_variable_set("@@#{name}", value)
+module RouteDowncaser
+  module Configuration
+    def configuration
+      yield self
     end
 
-    define_class_method name do
-      class_variable_get("@@#{name}")
+    def define_setting(name, default = nil)
+      class_variable_set(:"@@#{name}", default)
+
+      define_class_method "#{name}=" do |value|
+        class_variable_set(:"@@#{name}", value)
+      end
+
+      define_class_method name do
+        class_variable_get(:"@@#{name}")
+      end
     end
-  end
 
-  private
+    private
 
-  def define_class_method(name, &block)
-    (class << self; self; end).instance_eval do
-      define_method name, &block
+    def define_class_method(name, &block)
+      (class << self; self; end).instance_eval do
+        define_method name, &block
+      end
     end
   end
 end

data/lib/route_downcaser/downcase_route_middleware.rb

@@ -1,5 +1,6 @@
+# frozen_string_literal: true
+
 require "active_support/core_ext/object/blank"
-require "active_support/core_ext/string/multibyte"
 
 module RouteDowncaser
   class DowncaseRouteMiddleware
@@ -12,30 +13,22 @@ module RouteDowncaser
     end
 
     def _call(env)
-      request_uri = env['REQUEST_URI']
-      path_info = env['PATH_INFO']
+      path_info = env["PATH_INFO"]
 
-      # Don't touch anything, if uri/path is part of exclude_patterns
-      return @app.call(env) if excluded?([request_uri, path_info])
+      # Don't touch anything, if path is part of exclude_patterns
+      return @app.call(env) if excluded?([path_info])
 
-      # Downcase request_uri and/or path_info if applicable
-      request_uri = downcased_uri(request_uri)
+      # Downcase path_info if applicable
       path_info = downcased_uri(path_info)
+      path_info = path_info.gsub("%7E", "~") if path_info
 
-      # If redirect configured, then return redirect request,
-      # if either request_uri or path_info has changed
-      if RouteDowncaser.redirect && env['REQUEST_METHOD'] == 'GET'
-        if request_uri.present? && request_uri != env['REQUEST_URI']
-          return redirect_header(request_uri)
-        end
-
-        if path_info.present? && path_info != env['PATH_INFO']
-          return redirect_header(path_info)
-        end
+      # If redirect configured, then return redirect request, if either
+      # path_info has changed
+      if RouteDowncaser.redirect && env["REQUEST_METHOD"] == "GET"
+        return redirect_header(path_info) if path_info.present? && path_info != env["PATH_INFO"]
       end
 
-      env['PATH_INFO'] = path_info.to_s if path_info
-      env['REQUEST_URI'] = request_uri.to_s if request_uri
+      env["PATH_INFO"] = path_info.to_s if path_info
 
       # Default just move to next chain in Rack callstack
       # calling with downcased uri if needed
@@ -56,13 +49,22 @@ module RouteDowncaser
 
     def downcased_uri(uri)
       return nil unless uri.present?
+
       if has_querystring?(uri)
-        "#{path(uri).mb_chars.downcase}?#{querystring(uri)}"
+        "#{downcased_path(uri)}?#{querystring(uri)}"
       else
-        path(uri).mb_chars.downcase
+        downcased_path(uri)
       end
     end
 
+    def downcased_path(uri)
+      path(uri).split("/").map(&method(:downcase_path_segment)).join("/")
+    end
+
+    def downcase_path_segment(segment)
+      uri_encode(uri_decode(segment).downcase)
+    end
+
     def path(uri)
       uri_items(uri).first
     end
@@ -75,12 +77,20 @@ module RouteDowncaser
       uri_items(uri).length > 1
     end
 
+    def uri_decode(uri_segment)
+      URI.decode_www_form_component(uri_segment)
+    end
+
+    def uri_encode(uri_segment)
+      URI.encode_www_form_component(uri_segment)
+    end
+
     def uri_items(uri)
-      uri.split('?', 2)
+      uri.split("?", 2)
     end
 
     def redirect_header(uri)
-      [301, { 'Location' => uri.to_s, 'Content-Type' => 'text/html' }, []]
+      [301, {"Location" => uri.to_s, "Content-Type" => "text/html"}, []]
     end
   end
 end

data/lib/route_downcaser/railtie.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 module RouteDowncaser
   class Railtie < Rails::Railtie
-    initializer 'add_downcase_route_middleware' do |app|
+    initializer "add_downcase_route_middleware" do |app|
       app.config.middleware.use RouteDowncaser::DowncaseRouteMiddleware
     end
   end

data/lib/route_downcaser/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RouteDowncaser
-  VERSION = '1.2.3'.freeze
+  VERSION = "2.1.0"
 end

data/lib/route_downcaser.rb

@@ -1,10 +1,12 @@
-require 'route_downcaser/downcase_route_middleware'
-require 'route_downcaser/railtie' if defined? Rails
-require 'route_downcaser/configuration'
+# frozen_string_literal: true
+
+require "route_downcaser/downcase_route_middleware"
+require "route_downcaser/railtie" if defined? Rails
+require "route_downcaser/configuration"
 
 module RouteDowncaser
   extend RouteDowncaser::Configuration
 
   define_setting :redirect, false
-  define_setting :exclude_patterns, [/assets\//i]
+  define_setting :exclude_patterns, [%r{assets/}i]
 end

data/lib/tasks/route_downcaser_tasks.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # desc "Explaining what the task does"
 # task :route_downcaser do
 #   # Task goes here