hanami-router 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4c9e9cca50f4347eebb07e6028d00e3085ac08d
-  data.tar.gz: 53c659f0ee4e89ad910ccf3e6f59e07daa855d5c
+  metadata.gz: e9bd14745a1b63c2038d62532a7866d514ceb58f
+  data.tar.gz: 7ec9a711c3f691e7440b7cc9a2d6ea406ef0211d
 SHA512:
-  metadata.gz: abd6ed28d60cb4fc621dca483c40b2a34360d1a86b86f559727c8b13f162f30119b9f7cb89a76843055087484fb2d0e06545a84de5ae81090dceb26caeb8be31
-  data.tar.gz: 012172f6cf032845a56e4fec34173f5b7003a11ac8b6ccadf701debd7cb0854336df0253ad921118021fde4efb1a17fc1926f2a8a7bfed4ac84967adfdeb45ec
+  metadata.gz: 2b6ddfe2f03a008ea24d20da2ea7c6dce5a82c23861f3efd939e8c8858002d70321acb5bf1bc1582d8da210f505d19f394136edf516ace2822adaadb36058e14
+  data.tar.gz: 360579d8463cfb8e2bd7c26b77167f7095f7a39941ddd9ae0f68873ee2de117880142dcce79e625d1e31f72403f4591480126bcad21615ba2a80bec39ff964df

data/CHANGELOG.md

@@ -1,6 +1,13 @@
 # Hanami::Router
 Rack compatible HTTP router for Ruby
 
+## v1.0.1 - 2017-07-10
+### Added
+- [Luca Guidi] Introduce new introspection methods (`#redirect?` and `#redirection_path`) for recognized routes (see `Hanami::Router#recognize`)
+
+### Fixed
+- [Luca Guidi] Ensure `Hanami::Router#redirect` to be compatible with `#recognize`
+
 ## v1.0.0 - 2017-04-06
 
 ## v1.0.0.rc1 - 2017-03-31

data/hanami-router.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'hanami-utils', '~> 1.0'
 
   spec.add_development_dependency 'bundler',   '~> 1.5'
-  spec.add_development_dependency 'minitest',  '~> 5'
   spec.add_development_dependency 'rake',      '~> 11'
   spec.add_development_dependency 'rack-test', '~> 0.6'
+  spec.add_development_dependency 'rspec',     '~> 3.5'
 end

data/lib/hanami/router.rb

@@ -622,7 +622,10 @@ module Hanami
     #   router = Hanami::Router.new
     #   router.redirect '/legacy',  to: '/new_endpoint'
     def redirect(path, options = {}, &endpoint)
-      get(path).redirect @router.find(options), options[:code] || 301
+      destination_path = @router.find(options)
+      get(path).redirect(destination_path, options[:code] || 301).tap do |route|
+        route.dest = Hanami::Routing::RedirectEndpoint.new(destination_path, route.dest)
+      end
     end
 
     # Defines a Ruby block: all the routes defined within it will be namespaced

data/lib/hanami/router/version.rb

@@ -1,6 +1,6 @@
 module Hanami
   class Router
     # @since 0.1.0
-    VERSION = '1.0.0'.freeze
+    VERSION = '1.0.1'.freeze
   end
 end

data/lib/hanami/routing/endpoint.rb

@@ -53,6 +53,17 @@ module Hanami
         !__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
@@ -159,5 +170,26 @@ module Hanami
         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

data/lib/hanami/routing/recognized_route.rb

@@ -115,7 +115,7 @@ module Hanami
       #
       #   puts router.recognize('/books/23').action # => "books#show"
       def action
-        return unless routable?
+        return if !routable? || redirect?
         namespace = NAMESPACE % @namespace
 
         if destination.match(namespace)
@@ -146,7 +146,54 @@ module Hanami
       #   puts router.recognize('/').routable?    # => true
       #   puts router.recognize('/foo').routable? # => false
       def routable?
-        @endpoint&.routable?
+        @endpoint&.routable? || false
+      end
+
+      # Check if redirect
+      #
+      # @return [TrueClass,FalseClass]
+      #
+      # @since 1.0.1
+      # @api public
+      #
+      # @see Hanami::Router#recognize
+      #
+      # @example
+      #   require 'hanami/router'
+      #
+      #   router = Hanami::Router.new do
+      #     get '/', to: 'home#index'
+      #     redirect '/home', to: '/'
+      #   end
+      #
+      #   puts router.recognize('/home').redirect? # => true
+      #   puts router.recognize('/').redirect?     # => false
+      def redirect?
+        @endpoint&.redirect? || false
+      end
+
+      # Returns the redirect destination path
+      #
+      # @return [String,NilClass] the destination path, if it's a redirect
+      #
+      # @since 1.0.1
+      # @api public
+      #
+      # @see Hanami::Router#recognize
+      # @see #redirect?
+      #
+      # @example
+      #   require 'hanami/router'
+      #
+      #   router = Hanami::Router.new do
+      #     get '/', to: 'home#index'
+      #     redirect '/home', to: '/'
+      #   end
+      #
+      #   puts router.recognize('/home').destination_path # => "/"
+      #   puts router.recognize('/').destination_path     # => nil
+      def redirection_path
+        @endpoint&.destination_path
       end
 
       private

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hanami-router
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Luca Guidi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-06 00:00:00.000000000 Z
+date: 2017-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -67,47 +67,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '11'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11'
+        version: '0.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
-  name: rack-test
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '3.5'
 description: Rack compatible HTTP router for Ruby
 email:
 - me@lucaguidi.com