rack-app 5.11.1 → 5.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d2a02f6b4e7653fa9647f92c3aff43878fd64c2
-  data.tar.gz: e262d7601e24a4f451ffa43dcabfd1ca0bab0220
+  metadata.gz: ad41bbced4baeeea08b32f690ed2268453b9491b
+  data.tar.gz: 5b02692483edeeffb9aaf5e8f5d15ba763f426e6
 SHA512:
-  metadata.gz: bb38fe1f45db780873148bdf662baa41bc0cf84762204aa3be46ee8ffaa7495b6bfa707dc8a93069ee3f6509271bed3f70734491c331fa9cee5348544a12403c
-  data.tar.gz: 3177c3c9643288694a0d8ec3f51ec644cf5e9ee3a9e787e8169952b850e97df51af114dd20f3b02056fa059c02eb6bb1ca9f30d192882835febda8147eb85539
+  metadata.gz: 522f2d363ead4984e3afb39c81f801e8aec3f73cdfb6f897729756af7635a8ae40d0290f5257b99124f7bf3d9de9b3f14f1741d5868762d3dd5cdc0d2ff63619
+  data.tar.gz: 714c400a866ed8f47c386ea7dafdee6562ab97f590338b8f45d3bdd5b5fec04981afbd47dd8c9df951a6d33c0c3c9bbb48101432caef42de202859b1734cda63

data/VERSION

@@ -1 +1 @@
-5.11.1
+5.12.0

data/lib/rack/app/constants.rb

@@ -38,6 +38,7 @@ module Rack::App::Constants
     REQUEST_PATH = Rack::App::Constants.rack_constant(:REQUEST_PATH, "REQUEST_PATH")
     REQUEST_METHOD = Rack::App::Constants.rack_constant(:REQUEST_METHOD, "REQUEST_METHOD")
 
+    ROUTER = 'rack-app.router'.freeze
     EXTNAME = 'rack-app.extname'.freeze
     SERIALIZER = 'rack-app.serializer'.freeze
     CONTENT_TYPE = 'CONTENT_TYPE'.freeze

data/lib/rack/app/endpoint.rb

@@ -30,4 +30,10 @@ class Rack::App::Endpoint
     @config.application || self.class::Builder.new(@config).build
   end
 
+  def rack_app?
+    !!@config.app_class
+  rescue
+    false
+  end
+
 end

data/lib/rack/app/instance_methods.rb

@@ -3,6 +3,7 @@ module Rack::App::InstanceMethods
   require 'rack/app/instance_methods/core'
   require 'rack/app/instance_methods/http_status'
   require 'rack/app/instance_methods/redirect_to'
+  require 'rack/app/instance_methods/path_to'
   require 'rack/app/instance_methods/payload'
   require 'rack/app/instance_methods/serve_file'
   require 'rack/app/instance_methods/streaming'
@@ -10,6 +11,7 @@ module Rack::App::InstanceMethods
   include Rack::App::InstanceMethods::Core
   include Rack::App::InstanceMethods::HTTPStatus
   include Rack::App::InstanceMethods::RedirectTo
+  include Rack::App::InstanceMethods::PathTo
   include Rack::App::InstanceMethods::Payload
   include Rack::App::InstanceMethods::ServeFile
   include Rack::App::InstanceMethods::Streaming

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

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+module Rack::App::InstanceMethods::PathTo
+  def path_to(defined_path, options = {})
+    app_class = options[:class] || self.class
+
+    query_string_hash = options[:params] || {}
+    options.each do |k, v|
+      k.is_a?(String) && query_string_hash[k] = v
+    end
+
+    router = request.env[Rack::App::Constants::ENV::ROUTER]
+    final_path = router.final_path_for(app_class, defined_path)
+
+    path_keys = final_path.scan(/:(\w+)/).flatten
+
+    path_keys.each do |key|
+      value = query_string_hash.delete(key) || params[key] || raise("missing path-key value for #{key}!")
+      final_path.gsub!(/:#{key}/, value.to_s)
+    end
+
+    unless query_string_hash.empty?
+      final_path.concat("?" + Rack::App::Utils.encode_www_form(query_string_hash))
+    end
+
+    final_path
+  end
+end

data/lib/rack/app/router.rb

@@ -12,6 +12,7 @@ class Rack::App::Router
   end
 
   def call(env)
+    env[Rack::App::Constants::ENV::ROUTER]= self
     @tree.call(env) || NOT_FOUND_APP.call(env)
   end
 
@@ -27,6 +28,7 @@ class Rack::App::Router
 
   # add ! to method name
   def reset
+    @lookup_paths = Hash.new #(Hash.new)
     @tree = Rack::App::Router::Tree.new
     compile_registered_endpoints!
   end
@@ -61,6 +63,10 @@ class Rack::App::Router
 
   end
 
+  def final_path_for(klass, defined_path)
+    (@lookup_paths[klass][defined_path] || raise("missing path reference: #{klass}/#{original_path}")).dup
+  end
+
   protected
 
   def initialize
@@ -75,6 +81,15 @@ class Rack::App::Router
 
   def compile_endpoint!(endpoint)
     @tree.add(endpoint)
+    add_to_lookup_paths(endpoint)
+  end
+
+  def add_to_lookup_paths(endpoint)
+    return unless endpoint.rack_app?
+    def_path = endpoint.config.defined_request_path
+    final_path = endpoint.request_path
+    dictionary = @lookup_paths[endpoint.config.app_class] ||= {}
+    dictionary[def_path]= final_path
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-app
 version: !ruby/object:Gem::Version
-  version: 5.11.1
+  version: 5.12.0
 platform: ruby
 authors:
 - Adam Luzsi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-05 00:00:00.000000000 Z
+date: 2017-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -117,6 +117,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/path_to.rb
 - lib/rack/app/instance_methods/payload.rb
 - lib/rack/app/instance_methods/redirect_to.rb
 - lib/rack/app/instance_methods/serve_file.rb
@@ -148,7 +149,6 @@ files:
 - lib/rack/app/request_configurator.rb
 - lib/rack/app/request_stream.rb
 - lib/rack/app/router.rb
-- lib/rack/app/router/base.rb
 - lib/rack/app/router/tree.rb
 - lib/rack/app/router/tree/branch.rb
 - lib/rack/app/router/tree/env.rb

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

@@ -1,75 +0,0 @@
-class Rack::App::Router::Base
-
-  def call(env)
-    app = get_app(env)
-    app && app.call(env)
-  end
-
-  def endpoints
-    @endpoints ||= []
-  end
-
-  def register_endpoint!(endpoint)
-    endpoints.push(endpoint)
-    compile_endpoint!(endpoint)
-    return endpoint
-  end
-
-  def reset
-    clean_routes!
-    compile_registered_endpoints!
-  end
-
-  protected
-
-  def get_app(env)
-    raise(NotImplementedError)
-  end
-
-  def compile_endpoint!(endpoint)
-    raise(NotImplementedError)
-  end
-
-  def clean_routes!
-    raise(NotImplementedError)
-  end
-
-  def compile_registered_endpoints!
-    raise(NotImplementedError)
-  end
-
-  def fetch_context(request_method, request_path)
-    raise(NotImplementedError)
-  end
-
-  def as_app(endpoint_or_app)
-    if endpoint_or_app.respond_to?(:to_app)
-      endpoint_or_app.to_app
-    else
-      endpoint_or_app
-    end
-  end
-
-  def find_by_path_infos(env)
-    yield(raw_path_info(env)) || yield(formatted_path_info(env))
-  end
-
-  def get_request_method(env)
-    env[::Rack::App::Constants::ENV::REQUEST_METHOD]
-  end
-
-  def raw_path_info(env)
-    env[::Rack::App::Constants::ENV::PATH_INFO]
-  end
-
-  def formatted_path_info(env)
-    path_info = raw_path_info(env).dup
-    path_info.slice!(/#{Regexp.escape(extname(env))}$/)
-    path_info
-  end
-
-  def extname(env)
-    env[::Rack::App::Constants::ENV::EXTNAME]
-  end
-
-end