lhc 6.7.2 → 7.0.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e6b09ef7b4e0f1b03515fa76038d15d26b20362
-  data.tar.gz: 8963d07d786b7636b3d4366b4dec2767aa965f93
+  metadata.gz: dfdf5514e679a637e9e800e71d64394e922494ab
+  data.tar.gz: '09f38587235d31394bc9100cba4dde8e292592b8'
 SHA512:
-  metadata.gz: b06fd0687be3c9f1664fd0b432f47f56c4ed626ef8ee7a03cd19942d441de0f33a8e3028005b53b12bf324df1a18d5b2fc18813ff8917d4a7d1b941f5e1a2f95
-  data.tar.gz: 0b97fa787029486bb7c728013382781e011857d1b72ed9338b0000e7518678eb2d1190bd5edd24a2116a63abb6c6f63a9be6607b91edccde57e594d602849886
+  metadata.gz: 74a8a94d300802292148f4c590a924197f94f2e93e3909510f70537da5c740f6e5d10de3da5473b84f25b102822434f6709ec696986e46107789643cfc5fd2cf
+  data.tar.gz: 4dd2d4d39e7d9907366f6c132b676aca4167d219df0e2e7820f1e515a9c3bf79442016a547d16a5fe4d6fe8997234ffc50bffce821d6cbdb51c1c5999154568c

data/.ruby-version

@@ -1 +1 @@
-ruby-2.3.3
+ruby-2.4.3

data/README.md

@@ -105,7 +105,7 @@ You can configure global endpoints, placeholders and interceptors.
 ```ruby
   LHC.configure do |c|
     c.placeholder :datastore, 'http://datastore/v2'
-    c.endpoint :feedbacks, ':datastore/feedbacks', params: { has_reviews: true }
+    c.endpoint :feedbacks, '{+datastore}/feedbacks', params: { has_reviews: true }
     c.interceptors = [LHC::Caching]
   end
 ```
@@ -116,9 +116,10 @@ You can configure global endpoints, placeholders and interceptors.
 
 Instead of using concrete urls you can also use url-templates that contain placeholders.
 This is especially handy for configuring an endpoint once and generate the url from the params when doing the request.
+Since version `7.0` url templates follow the [RFC 6750](https://tools.ietf.org/html/rfc6570).
 
 ```ruby
-  url = 'http://datastore/v2/feedbacks/:id'
+  url = 'http://datastore/v2/feedbacks/{id}'
   LHC.config.endpoint(:find_feedback, url, options)
   LHC.get(:find_feedback, params:{ id: 123 })
   # GET http://datastore/v2/feedbacks/123
@@ -127,7 +128,7 @@ This is especially handy for configuring an endpoint once and generate the url f
 This also works in place without configuring an endpoint.
 
 ```ruby
-  LHC.get('http://datastore/v2/feedbacks/:id', params:{ id: 123 })
+  LHC.get('http://datastore/v2/feedbacks/{id}', params:{ id: 123 })
   # GET http://datastore/v2/feedbacks/123
 ```
 
@@ -155,7 +156,7 @@ response.data.name # 'unknown'
 
 ### Ignore certain errors
 
-As it's discouraged to rescue errors and then don't handle them (ruby styleguide),
+As it's discouraged to rescue errors and then don't handle them (ruby styleguide)[https://github.com/bbatsov/ruby-style-guide#dont-hide-exceptions],
 but you often want to continue working with `nil`, LHC provides the `ignored_errors` option.
 
 Errors listed in this option will not be raised and will leave the `response.body` and `response.data` to stay `nil`.

data/docs/configuration.md

@@ -1,17 +1,17 @@
 Configuration
 ===
 
-## Configure LHC on initialisation
+## Configure LHC on initialization
 
-If you want to configure LHC on initialisation (like in a Rails initializer, environment.rb or application.rb), you could run into the problem that certain configurations can only be set once.
-You can use `LHC.configure` to prevent the initialisation problem.
+If you want to configure LHC on initialization (like in a Rails initializer, `environment.rb` or `application.rb`), you could run into the problem that certain configurations can only be set once.
+You can use `LHC.configure` to prevent the initialization problem.
 Take care that you only use `LHC.configure` once, because it is actually reseting previously made configurations and applies the new once.
 
 ```ruby
 
   LHC.configure do |c|
     c.placeholder :datastore, 'http://datastore/v2'
-    c.endpoint :feedbacks, ':datastore/feedbacks'
+    c.endpoint :feedbacks, '{+datastore}/feedbacks'
     c.interceptors = [CachingInterceptor, MonitorInterceptor, TrackingIdInterceptor]
   end
 
@@ -41,7 +41,7 @@ You can configure global placeholders, that are used when generating urls from u
 ```ruby
   LHC.config.placeholder(:datastore, 'http://datastore/v2')
   options = { params: { has_reviews: true } }
-  LHC.config.endpoint(:feedbacks, url, options)
+  LHC.config.endpoint(:feedbacks, '{+datastore}/feedbacks', options)
   LHC.get(:feedbacks)
 ```
 

data/docs/exceptions.md

@@ -26,7 +26,7 @@ rescue => e
 ```
 
 All errors that are raise by LHC inherit from `LHC::Error`.
-They are divided into `LHC::ClientError`, `LHC::ServerError`, `LHC::Timeout` and `LHC::UnkownError` and mapped arcording to the following status code.
+They are divided into `LHC::ClientError`, `LHC::ServerError`, `LHC::Timeout` and `LHC::UnkownError` and mapped according to the following status code.
 
 ```ruby
 400 => LHC::BadRequest

data/docs/interceptors.md

@@ -64,7 +64,7 @@ You can override the global default interceptors on request level:
 ## Provide Response
 
 Inside an interceptor, you are able to provide a response, rather then doing a real request.
-This is usefull for implementing an interceptor for caching.
+This is useful for implementing an interceptor for caching.
 
 ```ruby
 class LHC::Cache < LHC::Interceptor

data/docs/interceptors/caching.md

@@ -24,7 +24,7 @@ You can also enable caching when configuring an endpoint in LHS.
 
 ```ruby
   class Feedbacks < LHS::Service
-    endpoint ':datastore/v2/feedbacks', cache: true
+    endpoint '{+datastore}/v2/feedbacks', cache: true
   end
 ```
 

data/docs/interceptors/prometheus.md

@@ -13,6 +13,6 @@ Logs basic request/response information to prometheus.
   LHC.get('http://local.ch')
 ```
 
-- Creates a promethues counter that receives additional meta information for: `:code`, `:success` and `:timeout`.
+- Creates a prometheus counter that receives additional meta information for: `:code`, `:success` and `:timeout`.
 
-- Creates a promethues histogram for response times in milliseconds.
+- Creates a prometheus histogram for response times in milliseconds.

data/docs/interceptors/retry.md

@@ -1,6 +1,6 @@
 # Retry Interceptor
 
-If you enable the retry interceptor, you can have lhc retry requests for you:
+If you enable the retry interceptor, you can have LHC retry requests for you:
 
 ```ruby
   LHC.config.interceptors = [LHC::Retry]

data/lhc.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'typhoeus'
   s.add_dependency 'activesupport', '>= 4.2'
+  s.add_dependency 'addressable'
 
   s.add_development_dependency 'rspec-rails', '>= 3.0.0'
   s.add_development_dependency 'rails', '~> 4.2'

data/lib/lhc/endpoint.rb

@@ -1,13 +1,8 @@
-require 'uri'
-# frozen_string_literal: true
+require 'addressable/template'
+
 # An endpoint is an url that leads to a backend resource.
-# The url can also be an url-template.
+# The url can also be an url-template (https://tools.ietf.org/html/rfc6570).
 class LHC::Endpoint
-
-  PLACEHOLDER ||= %r{:[^\/\.:;\d\&@]+}
-  ANYTHING_BUT_SINGLE_SLASH_AND_DOT ||= '([^\/\.]|\/\/)+'.freeze
-  URL_PARAMETERS ||= '(\\?.*)*'
-
   attr_accessor :url, :options
 
   def initialize(url, options = nil)
@@ -16,41 +11,19 @@ class LHC::Endpoint
   end
 
   def uri
-    @uri ||= parse_url_gracefully(url)
-  end
-
-  def parse_url_gracefully(url)
-    URI.parse(url)
-  rescue URI::InvalidURIError
-    url
+    @uri ||= Addressable::Template.new(url)
   end
 
   def compile(params)
-    add_basic_auth(
-      without_basic_auth(url).gsub(PLACEHOLDER) do |match|
-        replacement =
-          if params.is_a? Proc
-            params.call(match)
-          else
-            find_value(match, params)
-          end
-        replacement || fail("Compilation incomplete. Unable to find value for #{match.gsub(':', '')}.")
-      end
-    )
-  end
-
-  def add_basic_auth(url)
-    return url if !uri || !uri.is_a?(URI) || (uri.user.blank? && uri.password.blank?)
-    new_uri = parse_url_gracefully(url)
-    new_uri.user = uri.user
-    new_uri.password = uri.password
-    new_uri.to_s
-  end
+    context = LHC.config.placeholders.deep_dup
+    context.merge!(params) if params.is_a?(Hash)
+    expanded = uri.partial_expand(context)
 
-  # Strips basic auth from the url
-  def without_basic_auth(url)
-    return url if !uri || !uri.is_a?(URI) || (uri.user.blank? && uri.password.blank?)
-    url.gsub("#{uri.user}:#{uri.password}@", '')
+    if expanded.variables.empty?
+      expanded.pattern
+    else
+      fail("Compilation incomplete. Unable to find value for #{expanded.variables.join(', ')}.")
+    end
   end
 
   # Endpoint options are immutable
@@ -62,62 +35,79 @@ class LHC::Endpoint
   # when they are used for interpolation.
   def remove_interpolated_params!(params)
     params ||= {}
-    removed = {}
-    url.scan(PLACEHOLDER) do |match|
-      match = match.gsub(/^\:/, '')
-      value = find_value(match, params)
-      if value
-        removed[match.to_sym] = value
-        params.delete(match.to_sym)
-      end
-    end
+    removed = params.slice(*placeholders)
+    params.except!(*placeholders)
+
     removed
   end
 
   # Returns all placeholders found in the url-template.
   # They are alphabetically sorted.
   def placeholders
-    LHC::Endpoint.placeholders(url)
+    uri.variables.sort.map(&:to_sym)
   end
 
-  # Find a value for a placeholder either in the configuration
-  # or in the provided params.
-  def find_value(match, params)
-    params ||= {}
-    match = match.gsub(/^\:/, '').to_sym
-    params[match] || LHC.config.placeholders[match]
+  # Compares a concrete url with a template
+  # Returns true if concrete url is covered by the template
+  # Example: {+datastore}/contracts/{id} == http://local.ch/contracts/1
+  def match?(url)
+    return true if url == uri.pattern
+    match_data = match_data(url)
+    return false if match_data.nil?
+
+    match_data.values.all? { |value| valid_value?(value) }
+  end
+
+  # Extracts the values from url and
+  # creates params according to template
+  def values_as_params(url)
+    match_data = match_data(url)
+    return if match_data.nil?
+    Hash[match_data.variables.map(&:to_sym).zip(match_data.values)]
+  end
+
+  # Checks if the name has a match in the current context
+  def find_value(name, mapping)
+    context = LHC.config.placeholders.deep_dup
+    context.merge!(mapping)
+
+    context[name]
   end
 
   # Compares a concrete url with a template
   # Returns true if concrete url is covered by the template
-  # Example: :datastore/contracts/:id == http://local.ch/contracts/1
+  # Example: {+datastore}/contracts/{id} == http://local.ch/contracts/1
   def self.match?(url, template)
-    regexp = template.gsub PLACEHOLDER, ANYTHING_BUT_SINGLE_SLASH_AND_DOT
-    regexp += URL_PARAMETERS
-    url.match "#{regexp}$"
+    new(template).match?(url)
   end
 
   # Returns all placeholders found in the url-template.
   # They are alphabetically sorted.
   def self.placeholders(template)
-    template.scan(PLACEHOLDER).sort
+    new(template).placeholders
   end
 
   # Extracts the values from url and
   # creates params according to template
   def self.values_as_params(template, url)
-    params = {}
-    regexp = template
-    LHC::Endpoint.placeholders(template).each do |placeholder|
-      name = placeholder.gsub(":", '')
-      regexp = regexp.gsub(placeholder, "(?<#{name}>.*)")
-    end
-    regexp += URL_PARAMETERS
-    matchdata = url.match(Regexp.new("^#{regexp}$"))
-    LHC::Endpoint.placeholders(template).each do |placeholder|
-      name = placeholder.gsub(':', '')
-      params[name.to_sym] = matchdata[name]
-    end
-    params
+    fail("#{url} does not match the template: #{template}") if !match?(url, template)
+    new(template).values_as_params(url)
+  end
+
+  private
+
+  # Ensure there are no false positives in the template matching
+  def valid_value?(value)
+    value.match(%{https?:/$}).nil? &&
+      value.match(/.*\.json/).nil?
+  end
+
+  def match_data(url)
+    parsed = URI.parse(url)
+    parsed.query = parsed.fragment = nil
+
+    uri.match(parsed)
+  rescue URI::InvalidURIError
+    nil
   end
 end

data/lib/lhc/version.rb

@@ -1,3 +1,3 @@
 module LHC
-  VERSION ||= '6.7.2'
+  VERSION ||= '7.0.0.beta1'
 end

data/spec/basic_methods/get_spec.rb

@@ -16,7 +16,7 @@ describe LHC do
     end
 
     it 'does a get request when providing the name of a configured endpoint' do
-      url = 'http://:datastore/v2/feedbacks'
+      url = 'http://{+datastore}/v2/feedbacks'
       options = { params: { datastore: 'datastore' } }
       LHC.configure { |c| c.endpoint(:feedbacks, url, options) }
       LHC.get(:feedbacks, params: parameters)

data/spec/basic_methods/post_spec.rb

@@ -21,7 +21,7 @@ describe LHC do
     end
 
     it 'does a post request when providing the name of a configured endpoint' do
-      url = 'http://:datastore/v2/feedbacks'
+      url = 'http://{+datastore}/v2/feedbacks'
       options = { params: { datastore: 'datastore' } }
       LHC.configure { |c| c.endpoint(:feedbacks, url, options) }
       LHC.post(:feedbacks, body: feedback.to_json)

data/spec/basic_methods/put_spec.rb

@@ -27,7 +27,7 @@ describe LHC do
     end
 
     it 'does a post request when providing the name of a configured endpoint' do
-      url = 'http://:datastore/v2/feedbacks'
+      url = 'http://{+datastore}/v2/feedbacks'
       options = { params: { datastore: 'datastore' } }
       LHC.configure { |c| c.endpoint(:feedbacks, url, options) }
       LHC.put(:feedbacks, body: change.to_json)

data/spec/config/endpoints_spec.rb

@@ -2,7 +2,7 @@ require 'rails_helper'
 
 describe LHC do
   context 'configured endpoints' do
-    let(:url) { 'http://analytics/track/:entity_id/w/:type' }
+    let(:url) { 'http://analytics/track/{entity_id}/w/{type}' }
 
     let(:options) do
       {

data/spec/config/placeholders_spec.rb

@@ -5,13 +5,13 @@ describe LHC do
     it 'uses values for placeholders defined globally' do
       LHC.configure { |c| c.placeholder(:datastore, 'http://datastore/v2') }
       stub_request(:get, "http://datastore/v2/feedbacks")
-      LHC.get(':datastore/feedbacks')
+      LHC.get('{+datastore}/feedbacks')
     end
 
     it 'uses explicit values first' do
       LHC.configure { |c| c.placeholder(:campaign_id, '123') }
       stub_request(:get, 'http://datastore/v2/campaign/456/feedbacks')
-      url = 'http://datastore/v2/campaign/:campaign_id/feedbacks'
+      url = 'http://datastore/v2/campaign/{campaign_id}/feedbacks'
       LHC.get(url, params: { campaign_id: '456' })
     end
 

data/spec/endpoint/compile_spec.rb

@@ -3,39 +3,28 @@ require 'rails_helper'
 describe LHC::Endpoint do
   context 'compile' do
     it 'uses parameters for interpolation' do
-      endpoint = LHC::Endpoint.new(':datastore/v2/:campaign_id/feedbacks')
+      endpoint = LHC::Endpoint.new('{+datastore}/v2/{campaign_id}/feedbacks')
       expect(
         endpoint.compile(datastore: 'http://datastore', campaign_id: 'abc')
       ).to eq "http://datastore/v2/abc/feedbacks"
     end
 
-    it 'uses provided proc to find values' do
-      endpoint = LHC::Endpoint.new(':datastore/v2')
-      config = { datastore: 'http://datastore' }
-      find_value = lambda { |match|
-        config[match.gsub(':', '').to_sym]
-      }
-      expect(
-        endpoint.compile(find_value)
-      ).to eq "http://datastore/v2"
-    end
-
     it 'compiles when templates contain dots' do
-      endpoint = LHC::Endpoint.new(':datastore/entries/:id.json')
+      endpoint = LHC::Endpoint.new('{+datastore}/entries/{id}.json')
       expect(
         endpoint.compile(datastore: 'http://datastore', id: 123)
       ).to eq "http://datastore/entries/123.json"
     end
 
     it 'compiles complex urls containing all sort of characters' do
-      endpoint = LHC::Endpoint.new(':ads/?adrawdata/3.0/1108.1/2844859/0/0/header=yes;cookie=no;adct=204;alias=:region_id:lang:product_type:product;key=cat=:category_id')
+      endpoint = LHC::Endpoint.new('{+ads}/?adrawdata/3.0/1108.1/2844859/0/0/header=yes;cookie=no;adct=204;alias={region_id}{lang}{product_type}{product};key=cat={category_id}')
       expect(
         endpoint.compile(ads: 'http://ads', region_id: 291, lang: 'de', product_type: 'ABC', product: 'xyz', category_id: 312)
       ).to eq 'http://ads/?adrawdata/3.0/1108.1/2844859/0/0/header=yes;cookie=no;adct=204;alias=291deABCxyz;key=cat=312'
     end
 
     it 'compiles complex urls containing &' do
-      endpoint = LHC::Endpoint.new('http://:weather_search_host/forecast?format=json&period=hour&limit=:limit&areas=:zipcodes&when=:when')
+      endpoint = LHC::Endpoint.new('http://{+weather_search_host}/forecast?format=json&period=hour&limit={limit}&areas={+zipcodes}&when={when}')
       expect(
         endpoint.compile(weather_search_host: 'weather', limit: 5, zipcodes: [8005, 8004].join(','), when: 'today')
       ).to eq 'http://weather/forecast?format=json&period=hour&limit=5&areas=8005,8004&when=today'

data/spec/endpoint/match_spec.rb

@@ -3,35 +3,33 @@ require 'rails_helper'
 describe LHC::Endpoint do
   context 'match' do
     context 'matching' do
-      it 'checks if a url matches a template' do
-        {
-          ':datastore/v2/places' => 'http://local.ch:8082/v2/places',
-          ':datastore/v2/places/:id' => 'http://local.ch:8082/v2/places/ZW9OJyrbt4OZE9ueu80w-A',
-          ':datastore/v2/places/:namespace/:id' => 'http://local.ch:8082/v2/places/switzerland/ZW9OJyrbt',
-          ':datastore/addresses/:id' => 'http://local.ch/addresses/123',
-          'http://local.ch/addresses/:id' => 'http://local.ch/addresses/123',
-          ':datastore/customers/:id/addresses' => 'http://local.ch:80/server/rest/v1/customers/123/addresses',
-          ':datastore/entries/:id.json' => 'http://local.ch/entries/123.json',
-          ':datastore/places/:place_id/feedbacks' => 'http://local.ch/places/1/feedbacks?limit=10&offset=0'
-        }.each do |template, url|
-          expect(
-            LHC::Endpoint.match?(url, template)
-          ).to be, "#{url} should match #{template}!"
+      {
+        '{+datastore}/v2/places' => 'http://local.ch:8082/v2/places',
+        '{+datastore}/v2/places/{id}' => 'http://local.ch:8082/v2/places/ZW9OJyrbt4OZE9ueu80w-A',
+        '{+datastore}/v2/places/{namespace}/{id}' => 'http://local.ch:8082/v2/places/switzerland/ZW9OJyrbt',
+        '{+datastore}/addresses/{id}' => 'http://local.ch/addresses/123',
+        'http://local.ch/addresses/{id}' => 'http://local.ch/addresses/123',
+        '{+datastore}/customers/{id}/addresses' => 'http://local.ch:80/server/rest/v1/customers/123/addresses',
+        '{+datastore}/entries/{id}.json' => 'http://local.ch/entries/123.json',
+        '{+datastore}/places/{place_id}/feedbacks' => 'http://local.ch/places/1/feedbacks?limit=10&offset=0'
+      }.each do |template, url|
+        it "#{url} matches #{template}" do
+          expect(LHC::Endpoint.match?(url, template)).to be
         end
       end
     end
 
     context 'not matching' do
-      it 'checks if a url matches a template' do
-        {
-          ':datastore/v2/places' => 'http://local.ch:8082/v2/places/ZW9OJyrbt4OZE9ueu80w-A',
-          ':datastore/:campaign_id/feedbacks' => 'http://datastore.local.ch/feedbacks',
-          ':datastore/customers/:id' => 'http://local.ch:80/server/rest/v1/customers/123/addresses',
-          ':datastore/entries/:id' => 'http://local.ch/entries/123.json'
-        }.each do |template, url|
+      {
+        '{+datastore}/v2/places' => 'http://local.ch:8082/v2/places/ZW9OJyrbt4OZE9ueu80w-A',
+        '{+datastore}/{campaign_id}/feedbacks' => 'http://datastore.local.ch/feedbacks',
+        '{+datastore}/customers/{id}' => 'http://local.ch:80/server/rest/v1/customers/123/addresses',
+        '{+datastore}/entries/{id}' => 'http://local.ch/entries/123.json'
+      }.each do |template, url|
+        it "#{url} should not match #{template}" do
           expect(
             LHC::Endpoint.match?(url, template)
-          ).not_to be, "#{url} should not match #{template}!"
+          ).not_to be
         end
       end
     end

data/spec/endpoint/placeholders_spec.rb

@@ -3,10 +3,10 @@ require 'rails_helper'
 describe LHC::Endpoint do
   context 'placeholders' do
     it 'returns all placeholders alphabetically sorted' do
-      endpoint = LHC::Endpoint.new(':datastore/v2/:campaign_id/feedbacks')
+      endpoint = LHC::Endpoint.new('{+datastore}/v2/{campaign_id}/feedbacks')
       expect(
         endpoint.placeholders
-      ).to eq [':campaign_id', ':datastore']
+      ).to eq [:campaign_id, :datastore]
     end
 
     it 'allows basic auth token in url, like used on github' do

data/spec/endpoint/remove_interpolated_params_spec.rb

@@ -7,7 +7,7 @@ describe LHC::Endpoint do
       campaign_id: 'abc',
       has_reviews: true
     }
-    endpoint = LHC::Endpoint.new(':datastore/v2/:campaign_id/feedbacks')
+    endpoint = LHC::Endpoint.new('{+datastore}/v2/{campaign_id}/feedbacks')
     removed = endpoint.remove_interpolated_params!(params)
     expect(params).to eq(has_reviews: true)
     expect(removed).to eq(datastore: 'http://datastore', campaign_id: 'abc')

data/spec/endpoint/values_as_params_spec.rb

@@ -2,23 +2,27 @@ require 'rails_helper'
 
 describe LHC::Endpoint do
   context 'values_as_params' do
-    it 'provides params extracting values from a provided url and template' do
-      [
-        [':datastore/v2/places', 'http://local.ch:8082/v2/places', {
-          datastore: 'http://local.ch:8082'
-        }],
-        [':datastore/v2/places/:id', 'http://local.ch:8082/v2/places/ZW9OJyrbt4OZE9ueu80w-A', {
-          datastore: 'http://local.ch:8082',
-          id: 'ZW9OJyrbt4OZE9ueu80w-A'
-        }],
-        [':datastore/v2/places/:namespace/:id', 'http://local.ch:8082/v2/places/switzerland/ZW9OJyrbt', {
-          datastore: 'http://local.ch:8082',
-          namespace: 'switzerland',
-          id: 'ZW9OJyrbt'
-        }]
-      ].each do |example|
-        params = LHC::Endpoint.values_as_params(example[0], example[1])
-        expect(params).to eq example[2]
+    [
+      ['{+datastore}/v2/places', 'http://local.ch:8082/v2/places', {
+        datastore: 'http://local.ch:8082'
+      }],
+      ['{+datastore}/v2/places/{id}', 'http://local.ch:8082/v2/places/ZW9OJyrbt4OZE9ueu80w-A', {
+        datastore: 'http://local.ch:8082',
+        id: 'ZW9OJyrbt4OZE9ueu80w-A'
+      }],
+      ['{+datastore}/v2/places/{namespace}/{id}', 'http://local.ch:8082/v2/places/switzerland/ZW9OJyrbt', {
+        datastore: 'http://local.ch:8082',
+        namespace: 'switzerland',
+        id: 'ZW9OJyrbt'
+      }]
+    ].each do |example|
+      template = example[0]
+      url = example[1]
+      params = example[2]
+
+      it "for the template #{template} it extracts #{params.keys.join(', ')} from the url" do
+        extracted = LHC::Endpoint.values_as_params(template, url)
+        expect(extracted).to eq(params)
       end
     end
   end

data/spec/request/option_dup_spec.rb

@@ -2,7 +2,7 @@ require 'rails_helper'
 
 describe LHC::Request do
   it 'does not alter the options that where passed' do
-    LHC.configure { |c| c.endpoint(:kpi_tracker, 'http://analytics/track/:entity_id/w', params: { env: 'PROD' }) }
+    LHC.configure { |c| c.endpoint(:kpi_tracker, 'http://analytics/track/{entity_id}/w', params: { env: 'PROD' }) }
     options = { params: { entity_id: '123' } }
     stub_request(:get, "http://analytics/track/123/w?env=PROD")
     LHC.get(:kpi_tracker, options)

data/spec/request/url_patterns_spec.rb

@@ -5,7 +5,7 @@ describe LHC::Request do
     options = { params: {
       has_reviews: true
     } }
-    url = 'http://datastore/v2/campaign/:campaign_id/feedbacks'
+    url = 'http://datastore/v2/campaign/{campaign_id}/feedbacks'
     LHC.configure { |c| c.endpoint(:feedbacks, url, options) }
     stub_request(:get, 'http://datastore/v2/campaign/123/feedbacks?has_reviews=true')
     LHC.get(:feedbacks, params: { campaign_id: 123 })
@@ -13,11 +13,11 @@ describe LHC::Request do
 
   it 'compiles url when doing a request' do
     stub_request(:get, 'http://datastore:8080/v2/feedbacks/123')
-    LHC.get('http://datastore:8080/v2/feedbacks/:id', params: { id: 123 })
+    LHC.get('http://datastore:8080/v2/feedbacks/{id}', params: { id: 123 })
   end
 
   it 'considers body when compiling urls' do
     stub_request(:post, "http://datastore:8080/v2/places/123")
-    LHC.json.post('http://datastore:8080/v2/places/:id', body: { id: 123 }.to_json)
+    LHC.json.post('http://datastore:8080/v2/places/{id}', body: { id: 123 }.to_json)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhc
 version: !ruby/object:Gem::Version
-  version: 6.7.2
+  version: 7.0.0.beta1
 platform: ruby
 authors:
 - https://github.com/local-ch/lhc/contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-12 00:00:00.000000000 Z
+date: 2018-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -339,13 +353,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements:
 - Ruby >= 2.0.0
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: LocalHttpClient