lotus-router 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe3bedc422dfc753499bc3b622eae9991fbb5f6d
-  data.tar.gz: 04092313d4a1f9c19f83e4f555b4da56394b33ba
+  metadata.gz: d7a9c9761153f8eddd68faf42de96a0f24b2322b
+  data.tar.gz: 1a061c973e8f66fd70c9ec729fdb5b57b0e62b51
 SHA512:
-  metadata.gz: e0481beec0347d4f748fddd153eefa13b7e6460bf9ce16901179d7930fcecd2a6f2196e954d84a37a8c7b3f9355da2eb3b3ba6ad46ca404534759ca7fbbabd81
-  data.tar.gz: cf5c52860e529475867d0f4df858df214acd206054912fa82849b2d973ecf5a46d84292609599d0496fb04270f11f0b01bfb5784fabd0d625ef7348dee0ea69d
+  metadata.gz: 4acb5fb5676f9ed4bcebf05654aef397a93ddefae101f3e5a10688a9c2b35bdcae343ba29205d0e522b397a83ad37455465dbe84d2f6ca24c842436e74e85eeb
+  data.tar.gz: 410e13279ef4ea18b8e43189c5e70fcc42dda2c3dc6730846f721d5fda07673a91676292bd88af02cd6f34ee43fd9a1d5d52709f3ce8c2b2178c1c6068a93425

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 # Lotus::Router
 Rack compatible HTTP router for Ruby
 
+## v0.4.2 - 2015-07-10
+### Fixed
+- [Alfonso Uceda Pompa] Ensure mounted applications to not repeat their prefix (eg `/admin/admin`)
+- [Thiago Felippe] Ensure router inspector properly prints routes with repeated entries (eg `/admin/dashboard/admin`)
+
 ## v0.4.1 - 2015-06-23
 ### Added
 - [Alfonso Uceda Pompa] Force SSL (eg `Lotus::Router.new(force_ssl: true`).

data/lib/lotus/router/version.rb

@@ -1,6 +1,6 @@
 module Lotus
   class Router
     # @since 0.1.0
-    VERSION = '0.4.1'.freeze
+    VERSION = '0.4.2'.freeze
   end
 end

data/lib/lotus/routing/http_router.rb

@@ -75,8 +75,10 @@ module Lotus
       #
       # @since 0.1.0
       # @api private
-      def path(route, *args)
-        _rescue_url_recognition { super }
+      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.
@@ -85,68 +87,10 @@ module Lotus
       #
       # @since 0.1.0
       # @api private
-      def url(route, *args)
-        _rescue_url_recognition { super }
-      end
-
-      # Support for GET HTTP verb
-      #
-      # @see Lotus::Router#options
-      #
-      # @since 0.4.1
-      # @api private
-      def get(path, options = {}, &blk)
-        super(@prefix.join(path), options, &blk)
-      end
-
-      # Support for POST HTTP verb
-      #
-      # @see Lotus::Router#post
-      #
-      # @since 0.4.1
-      # @api private
-      def post(path, options = {}, &blk)
-        super(@prefix.join(path), options, &blk)
-      end
-
-      # Support for PUT HTTP verb
-      #
-      # @see Lotus::Router#put
-      #
-      # @since 0.4.1
-      # @api private
-      def put(path, options = {}, &blk)
-        super(@prefix.join(path), options, &blk)
-      end
-
-      # Support for PATCH HTTP verb
-      #
-      # @see Lotus::Router#patch
-      #
-      # @since 0.4.1
-      # @api private
-      def patch(path, options = {}, &blk)
-        super(@prefix.join(path), options, &blk)
-      end
-
-      # Support for DELETE HTTP verb
-      #
-      # @see Lotus::Router#delete
-      #
-      # @since 0.4.1
-      # @api private
-      def delete(path, options = {}, &blk)
-        super(@prefix.join(path), options, &blk)
-      end
-
-      # Support for TRACE HTTP verb
-      #
-      # @see Lotus::Router#trace
-      #
-      # @since 0.4.1
-      # @api private
-      def trace(path, options = {}, &blk)
-        super(@prefix.join(path), options, &blk)
+      def raw_url(route, *args)
+        _rescue_url_recognition do
+          _custom_path(super(route, *args))
+        end
       end
 
       # Support for OPTIONS HTTP verb
@@ -156,7 +100,7 @@ module Lotus
       # @since 0.1.0
       # @api private
       def options(path, options = {}, &blk)
-        add_with_request_method(@prefix.join(path), :options, options, &blk)
+        add_with_request_method(path, :options, options, &blk)
       end
 
       # Allow to mount a Rack app
@@ -212,6 +156,12 @@ module Lotus
              ::HttpRouter::TooManyParametersException => e
         raise Routing::InvalidRouteException.new(e.message)
       end
+
+      def _custom_path(uri_string)
+        uri = URI.parse(uri_string)
+        uri.path = @prefix.join(uri.path)
+        uri.to_s
+      end
     end
   end
 end

data/lotus-router.gemspec

@@ -6,8 +6,8 @@ require 'lotus/router/version'
 Gem::Specification.new do |spec|
   spec.name          = 'lotus-router'
   spec.version       = Lotus::Router::VERSION
-  spec.authors       = ['Luca Guidi']
-  spec.email         = ['me@lucaguidi.com']
+  spec.authors       = ['Luca Guidi', 'Trung Lê', 'Alfonso Uceda Pompa']
+  spec.email         = ['me@lucaguidi.com', 'trung.le@ruby-journal.com', 'uceda73@gmail.com']
   spec.description   = %q{Rack compatible HTTP router for Ruby}
   spec.summary       = %q{Rack compatible HTTP router for Ruby and Lotus}
   spec.homepage      = 'http://lotusrb.org'
@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 2.0.0'
 
   spec.add_dependency 'http_router', '~> 0.11'
-  spec.add_dependency 'lotus-utils', '~> 0.5'
+  spec.add_dependency 'lotus-utils', '~> 0.5', '>= 0.5.1'
 
   spec.add_development_dependency 'bundler',  '~> 1.5'
   spec.add_development_dependency 'minitest', '~> 5'

metadata

@@ -1,14 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: lotus-router
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Luca Guidi
+- Trung Lê
+- Alfonso Uceda Pompa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-23 00:00:00.000000000 Z
+date: 2015-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http_router
@@ -31,6 +33,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -38,6 +43,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.5.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -83,6 +91,8 @@ dependencies:
 description: Rack compatible HTTP router for Ruby
 email:
 - me@lucaguidi.com
+- trung.le@ruby-journal.com
+- uceda73@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []