tansu 0.5.0 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cbf58b1e60bd4e4fccacb3e82574ea4c229e0c49
-  data.tar.gz: 59e5f0390bdc9c6a621a5e52d0873923628f9399
+  metadata.gz: be97fbe1a67fc83dbd196ab45e51873c85d0cebf
+  data.tar.gz: dff32f99aa31020c5f1d6fa0447b8413d0d13d99
 SHA512:
-  metadata.gz: 74836d1a3c0ccc86a1d5f80732667719c52a0e4ab759bf453d8d3aa40e189220c8932fcf796d703f37ae83f9ca990e70ad234167baf258cc390ddf4a06f42e7e
-  data.tar.gz: d77bdb7a64c9c816bbcfcb70b9e3f93788049a5201771eb19c2aa8879e6fa1185c3b8af8a60c30c694734e2be0867ff34470ac7f2408ae8092fd5a48e1651c86
+  metadata.gz: 8f5178c3b0263617933b808254373707449d29260fdd8f7f95d527f32e61bd2d7dfcc6d642cbc8f23a791ca0377963b73689f13f384dbf4e151493a4a711b220
+  data.tar.gz: eb07b6f19f3f53f50ba8692e3ef14a68fc2bb4b12f203ba31ca773d2b31974e09b36bb0b42195042e5b796f2af49f4955862829e83bb22fc814d0acd17f014e9

data/lib/tansu/application.rb

@@ -18,7 +18,7 @@ module Tansu
       request     = Rack::Request.new(env)
       environment = Environment.new(request, Response.new)
 
-      path   = environment.path.empty? ? [:*] : environment.path
+      path   = (path = environment.params[:path_info]).empty? ? [:*] : path
       router = path.inject(Tansu.root) { |a, e| a[e] }[request.request_method]
 
       if Minicontext::Router::Just === router

data/lib/tansu/environment.rb

@@ -2,12 +2,12 @@ module Tansu
   class Environment < Minicontext::Environment
     include Tansu::Render
 
-    attr_reader :path
+    attr_reader :params
 
     IS_RESPOND_TO_EACH = -> (v) { v.respond_to?(:each) }
 
     def initialize(request, response = nil)
-      @path = parse(request.path_info)
+      @params = parse(request)
 
       super request, response
     end
@@ -49,10 +49,6 @@ module Tansu
       request.session
     end
 
-    def params
-      request.params
-    end
-
     def logger
       Application[:logger]
     end
@@ -63,12 +59,24 @@ module Tansu
 
     private
 
-    def parse(path)
-      (path[1..-1] || '').split('/').map(&:to_sym)
-    end
-
     def redirect?
       Response === @response && @response.status == 302
     end
+
+    def parse(request)
+      indifferent_params(request.params).merge(path_info(request.path_info))
+    end
+
+    def indifferent_params(hash)
+      indifferent_hash = Hash.new { |h, k| h[k.to_s] if Symbol === k }
+
+      hash.each_with_object(indifferent_hash) do |(k, v), a|
+        a[k] = Hash === v ? indifferent_params(v) : v
+      end
+    end
+
+    def path_info(path)
+      { 'path_info' => (path[1..-1] || '').split('/').map(&:to_sym) }
+    end
   end
 end

data/lib/tansu/version.rb

@@ -1,3 +1,3 @@
 module Tansu
-  VERSION = "0.5.0"
+  VERSION = "0.5.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tansu
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.5
 platform: ruby
 authors:
 - daisuko
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-11-14 00:00:00.000000000 Z
+date: 2015-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack