pendragon 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89f0b037692dd728f51329a2cc4df730582d0480
-  data.tar.gz: 20859c54d93fa69ff145d11d052600b60245ffd9
+  metadata.gz: 914465eff1ee8117a07da6fd8f8e9619885003d2
+  data.tar.gz: dec0c29b856f107c142018b068e978012de160c9
 SHA512:
-  metadata.gz: e7226f8f044f7310cd4de904661c2cfeda0ac66169d691363f905718498db5cae9f44bf4d857f585a1c4547d9b1de8356763ef6e5414245724f4e4a2031063a7
-  data.tar.gz: 80b0c5acd5492211707c5e7c3fd5f0bb3b3fba6adadd5863e641dca640ca544752e5ff7fdfa97ad87a5de58a292f68c7dc3c048bdc3090a8e61dae5e1d524678
+  metadata.gz: 9defb1e67cef1b199bc9b556467a17c56e9fa94a97421a5fbcc6b519fd9039d4ba55e9f9d02f7c2bb4ead6a1cb954e12052fbc59c7697b5a59db52e72691da68
+  data.tar.gz: 97473aaab4ccbfbbc7e8ab6147935107c45fd9852463abe53a8285f3e1bbccc32163298fee0c6e97060aa0377d67f42d80f428585a1f8b14dc9df874cddfb699

data/.travis.yml

@@ -6,7 +6,7 @@ install:
 rvm:
   - 2.0.0
   - 2.1.0
-  - jruby-head
+  - jruby
   - rbx
 notifications:
   recipients:
@@ -17,4 +17,4 @@ branches:
 matrix:
   allow_failures:
     - rvm: rbx
-    - rvm: jruby-head
+    - rvm: jruby

data/Gemfile.lock

@@ -1,19 +1,20 @@
 PATH
   remote: .
   specs:
-    pendragon (0.6.0)
-      mustermann (= 0.2.0)
+    pendragon (0.6.1)
+      mustermann19 (~> 0.3.0)
       rack (>= 1.3.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.1.5)
+    activesupport (4.1.6)
       i18n (~> 0.6, >= 0.6.9)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.1)
       tzinfo (~> 1.1)
+    enumerable-lazy (0.0.1)
     haml (4.0.5)
       tilt
     http_router (0.11.1)
@@ -21,49 +22,51 @@ GEM
       url_mount (~> 0.2.1)
     i18n (0.6.11)
     json (1.8.1)
+    json (1.8.1-java)
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     metaclass (0.0.4)
     mime-types (1.25.1)
-    minitest (5.4.0)
+    minitest (5.4.2)
     mocha (1.1.0)
       metaclass (~> 0.0.1)
     moneta (0.7.20)
-    mustermann (0.2.0)
-    padrino (0.12.3)
-      padrino-admin (= 0.12.3)
-      padrino-cache (= 0.12.3)
-      padrino-core (= 0.12.3)
-      padrino-gen (= 0.12.3)
-      padrino-helpers (= 0.12.3)
-      padrino-mailer (= 0.12.3)
-      padrino-support (= 0.12.3)
-    padrino-admin (0.12.3)
-      padrino-core (= 0.12.3)
-      padrino-helpers (= 0.12.3)
-    padrino-cache (0.12.3)
+    mustermann19 (0.3.1)
+      enumerable-lazy
+    padrino (0.12.4)
+      padrino-admin (= 0.12.4)
+      padrino-cache (= 0.12.4)
+      padrino-core (= 0.12.4)
+      padrino-gen (= 0.12.4)
+      padrino-helpers (= 0.12.4)
+      padrino-mailer (= 0.12.4)
+      padrino-support (= 0.12.4)
+    padrino-admin (0.12.4)
+      padrino-core (= 0.12.4)
+      padrino-helpers (= 0.12.4)
+    padrino-cache (0.12.4)
       moneta (~> 0.7.0)
-      padrino-core (= 0.12.3)
-      padrino-helpers (= 0.12.3)
-    padrino-core (0.12.3)
+      padrino-core (= 0.12.4)
+      padrino-helpers (= 0.12.4)
+    padrino-core (0.12.4)
       activesupport (>= 3.1)
       http_router (~> 0.11.0)
-      padrino-support (= 0.12.3)
+      padrino-support (= 0.12.4)
       rack-protection (>= 1.5.0)
       sinatra (~> 1.4.2)
       thor (~> 0.18)
-    padrino-gen (0.12.3)
+    padrino-gen (0.12.4)
       bundler (~> 1.0)
-      padrino-core (= 0.12.3)
-    padrino-helpers (0.12.3)
+      padrino-core (= 0.12.4)
+    padrino-helpers (0.12.4)
       i18n (~> 0.6, >= 0.6.7)
-      padrino-support (= 0.12.3)
+      padrino-support (= 0.12.4)
       tilt (~> 1.4.1)
-    padrino-mailer (0.12.3)
+    padrino-mailer (0.12.4)
       mail (~> 2.5.3)
-      padrino-core (= 0.12.3)
-    padrino-support (0.12.3)
+      padrino-core (= 0.12.4)
+    padrino-support (0.12.4)
       activesupport (>= 3.1)
     polyglot (0.3.5)
     rack (1.5.2)
@@ -78,6 +81,7 @@ GEM
       tilt (~> 1.3, >= 1.3.4)
     thor (0.19.1)
     thread_safe (0.3.4)
+    thread_safe (0.3.4-java)
     tilt (1.4.1)
     treetop (1.4.15)
       polyglot
@@ -88,6 +92,7 @@ GEM
       rack
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES

data/lib/pendragon/engine/compiler.rb

@@ -21,6 +21,7 @@ module Pendragon
     def call(request)
       compile! unless compiled?
       pattern, verb, params = parse_request(request)
+      pattern = pattern.encode(Encoding.default_external)
       raise_exception(400) unless valid_verb?(verb)
       candidacies = match_with(pattern)
       raise_exception(404) if candidacies.empty?
@@ -62,7 +63,7 @@ module Pendragon
       conditions << pattern[0..-2] if pattern != Matcher::PATH_DELIMITER && pattern.end_with?(Matcher::PATH_DELIMITER)
       loop.with_object([]) do |_, candidacies|
         return candidacies unless conditions.any?{|x| @regexps[offset] === x }
-        route = @routes[offset..-1].detect{|route| Regexp.last_match("_#{route.index}") }
+        route = @routes[offset..-1].detect{|route| Regexp.last_match["_#{route.index}"] }
         candidacies << route
         offset = route.index + 1
       end

data/lib/pendragon/engine/recognizer.rb

@@ -20,6 +20,7 @@ module Pendragon
     # @return [Array] The return value will be something like [Pendragon::Route, Hash]
     def call(request)
       pattern, verb, params = parse_request(request)
+      pattern = pattern.encode(Encoding.default_external)
       raise_exception(400) unless valid_verb?(verb)
       fetch(pattern, verb){|route| [route, params_for(route, pattern, params)] }
     end

data/lib/pendragon/matcher.rb

@@ -34,7 +34,9 @@ module Pendragon
     # @return [MatchData] If the pattern matched this route, return a MatchData.
     # @return [Nil] If the pattern doesn't matched this route, return a nil.
     def match(pattern)
-      pattern = pattern[0..-2] if mustermann? and pattern != PATH_DELIMITER and pattern.end_with?(PATH_DELIMITER)
+      match_data = handler.match(pattern)
+      return match_data if match_data
+      pattern = pattern[0..-2] if mustermann? && pattern != PATH_DELIMITER && pattern.end_with?(PATH_DELIMITER)
       handler.match(pattern)
     end
 

data/lib/pendragon/version.rb

@@ -1,4 +1,4 @@
 
 module Pendragon
-  VERSION = '0.6.1'
+  VERSION = '0.6.2'
 end

data/pendragon.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new "pendragon", Pendragon::VERSION do |s|
   s.license = "MIT"
 
   s.add_dependency "rack", ">= 1.3.0"
-  s.add_dependency "mustermann", "= 0.2.0"
+  s.add_dependency "mustermann19", "~> 0.3.0"
   s.add_development_dependency "rake", ">= 0.8.7"
   s.add_development_dependency "rack-test", ">= 0.5.0"
   s.add_development_dependency "mocha", ">= 0.10.0"

data/test/padrino_test.rb

@@ -1,3 +1,4 @@
+# coding: utf-8
 require File.expand_path('../../lib/pendragon/padrino', __FILE__)
 $:.unshift(File.dirname(__FILE__))
 require 'active_support/core_ext/hash/conversions'

data/test/pendragon_test.rb

@@ -1,3 +1,4 @@
+# coding: utf-8
 require File.expand_path('../../lib/pendragon', __FILE__)
 $:.unshift(File.dirname(__FILE__))
 require 'helper'
@@ -99,6 +100,13 @@ describe Pendragon do
       get "/"
       assert_equal "yay", body
     end
+
+    should "recognize the route if non-cut pattern is matched" do
+      @pendragon.get("/hey/"){ "say" }
+      @pendragon.get("/hey"){ "yay" }
+      get "/hey/"
+      assert_equal "say", body
+    end
   end
 
   describe "route options" do
@@ -196,6 +204,20 @@ describe Pendragon do
     end
   end
 
+  describe "splat" do
+    should "support splat pattern" do
+      @pendragon.get("/hey/*"){|s| "#{s[:splat][0]} splat!" }
+      get "/hey/hello"
+      assert_equal "hello splat!", body
+    end
+
+    should "support splat pattern including slash" do
+      @pendragon.get("/hey/*"){|s| "#{s[:splat][0]} splat!" }
+      get "/hey/hello/world"
+      assert_equal "hello/world splat!", body
+    end
+  end
+
   describe "header" do
     should "set Allow header when occur 405" do
       @pendragon.get("/"){}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pendragon
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - namusyaka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-23 00:00:00.000000000 Z
+date: 2014-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -25,19 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.3.0
 - !ruby/object:Gem::Dependency
-  name: mustermann
+  name: mustermann19
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement