rack-app 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 08805ebc1c3be6338441b4ca870489333fdee27a
-  data.tar.gz: 0fc3f607f9bbc02ed4fe4392b49968e23612015e
+  metadata.gz: d3ec73ef1741248aea0a795217bb718ad9aee4a5
+  data.tar.gz: bee58d13e8db2f14d1ed1bb7b0f06fb6c0429def
 SHA512:
-  metadata.gz: eaa0c3dc517544bc6dee91ae97a3208a39172da520c4368c399f222e928947252ed7c87a9e9dec637d7352bc6abd616a44304331c6622419c77316f84b68d1d8
-  data.tar.gz: ae56428e27d1ad9e30ebb9e21b215cd440d3b0cde6bb97ef8a0ddcb92a2b4b15f6390ce631bee218de7efd426af76b6330f5755301fc93669e166d266be1f35a
+  metadata.gz: 17bdeed0847c57119871824c6eea1defa58a51c595dada79153fa0d1d0d68db8019828a390b20d4d4c29be5d87c383dc45ff5297afad3d3a544a9ce10c39d1b4
+  data.tar.gz: 913db22c6134df5b7c6213dc7d07bafb9e71bc2d6966e401ab482f5aab76ad62f385a5937ae6f43149815b52133b867a54b6119fb5ac728a05642e269e28f06f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rack-app (0.3.0)
+    rack-app (0.4.0)
       rack
 
 GEM

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.0

data/lib/rack/app.rb

@@ -22,14 +22,14 @@ class Rack::App
     Rack::App::Runner.response_for(self,request_env)
   end
 
-  attr_reader :request, :response
+  attr_writer :request, :response
 
-  protected
+  def request
+    @request || raise("request object is not set for #{self.class}")
+  end
 
-  def initialize(request, response,options = {})
-    @response = response
-    @request = request
-    @options = options
+  def response
+    @response || raise("response object is not set for #{self.class}")
   end
 
 end

data/lib/rack/app/endpoint.rb

@@ -12,7 +12,12 @@ class Rack::App::Endpoint
     request = Rack::Request.new(request_env)
     response = Rack::Response.new
 
-    request_handler = @api_class.new(request, response,{path_params_matcher: @path_params_matcher})
+    request_handler = @api_class.new
+
+    request_handler.request = request
+    request_handler.response = response
+    request.env['rack.app.path_params_matcher']= @path_params_matcher.dup
+
     call_return = request_handler.instance_exec(&@logic_block)
 
     return call_return if is_a_rack_response_finish?(call_return)

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

@@ -1,10 +1,8 @@
 require 'cgi'
 class Rack::App::RequestHelpers::Params
 
-  def initialize(request_env, options = {})
+  def initialize(request_env)
     @request_env = request_env
-
-    @path_params_matcher = options[:path_params_matcher] || {}
   end
 
   def to_hash
@@ -14,36 +12,39 @@ class Rack::App::RequestHelpers::Params
   protected
 
   def query_params
-    CGI.parse(@request_env['QUERY_STRING'].to_s).freeze.reduce({}) do |params_collection, (k, v)|
+    CGI.parse(@request_env[Rack::QUERY_STRING].to_s).freeze.reduce({}) do |params_collection, (k, v)|
+
       if v.is_a?(Array) and v.length === 1
         params_collection[k]= v[0]
       else
-        k = k.sub(/\[\]$/,'')
+        k = k.sub(/\[\]$/, '')
         params_collection[k]= v
       end
 
       params_collection
+
     end
   end
 
-
   def request_path_params
     path_params = {}
-    if @path_params_matcher.is_a?(Hash) and not @path_params_matcher.empty?
-
-      request_path_parts = Rack::App::Utils.normalize_path(@request_env['REQUEST_PATH']).split('/')
+    path_params.merge!(extract_path_params) unless path_params_matcher.empty?
+    path_params
+  end
 
-      path_params = request_path_parts.each.with_index.reduce({}) do |params_col, (path_part, index)|
-        if @path_params_matcher[index]
-          params_col[@path_params_matcher[index]]= path_part
-        end
-        params_col
-      end
+  def extract_path_params
+    request_path_parts.each.with_index.reduce({}) do |params_col, (path_part, index)|
+      params_col[path_params_matcher[index]]= path_part if path_params_matcher[index]
+      params_col
+    end
+  end
 
-      path_params.merge!(path_params)
+  def request_path_parts
+    Rack::App::Utils.normalize_path(@request_env['REQUEST_PATH']).split('/')
+  end
 
-    end
-    path_params
+  def path_params_matcher
+    @request_env['rack.app.path_params_matcher'] || {}
   end
 
 end

data/lib/rack/app/request_helpers.rb

@@ -3,7 +3,7 @@ module Rack::App::RequestHelpers
   require 'rack/app/request_helper/params'
 
   def params
-    @__request_params__ ||= Rack::App::RequestHelpers::Params.new(request.env,@options).to_hash
+    @__request_params__ ||= Rack::App::RequestHelpers::Params.new(request.env).to_hash
   end
 
   def status(new_status=nil)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-app
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Adam Luzsi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-11-25 00:00:00.000000000 Z
+date: 2015-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler