sinatra-rake-routes 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 407b7955269b5c168134db5d9281869200d38d11
-  data.tar.gz: d5e39656762c0dede87e9589aa7cfe0fb76164e1
+  metadata.gz: 95a7c71875de28832eba243ffb2ed23f6ea5d1ea
+  data.tar.gz: dc1f9c24996341ef8eb3ac17a171ef7f9a019d71
 SHA512:
-  metadata.gz: a1a174a8a372d2bbae676ea191e2c5e3d74d8cd8a063c5c5552958eb893ebab0c5c6bbb85a32162da3c32659d4e4973915972370a5ecc197e447ff054738a512
-  data.tar.gz: 3294f3f0b7be56e948258183e5ef34c7432d1621faca77493173adf02738e022677bd6d34a770ea694661f1c697d1c2d8dcd3882d4b8dcefc81b5e2c73591fe5
+  metadata.gz: 94bf7e057f889ae53698ffe57556cf70e4e1c26411b290ad9d89a13686fdb0fe0d2cc8c39136b67335397cb78a5ec6adcd663562fccf8e161d43e47651ba538b
+  data.tar.gz: c1a5ab469ce3465f89782a1ae19302b6957b0e171664c6529584508d68f3bc7a991a812ecc3f6f911f51433b98f1b8f0b395496f9c718b42cb8ccbafc6ecaccf

data/README.md

@@ -1,4 +1,4 @@
-# sinatra-rake-routes [![Circle CI](https://circleci.com/gh/wealthsimple/sinatra-rake-routes.svg?style=svg)](https://circleci.com/gh/wealthsimple/sinatra-rake-routes)
+# sinatra-rake-routes [![Circle CI](https://circleci.com/gh/wealthsimple/sinatra-rake-routes.svg?style=svg)](https://circleci.com/gh/wealthsimple/sinatra-rake-routes) ![](https://img.shields.io/gem/v/sinatra-rake-routes.svg)
 
 `rake routes` command for Sinatra applications for printing out all defined routes.
 

data/lib/sinatra-rake-routes.rb

@@ -4,14 +4,6 @@ require 'sinatra-rake-routes/version'
 class SinatraRakeRoutes
   @@app_class = nil
 
-  # Sinatra compiles routes into regexes. See below link for how this works:
-  # https://github.com/sinatra/sinatra/blob/4c7d38eb1b2cc02ce51029f28e0c3c34ca12ccfd/lib/sinatra/base.rb#L1618
-  # The below regexes cover some of the common cases.
-  HYPHEN_REGEX = /(?:\-|%2[Dd])/
-  NAMED_PARAM_REGEX_SOURCE = "([^\/?#]+)"
-  PERIOD_REGEX = /(?:\.|%2[Ee])/
-  SPLAT_REGEX = /(.*?)/
-
   def self.set_app_class(klass)
     if klass.respond_to?(:routes) && klass.routes.is_a?(Hash)
       @@app_class = klass
@@ -28,7 +20,7 @@ class SinatraRakeRoutes
     str = []
     self.class.app_class.routes.each do |http_method, routes|
       str << http_method
-      routes = routes.map { |route| decompile_route(route) }
+      routes = routes.map { |route| decompile(*route) }
       str << routes.sort.join("\n") + "\n"
     end
     str.join("\n")
@@ -36,16 +28,55 @@ class SinatraRakeRoutes
 
   private
 
-  def decompile_route(route)
-    source = route[0].source
-    params = route[1]
-    source.gsub!(HYPHEN_REGEX.source, "-")
-    source.gsub!(PERIOD_REGEX.source, ".")
-    source.gsub!(SPLAT_REGEX.source, "*")
-    params.each do |param|
-      source.sub!(NAMED_PARAM_REGEX_SOURCE, ":#{param}")
+  # Below method taken from Sinatra::Contrib
+  # https://github.com/sinatra/sinatra-contrib/blob/66892d3789ba23f157b17d67570479e97d7eaa95/lib/sinatra/decompile.rb#L70
+  def decompile(pattern, keys = nil, *)
+    # Everything in here is basically just the reverse of
+    # Sinatra::Base#compile
+    #
+    # Sinatra 2.0 will come with a mechanism for this, making this obsolete.
+    pattern, keys = pattern if pattern.respond_to? :to_ary
+    str     = pattern.inspect
+    return pattern unless str.start_with? '/' and str.end_with? '/'
+    str.gsub! /(?:\\-|%2[Dd])/, "-"
+    str.gsub! /^\/(\^|\\A)?|(\$|\\z)?\/$/, ''
+    str.gsub! encoded(' '), ' '
+    return pattern if str =~ /^[\.\+]/
+    str.gsub! '((?:[^\.\/?#%]|(?:%[^2].|%[2][^Ee]))+)', '([^\/?#]+)'
+    str.gsub! '((?:[^\/?#%]|(?:%[^2].|%[2][^Ee]))+)', '([^\/?#]+)'
+    str.gsub! /\([^\(\)]*\)|\([^\(\)]*\([^\(\)]*\)[^\(\)]*\)/ do |part|
+      case part
+      when '(.*?)'
+        return pattern if keys.shift != 'splat'
+        '*'
+      when /^\(\?\:(\\*.)\|%[\w\[\]]+\)$/
+        $1
+      when /^\(\?\:(%\d+)\|([^\)]+|\([^\)]+\))\)$/
+        URI.unescape($1)
+      when '([^\/?#]+)'
+        return pattern if keys.empty?
+        ":" << keys.shift
+      when /^\(\?\:\\?(.)\|/
+        char = $1
+        return pattern unless encoded(char) == part
+        Regexp.escape(char)
+      else
+        return pattern
+      end
+    end
+    str.gsub /(.)([\.\+\(\)\/])/ do
+      return pattern if $1 != "\\"
+      $2
     end
-    # Remove leading "\A" and trailing "\z"
-    source[2...-2]
   end
+
+  def encoded(char)
+    @uri_parser ||= URI::Parser.new
+    enc = @uri_parser.escape(char)
+    escaped = [Regexp.escape(enc), @uri_parser.escape(char, /./)]
+    enc = "(?:#{escaped.join('|')})" if enc == char
+    enc = "(?:#{enc}|#{encoded('+')})" if char == " "
+    enc
+  end
+
 end

data/lib/sinatra-rake-routes/version.rb

@@ -1,3 +1,3 @@
 class SinatraRakeRoutes
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/fixtures/sample_app_output.txt

@@ -7,12 +7,14 @@ POST
 GET
 /users.tar.gz
 /users/:user_id
+/users/:user_id.json
 /users/:user_id/messages
 /users/:user_id/messages/:message_id
 
 HEAD
 /users.tar.gz
 /users/:user_id
+/users/:user_id.json
 /users/:user_id/messages
 /users/:user_id/messages/:message_id
 

data/spec/support/sample_app.rb

@@ -11,6 +11,8 @@ class SampleApp < Sinatra::Base
   end
   get '/users.tar.gz' do
   end
+  get '/users/:user_id.json' do
+  end
   get '/users/:user_id' do
   end
   get '/users/:user_id/messages' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-rake-routes
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Peter Graham