wd_sinatra 1.0.1 → 1.0.2

data/.travis.yml

@@ -0,0 +1,15 @@
+language: ruby
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - rbx-18mode
+  - rbx-19mode
+  - ruby-head
+  - jruby-head
+  - ree
+
+matrix:
+  allow_failures:
+    - rvm: ruby-head
+    - rvm: jruby-18mode

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Weasel Diesel Sinatra Changelog
 
+## 1.0.2
+* Fixed a bug with the way sinatra routes are loaded. Because the routes
+  can contain a globing param, the loading had to be changed to be
+  smarter to globbing routes are loaded last.
+
 ## 1.0.1
 * Added dependency on `WeaselDiesel` `1.2.0` or greater since the API
   slightly changed.

data/Gemfile

@@ -1,4 +1,6 @@
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in wd-sinatra.gemspec
+gem 'backports', '2.3.0', :platform => 'ruby_18'
+gem 'json', :platform => 'ruby_18'
 gemspec

data/README.md

@@ -1,5 +1,7 @@
 # Weasel Diesel Sinatra
 
+[![Build Status](https://secure.travis-ci.org/mattetti/wd-sinatra.png?branch=master)](https://next.travis-ci.org/mattetti/wd-sinatra)
+
 Weasel-Diesel Sinatra app gem, allowing you to generate/update sinatra apps using the Weasel Diesel DSL
 
 

data/Rakefile

@@ -1,2 +1,11 @@
 #!/usr/bin/env rake
 require "bundler/gem_tasks"
+require 'rake/testtask'
+
+Rake::TestTask.new do |t|
+  t.libs << "."
+  t.libs << 'test'
+  t.pattern = "test/**/**.rb"
+end
+
+task :default => :test

data/lib/wd_sinatra.rb

@@ -1,7 +1,9 @@
 require "wd_sinatra/version"
+require 'wd_sinatra/app_loader'
+require 'wd_sinatra/sinatra_ext'
+require 'wd_sinatra/test_helpers'
+require 'wd_sinatra/test_unit_helpers'
+require 'wd_sinatra/ws_list_ext'
 
-module WD
-  module Sinatra
-    # Your code goes here...
-  end
+module WDSinatra
 end

data/lib/wd_sinatra/app_loader.rb

@@ -106,7 +106,7 @@ module WDSinatra
     end
 
     def set_sinatra_routes
-      WSList.all.sort.each{|api| api.load_sinatra_route }
+      WSList.sorted_for_sinatra_load.each{|api| api.load_sinatra_route }
     end
 
     def load_middleware

data/lib/wd_sinatra/sinatra_ext.rb

@@ -119,7 +119,7 @@ class WeaselDiesel
       env['wd.service'] = service
       service.handler.dispatch(self)
     end
-    
+
   end
 
 end

data/lib/wd_sinatra/version.rb

@@ -1,5 +1,5 @@
 module WD
   module Sinatra
-    VERSION = "1.0.1"
+    VERSION = "1.0.2"
   end
 end

data/lib/wd_sinatra/ws_list_ext.rb

@@ -0,0 +1,26 @@
+# Reopening WSList to add custom methods specific to this library.
+module WSList
+
+  # We want to load all routes with more globing routes last
+  def self.sorted_for_sinatra_load
+    globbing, no_globbing = all.partition{|ws| ws.url.include?(":") }
+
+    all.sort do |a,b|
+      a_colon_idx = a.url.index(":")
+      b_colon_idx = b.url.index(":")
+      a_length = a_colon_idx ? a_colon_idx + 1 : a.url.length
+      b_length = b_colon_idx ? b_colon_idx + 1 : b.url.length
+      if a_length == b_length
+        if a_colon_idx && !b_colon_idx
+          a_length -= 1
+        elsif b_colon_idx && !a_colon_idx
+          b_length -= 1
+        else
+          a_length = a.url.gsub(/\/$/, '').length
+          b_length = b.url.gsub(/\/$/, '').length
+        end
+      end
+      b_length <=> a_length
+    end
+  end
+end

data/test/test_helper.rb

@@ -0,0 +1,12 @@
+ENV['RACK_ENV'] ||= 'test'
+require 'rubygems'
+require 'bundler'
+Bundler.setup
+require 'test/unit'
+if RUBY_VERSION.to_f < 1.9
+  require 'minitest/autorun'
+end
+
+$: << File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'wd_sinatra'
+

data/test/ws_list_ext_test.rb

@@ -0,0 +1,96 @@
+require 'uri'
+require File.expand_path(File.join(File.dirname(__FILE__), 'test_helper'))
+
+class WsListExtTest < MiniTest::Unit::TestCase
+
+  def char_encoded(char)
+    enc = URI.escape(char)
+    enc = "(?:#{escaped(char, enc).join('|')})" if enc == char
+    enc = "(?:#{enc}|#{encoded('+')})" if char == " "
+    enc
+  end
+
+  def clear_ws_list
+    WSList.all.clear
+    assert WSList.all.length == 0
+  end
+
+  def add_test_services
+    WSList.add WeaselDiesel.new("/foo")
+    WSList.add WeaselDiesel.new("/foo/:bar")
+    WSList.add WeaselDiesel.new("/foo/bar/")
+    WSList.add WeaselDiesel.new("/foo/bart")
+    WSList.add WeaselDiesel.new("/foo/bar/:baz")
+    WSList.add WeaselDiesel.new("/foo/bar/bazz")
+    WSList.add WeaselDiesel.new("/foo/:id/bazz")
+  end
+
+  # A snapshot of a working sorting of url array
+  # The sorting doesn't have to actually be similar to that
+  # but this allows us to have a baseline to measure against in case 
+  # of tests.
+  def expected_sorted_urls
+    [
+      "/foo/bar/bazz", 
+      "/foo/bart",
+      "/foo/bar/",
+      "/foo/bar/:baz",
+      "/foo/:id/bazz",
+      "/foo/:bar",
+      "/foo"
+    ]
+  end
+
+  def matched_route(url_query, reference_urls)
+    sorted_regexps = reference_urls.map do |url|
+      ignore = ""
+      pattern = url.gsub(/[^\?\%\\\/\:\*\w]/){ |c| 
+        ignore << escaped(c).join if c.match(/[\.@]/)
+        char_encoded(c) 
+      }
+      pattern.gsub!(/((:\w+)|\*)/) do |match|
+        if match == "*"
+          "(.*?)"
+        else
+          "([^#{ignore}/?#]+)"
+        end
+      end
+      /\A#{pattern}\z/
+    end
+
+    # p sorted_regexps.inspect
+    regexp_match = sorted_regexps.detect{|r| r.match(url_query) }
+    if regexp_match
+      regexp_match.source[/\\A(.*?)\\z/, 1]
+    else
+      nil
+    end
+
+  end
+
+  def assert_route_matching(base_urls)
+    assert_equal "/foo", matched_route("/foo", base_urls), "Matching /foo to /foo Registered \n#{base_urls.join("\n")}\n"
+    assert_equal "/foo/bar/bazz", matched_route("/foo/bar/bazz", base_urls), "Matching /foo/bar/bazz to /foo/bar/bazz. Registered routes: \n#{base_urls.join("\n")}\n"
+    assert_equal "/foo/bart", matched_route("/foo/bart", base_urls)
+    assert_equal "/foo/bar/", matched_route("/foo/bar/", base_urls)
+    assert_equal "/foo/bar/([^/?#]+)", matched_route("/foo/bar/foo", base_urls)
+    assert_equal "/foo/([^/?#]+)", matched_route("/foo/baz", base_urls)
+    assert_equal nil, matched_route("/fooz", base_urls), "shouldn't match /fooz"
+    assert_equal nil, matched_route("/foo/bar/baz/baz", base_urls), "shouldn't match /foo/bar/baz/baz"
+    assert_equal nil, matched_route("/foo/", base_urls), "shouldn't match /foo/"
+    assert_equal "/foo/([^/?#]+)/bazz", matched_route("/foo/123/bazz", base_urls), "Should match /foo/123/bazz" 
+  end
+
+  def test_route_matching_expectations
+    clear_ws_list
+    add_test_services
+    assert_route_matching(expected_sorted_urls)
+  end
+
+  def test_route_loading_and_matching
+    clear_ws_list
+    add_test_services
+    assert_route_matching(WSList.sorted_for_sinatra_load.map{|ws| ws.url})
+  end
+
+end

data/wd-sinatra.gemspec

@@ -15,8 +15,12 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = WD::Sinatra::VERSION
 
+  gem.add_dependency('rake')
   gem.add_dependency('weasel_diesel', ">= 1.2.0")
+  gem.add_dependency('rack')
+  gem.add_dependency('rack-test')
   gem.add_dependency('thor')
+  gem.add_dependency('minitest')
 end
 
 

metadata

@@ -1,58 +1,120 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: wd_sinatra
-version: !ruby/object:Gem::Version
-  version: 1.0.1
+version: !ruby/object:Gem::Version 
+  hash: 19
   prerelease: 
+  segments: 
+  - 1
+  - 0
+  - 2
+  version: 1.0.2
 platform: ruby
-authors:
+authors: 
 - Matt Aimonetti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-26 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-10-30 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rake
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  requirement: *id001
+  prerelease: false
+- !ruby/object:Gem::Dependency 
   name: weasel_diesel
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 1
+        - 2
+        - 0
         version: 1.2.0
   type: :runtime
+  requirement: *id002
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+- !ruby/object:Gem::Dependency 
+  name: rack
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.2.0
-- !ruby/object:Gem::Dependency
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  requirement: *id003
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  name: rack-test
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  requirement: *id004
+  prerelease: false
+- !ruby/object:Gem::Dependency 
   name: thor
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  requirement: *id005
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+- !ruby/object:Gem::Dependency 
+  name: minitest
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-description: Weasel-Diesel Sinatra app gem, allowing you to generate/update sinatra
-  apps using the Weasel Diesel DSL
-email:
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  requirement: *id006
+  prerelease: false
+description: Weasel-Diesel Sinatra app gem, allowing you to generate/update sinatra apps using the Weasel Diesel DSL
+email: 
 - mattaimonetti@gmail.com
-executables:
+executables: 
 - wd_sinatra
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -65,6 +127,7 @@ files:
 - lib/wd_sinatra/test_helpers.rb
 - lib/wd_sinatra/test_unit_helpers.rb
 - lib/wd_sinatra/version.rb
+- lib/wd_sinatra/ws_list_ext.rb
 - templates/Gemfile
 - templates/Guardfile
 - templates/Rakefile
@@ -141,31 +204,42 @@ files:
 - templates/public/favicon.ico
 - templates/test/integration/hello_world_test.rb
 - templates/test/test_helpers.rb
+- test/test_helper.rb
+- test/ws_list_ext_test.rb
 - wd-sinatra.gemspec
 homepage: https://github.com/mattetti/wd-sinatra
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: Weasel-Diesel Sinatra app gem, allowing you to generate/update sinatra apps
-  using the Weasel Diesel DSL
-test_files: []
-has_rdoc: 
+summary: Weasel-Diesel Sinatra app gem, allowing you to generate/update sinatra apps using the Weasel Diesel DSL
+test_files: 
+- test/test_helper.rb
+- test/ws_list_ext_test.rb