hanami-router 1.3.2 → 2.0.0.alpha1

data/lib/hanami-router.rb

@@ -1 +0,0 @@
-require 'hanami/router'

data/lib/hanami/routing/error.rb

@@ -1,7 +0,0 @@
-module Hanami
-  module Routing
-    # @since 0.5.0
-    class Error < ::StandardError
-    end
-  end
-end

data/lib/hanami/routing/force_ssl.rb

@@ -1,212 +0,0 @@
-require 'rack/request'
-require 'hanami/utils/deprecation'
-
-module Hanami
-  module Routing
-    # Force ssl
-    #
-    # Redirect response to the secure equivalent resource (https)
-    #
-    # @since 0.4.1
-    # @api private
-    class ForceSsl
-      # Https scheme
-      #
-      # @since 0.4.1
-      # @api private
-      SSL_SCHEME = 'https'.freeze
-
-      # @since 0.4.1
-      # @api private
-      HTTPS = 'HTTPS'.freeze
-
-      # @since 0.4.1
-      # @api private
-      ON    = 'on'.freeze
-
-      # Location header
-      #
-      # @since 0.4.1
-      # @api private
-      LOCATION_HEADER = 'Location'.freeze
-
-      # Default http port
-      #
-      # @since 0.4.1
-      # @api private
-      DEFAULT_HTTP_PORT = 80
-
-      # Default ssl port
-      #
-      # @since 0.4.1
-      # @api private
-      DEFAULT_SSL_PORT = 443
-
-      # Moved Permanently http code
-      #
-      # @since 0.4.1
-      # @api private
-      MOVED_PERMANENTLY_HTTP_CODE = 301
-
-      # Temporary Redirect http code
-      #
-      # @since 0.4.1
-      # @api private
-      TEMPORARY_REDIRECT_HTTP_CODE = 307
-
-      # @since 0.4.1
-      # @api private
-      HTTP_X_FORWARDED_SSL = 'HTTP_X_FORWARDED_SSL'.freeze
-
-      # @since 0.4.1
-      # @api private
-      HTTP_X_FORWARDED_SCHEME = 'HTTP_X_FORWARDED_SCHEME'.freeze
-
-      # @since 0.4.1
-      # @api private
-      HTTP_X_FORWARDED_PROTO = 'HTTP_X_FORWARDED_PROTO'.freeze
-
-      # @since 0.4.1
-      # @api private
-      HTTP_X_FORWARDED_PROTO_SEPARATOR = ','.freeze
-
-      # @since 0.4.1
-      # @api private
-      RACK_URL_SCHEME = 'rack.url_scheme'.freeze
-
-      # @since 0.4.1
-      # @api private
-      REQUEST_METHOD = 'REQUEST_METHOD'.freeze
-
-      # @since 0.4.1
-      # @api private
-      IDEMPOTENT_METHODS = ['GET', 'HEAD'].freeze
-
-      EMPTY_BODY = [].freeze
-
-      # Initialize ForceSsl.
-      #
-      # @param active [Boolean] activate redirection to SSL
-      # @param options [Hash] set of options
-      # @option options [String] :host
-      # @option options [Integer] :port
-      #
-      # @since 0.4.1
-      # @api private
-      def initialize(active, options = {})
-        @active = active
-        @host   = options[:host]
-        @port   = options[:port]
-
-        _redefine_call
-      end
-
-      # Set 301 status and Location header if this feature is activated.
-      #
-      # @param env [Hash] a Rack env instance
-      #
-      # @return [Array]
-      #
-      # @see Hanami::Routing::HttpRouter#call
-      #
-      # @since 0.4.1
-      # @api private
-      def call(env)
-      end
-
-      # Check if router has to force the response with ssl
-      #
-      # @return [Boolean]
-      #
-      # @since 0.4.1
-      # @api private
-      def force?(env)
-        !ssl?(env)
-      end
-
-      private
-
-      # @since 0.4.1
-      # @api private
-      attr_reader :host
-
-      # Return full url to redirect
-      #
-      # @param env [Hash] Rack env
-      #
-      # @return [String]
-      #
-      # @since 0.4.1
-      # @api private
-      def full_url(env)
-        "#{ SSL_SCHEME }://#{ host }:#{ port }#{ ::Rack::Request.new(env).fullpath }"
-      end
-
-      # Return redirect code
-      #
-      # @param env [Hash] Rack env
-      #
-      # @return [Integer]
-      #
-      # @since 0.4.1
-      # @api private
-      def redirect_code(env)
-        if IDEMPOTENT_METHODS.include?(env[REQUEST_METHOD])
-          MOVED_PERMANENTLY_HTTP_CODE
-        else
-          TEMPORARY_REDIRECT_HTTP_CODE
-        end
-      end
-
-      # Return correct default port for full url
-      #
-      # @return [Integer]
-      #
-      # @since 0.4.1
-      # @api private
-      def port
-        if @port == DEFAULT_HTTP_PORT
-          DEFAULT_SSL_PORT
-        else
-          @port
-        end
-      end
-
-      # @since 0.4.1
-      # @api private
-      def _redefine_call
-        return unless @active
-
-        Hanami::Utils::Deprecation.new('force_ssl option is deprecated, please delegate this behaviour to Nginx/Apache or use a Rack middleware like `rack-ssl`')
-
-        define_singleton_method :call do |env|
-          [redirect_code(env), { LOCATION_HEADER => full_url(env) }, EMPTY_BODY] if force?(env)
-        end
-      end
-
-      # Adapted from Rack::Request#scheme
-      #
-      # @since 0.4.1
-      # @api private
-      def scheme(env)
-        if env[HTTPS] == ON
-          SSL_SCHEME
-        elsif env[HTTP_X_FORWARDED_SSL] == ON
-          SSL_SCHEME
-        elsif env[HTTP_X_FORWARDED_SCHEME]
-          env[HTTP_X_FORWARDED_SCHEME]
-        elsif env[HTTP_X_FORWARDED_PROTO]
-          env[HTTP_X_FORWARDED_PROTO].split(HTTP_X_FORWARDED_PROTO_SEPARATOR)[0]
-        else
-          env[RACK_URL_SCHEME]
-        end
-      end
-
-      # @since 0.4.1
-      # @api private
-      def ssl?(env)
-        scheme(env) == SSL_SCHEME
-      end
-    end
-  end
-end

data/lib/hanami/routing/http_router.rb

@@ -1,220 +0,0 @@
-require 'uri'
-require 'http_router'
-require 'hanami/routing/endpoint_resolver'
-require 'hanami/routing/route'
-require 'hanami/routing/parsers'
-require 'hanami/routing/force_ssl'
-require 'hanami/routing/error'
-require 'hanami/utils/path_prefix'
-require 'hanami/routing/http_router_monkey_patch'
-
-module Hanami
-  module Routing
-    # Invalid route
-    # This is raised when the router fails to recognize a route, because of the
-    # given arguments.
-    #
-    # @since 0.1.0
-    class InvalidRouteException < Hanami::Routing::Error
-    end
-
-    # HTTP router
-    #
-    # This implementation is based on ::HttpRouter (http_router gem).
-    #
-    # Hanami::Router wraps an instance of this class, in order to protect its
-    # public API from any future change of ::HttpRouter.
-    #
-    # @since 0.1.0
-    # @api private
-    class HttpRouter < ::HttpRouter
-      # Script name - rack environment variable
-      #
-      # @since 0.5.0
-      # @api private
-      SCRIPT_NAME = 'SCRIPT_NAME'.freeze
-
-      # Path info - rack environment variable
-      #
-      # @since 0.7.0
-      # @api private
-      PATH_INFO = 'PATH_INFO'.freeze
-
-      # Default PATH_INFO for Rack requests
-      #
-      # @since 0.7.0
-      # @api private
-      DEFAULT_PATH_INFO = '/'.freeze
-
-      # URL separator
-      #
-      # @since 0.7.0
-      # @api private
-      URL_SEPARATOR = '/'.freeze
-
-      # @since 0.5.0
-      # @api private
-      attr_reader :namespace
-
-      # @since 0.8.0
-      # @api private
-      attr_reader :prefix
-
-      # Initialize the router.
-      #
-      # @see Hanami::Router#initialize
-      #
-      # @since 0.1.0
-      # @api private
-      def initialize(options = {}, &blk)
-        if options[:parsers]
-          depecration_message = 'Hanami::Router options[:parsers] is deprecated and it will be removed in future versions'
-          Hanami::Utils::Deprecation.new(depecration_message)
-        end
-        @compiled         = false
-        @uri_parser       = URI::Parser.new
-        super(options, &nil)
-
-        @namespace        = options[:namespace] if options[:namespace]
-        @default_scheme   = options[:scheme]    if options[:scheme]
-        @default_host     = options[:host]      if options[:host]
-        @default_port     = options[:port]      if options[:port]
-        @route_class      = options[:route]    || Routing::Route
-        @resolver         = options[:resolver] || Routing::EndpointResolver.new(options)
-        @parsers          = Routing::Parsers.new(options[:parsers])
-        @prefix           = Utils::PathPrefix.new(options[:prefix] || '')
-        @force_ssl        = Hanami::Routing::ForceSsl.new(!!options[:force_ssl], host: @default_host, port: @default_port)
-      end
-
-      # Separator between controller and action name.
-      #
-      # @see Hanami::Routing::EndpointResolver::ACTION_SEPARATOR
-      #
-      # @since 0.1.0
-      # @api private
-      def action_separator
-        @resolver.action_separator
-      end
-
-      # Finds a path from the given options.
-      #
-      # @see Hanami::Routing::EndpointResolver#find
-      #
-      # @since 0.1.0
-      # @api private
-      def find(options)
-        @resolver.find(options)
-      end
-
-      # Generate a relative URL for a specified named route.
-      #
-      # @see Hanami::Router#path
-      #
-      # @since 0.1.0
-      # @api private
-      def raw_path(route, *args)
-        _rescue_url_recognition do
-          _custom_path(super(route, *args))
-        end
-      end
-
-      # Generate an absolute URL for a specified named route.
-      #
-      # @see Hanami::Router#path
-      #
-      # @since 0.1.0
-      # @api private
-      def raw_url(route, *args)
-        _rescue_url_recognition do
-          _custom_path(super(route, *args))
-        end
-      end
-
-      # Support for OPTIONS HTTP verb
-      #
-      # @see Hanami::Router#options
-      #
-      # @since 0.1.0
-      # @api private
-      def options(path, options = {}, &blk)
-        add_with_request_method(path, :options, options, &blk)
-      end
-
-      # Allow to mount a Rack app
-      #
-      # @see Hanami::Router#mount
-      #
-      # @since 0.1.1
-      # @api private
-      def mount(app, options)
-        add("#{ options.fetch(:at) }*", host: options[:host]).to(
-          @resolver.resolve(to: app)
-        )
-      end
-
-      # @api private
-      def raw_call(env, &blk)
-        if response = @force_ssl.call(env)
-          response
-        else
-          super(@parsers.call(env))
-        end
-      end
-
-      # @api private
-      def reset!
-        uncompile
-        @routes, @named_routes, @root = [], Hash.new{|h,k| h[k] = []}, Node::Root.new(self)
-        @default_host, @default_port, @default_scheme = 'localhost', 80, 'http'
-      end
-
-      # @api private
-      def pass_on_response(response)
-        super response.to_a
-      end
-
-      # @api private
-      def no_response(request, env)
-        if request.acceptable_methods.any? && !request.acceptable_methods.include?(env['REQUEST_METHOD'])
-          [405, {'Allow' => request.acceptable_methods.sort.join(", ")}, []]
-        else
-          @default_app.call(env)
-        end
-      end
-
-      # @api private
-      def rewrite_partial_path_info(env, request)
-        if request.path.empty?
-          env[SCRIPT_NAME] += env[PATH_INFO]
-          env[PATH_INFO]    = DEFAULT_PATH_INFO
-        else
-          path_info_before  = env[PATH_INFO].dup
-          env[PATH_INFO]    = "/#{@uri_parser.escape(request.path.join(URL_SEPARATOR))}"
-          env[SCRIPT_NAME] += path_info_before[0, path_info_before.bytesize - env[PATH_INFO].bytesize]
-        end
-      end
-
-      private
-
-      # @api private
-      def _rescue_url_recognition
-        yield
-      rescue ::HttpRouter::InvalidRouteException,
-             ::HttpRouter::TooManyParametersException => e
-        raise Routing::InvalidRouteException.new("#{ e.message } - please check given arguments")
-      end
-
-      # @api private
-      def add_with_request_method(path, method, opts = {}, &app)
-        super.generate(@resolver, opts, &app)
-      end
-
-      # @api private
-      def _custom_path(uri_string)
-        uri = URI.parse(uri_string)
-        uri.path = @prefix.join(uri.path)
-        uri.to_s
-      end
-    end
-  end
-end

data/lib/hanami/routing/http_router_monkey_patch.rb

@@ -1,38 +0,0 @@
-# coding: utf-8
-#
-# This monkey patches http_router to make it Rack 2.0 compatible.
-# Details see: https://github.com/hanami/router/issues/136
-#
-# @api private
-class HttpRouter
-  # @api private
-  class Node
-    # @api private
-    class Path < Node
-      def to_code
-        path_ivar = inject_root_ivar(self)
-        "#{"if !callback && request.path.size == 1 && request.path.first == '' && (request.rack_request.head? || request.rack_request.get?) && request.rack_request.path_info[-1] == ?/
-          response = ::Rack::Response.new
-          response.redirect(request.rack_request.path_info[0, request.rack_request.path_info.size - 1], 302)
-          return response.finish
-        end" if router.redirect_trailing_slash?}
-
-        #{"if request.#{router.ignore_trailing_slash? ? 'path_finished?' : 'path.empty?'}" unless route.match_partially}
-          if callback
-            request.called = true
-            callback.call(Response.new(request, #{path_ivar}))
-          else
-            env = request.rack_request.env
-            env['router.request'] = request
-            env['router.params'] ||= {}
-            #{"env['router.params'].merge!(Hash[#{param_names.inspect}.zip(request.params)])" if dynamic?}
-            @router.rewrite#{"_partial" if route.match_partially}_path_info(env, request)
-            response = @router.process_destination_path(#{path_ivar}, env)
-            return response unless router.pass_on_response(response)
-          end
-        #{"end" unless route.match_partially}"
-      end
-
-    end
-  end
-end