padrino-core 0.13.0 → 0.13.1.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df73d4a14b1d5ad90c0cee78699bfb08addd30f4
-  data.tar.gz: 7307777a18f4d046f27bbc3296afcb26bab98757
+  metadata.gz: af7cd163789baddaf975d9fba8d190c6ebc9ac3a
+  data.tar.gz: 5436fc024ed5e7c1cdd605d82e8ca087366c72d3
 SHA512:
-  metadata.gz: c951c3160d9354c1d0cef4c195f90cfc9e725661d235033ce930cc0fc2a3c47f34db0dda0dc02d9ee23fd6af7485f3c87e2389554f7330ac1df41572dbd21582
-  data.tar.gz: bd1cd61aec6fd3de5c26c1f1e52695fb7dd4649f5d18a89a943f695b6b11f566483ec227362876800a987a7889f818fee8a74cd55bb0f3356735ae1b30b8fa9a
+  metadata.gz: 6796d2b316dc62d1007c71efc1f8513df379f8852f6633aca39d12daaa00535c7e107ea2cdc4c002dd01c83efe8c1b73dadcd3bb1bcc1bcf5d6df72f713a4af5
+  data.tar.gz: 082b444f689877f4d5bcaa9c31ebbf100fa427458ca6c7900a9ec20998875eb04b3235746c37adc28e2808580fa0a2a8bb5cec865718a3a1ceaf421e6c71d3fb

data/lib/padrino-core/path_router/compiler.rb

@@ -4,8 +4,7 @@ module Padrino
     # High performance engine for finding all routes which are matched with pattern
     #
     class Compiler
-      # All regexps generated by recursive compiler
-      attr_reader :regexps
+      attr_accessor :routes
 
       ##
       # Constructs an instance of Padrino::PathRouter::Compiler
@@ -19,11 +18,10 @@ module Padrino
       #
       def compile!
         return if compiled?
-        @regexps = @routes.map.with_index do |route, index|
+        @routes.each_with_index do |route, index|
           route.index = index
-          /(?<_#{index}>#{route.matcher.to_regexp})/
+          route.regexp = /(?<_#{index}>#{route.matcher.to_regexp})/
         end
-        @regexps = recursive_compile(@regexps)
         @compiled = true
       end
 
@@ -39,7 +37,7 @@ module Padrino
       #
       def find_by(request_or_env)
         request = request_or_env.is_a?(Hash) ? Sinatra::Request.new(request_or_env) : request_or_env
-        pattern = encode_default_external(request.path_info)
+        pattern  = decode_pattern(request.path_info)
         verb    = request.request_method
         rotation { |offset| match?(offset, pattern) }.select { |route| route.verb == verb }
       end
@@ -49,7 +47,7 @@ module Padrino
       #
       def call_by_request(request)
         rotation do |offset|
-          pattern  = encode_default_external(request.path_info)
+          pattern  = decode_pattern(request.path_info)
           if route = match?(offset, pattern)
             params = route.params_for(pattern, request.params)
             yield(route, params) if route.verb == request.request_method
@@ -62,7 +60,7 @@ module Padrino
       # Finds routes by using PATH_INFO.
       #
       def find_by_pattern(pattern)
-        pattern = pattern.encode(Encoding.default_external)
+        pattern  = decode_pattern(pattern)
         rotation { |offset| match?(offset, pattern) }
       end
   
@@ -72,9 +70,9 @@ module Padrino
       # Returns a instance of PathRouter::Route if path is matched with current regexp
       #
       def match?(offset, path)
-        current_regexp = @regexps[offset]
-        return unless current_regexp === path || (path.end_with?("/") && current_regexp === path[0..-2])
-        @routes[offset..-1].detect{ |route| Regexp.last_match["_#{route.index}"] }
+        @routes[offset..-1].find do |route|
+          route.regexp === path || (path.end_with?("/") && route.regexp === path[0..-2])
+        end
       end
 
       ##
@@ -90,13 +88,10 @@ module Padrino
       end
 
       ##
-      # Compiles routes into regexp recursively.
+      # Decode env["PATH_INFO"]
       #
-      def recursive_compile(regexps, paths = [])
-        return paths if regexps.length.zero?
-        paths << Regexp.union(regexps)
-        regexps.shift
-        recursive_compile(regexps, paths)
+      def decode_pattern(pattern)
+        decode_uri(encode_default_external(pattern))
       end
 
       ##
@@ -105,6 +100,13 @@ module Padrino
       def encode_default_external(string)
         string.encode(Encoding.default_external)
       end
+
+      ##
+      # Decode uri escape sequences
+      #
+      def decode_uri(string)
+        string.split(/%2F|%2f/, -1).map { |part| Rack::Utils.unescape(part) }.join('%2F')
+      end
     end
   end
 end

data/lib/padrino-core/path_router/matcher.rb

@@ -76,7 +76,7 @@ module Padrino
         @handler ||=
           case @path
           when String
-            Mustermann.new(@path, :capture => @capture)
+            Mustermann.new(@path, :capture => @capture, :uri_decode => false)
           when Regexp
             /^(?:#{@path})$/
           else

data/lib/padrino-core/path_router/route.rb

@@ -4,7 +4,7 @@ module Padrino
       ##
       # The accessors are useful to access from PathRouter::Router
       #
-      attr_accessor :name, :capture, :order, :options, :index
+      attr_accessor :name, :capture, :order, :options, :index, :regexp
 
       ##
       # A reader for compile option

data/lib/padrino-core/version.rb

@@ -6,7 +6,7 @@
 #
 module Padrino
   # The version constant for the current version of Padrino.
-  VERSION = '0.13.0' unless defined?(Padrino::VERSION)
+  VERSION = '0.13.1.beta1' unless defined?(Padrino::VERSION)
 
   #
   # The current Padrino version.

data/test/test_application.rb

@@ -165,8 +165,8 @@ describe "Application" do
         assert_instance_of Padrino::PathRouter::Compiler, PrecompiledApp::SubApp.compiled_router.engine
         assert_equal true, PrecompiledApp::App.compiled_router.engine.compiled?
         assert_equal true, PrecompiledApp::SubApp.compiled_router.engine.compiled?
-        assert_equal 20, PrecompiledApp::App.compiled_router.engine.regexps.length
-        assert_equal 20, PrecompiledApp::SubApp.compiled_router.engine.regexps.length
+        assert_equal 20, PrecompiledApp::App.compiled_router.engine.routes.length
+        assert_equal 20, PrecompiledApp::SubApp.compiled_router.engine.routes.length
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: padrino-core
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.13.1.beta1
 platform: ruby
 authors:
 - Padrino Team
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-11 00:00:00.000000000 Z
+date: 2015-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: padrino-support
@@ -19,82 +19,82 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: 0.13.1.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: 0.13.1.beta1
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.6
 - !ruby/object:Gem::Dependency
   name: mustermann19
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.18'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
   name: rack-protection
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.0
 description: The Padrino core gem required for use of this framework
@@ -105,9 +105,9 @@ extensions: []
 extra_rdoc_files:
 - README.rdoc
 files:
-- .document
-- .gitignore
-- .yardopts
+- ".document"
+- ".gitignore"
+- ".yardopts"
 - LICENSE.txt
 - README.rdoc
 - Rakefile
@@ -218,19 +218,19 @@ licenses:
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --charset=UTF-8
+- "--charset=UTF-8"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">"
     - !ruby/object:Gem::Version
-      version: 1.3.6
+      version: 1.3.1
 requirements: []
 rubyforge_project: padrino-core
 rubygems_version: 2.4.8