usher 0.7.3 → 0.7.4

data/lib/usher/util/generate.rb

@@ -3,7 +3,6 @@ class Usher
     class Generators
 
       class Generic
-
         attr_accessor :usher
 
         def generate(name, params)
@@ -14,20 +13,11 @@ class Usher
           raise UnrecognizedException.new unless path
           case params
           when nil, Hash
-            generate_path_for_base_params_with_hash(path, params)
+            path.generate_from_hash(params)
           else
-            generate_path_for_base_params_with_array(path, Array(params))
+            path.generate(*Array(params).slice!(0, path.dynamic_parts.size))
           end
         end
-
-        def generate_path_for_base_params_with_hash(path, params)
-          path.generate_from_hash(params)
-        end
-        
-        def generate_path_for_base_params_with_array(path, params)
-          path.generate(*params.slice!(0, path.dynamic_parts.size))
-        end
-        
       end
 
       class URL < Generic
@@ -114,14 +104,11 @@ class Usher
           
           params = extra_params if extra_params
           
-          unless !generate_extra || params.nil? || params.empty?
+          if generate_extra && params && !params.empty?
             if usher.consider_destination_keys? && path.route.destination_keys
               params.delete_if{|k, v| path.route.destination_keys.include?(k)}
             end
-            unless params.empty?
-              result << '?' unless result[??]
-              result << generate_extra_params(params)
-            end
+            result << '?' << generate_querystring(params) unless params.empty?
           end
           result
         end
@@ -184,25 +171,8 @@ class Usher
           (url[-1] == ?/) ? url[0..-2] : url
         end
 
-        def path_for_routing_lookup(routing_lookup, params = {})
-          path = case routing_lookup
-          when Route::Path
-            routing_lookup
-          when Symbol
-            route = @usher.named_routes[routing_lookup]
-            raise UnrecognizedException unless route
-            route.find_matching_path(params || {})
-          when Route
-            routing_lookup.find_matching_path(params)
-          when nil
-            params.is_a?(Hash) ? usher.path_for_options(params) : raise
-          end
-        end
-
-
-        def generate_extra_params(params)
+        def generate_querystring(params)
           extra_params_result = ''
-
           params.each do |k,v|
             case v
             when Array
@@ -218,8 +188,22 @@ class Usher
           extra_params_result
         end
 
-      end
 
+        def path_for_routing_lookup(routing_lookup, params = {})
+          path = case routing_lookup
+          when Route::Path
+            routing_lookup
+          when Symbol
+            route = @usher.named_routes[routing_lookup]
+            raise UnrecognizedException unless route
+            route.find_matching_path(params || {})
+          when Route
+            routing_lookup.find_matching_path(params)
+          when nil
+            params.is_a?(Hash) ? usher.path_for_options(params) : raise
+          end
+        end
+      end
     end
   end
 end

data/usher.gemspec

@@ -5,8 +5,8 @@ require "base64"
 
 Gem::Specification.new do |s|
   s.name = "usher"
-  s.version = "0.7.3"
-  s.authors = ["Daniel Neighman", "Daniel Vartanov", "Jakub Šťastný", "Joshua Hull"]
+  s.version = "0.7.4"
+  s.authors = ["Daniel Neighman", "Daniel Vartanov", "Jakub Šťastný", "Joshua Hull", "Davide D'Agostino"].sort
   s.homepage = "http://github.com/joshbuddy/usher"
   s.summary = "Pure ruby general purpose router with interfaces for rails, rack, email or choose your own adventure"
   s.cert_chain = nil

metadata

@@ -5,12 +5,13 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 7
-  - 3
-  version: 0.7.3
+  - 4
+  version: 0.7.4
 platform: ruby
 authors: 
 - Daniel Neighman
 - Daniel Vartanov
+- Davide D'Agostino
 - !binary |
   SmFrdWIgxaDFpWFzdG7DvQ==