hanami-router 2.0.0.alpha1 → 2.0.0.alpha2

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

@@ -3,6 +3,7 @@
 module Hanami
   class Router
     # @since 0.1.0
-    VERSION = "2.0.0.alpha1"
+    # @api public
+    VERSION = "2.0.0.alpha2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hanami-router
 version: !ruby/object:Gem::Version
-  version: 2.0.0.alpha1
+  version: 2.0.0.alpha2
 platform: ruby
 authors:
 - Luca Guidi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-30 00:00:00.000000000 Z
+date: 2020-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -52,34 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: hanami-utils
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.0.alpha
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.0.alpha
-- !ruby/object:Gem::Dependency
-  name: dry-inflector
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -106,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
@@ -134,14 +106,14 @@ 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'
 description: Rack compatible HTTP router for Ruby
 email:
 - me@lucaguidi.com
@@ -159,20 +131,17 @@ files:
 - lib/hanami/middleware/body_parser/json_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.rb
-- lib/hanami/routing/endpoint.rb
-- lib/hanami/routing/endpoint_resolver.rb
-- lib/hanami/routing/prefix.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/routes_inspector.rb
-- lib/hanami/routing/scope.rb
 homepage: http://hanamirb.org
 licenses:
 - MIT
@@ -192,7 +161,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Rack compatible HTTP router for Ruby and Hanami

data/lib/hanami/routing.rb

@@ -1,193 +0,0 @@
-# frozen_string_literal: true
-
-require "uri"
-require "rack/utils"
-require "mustermann/rails"
-
-# Hanami
-#
-# @since 0.1.0
-module Hanami
-  # Hanami routing
-  #
-  # @since 0.1.0
-  module Routing
-    PATH_INFO      = "PATH_INFO"
-    QUERY_STRING   = "QUERY_STRING"
-    REQUEST_METHOD = "REQUEST_METHOD"
-
-    HTTP_VERBS = %w[get post delete put patch trace options link unlink].freeze
-
-    PARAMS = "router.params"
-
-    def self.http_verbs
-      HTTP_VERBS
-    end
-
-    # @since 0.5.0
-    class Error < ::StandardError
-    end
-
-    # Invalid route
-    # This is raised when the router fails to recognize a route, because of the
-    # given arguments.
-    #
-    # @since 0.1.0
-    class InvalidRouteException < Error
-    end
-
-    # Endpoint not found
-    # This is raised when the router fails to load an endpoint at the runtime.
-    #
-    # @since 0.1.0
-    class EndpointNotFound < Error
-    end
-
-    # @since 2.0.0
-    class NotCallableEndpointError < Error
-      def initialize(endpoint)
-        super("#{endpoint.inspect} isn't compatible with Rack. Please make sure it implements #call.")
-      end
-    end
-
-    # HTTP redirect
-    #
-    # @since 2.0.0
-    # @api private
-    class Redirect
-      # @since 2.0.0
-      # @api private
-      LOCATION = "Location"
-
-      # @since 2.0.0
-      # @api private
-      STATUS_RANGE = (300..399).freeze
-
-      attr_reader :path
-      alias destination_path path
-
-      # Instantiate a new redirect
-      #
-      # @param path [String] a relative or absolute URI
-      # @param status [Integer] a redirect status (an integer between `300` and `399`)
-      #
-      # @return [Hanami::Routing::Redirect] a new instance
-      #
-      # @raise [ArgumentError] if path is nil, or status code isn't a redirect
-      #
-      # @since 2.0.0
-      # @api private
-      def initialize(path, status)
-        raise ArgumentError.new("Path is nil") if path.nil?
-        raise ArgumentError.new("Status code isn't a redirect: #{status.inspect}") unless STATUS_RANGE.include?(status)
-
-        @path   = path
-        @status = status
-        freeze
-      end
-
-      def call(*)
-        [@status, { LOCATION => @path }, []]
-      end
-
-      def redirect?
-        true
-      end
-    end
-
-    # Route
-    #
-    # @since 0.1.0
-    # @api private
-    class Route
-      # @since 0.7.0
-      # @api private
-      def initialize(verb, path, endpoint, constraints)
-        @verb     = verb
-        @path     = Mustermann.new(path, type: :rails, version: "5.0", capture: constraints)
-        @endpoint = endpoint
-        freeze
-      end
-
-      # @since 0.1.0
-      # @api private
-      def call(env)
-        env[PARAMS] ||= {}
-        env[PARAMS].merge!(Rack::Utils.parse_nested_query(env[QUERY_STRING]))
-        env[PARAMS].merge!(@path.params(env[PATH_INFO]))
-        env[PARAMS] = Utils::Hash.deep_symbolize(env[PARAMS])
-
-        @endpoint.call(env)
-      end
-
-      # @since 0.1.0
-      # @api private
-      def path(args)
-        @path.expand(:append, args)
-      rescue Mustermann::ExpandError => e
-        raise Hanami::Routing::InvalidRouteException.new(e.message)
-      end
-
-      # @since 2.0.0
-      # @api private
-      def match?(env)
-        match_path?(env) &&
-          @verb.include?(env[REQUEST_METHOD])
-      end
-
-      # @since 2.0.0
-      # @api private
-      def match_path?(env)
-        @path =~ env[PATH_INFO]
-      end
-    end
-
-    # @since 2.0.0
-    # @api private
-    module Uri
-      # @since 2.0.0
-      # @api private
-      HTTP  = "http"
-
-      # @since 2.0.0
-      # @api private
-      HTTPS = "https"
-
-      # @since 2.0.0
-      # @api private
-      DEFAULT_SCHEME = HTTP
-
-      # Build a URI string from the given arguments
-      #
-      # @param scheme [String] the URI scheme: one of `"http"` or `"https"`
-      # @param host [String] the URI host
-      # @param port [String,Integer] the URI port
-      #
-      # @raise [ArgumentError] if one of `scheme`, `host`, `port` is `nil`, or
-      #   if `scheme` is unknown
-      #
-      # @since 2.0.0
-      # @api private
-      def self.build(scheme:, host:, port:)
-        raise ArgumentError.new("host is nil") if host.nil?
-        raise ArgumentError.new("port is nil") if port.nil?
-
-        case scheme
-        when HTTP
-          URI::HTTP
-        when HTTPS
-          URI::HTTPS
-        else
-          raise ArgumentError.new("Unknown scheme: #{scheme.inspect}")
-        end.build(scheme: scheme, host: host, port: port).to_s
-      end
-    end
-
-    require "hanami/routing/endpoint"
-    require "hanami/routing/prefix"
-    require "hanami/routing/scope"
-    require "hanami/routing/resource"
-    require "hanami/routing/resources"
-    require "hanami/routing/recognized_route"
-  end
-end