howl-router 0.1 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81ee1a9fd3fb9b42514e112a63ae5d0da2531553
-  data.tar.gz: 18f0e9a58f174d209feb7857d77918067059b7ff
+  metadata.gz: a4ebbc66f3c3f654d674622767d7edf84254af76
+  data.tar.gz: a4f0e1a5b59fab741073bae7cf03fa985ada4ab9
 SHA512:
-  metadata.gz: 23a2afffa48fabc92fa977bf01de758575dd5bd8bed88345cf6d9c92e12e43584143330262a5afeff6e9a6709718e17c1502c14c2ce6f2467e03e75699c10f23
-  data.tar.gz: a08e7b11b6a41c65fd66e8635662aac4c62fcf7c78580ea45cf9d5305088f8c7eb7515d8a1203f3a06bd6fd0f36a32e765651e8692a01a5e7dc50f9baacb76cb
+  metadata.gz: 85c9892dd1461ab74ac61faceb3d5a92555793a5f4810d3c724008765aec3758dda65e478a6d22e534076bfce3b743a3d463920a2d1ed768870b3e301b1f8459
+  data.tar.gz: 08f15a1b94df198e78e195ea4a1e547b2552a3b2ef1d041f405fabfa3e56f2f771192471f09ad9b23ee456defad79e77e60be5ccaf9a8a384830049de3d1b90d

data/README.md

@@ -8,9 +8,13 @@ Howl works only in Ruby2.0.
 
 ## Installation
 
-`git clone git@github.com:namusyaka/howl-router.git`
+add this line to your Gemfile.
 
-`cd howl-router; bundle install`
+`gem 'howl-router'`
+
+or
+
+`$ gem install howl-router`
 
 ## Example
 

data/config.ru

@@ -1,4 +1,4 @@
-load  File.expand_path('../lib/howl.rb', __FILE__)
+load  File.expand_path('../lib/howl-router.rb', __FILE__)
 
 howl = Howl.new
 

data/howl-router.gemspec

@@ -0,0 +1,20 @@
+require File.expand_path("../lib/howl-router/version", __FILE__)
+
+Gem::Specification.new "howl-router", Howl::VERSION do |s|
+  s.description = "A http router for Rack and Padrino."
+  s.summary = "http router library."
+  s.authors = ["namusyaka"]
+  s.email = "namusyaka@gmail.com"
+  s.homepage = "https://github.com/namusyaka/howl-router"
+  s.files = `git ls-files`.split("\n") - %w(.gitignore)
+  s.test_files = s.files.select { |path| path =~ /^test\/.*_test\.rb/ }
+  s.license = "MIT"
+
+  s.add_dependency "rack", ">= 1.3.0"
+  s.add_dependency "mustermann", "= 0.2.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"
+  s.add_development_dependency "haml"
+  s.add_development_dependency "padrino-core"
+end

data/lib/howl-router/matcher.rb

@@ -30,9 +30,11 @@ class Howl
 
     def handler
       @handler ||= case @path
-                   when String then Mustermann.new(@path, :type => :rails, :capture => @capture)
-                   when Regexp then /^(?:#{@path})$/
-                   end
+      when String
+        Mustermann.new(@path, :type => :rails, :capture => @capture, :uri_decode => nil)
+      when Regexp
+        /^(?:#{@path})$/
+      end
     end
 
     def to_s

data/lib/howl-router/padrino/ext/instance_methods.rb

@@ -3,41 +3,46 @@ class Howl
   module Padrino
     module InstanceMethods
       private
+        def invoke_route(route, params, options = {})
+          original_params, parent_layout, successful = @params.dup, @layout, false
+          captured_params = params[:captures].is_a?(Array) ? params.delete(:captures) :
+                                                             params.values_at(*route.matcher.names.dup)
+
+          @_response_buffer = nil
+          @route = request.route_obj = route
+          @params.merge!(params) if params.is_a?(Hash)
+          @params.merge!(:captures => captured_params) unless captured_params.empty?
+          @block_params = params
+
+          filter! :before if options[:first]
+
+          catch(:pass) do
+            begin
+              (route.before_filters - settings.filters[:before]).each{|block| instance_eval(&block) }
+              @layout = route.use_layout if route.use_layout
+              route.custom_conditions.each {|block|
+                pass if block.bind(self).call == false
+              } unless route.custom_conditions.empty?
+              halt_response     = catch(:halt){ route_eval{ route.block[self, captured_params] }}
+              @_response_buffer = halt_response.is_a?(Array) ? halt_response.last : halt_response
+              successful        = true
+              halt(halt_response)
+            ensure
+              (route.after_filters - settings.filters[:after]).each {|block| instance_eval(&block) } if successful
+              @layout, @params = parent_layout, original_params
+            end
+          end
+        end
+
         def route!(base = settings, pass_block = nil)
           Thread.current['padrino.instance'] = self
           code, headers, routes = base.compiled_router.call(@request.env)
 
           status(code)
           if code == 200
-            routes.each_with_index do |route_pair, index|
-              route = route_pair[0]
+            routes.each_with_index do |(route, howl_params), index|
               next if route.user_agent && !(route.user_agent =~ @request.user_agent)
-              original_params, parent_layout, successful = @params.dup, @layout, false
-
-              howl_params     = route_pair[1]
-              param_names     = route.matcher.names.dup
-              captured_params = howl_params[:captures].is_a?(Array) ? howl_params.delete(:captures) : howl_params.values_at(*param_names)
-
-              @route = request.route_obj = route
-              @params.merge!(howl_params) if howl_params.is_a?(Hash)
-              @params.merge!(:captures => captured_params) unless captured_params.empty?
-              @block_params = howl_params
-
-              filter! :before if index == 0
-
-              catch(:pass) do
-                begin
-                  (route.before_filters - settings.filters[:before]).each{|block| instance_eval(&block) }
-                  @layout = route.use_layout if route.use_layout
-                  route.custom_conditions.each {|block| pass if block.bind(self).call == false } unless route.custom_conditions.empty?
-                  halt_response = catch(:halt){ route_eval{ route.block[self, captured_params] }}
-                  successful    = true
-                  halt(halt_response)
-                ensure
-                   (route.after_filters - settings.filters[:after]).each {|block| instance_eval(&block) } if successful
-                   @layout, @params = parent_layout, original_params
-                end
-              end
+              invoke_route(route, howl_params, :first => index.zero?)
             end
           else
             route_eval do

data/lib/howl-router/request.rb

@@ -3,5 +3,9 @@ require 'rack'
 class Howl
   class Request < Rack::Request
     attr_accessor :acceptable_methods
+
+    def path_info
+      Rack::Utils.unescape super
+    end
   end
 end

data/lib/howl-router/version.rb

@@ -1,3 +1,3 @@
 class Howl
-  VERSION = '0.1'
+  VERSION = '0.1.1'
 end

data/test/howl_test.rb

@@ -33,6 +33,8 @@ describe Howl do
 
       get("/1")
       assert_equal "show 1", body
+      get(URI.escape("/あいうえお"))
+      assert_equal "show あいうえお", body
       get("/foo")
       assert_equal "show foo", body
       get("/1.json")

data/test/padrino_test.rb

@@ -110,6 +110,14 @@ describe "Howl::Padrino" do
     assert_equal 'success!', body    
   end
 
+  should 'parse route that contains encoded param.' do
+    mock_app do
+      get('/foo/:name'){ params[:name] }
+    end
+    get(URI.escape('/foo/あいうえお'))
+    assert_equal 'あいうえお', body
+  end
+
   should 'encode params using UTF-8' do
     #skip unless ''.respond_to?(:encoding) # for 1.8.7
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: howl-router
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: 0.1.1
 platform: ruby
 authors:
 - namusyaka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-24 00:00:00.000000000 Z
+date: 2013-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -119,6 +119,7 @@ files:
 - README.md
 - Rakefile
 - config.ru
+- howl-router.gemspec
 - lib/howl-router.rb
 - lib/howl-router/matcher.rb
 - lib/howl-router/padrino.rb