sinatra-rake-routes 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d5ce5982072c93d1f8ea2a3f091e1a0dab7effd
-  data.tar.gz: 455143d3f9b4908901fe57bb8bcc12d4e36b1960
+  metadata.gz: 20a8a6eb82256cc8d036ce1ed352f4d8594f047e
+  data.tar.gz: d59ebfe726be080845da89cb1836018e9bc082fb
 SHA512:
-  metadata.gz: 15bb3d4f668108a439caa03d78edde3f515085595f9960cb649c9d8f866919c5e841debbaf6859aca19495ebbd4484005e1414378c65496d026188559792da35
-  data.tar.gz: 099ee3bfed991ead6f90a05e5d17c1eec290577182ac2e64428b3d6ad5022c811bdec214df20661b0c47696405833b5cf55f965762a7ce08e4a4e428c5f54d16
+  metadata.gz: 36cfdde45a9cdc8eb31f07a90c39105d8e799ba30a723aabd66ebe13d7159c9d6c390479a9378adfc5175f95649dbe7bb992d0beb46bb35cc5a96d794d4eaedb
+  data.tar.gz: 04a45094da7de351568798efc787d150a484d4fd2a7ecc9e9e207353ccfa5ad9c9b1845c7ca4da462ecab74bd9e67618eac8f2644f0a94ed06d687a647f9f384

data/README.md

@@ -31,23 +31,23 @@ require "sinatra-rake-routes/tasks"
 bundle exec rake routes
 
 POST
-A/users/:user_id/messages\
-A/users\
+/users
+/users/:user_id/messages
 
 GET
-A/users/:user_id/messages/:message_id\
-A/users/:user_id/messages\
-A/users/:user_id\
+/users/:user_id
+/users/:user_id/messages
+/users/:user_id/messages/:message_id
 
 HEAD
-A/users/:user_id/messages/:message_id\
-A/users/:user_id/messages\
-A/users/:user_id\
+/users/:user_id
+/users/:user_id/messages
+/users/:user_id/messages/:message_id
 
 PUT
-A/users/:user_id/messages/:message_id\
-A/users/:user_id\
+/users/:user_id
+/users/:user_id/messages/:message_id
 
 DELETE
-A/users/:user_id\
+/users/:user_id
 ```

data/circle.yml

@@ -0,0 +1,9 @@
+dependencies:
+  override:
+    - 'rvm-exec 1.9.3-p551 bundle install'
+    - 'rvm-exec 2.3.0 bundle install'
+
+test:
+  override:
+    - 'rvm-exec 1.9.3-p551 bundle exec rspec'
+    - 'rvm-exec 2.3.0 bundle exec rspec'

data/lib/sinatra-rake-routes.rb

@@ -4,6 +4,14 @@ 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
@@ -19,15 +27,18 @@ class SinatraRakeRoutes
   def self.output
     str = []
     app_routes = app_class.routes
-    app_routes.each_with_index do |(http_method, routes_list), i|
+    app_routes.each do |http_method, routes_list|
       str << http_method
       routes = []
       routes_list.each do |item|
         source = item[0].source
+        source.gsub!(HYPHEN_REGEX.source, "-")
+        source.gsub!(PERIOD_REGEX.source, ".")
+        source.gsub!(SPLAT_REGEX.source, "*")
         item[1].each do |s|
-          source.sub!(/\(.+?\)/, ':'+s)
+          source.sub!(NAMED_PARAM_REGEX_SOURCE, ":#{s}")
         end
-        routes << source[1...-1]
+        routes << source[2...-2]
       end
       str << routes.sort.join("\n") + "\n"
     end

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

@@ -1,3 +1,3 @@
 class SinatraRakeRoutes
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/sinatra-rake-routes.gemspec

@@ -23,4 +23,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "rspec-collection_matchers"
   gem.add_development_dependency "rspec-its"
   gem.add_development_dependency "sinatra"
+  gem.add_development_dependency "rspec_junit_formatter"
 end

data/spec/fixtures/sample_app_output.txt

@@ -1,20 +1,24 @@
 POST
-A/users/:user_id/messages\
-A/users\
+/test-hyphenated/:test_id/something
+/users
+/users/*/splat/*
+/users/:user_id/messages
 
 GET
-A/users/:user_id/messages/:message_id\
-A/users/:user_id/messages\
-A/users/:user_id\
+/users.tar.gz
+/users/:user_id
+/users/:user_id/messages
+/users/:user_id/messages/:message_id
 
 HEAD
-A/users/:user_id/messages/:message_id\
-A/users/:user_id/messages\
-A/users/:user_id\
+/users.tar.gz
+/users/:user_id
+/users/:user_id/messages
+/users/:user_id/messages/:message_id
 
 PUT
-A/users/:user_id/messages/:message_id\
-A/users/:user_id\
+/users/:user_id
+/users/:user_id/messages/:message_id
 
 DELETE
-A/users/:user_id\
+/users/:user_id

data/spec/spec_helper.rb

@@ -9,12 +9,4 @@ require './lib/sinatra-rake-routes'
 RSpec.configure do |config|
   config.filter_run :focus
   config.run_all_when_everything_filtered = true
-
-  config.expect_with :rspec do |expectations|
-    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
-  end
-
-  config.mock_with :rspec do |mocks|
-    mocks.verify_partial_doubles = true
-  end
 end

data/spec/support/sample_app.rb

@@ -3,8 +3,14 @@ require 'sinatra'
 class SampleApp < Sinatra::Base
   post '/users' do
   end
+  post '/users/*/splat/*' do
+  end
+  post '/test-hyphenated/:test_id/something' do
+  end
   post '/users/:user_id/messages' do
   end
+  get '/users.tar.gz' do
+  end
   get '/users/:user_id' do
   end
   get '/users/:user_id/messages' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-rake-routes
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Peter Graham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-10 00:00:00.000000000 Z
+date: 2016-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec_junit_formatter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Rails' `rake routes` command for Sinatra applications
 email: peter@wealthsimple.com
 executables: []
@@ -91,6 +105,7 @@ files:
 - Gemfile
 - LICENSE
 - README.md
+- circle.yml
 - lib/sinatra-rake-routes.rb
 - lib/sinatra-rake-routes/tasks.rb
 - lib/sinatra-rake-routes/version.rb