friendly_routes 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7de0ba5374e04ea6b36c94db8b69f578625d93e1
-  data.tar.gz: 637009a6c665bb90b54aa4256accab74d61aa9fa
+  metadata.gz: 77ed12df2420528a82f7ed13566099b1d72a95e8
+  data.tar.gz: 24b3222a6adc594631e82b6000773b4f373daac6
 SHA512:
-  metadata.gz: c5e2aa090122f1eecdef2e61ddeb63fb9dccb8a7c75b802a39e07f9ff137fbb5f991a8e66fa44092387aa39dbce6a737ac985eb71d77d61f48d99f3146411f84
-  data.tar.gz: 919abe796d939ef71af29b6b907f9e16ba79f4c77ec5d309ea42588df2084f4793b0217b2cff4abd34630bc021c53046fc1bf43f8351e2882d2766d37a89bf16
+  metadata.gz: 95ab4a5e21c0d7f81b3f3cf3bbb137b776bee0aa59eb8a1f2c381e466b2bddf9a5157556437cadb565316493bd293f0c8da9da9aef6ae53c22514bb0b40548e7
+  data.tar.gz: 6fcc0e2a5ad78d02ce560233d2687d5116d8ca840af4d1684ef638ee5c16602584d5e2a8516f36e0a2c8dcc83ec76f578acb462306cba4cc2fe85d6cf59ffd94

data/README.md

@@ -34,10 +34,11 @@ dummies_route.params = [free, category]
 
 friendly_url_for dummies_route, :get # '/:free/:category'
 
-second_dummies_route = FriendlyRoutes::Route.new(:get, '/', controller: :dummies, action: :index)
+second_dummies_route = FriendlyRoutes::Route.new(controller: :dummies, action: :index)
 dummies_route.params = [free, 'categories', category]
 
-friendly_url_for dummies_route, :get # '/:free/categories/:category'
+friendly_url_for dummies_route, :get, '/' # '/:free/categories/:category'
+friendly_url_for dummies_route, :get, '/hello/' # '/hello/:free/categories/:category'
 
 # app/controllers/dummies_controller.rb
 class DummiesController < ApplicationController

data/lib/friendly_routes/dispatcher.rb

@@ -2,12 +2,12 @@
 
 module FriendlyRoutes
   module Dispatcher
-    def friendly_url_for(route, method, as: '')
+    def friendly_url_for(route, method, path, as: '', controller: '', action: '')
       public_send(
         method,
-        route.path,
-        controller: route.controller,
-        action: route.action,
+        path + route.path,
+        controller: controller,
+        action: action,
         friendly_route: route,
         constraints: route.constraints,
         as: as

data/lib/friendly_routes/route.rb

@@ -2,18 +2,15 @@
 
 module FriendlyRoutes
   class Route
-    attr_accessor :method, :controller, :action, :params, :prefix
+    attr_accessor :method, :params, :prefix
 
-    def initialize(path, controller: nil, action: nil, prefix: 'friendly_routes')
-      @original_path = path
-      @controller = controller
-      @action = action
+    def initialize(prefix: 'friendly_routes')
       @params = []
       @prefix = prefix
     end
 
     def path
-      @original_path + FriendlyRoutes::PrefixedParams.new(@params, @prefix).call
+      FriendlyRoutes::PrefixedParams.new(@params, @prefix).call
     end
 
     def constraints

data/lib/friendly_routes/services/parser.rb

@@ -21,7 +21,7 @@ module FriendlyRoutes
       value = @params[prefixed_name]
       return unless value
       @params[param.name] = param.parse(value)
-      @params.delete(prefixed_name)
+      @params.delete(prefixed_name) unless param.name == prefixed_name
     end
   end
 end

data/lib/friendly_routes/services/prefixed_param.rb

@@ -8,7 +8,7 @@ module FriendlyRoutes
     end
 
     def call
-      "#{@prefix}_#{@param}"
+      @prefix ? "#{@prefix}_#{@param}" : @param
     end
   end
 end

data/lib/friendly_routes/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FriendlyRoutes
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: friendly_routes
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Roman Gritsay
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-04 00:00:00.000000000 Z
+date: 2016-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails