hanami-router 1.3.1 → 2.0.0.alpha4

data/lib/hanami/router/segment.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require "mustermann/rails"
+
+module Hanami
+  class Router
+    # Route path
+    #
+    # @since 2.0.0
+    # @api private
+    class Segment
+      # @since 2.0.0
+      # @api private
+      def self.fabricate(segment, **constraints)
+        Mustermann.new(segment, type: :rails, version: "5.0", capture: constraints)
+      end
+    end
+  end
+end

data/lib/hanami/router/trie.rb

@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+require "hanami/router/node"
+
+module Hanami
+  class Router
+    # Trie data structure to store routes
+    #
+    # @api private
+    # @since 2.0.0
+    class Trie
+      # @api private
+      # @since 2.0.0
+      attr_reader :root
+
+      # @api private
+      # @since 2.0.0
+      def initialize
+        @root = Node.new
+      end
+
+      # @api private
+      # @since 2.0.0
+      def add(path, to, constraints)
+        node = @root
+        for_each_segment(path) do |segment|
+          node = node.put(segment, constraints)
+        end
+
+        node.leaf!(to)
+      end
+
+      # @api private
+      # @since 2.0.0
+      def find(path)
+        node = @root
+        params = {}
+
+        for_each_segment(path) do |segment|
+          break unless node
+
+          child, captures = node.get(segment)
+          params.merge!(captures) if captures
+
+          node = child
+        end
+
+        return [node.to, params] if node&.leaf?
+
+        nil
+      end
+
+      private
+
+      # @api private
+      # @since 2.0.0
+      def for_each_segment(path, &blk)
+        _, *segments = path.split(/\//)
+        segments.each(&blk)
+      end
+    end
+  end
+end

data/lib/hanami/router/url_helpers.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require "hanami/router/error"
+require "mustermann/error"
+
+module Hanami
+  class Router
+    # URL Helpers
+    class UrlHelpers
+      # @since 2.0.0
+      # @api private
+      def initialize(base_url)
+        @base_url = base_url
+        @named = {}
+      end
+
+      # @since 2.0.0
+      # @api private
+      def add(name, segment)
+        @named[name] = segment
+      end
+
+      # @since 2.0.0
+      # @api public
+      def path(name, variables = {})
+        @named.fetch(name.to_sym) do
+          raise InvalidRouteException.new(name)
+        end.expand(:append, variables)
+      rescue Mustermann::ExpandError => exception
+        raise InvalidRouteExpansionException.new(name, exception.message)
+      end
+
+      # @since 2.0.0
+      # @api public
+      def url(name, variables = {})
+        @base_url + path(name, variables)
+      end
+    end
+  end
+end

data/lib/hanami/router/version.rb

@@ -1,6 +1,9 @@
+# frozen_string_literal: true
+
 module Hanami
   class Router
     # @since 0.1.0
-    VERSION = '1.3.1'.freeze
+    # @api public
+    VERSION = "2.0.0.alpha4"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hanami-router
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 2.0.0.alpha4
 platform: ruby
 authors:
 - Luca Guidi
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-01-18 00:00:00.000000000 Z
+date: 2021-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -25,33 +25,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: http_router
+  name: mustermann
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: hanami-utils
+  name: mustermann-contrib
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -78,14 +78,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12'
+        version: '13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12'
+        version: '13'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
@@ -106,14 +106,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.8'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: '0.91'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: '0.91'
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.8.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.8.1
 description: Rack compatible HTTP router for Ruby
 email:
 - me@lucaguidi.com
@@ -125,37 +153,29 @@ files:
 - LICENSE.md
 - README.md
 - hanami-router.gemspec
-- lib/hanami-router.rb
 - lib/hanami/middleware/body_parser.rb
 - lib/hanami/middleware/body_parser/class_interface.rb
 - lib/hanami/middleware/body_parser/errors.rb
 - lib/hanami/middleware/body_parser/json_parser.rb
+- lib/hanami/middleware/body_parser/parser.rb
+- lib/hanami/middleware/error.rb
 - lib/hanami/router.rb
+- lib/hanami/router/block.rb
+- lib/hanami/router/error.rb
+- lib/hanami/router/node.rb
+- lib/hanami/router/params.rb
+- lib/hanami/router/prefix.rb
+- lib/hanami/router/recognized_route.rb
+- lib/hanami/router/redirect.rb
+- lib/hanami/router/segment.rb
+- lib/hanami/router/trie.rb
+- lib/hanami/router/url_helpers.rb
 - lib/hanami/router/version.rb
-- lib/hanami/routing/endpoint.rb
-- lib/hanami/routing/endpoint_resolver.rb
-- lib/hanami/routing/error.rb
-- lib/hanami/routing/force_ssl.rb
-- lib/hanami/routing/http_router.rb
-- lib/hanami/routing/http_router_monkey_patch.rb
-- lib/hanami/routing/namespace.rb
-- lib/hanami/routing/parsers.rb
-- lib/hanami/routing/parsing/json_parser.rb
-- lib/hanami/routing/parsing/parser.rb
-- lib/hanami/routing/recognized_route.rb
-- lib/hanami/routing/resource.rb
-- lib/hanami/routing/resource/action.rb
-- lib/hanami/routing/resource/nested.rb
-- lib/hanami/routing/resource/options.rb
-- lib/hanami/routing/resources.rb
-- lib/hanami/routing/resources/action.rb
-- lib/hanami/routing/route.rb
-- lib/hanami/routing/routes_inspector.rb
 homepage: http://hanamirb.org
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -163,15 +183,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.0.2
-signing_key: 
+rubygems_version: 3.2.4
+signing_key:
 specification_version: 4
 summary: Rack compatible HTTP router for Ruby and Hanami
 test_files: []

data/lib/hanami-router.rb

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

data/lib/hanami/routing/endpoint.rb

@@ -1,195 +0,0 @@
-require 'delegate'
-require 'hanami/routing/error'
-require 'hanami/utils/class'
-
-module Hanami
-  module Routing
-    # Endpoint not found
-    # This is raised when the router fails to load an endpoint at the runtime.
-    #
-    # @since 0.1.0
-    class EndpointNotFound < Hanami::Routing::Error
-    end
-
-    # Routing endpoint
-    # This is the object that responds to an HTTP request made against a certain
-    # path.
-    #
-    # The router will use this class for:
-    #
-    #   * Procs and any Rack compatible object (respond to #call)
-    #
-    # @since 0.1.0
-    #
-    # @api private
-    #
-    # @example
-    #   require 'hanami/router'
-    #
-    #   Hanami::Router.new do
-    #     get '/proc',     to: ->(env) { [200, {}, ['This will use Hanami::Routing::Endpoint']] }
-    #     get '/rack-app', to: RackApp.new
-    #   end
-    class Endpoint < SimpleDelegator
-      # @since 0.2.0
-      # @api private
-      def inspect
-        case __getobj__
-        when Proc
-          source, line     = __getobj__.source_location
-          lambda_inspector = " (lambda)"  if  __getobj__.lambda?
-
-          "#<Proc@#{ ::File.expand_path(source) }:#{ line }#{ lambda_inspector }>"
-        when Class
-          __getobj__
-        else
-          "#<#{ __getobj__.class }>"
-        end
-      end
-
-      # @since 1.0.0
-      # @api private
-      def routable?
-        !__getobj__.nil?
-      rescue ArgumentError
-      end
-
-      # @since 1.0.1
-      # @api private
-      def redirect?
-        false
-      end
-
-      # @since 1.0.1
-      # @api private
-      def destination_path
-      end
-    end
-
-    # Routing endpoint
-    # This is the object that responds to an HTTP request made against a certain
-    # path.
-    #
-    # The router will use this class for:
-    #
-    #   * Classes
-    #   * Hanami::Action endpoints referenced as a class
-    #   * Hanami::Action endpoints referenced a string
-    #   * RESTful resource(s)
-    #
-    # @since 0.1.0
-    #
-    # @api private
-    #
-    # @example
-    #   require 'hanami/router'
-    #
-    #   Hanami::Router.new do
-    #     get '/class',               to: RackMiddleware
-    #     get '/hanami-action-class',  to: Dashboard::Index
-    #     get '/hanami-action-string', to: 'dashboard#index'
-    #
-    #     resource  'identity'
-    #     resources 'articles'
-    #   end
-    class ClassEndpoint < Endpoint
-      # Rack interface
-      #
-      # @since 0.1.0
-      # @api private
-      def call(env)
-        __getobj__.new.call(env)
-      end
-    end
-
-    # Routing endpoint
-    # This is the object that responds to an HTTP request made against a certain
-    # path.
-    #
-    # The router will use this class for the same use cases of `ClassEndpoint`,
-    # but when the target class can't be found, instead of raise a `LoadError`
-    # we reference in a lazy endpoint.
-    #
-    # For each incoming HTTP request, it will look for the referenced class,
-    # then it will instantiate and invoke #call on the object.
-    #
-    # This behavior is required to solve a chicken-egg situation when we try
-    # to load the router first and then the application with all its endpoints.
-    #
-    # @since 0.1.0
-    #
-    # @api private
-    #
-    # @see Hanami::Routing::ClassEndpoint
-    class LazyEndpoint < Endpoint
-      # Initialize the lazy endpoint
-      #
-      # @since 0.1.0
-      # @api private
-      def initialize(name, namespace)
-        @name, @namespace = name, namespace
-      end
-
-      # Rack interface
-      #
-      # @raise [EndpointNotFound] when the endpoint can't be found.
-      #
-      # @since 0.1.0
-      # @api private
-      def call(env)
-        obj.call(env)
-      end
-
-      # @since 0.2.0
-      # @api private
-      def inspect
-        # TODO review this implementation once the namespace feature will be
-        # cleaned up.
-        result = klass rescue nil
-
-        if result.nil?
-          result = @name
-          result = "#{ @namespace }::#{ result }" if @namespace != Object
-        end
-
-        result
-      end
-
-      private
-      # @since 0.1.0
-      # @api private
-      def obj
-        klass.new
-      end
-
-      # @since 0.2.0
-      # @api private
-      def klass
-        Utils::Class.load!(@name, @namespace)
-      rescue NameError => e
-        raise EndpointNotFound.new(e.message)
-      end
-    end
-
-    # @since 1.0.1
-    # @api private
-    class RedirectEndpoint < Endpoint
-      # @since 1.0.1
-      # @api private
-      attr_reader :destination_path
-
-      # @since 1.0.1
-      # @api private
-      def initialize(destination_path, destination)
-        @destination_path = destination_path
-        super(destination)
-      end
-
-      # @since 1.0.1
-      # @api private
-      def redirect?
-        true
-      end
-    end
-  end
-end