hanami-router 1.3.2 → 2.0.0.alpha1

data/lib/hanami/routing/resource/nested.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Hanami
   module Routing
     class Resource
@@ -8,7 +10,7 @@ module Hanami
       class Nested
         # @api private
         # @since 0.4.0
-        SEPARATOR = '/'.freeze
+        SEPARATOR = "/"
 
         # @api private
         # @since 0.4.0
@@ -32,6 +34,7 @@ module Hanami
         # @since 0.4.0
         def _calculate(param_wildcard, resource = nil)
           return if resource.nil?
+
           @path << resource.wildcard_param(param_wildcard.pop)
           _calculate(param_wildcard, resource.parent)
         end

data/lib/hanami/routing/resource/options.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Hanami
   module Routing
     class Resource
@@ -39,7 +41,7 @@ module Hanami
         def initialize(actions, options = {})
           only     = Array(options.delete(:only) || actions)
           except   = Array(options.delete(:except))
-          @actions = ( actions & only ) - except
+          @actions = (actions & only) - except
 
           @options = options
         end

data/lib/hanami/routing/resources.rb

@@ -1,5 +1,7 @@
-require 'hanami/routing/resource'
-require 'hanami/routing/resources/action'
+# frozen_string_literal: true
+
+require "hanami/routing/resource"
+require "hanami/routing/resources/action"
 
 module Hanami
   module Routing
@@ -16,7 +18,7 @@ module Hanami
       #
       # @api private
       # @since 0.1.0
-      self.actions = [:index, :new, :create, :show, :edit, :update, :destroy]
+      self.actions = %i[index new create show edit update destroy]
 
       # Action class
       #
@@ -41,7 +43,7 @@ module Hanami
       # @api private
       # @since 0.4.0
       def wildcard_param(route_param = nil)
-        "/:#{ Hanami::Utils::String.singularize(route_param) }_id/"
+        "/:#{@router.inflector.singularize(route_param)}_id/"
       end
     end
   end

data/lib/hanami/routing/resources/action.rb

@@ -1,6 +1,7 @@
-require 'hanami/utils/string'
-require 'hanami/utils/path_prefix'
-require 'hanami/routing/resource'
+# frozen_string_literal: true
+
+require "hanami/utils/path_prefix"
+require "hanami/routing/resource"
 
 module Hanami
   module Routing
@@ -24,7 +25,7 @@ module Hanami
         # @since 0.2.0
         # @api private
         class_attribute :identifier
-        self.identifier = ':id'.freeze
+        self.identifier = ":id"
       end
 
       # Pluralize concrete actions
@@ -33,12 +34,13 @@ module Hanami
       # @since 0.4.0
       module PluralizedAction
         private
+
         # The name of the RESTful action.
         #
         # @api private
         # @since 0.4.0
         def as
-          Hanami::Utils::String.pluralize(super)
+          @router.inflector.pluralize(super).to_sym
         end
       end
 
@@ -50,7 +52,7 @@ module Hanami
       # @see Hanami::Router#resources
       class CollectionAction < Resource::CollectionAction
         def as(action_name)
-          Hanami::Utils::String.pluralize(super(action_name))
+          @router.inflector.pluralize(super(action_name)).to_sym
         end
       end
 
@@ -62,6 +64,7 @@ module Hanami
       # @see Hanami::Router#resources
       class MemberAction < Resource::MemberAction
         private
+
         # @since 0.1.0
         # @api private
         def path(action_name)
@@ -75,6 +78,7 @@ module Hanami
       # @since 0.1.0
       module DefaultMemberAction
         private
+
         # @since 0.1.0
         # @api private
         def path
@@ -127,6 +131,7 @@ module Hanami
         include DefaultMemberAction
 
         private
+
         # @since 0.1.0
         # @api private
         def path

data/lib/hanami/routing/routes_inspector.rb

@@ -1,4 +1,6 @@
-require 'hanami/utils/path_prefix'
+# frozen_string_literal: true
+
+require "hanami/utils/path_prefix"
 
 module Hanami
   module Routing
@@ -10,36 +12,36 @@ module Hanami
       #
       # @since 0.2.0
       # @api private
-      FORMATTER = "%<name>20s %<methods>-10s %<path>-30s %<endpoint>-30s\n".freeze
+      FORMATTER = "%<name>20s %<methods>-10s %<path>-30s %<endpoint>-30s\n"
 
       # Default HTTP methods separator
       #
       # @since 0.2.0
       # @api private
-      HTTP_METHODS_SEPARATOR = ', '.freeze
+      HTTP_METHODS_SEPARATOR = ", "
 
       # Default inspector header hash values
       #
       # @since 0.5.0
       # @api private
-      INSPECTOR_HEADER_HASH =  Hash[
-        name:     'Name',
-        methods:  'Method',
-        path:     'Path',
-        endpoint: 'Action'
+      INSPECTOR_HEADER_HASH = ::Hash[
+        name: "Name",
+        methods: "Method",
+        path: "Path",
+        endpoint: "Action"
       ].freeze
 
       # Default inspector header name values
       #
       # @since 0.5.0
       # @api private
-      INSPECTOR_HEADER_NAME = 'Name'.freeze
+      INSPECTOR_HEADER_NAME = "Name"
 
       # Empty line string
       #
       # @since 0.5.0
       # @api private
-      EMPTY_LINE = "\n".freeze
+      EMPTY_LINE = "\n"
 
       # Instantiate a new inspector
       #
@@ -155,17 +157,17 @@ module Hanami
       # @see Hanami::Routing::RoutesInspector#FORMATTER
       # @see Hanami::Routing::RoutesInspector#to_s
       def inspect_routes(formatter, base_path)
-        result = ''
+        result = ""
 
-        # TODO refactoring: replace conditional with polymorphism
+        # TODO: refactoring: replace conditional with polymorphism
         # We're exposing too much knowledge from Routing::Route:
         # #path_for_generation and #base_path
         @routes.each do |route|
-          result << if router = route.nested_router
-            inspect_router(formatter, router, route, base_path)
-          else
-            inspect_route(formatter, route, base_path)
-          end
+          result << if (router = route.nested_router)
+                      inspect_router(formatter, router, route, base_path)
+                    else
+                      inspect_route(formatter, route, base_path)
+                    end
         end
 
         result
@@ -192,9 +194,9 @@ module Hanami
       # @see Hanami::Routing::RoutesInspector#to_s
       def inspect_route(formatter, route, base_path)
         formatter % Hash[
-          name:     route.name,
-          methods:  route.request_methods.to_a.join(HTTP_METHODS_SEPARATOR),
-          path:     base_path.join(route.path_for_generation),
+          name: route.name,
+          methods: route.request_methods.to_a.join(HTTP_METHODS_SEPARATOR),
+          path: base_path.join(route.path_for_generation),
           endpoint: route.dest.inspect
         ]
       end

data/lib/hanami/routing/scope.rb

@@ -0,0 +1,112 @@
+# frozen_string_literal: true
+
+require "delegate"
+require "hanami/utils/path_prefix"
+
+module Hanami
+  module Routing
+    # Prefix for routes.
+    # Implementation of Hanami::Router#prefix
+    #
+    # @since 2.0.0
+    # @api private
+    #
+    # @see Hanami::Router#prefix
+    class Scope < SimpleDelegator
+      # @api private
+      # @since 2.0.0
+      def initialize(router, prefix, namespace, configuration, &blk)
+        @router        = router
+        @namespace     = namespace
+        @configuration = configuration
+        @prefix        = Utils::PathPrefix.new(prefix)
+        __setobj__(@router)
+        instance_eval(&blk)
+      end
+
+      def root(to:, as: :root, **, &blk)
+        super(to: to, as: route_name(as), prefix: @prefix, namespace: @namespace, configuration: @configuration, &blk)
+      end
+
+      # @api private
+      # @since 2.0.0
+      def get(path, as: nil, **options, &endpoint)
+        super(@prefix.join(path), options.merge(as: route_name(as), namespace: @namespace, configuration: @configuration), &endpoint)
+      end
+
+      # @api private
+      # @since 2.0.0
+      def post(path, as: nil, **options, &endpoint)
+        super(@prefix.join(path), options.merge(as: route_name(as), namespace: @namespace, configuration: @configuration), &endpoint)
+      end
+
+      # @api private
+      # @since 2.0.0
+      def put(path, as: nil, **options, &endpoint)
+        super(@prefix.join(path), options.merge(as: route_name(as), namespace: @namespace, configuration: @configuration), &endpoint)
+      end
+
+      # @api private
+      # @since 2.0.0
+      def patch(path, as: nil, **options, &endpoint)
+        super(@prefix.join(path), options.merge(as: route_name(as), namespace: @namespace, configuration: @configuration), &endpoint)
+      end
+
+      # @api private
+      # @since 2.0.0
+      def delete(path, as: nil, **options, &endpoint)
+        super(@prefix.join(path), options.merge(as: route_name(as), namespace: @namespace, configuration: @configuration), &endpoint)
+      end
+
+      # @api private
+      # @since 2.0.0
+      def trace(path, as: nil, **options, &endpoint)
+        super(@prefix.join(path), options.merge(as: route_name(as), namespace: @namespace, configuration: @configuration), &endpoint)
+      end
+
+      # @api private
+      # @since 2.0.0
+      def options(path, as: nil, **options, &endpoint)
+        super(@prefix.join(path), options.merge(as: route_name(as), namespace: @namespace, configuration: @configuration), &endpoint)
+      end
+
+      # @api private
+      # @since 2.0.0
+      def resource(name, options = {})
+        super(name, options.merge(prefix: @prefix.relative_join(options[:prefix]), namespace: @namespace, configuration: @configuration))
+      end
+
+      # @api private
+      # @since 2.0.0
+      def resources(name, options = {})
+        super(name, options.merge(prefix: @prefix.relative_join(options[:prefix]), namespace: @namespace, configuration: @configuration))
+      end
+
+      # @api private
+      # @since 2.0.0
+      def redirect(path, options = {}, &endpoint)
+        super(@prefix.join(path), options.merge(to: @prefix.join(options[:to])), &endpoint)
+      end
+
+      # @api private
+      # @since 2.0.0
+      def mount(app, options)
+        super(app, options.merge(at: @prefix.join(options[:at])))
+      end
+
+      # @api private
+      # @since 2.0.0
+      def prefix(path, &blk)
+        super(@prefix.join(path), namespace: @namespace, configuration: @configuration, &blk)
+      end
+
+      private
+
+      ROUTE_NAME_SEPARATOR = "_"
+
+      def route_name(as)
+        @prefix.relative_join(as, ROUTE_NAME_SEPARATOR).to_sym unless as.nil?
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hanami-router
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 2.0.0.alpha1
 platform: ruby
 authors:
 - Luca Guidi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-13 00:00:00.000000000 Z
+date: 2019-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -25,33 +25,61 @@ 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: mustermann-contrib
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !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: '1.3'
+        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: '1.3'
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -78,14 +106,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13'
+        version: '12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13'
+        version: '12'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
@@ -125,23 +153,17 @@ 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/error.rb
 - lib/hanami/router.rb
 - lib/hanami/router/version.rb
+- lib/hanami/routing.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/prefix.rb
 - lib/hanami/routing/recognized_route.rb
 - lib/hanami/routing/resource.rb
 - lib/hanami/routing/resource/action.rb
@@ -149,8 +171,8 @@ files:
 - 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
+- lib/hanami/routing/scope.rb
 homepage: http://hanamirb.org
 licenses:
 - MIT
@@ -163,14 +185,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: Rack compatible HTTP router for Ruby and Hanami