rack-app 6.0.0 → 6.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 115ef984aee400271ed64f69eee96b2bc3896cb9
-  data.tar.gz: dcb1b5ee1fd8af7b107b6dc50d9089fd9410657e
+  metadata.gz: 0b3fcb5171d9537595e5217484244a8033f25672
+  data.tar.gz: ae2b66351cfb4deeb2eb1f6fe184d90dba7e5014
 SHA512:
-  metadata.gz: a921f4cc74415fd8aef272fd97bdd3fd53e2066e42266ddddc98a9271cee6df6612d695fa6129055d7d216df533f596099cea13fa59a8c311380f3e31dfa68de
-  data.tar.gz: fe97b75e3b27041a03b34daa0650c40fc4719161d3d1d91e355000f6454762d50b431f1384eddad588f387c6991f69e59f4d49203df0a9428b048381ec0abe97
+  metadata.gz: 56d6b686fdfd3961c10aa20fa9d39deb4ff025491ac0aefe99a01e73857f0dc402dcc4123e4335462276ecc8aacd076a90a1e252044dc61234390878893ca2a4
+  data.tar.gz: a3b712d9292e047d9367a4bc14085bc33beb6ce144412e4aa00559633d147d6d511a56c6c7dcc32140b32af986d6d0f1389436278c711df743ff7b8b60e45dd1

data/VERSION

@@ -1 +1 @@
-6.0.0
+6.1.0

data/lib/rack/app/constants.rb

@@ -45,14 +45,17 @@ module Rack::App::Constants
     REQUEST_HANDLER = 'rack-app.handler'.freeze
 
     PARAMS_GETTER = 'rack-app.params.getter'
-    PARSED_PARAMS = 'rack-app.params.parsed'.freeze
+    PARAMS = 'rack-app.params.object'.freeze
+
+    MERGED_PARAMS = 'rack-app.params.merged'.freeze
     VALIDATED_PARAMS = 'rack-app.params.validated'.freeze
+    QUERY_STRING_PARAMS =  'rack-app.params.query_string'.freeze
+    PATH_SEGMENTS_PARAMS = 'rack-app.params.path_segments'.freeze
 
     PAYLOAD_PARSER = 'rack-app.payload.parser'.freeze
     PAYLOAD_GETTER = 'rack-app.payload.getter'.freeze
     PARSED_PAYLOAD = 'rack-app.payload.parsed'.freeze
 
-    PATH_PARAMS = 'rack-app.path_params'.freeze
     ORIGINAL_PATH_INFO = 'rack-app.original_path_info'.freeze
     FORMATTED_PATH_INFO = 'rack-app.formatted_path_info'.freeze
     SPLITTED_PATH_INFO = 'rack-app.splitted_path_info'.freeze

data/lib/rack/app/endpoint.rb

@@ -2,7 +2,7 @@ class Rack::App::Endpoint
 
   require "forwardable"
   extend Forwardable
-  def_delegators :@config, :request_methods, :request_path, :description
+  def_delegators :@config, :request_method, :request_path, :description
 
   require "rack/app/endpoint/config"
   require "rack/app/endpoint/builder"

data/lib/rack/app/endpoint/config.rb

@@ -5,7 +5,7 @@ class Rack::App::Endpoint::Config
     error_handler
     endpoint_specific_middlewares
     request_path
-    request_methods
+    request_method
     defined_request_path
     @raw
   end
@@ -55,16 +55,8 @@ class Rack::App::Endpoint::Config
     @raw[:endpoint_specific_middlewares] ||= []
   end
 
-
-  def request_methods
-    case @raw[:request_methods] || raise('missing config: request_methods')
-    when Rack::App::Constants::HTTP::METHOD::ANY
-      Rack::App::Constants::HTTP::METHODS
-    when ::Array
-      @raw[:request_methods].map(&:to_sym)
-    else
-      [@raw[:request_methods]].flatten.map(&:to_sym)
-    end
+  def request_method
+    @raw[:request_method] || raise('missing config: request_methods')
   end
 
   def request_path

data/lib/rack/app/instance_methods.rb

@@ -1,6 +1,7 @@
 module Rack::App::InstanceMethods
 
   require 'rack/app/instance_methods/core'
+  require 'rack/app/instance_methods/params'
   require 'rack/app/instance_methods/http_status'
   require 'rack/app/instance_methods/redirect_to'
   require 'rack/app/instance_methods/path_to'
@@ -9,6 +10,7 @@ module Rack::App::InstanceMethods
   require 'rack/app/instance_methods/streaming'
 
   include Rack::App::InstanceMethods::Core
+  include Rack::App::InstanceMethods::Params
   include Rack::App::InstanceMethods::HTTPStatus
   include Rack::App::InstanceMethods::RedirectTo
   include Rack::App::InstanceMethods::PathTo

data/lib/rack/app/instance_methods/core.rb

@@ -2,14 +2,6 @@ module Rack::App::InstanceMethods::Core
 
   attr_writer :request, :response
 
-  def params
-    request.env[::Rack::App::Constants::ENV::PARSED_PARAMS] ||= Rack::App::Params.new(request.env).to_hash
-  end
-
-  def validated_params
-    request.env[::Rack::App::Constants::ENV::VALIDATED_PARAMS]
-  end
-
   def request
     @request || raise("request object is not set for #{self.class}")
   end
@@ -18,15 +10,15 @@ module Rack::App::InstanceMethods::Core
     @response || raise("response object is not set for #{self.class}")
   end
 
-  def finish!(rack_response=response)
-    throw(:rack_response, rack_response)
+  def respond_with(value = response)
+    case value
+    when Rack::Response
+      throw(:rack_response, value)
+    else
+      throw(:response_body, value)
+    end
   end
 
-  alias finish_response finish!
-  Rack::App::Utils.deprecate(self, :finish_response, :finish!, 2016,9)
-
-  def respond_with(respond_body)
-    throw(:response_body, respond_body)
-  end
+  alias finish! respond_with
 
 end

data/lib/rack/app/instance_methods/params.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+module Rack::App::InstanceMethods::Params
+
+  E = ::Rack::App::Constants::ENV
+
+  def params
+    request.env[E::PARAMS].to_hash
+  end
+
+  def validated_params
+    request.env[E::PARAMS].validated_params
+  end
+
+  def path_segments_params
+    request.env[E::PARAMS].path_segments_params
+  end
+
+  def query_string_params
+    request.env[E::PARAMS].query_string_params
+  end
+
+end

data/lib/rack/app/middlewares/params/setter.rb

@@ -5,15 +5,9 @@ class Rack::App::Middlewares::Params::Setter
   end
 
   def call(env)
-    env[::Rack::App::Constants::ENV::PARSED_PARAMS] ||= params_hash(env)
+    Rack::App::Params.new(env).to_hash
 
     @app.call(env)
   end
 
-  protected
-
-  def params_hash(env)
-    Rack::App::Params.new(env).to_hash
-  end
-
 end

data/lib/rack/app/middlewares/set_path_params.rb

@@ -17,14 +17,14 @@ class Rack::App::Middlewares::SetPathParams
 
   def populate_path_params(env)
     @params_lookup_hash.each do |index, key|
-      env[E::PATH_PARAMS][key] = env[E::SPLITTED_PATH_INFO][index]
+      env[E::PATH_SEGMENTS_PARAMS][key] = env[E::SPLITTED_PATH_INFO][index]
     end
   end
 
   def correct_last_value_from_extensions(env)
     last_index = env[E::SPLITTED_PATH_INFO].length - 1
     return if @params_lookup_hash[last_index].nil?
-    extless(env[E::PATH_PARAMS][@params_lookup_hash[last_index]])
+    extless(env[E::PATH_SEGMENTS_PARAMS][@params_lookup_hash[last_index]])
   end
 
   def extless(value)

data/lib/rack/app/params.rb

@@ -1,12 +1,23 @@
 require 'cgi'
+require 'uri'
 class Rack::App::Params
 
+  E = ::Rack::App::Constants::ENV
+
   def to_hash
-    if @env[::Rack::App::Constants::ENV::PARSED_PARAMS]
-      @env[::Rack::App::Constants::ENV::PARSED_PARAMS]
-    else
-      query_params.merge(request_path_params)
-    end
+    @env[E::MERGED_PARAMS] ||= query_string_params.merge(path_segments_params)
+  end
+
+  def query_string_params
+    @env[E::QUERY_STRING_PARAMS] ||= generate_query_params
+  end
+
+  def path_segments_params
+    @env[E::PATH_SEGMENTS_PARAMS]
+  end
+
+  def validated_params
+    @env[E::VALIDATED_PARAMS]
   end
 
   protected
@@ -15,20 +26,17 @@ class Rack::App::Params
     @env = env
   end
 
-  def query_params
+  def generate_query_params
     raw_cgi_params.reduce({}) do |params_collection, (k, v)|
-      stripped_key = k.sub(/\[\]$/, '')
-
-      if single_paramter_value?(v) && !k.end_with?("[]")
-        params_collection[stripped_key]= v[0]
-      else
-        params_collection[stripped_key]= v
-      end
-
+      params_collection[k.sub(/\[\]$/, '')] = formatted_value(k, v)
       params_collection
     end
   end
 
+  def formatted_value(key, value)
+    single_paramter_value?(value) && !key.end_with?("[]") ? value[0] : value
+  end
+
   def single_paramter_value?(v)
     v.is_a?(Array) and v.length === 1
   end
@@ -37,8 +45,4 @@ class Rack::App::Params
     CGI.parse(@env[::Rack::QUERY_STRING].to_s)
   end
 
-  def request_path_params
-    @env[::Rack::App::Constants::ENV::PATH_PARAMS]
-  end
-
 end

data/lib/rack/app/router.rb

@@ -49,13 +49,13 @@ class Rack::App::Router
 
     endpoints = self.endpoints
 
-    wd0 = endpoints.map { |endpoint| endpoint.request_methods.first.to_s.length }.max
+    wd0 = endpoints.map { |endpoint| endpoint.request_method.to_s.length }.max
     wd1 = endpoints.map { |endpoint| endpoint.request_path.to_s.length }.max
     wd2 = endpoints.map { |endpoint| endpoint.description.to_s.length }.max
 
-    return endpoints.sort_by { |endpoint| [endpoint.request_methods.first, endpoint.request_path] }.map do |endpoint|
+    return endpoints.sort_by { |endpoint| [endpoint.request_method, endpoint.request_path] }.map do |endpoint|
       [
-        endpoint.request_methods.first.to_s.ljust(wd0),
+        endpoint.request_method.to_s.ljust(wd0),
         endpoint.request_path.to_s.ljust(wd1),
         endpoint.description.to_s.ljust(wd2)
       ].join('   ')

data/lib/rack/app/router/tree.rb

@@ -27,7 +27,8 @@ class Rack::App::Router::Tree
   E = Rack::App::Constants::ENV
 
   def configure_request(env)
-    env[E::PATH_PARAMS] ||= {}
+    env[E::PATH_SEGMENTS_PARAMS] ||= {}
+    env[E::PARAMS] ||= Rack::App::Params.new(env)
     fpi = format_path_info(env).freeze
     env[E::FORMATTED_PATH_INFO] = fpi
     spi = split_path_info(fpi).freeze

data/lib/rack/app/router/tree/vein.rb

@@ -3,7 +3,7 @@ class Rack::App::Router::Tree::Vein < ::Hash
 
   def set(env)
     app = create_app(env)
-    env.endpoint.request_methods.each do |request_method|
+    request_methods(env).each do |request_method|
       self[request_method.to_s.upcase] = app
     end
   end
@@ -31,4 +31,14 @@ class Rack::App::Router::Tree::Vein < ::Hash
     builder.to_app
   end
 
+  def request_methods(env)
+    request_method = env.endpoint.request_method
+    case request_method || raise('missing config: request_methods')
+    when Rack::App::Constants::HTTP::METHOD::ANY
+      Rack::App::Constants::HTTP::METHODS
+    else
+      [request_method].flatten.map(&:to_sym)
+    end
+  end
+
 end

data/lib/rack/app/singleton_methods/route_handling.rb

@@ -28,7 +28,7 @@ module Rack::App::SingletonMethods::RouteHandling
         :callable => callable,
         :payload => payload,
         :error_handler => error,
-        :request_methods => [request_method],
+        :request_method => request_method,
         :route => route_registration_properties.dup,
         :endpoint_specific_middlewares => next_endpoint_middlewares.dup,
         :request_path => ::Rack::App::Utils.join(@namespaces, request_path)
@@ -41,9 +41,6 @@ module Rack::App::SingletonMethods::RouteHandling
 
   end
 
-  def add_app_to_route(app, request_path)
-  end
-
   def namespace(request_path_namespace)
     return unless block_given?
     @namespaces ||= []

data/lib/rack/app/test.rb

@@ -16,7 +16,7 @@ module Rack::App::Test
     properties = args.select { |e| e.is_a?(Hash) }.reduce({}, &:merge!)
     url = args.detect { |e| e.is_a?(String) } || properties.delete(:url)
     mock_request = Rack::MockRequest.new(rack_app)
-    request_env = Rack::App::Test::Utils.env_by(properties)
+    request_env = Rack::App::Test::Utils.env_by(url, properties)
     return @last_response = mock_request.request(request_method.to_s.upcase, url, request_env)
   end
 

data/lib/rack/app/test/utils.rb

@@ -10,18 +10,27 @@ module Rack::App::Test::Utils
     properties
   end
 
-  def env_by(properties)
+  def env_by(uri, properties)
 
     properties = format_properties(properties)
     env = properties[:headers].reduce({}) { |m, (k, v)| m.merge("HTTP_#{k.to_s.tr('-', '_').upcase}" => v.to_s) }
     payload = properties.delete(:payload)
     env["rack.input"]= ::Rack::Lint::InputWrapper.new(string_io_for(payload))
-    env[::Rack::QUERY_STRING]= Rack::App::Utils.encode_www_form(properties[:params].to_a)
+    env[::Rack::QUERY_STRING]= query_string_by(uri, properties[:params])
     env.merge!(properties[:env] || {})
 
     env
   end
 
+  def query_string_by(uri, params={})
+     uri_based = URI.parse(uri).query.to_s
+     prop_based = Rack::App::Utils.encode_www_form(params.to_a)
+
+     parts = [uri_based, prop_based]
+     parts.delete("")
+     parts.join("&")
+  end
+
   def string_io_for(payload)
     case payload
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-app
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 6.1.0
 platform: ruby
 authors:
 - Adam Luzsi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-02 00:00:00.000000000 Z
+date: 2017-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -118,6 +118,7 @@ files:
 - lib/rack/app/instance_methods.rb
 - lib/rack/app/instance_methods/core.rb
 - lib/rack/app/instance_methods/http_status.rb
+- lib/rack/app/instance_methods/params.rb
 - lib/rack/app/instance_methods/path_to.rb
 - lib/rack/app/instance_methods/payload.rb
 - lib/rack/app/instance_methods/redirect_to.rb