lib/stub_requests/uri.rb in stub_requests-0.1.3 vs lib/stub_requests/uri.rb in stub_requests-0.1.4

@@ -13,21 +13,48 @@
   # @author Mikael Henriksson <[e-mail]>
   # @since 0.1.2
   #
   module URI
     #
+    # @return [Regexp] A pattern for matching route parameters
+    ROUTE_PARAM = %r{/:(\w+)/?}.freeze
+
+    #
+    # Extracts route parameters from a string
+    #
+    # @param [String] string a regular string to scan for route parameters
+    #
+    # @return [Array<Symbol>] an array with all route parameter keys
+    #
+    def self.route_params(string)
+      string.scan(ROUTE_PARAM).flatten.map(&:to_sym)
+    end
+
+    #
+    # Safely joins two string without any extra ///
+    #
+    # @param [String] host the host of the URI
+    # @param [String] path the path of the URI
+    #
+    # @return [String] the full URI
+    #
+    def self.safe_join(host, path)
+      [host.chomp("/"), path.sub(%r{\A/}, "")].join("/")
+    end
+
+    #
     # UtilityFunction to construct the full URI for a service endpoint
     #
     # @param [Symbol] service_id the id of a service
     # @param [Symbol] endpoint_id the id of an endpoint
-    # @param [Hash<Symbol>] replacements hash with replacements
+    # @param [Hash<Symbol>] route_params hash with route_params
     #
     # @return [Array<Service, Endpoint, String] the service, endpoint and full URI
     #
-    def self.for_service_endpoint(service_id, endpoint_id, replacements)
-      service  = Registration::Registry.instance.find!(service_id)
+    def self.for_service_endpoint(service_id, endpoint_id, route_params)
+      service  = ServiceRegistry.instance.find!(service_id)
       endpoint = service.endpoints.find!(endpoint_id)
-      uri      = URI::Builder.build(service.uri, endpoint.uri_template, replacements)
+      uri      = URI::Builder.build(service.uri, endpoint.path, route_params)
 
       [service, endpoint, uri]
     end
   end
 end