lhs 14.6.5 → 15.0.0

data/spec/proxy/record_identification_spec.rb

@@ -7,7 +7,7 @@ describe LHS::Proxy do
     end
 
     class Feedback < LHS::Record
-      endpoint 'http://datastore/places/:place_id/feedbacks'
+      endpoint 'http://datastore/places/{place_id}/feedbacks'
     end
   end
 

data/spec/record/build_spec.rb

@@ -7,8 +7,8 @@ describe LHS::Record do
     before(:each) do
       LHC.config.placeholder('datastore', datastore)
       class Feedback < LHS::Record
-        endpoint ':datastore/content-ads/:campaign_id/feedbacks'
-        endpoint ':datastore/feedbacks'
+        endpoint '{+datastore}/content-ads/{campaign_id}/feedbacks'
+        endpoint '{+datastore}/feedbacks'
       end
     end
 

data/spec/record/cast_nested_data_spec.rb

@@ -7,16 +7,16 @@ describe LHS::Record do
     before(:each) do
       LHC.config.placeholder('datastore', datastore)
       class Customer < LHS::Record
-        endpoint ':datastore/customers'
-        endpoint ':datastore/customers/:id'
+        endpoint '{+datastore}/customers'
+        endpoint '{+datastore}/customers/{id}'
       end
       class Contract < LHS::Record
-        endpoint ':datastore/contracts'
-        endpoint ':datastore/contracts/:id'
+        endpoint '{+datastore}/contracts'
+        endpoint '{+datastore}/contracts/{id}'
       end
       class Address < LHS::Record
-        endpoint ':datastore/addresses'
-        endpoint ':datastore/addresses/:id'
+        endpoint '{+datastore}/addresses'
+        endpoint '{+datastore}/addresses/{id}'
       end
     end
 

data/spec/record/create_spec.rb

@@ -7,8 +7,8 @@ describe LHS::Record do
     before(:each) do
       LHC.config.placeholder('datastore', datastore)
       class Feedback < LHS::Record
-        endpoint ':datastore/content-ads/:campaign_id/feedbacks'
-        endpoint ':datastore/feedbacks'
+        endpoint '{+datastore}/content-ads/{campaign_id}/feedbacks'
+        endpoint '{+datastore}/feedbacks'
       end
     end
 

data/spec/record/creation_failed_spec.rb

@@ -7,8 +7,8 @@ describe LHS::Record do
     before(:each) do
       LHC.config.placeholder(:datastore, datastore)
       class Record < LHS::Record
-        endpoint ':datastore/:campaign_id/feedbacks'
-        endpoint ':datastore/feedbacks'
+        endpoint '{+datastore}/{campaign_id}/feedbacks'
+        endpoint '{+datastore}/feedbacks'
       end
     end
 

data/spec/record/definitions_spec.rb

@@ -7,8 +7,8 @@ describe LHS::Record do
     before(:each) do
       LHC.config.placeholder('datastore', datastore)
       class LocalEntry < LHS::Record
-        endpoint ':datastore/local-entries'
-        endpoint ':datastore/local-entries/:id'
+        endpoint '{+datastore}/local-entries'
+        endpoint '{+datastore}/local-entries/{id}'
       end
     end
 

data/spec/record/destroy_spec.rb

@@ -5,7 +5,7 @@ describe LHS::Record do
     before(:each) do
       class Record < LHS::Record
         endpoint 'http://datastore/history'
-        endpoint 'http://datastore/history/:id'
+        endpoint 'http://datastore/history/{id}'
       end
     end
 

data/spec/record/endpoint_inheritance_spec.rb

@@ -4,7 +4,7 @@ describe LHS::Record do
   context 'inherit endpoints' do
     before(:each) do
       class Base < LHS::Record
-        endpoint 'records/:id'
+        endpoint 'records/{id}'
       end
 
       class Example < Base
@@ -22,7 +22,7 @@ describe LHS::Record do
   context 'define endpoints in subclass' do
     before(:each) do
       class Base < LHS::Record
-        endpoint 'records/:id'
+        endpoint 'records/{id}'
       end
 
       class Example < Base
@@ -46,7 +46,7 @@ describe LHS::Record do
       end
 
       class Example < Base
-        endpoint 'examples/:id'
+        endpoint 'examples/{id}'
       end
     end
 

data/spec/record/endpoint_misconfiguration_spec.rb

@@ -6,8 +6,8 @@ describe LHS::Record do
       expect(
         lambda {
           class Record < LHS::Record
-            endpoint ':datastore/v2/feedbacks'
-            endpoint ':datastore/v2/reviews'
+            endpoint '{+datastore}/v2/feedbacks'
+            endpoint '{+datastore}/v2/reviews'
           end
         }
       ).to raise_error(/Clashing endpoints/)
@@ -15,8 +15,8 @@ describe LHS::Record do
       expect(
         lambda {
           class Record < LHS::Record
-            endpoint ':datastore/v2/:campaign_id/feedbacks'
-            endpoint ':datastore/v2/:campaign_id/reviews'
+            endpoint '{+datastore}/v2/{campaign_id}/feedbacks'
+            endpoint '{+datastore}/v2/{campaign_id}/reviews'
           end
         }
       ).to raise_error(/Clashing endpoints/)

data/spec/record/endpoint_options_spec.rb

@@ -4,7 +4,7 @@ describe LHS::Record do
   context 'set options for an endpoint' do
     before(:each) do
       class Record < LHS::Record
-        endpoint 'backend/v2/feedbacks/:id', cache_expires_in: 1.day, retry: 2, cache: true
+        endpoint 'backend/v2/feedbacks/{id}', cache_expires_in: 1.day, retry: 2, cache: true
       end
     end
 

data/spec/record/endpoints_spec.rb

@@ -7,45 +7,45 @@ describe LHS::Record do
     before(:each) do
       LHC.config.placeholder(:datastore, datastore)
       class Record < LHS::Record
-        endpoint ':datastore/entries/:entry_id/content-ads/:campaign_id/feedbacks'
-        endpoint ':datastore/:campaign_id/feedbacks'
-        endpoint ':datastore/feedbacks'
+        endpoint '{+datastore}/entries/{entry_id}/content-ads/{campaign_id}/feedbacks'
+        endpoint '{+datastore}/{campaign_id}/feedbacks'
+        endpoint '{+datastore}/feedbacks'
       end
     end
 
     it 'stores all the endpoints by url' do
-      expect(LHS::Record::Endpoints.all[':datastore/entries/:entry_id/content-ads/:campaign_id/feedbacks']).to be
-      expect(LHS::Record::Endpoints.all[':datastore/:campaign_id/feedbacks']).to be
-      expect(LHS::Record::Endpoints.all[':datastore/feedbacks']).to be
+      expect(LHS::Record::Endpoints.all['{+datastore}/entries/{entry_id}/content-ads/{campaign_id}/feedbacks']).to be
+      expect(LHS::Record::Endpoints.all['{+datastore}/{campaign_id}/feedbacks']).to be
+      expect(LHS::Record::Endpoints.all['{+datastore}/feedbacks']).to be
     end
 
     it 'stores the endpoints of the service' do
       expect(Record.endpoints.count).to eq 3
-      expect(Record.endpoints[0].url).to eq ':datastore/entries/:entry_id/content-ads/:campaign_id/feedbacks'
-      expect(Record.endpoints[1].url).to eq ':datastore/:campaign_id/feedbacks'
-      expect(Record.endpoints[2].url).to eq ':datastore/feedbacks'
+      expect(Record.endpoints[0].url).to eq '{+datastore}/entries/{entry_id}/content-ads/{campaign_id}/feedbacks'
+      expect(Record.endpoints[1].url).to eq '{+datastore}/{campaign_id}/feedbacks'
+      expect(Record.endpoints[2].url).to eq '{+datastore}/feedbacks'
     end
 
     it 'finds the endpoint by the one with the most route param hits' do
       expect(
         Record.find_endpoint(campaign_id: '12345').url
-      ).to eq ':datastore/:campaign_id/feedbacks'
+      ).to eq '{+datastore}/{campaign_id}/feedbacks'
       expect(
         Record.find_endpoint(campaign_id: '12345', entry_id: '123').url
-      ).to eq ':datastore/entries/:entry_id/content-ads/:campaign_id/feedbacks'
+      ).to eq '{+datastore}/entries/{entry_id}/content-ads/{campaign_id}/feedbacks'
     end
 
     it 'finds the base endpoint (endpoint with least amount of route params)' do
       expect(
         Record.find_endpoint.url
-      ).to eq ':datastore/feedbacks'
+      ).to eq '{+datastore}/feedbacks'
     end
 
     context 'compute url from endpoint' do
       before(:each) do
         class Feedback < LHS::Record
-          endpoint ':datastore/feedbacks'
-          endpoint ':datastore/feedbacks/:id'
+          endpoint '{+datastore}/feedbacks'
+          endpoint '{+datastore}/feedbacks/{id}'
         end
       end
 
@@ -58,9 +58,9 @@ describe LHS::Record do
     context 'unsorted endpoints' do
       before(:each) do
         class AnotherRecord < LHS::Record
-          endpoint ':datastore/feedbacks'
-          endpoint ':datastore/:campaign_id/feedbacks'
-          endpoint ':datastore/entries/:entry_id/content-ads/:campaign_id/feedbacks'
+          endpoint '{+datastore}/feedbacks'
+          endpoint '{+datastore}/{campaign_id}/feedbacks'
+          endpoint '{+datastore}/entries/{entry_id}/content-ads/{campaign_id}/feedbacks'
         end
       end
 
@@ -73,8 +73,8 @@ describe LHS::Record do
     context 'includes data without considering base endpoint of parent record if url is present' do
       before(:each) do
         class Contract < LHS::Record
-          endpoint ':datastore/contracts/:id'
-          endpoint ':datastore/entry/:entry_id/contracts'
+          endpoint '{+datastore}/contracts/:id'
+          endpoint '{+datastore}/entry/{entry_id}/contracts'
         end
       end
 

data/spec/record/find_by_spec.rb

@@ -6,10 +6,10 @@ describe LHS::Record do
   before(:each) do
     LHC.config.placeholder(:datastore, datastore)
     class Record < LHS::Record
-      endpoint ':datastore/content-ads/:campaign_id/feedbacks'
-      endpoint ':datastore/content-ads/:campaign_id/feedbacks/:id'
-      endpoint ':datastore/feedbacks'
-      endpoint ':datastore/feedbacks/:id'
+      endpoint '{+datastore}/content-ads/{campaign_id}/feedbacks'
+      endpoint '{+datastore}/content-ads/{campaign_id}/feedbacks/{id}'
+      endpoint '{+datastore}/feedbacks'
+      endpoint '{+datastore}/feedbacks/{id}'
     end
   end
 

data/spec/record/find_each_spec.rb

@@ -20,8 +20,8 @@ describe LHS::Collection do
   before(:each) do
     LHC.config.placeholder('datastore', datastore)
     class Record < LHS::Record
-      endpoint ':datastore/:campaign_id/feedbacks'
-      endpoint ':datastore/feedbacks'
+      endpoint '{+datastore}/{campaign_id}/feedbacks'
+      endpoint '{+datastore}/feedbacks'
     end
   end
 

data/spec/record/find_in_batches_spec.rb

@@ -20,8 +20,8 @@ describe LHS::Collection do
   before(:each) do
     LHC.config.placeholder('datastore', datastore)
     class Record < LHS::Record
-      endpoint ':datastore/:campaign_id/feedbacks'
-      endpoint ':datastore/feedbacks'
+      endpoint '{+datastore}/{campaign_id}/feedbacks'
+      endpoint '{+datastore}/feedbacks'
     end
   end
 
@@ -67,8 +67,8 @@ describe LHS::Collection do
   context 'configured pagination' do
     before(:each) do
       class Record < LHS::Record
-        endpoint ':datastore/:campaign_id/feedbacks'
-        endpoint ':datastore/feedbacks'
+        endpoint '{+datastore}/{campaign_id}/feedbacks'
+        endpoint '{+datastore}/feedbacks'
         configuration items_key: 'docs', limit_key: 'size', pagination_key: 'start', pagination_strategy: 'start', total_key: 'totalResults'
       end
     end

data/spec/record/find_in_parallel_spec.rb

@@ -3,7 +3,7 @@ require 'rails_helper'
 describe LHS::Record do
   before(:each) do
     class Record < LHS::Record
-      endpoint 'http://datastore/records/:id'
+      endpoint 'http://datastore/records/{id}'
     end
   end
 

data/spec/record/find_spec.rb

@@ -6,10 +6,10 @@ describe LHS::Record do
   before(:each) do
     LHC.config.placeholder(:datastore, datastore)
     class Record < LHS::Record
-      endpoint ':datastore/content-ads/:campaign_id/feedbacks'
-      endpoint ':datastore/content-ads/:campaign_id/feedbacks/:id'
-      endpoint ':datastore/feedbacks'
-      endpoint ':datastore/feedbacks/:id'
+      endpoint '{+datastore}/content-ads/{campaign_id}/feedbacks'
+      endpoint '{+datastore}/content-ads/{campaign_id}/feedbacks/{id}'
+      endpoint '{+datastore}/feedbacks'
+      endpoint '{+datastore}/feedbacks/{id}'
     end
   end
 

data/spec/record/first_spec.rb

@@ -6,8 +6,8 @@ describe LHS::Record do
   before(:each) do
     LHC.config.placeholder(:datastore, datastore)
     class Record < LHS::Record
-      endpoint ':datastore/content-ads/:campaign_id/feedbacks'
-      endpoint ':datastore/feedbacks'
+      endpoint '{+datastore}/content-ads/{campaign_id}/feedbacks'
+      endpoint '{+datastore}/feedbacks'
     end
   end
 

data/spec/record/has_many_spec.rb

@@ -4,7 +4,7 @@ describe LHS::Record do
   before(:each) do
     class Location < LHS::Record
       endpoint 'http://uberall/locations'
-      endpoint 'http://uberall/locations/:id'
+      endpoint 'http://uberall/locations/{id}'
       has_many :listings
     end
 

data/spec/record/ignore_errors_spec.rb

@@ -7,7 +7,7 @@ describe LHS::Record do
   before(:each) do
     class Record < LHS::Record
       endpoint 'http://local.ch/v2/records'
-      endpoint 'http://local.ch/v2/records/:id'
+      endpoint 'http://local.ch/v2/records/{id}'
     end
   end
 

data/spec/record/includes_all_spec.rb

@@ -4,7 +4,7 @@ describe LHS::Record do
   context 'includes all' do
     before(:each) do
       class Customer < LHS::Record
-        endpoint 'http://datastore/customers/:id'
+        endpoint 'http://datastore/customers/{id}'
       end
     end
 
@@ -172,7 +172,7 @@ describe LHS::Record do
     context 'includes for an empty array' do
       before(:each) do
         class Contract < LHS::Record
-          endpoint 'http://datastore/contracts/:id'
+          endpoint 'http://datastore/contracts/{id}'
         end
         stub_request(:get, %r{http://datastore/contracts/\d})
           .to_return(body: {
@@ -215,11 +215,11 @@ describe LHS::Record do
     context 'include a known/identifiable record' do
       before(:each) do
         class Contract < LHS::Record
-          endpoint 'http://datastore/contracts/:id'
+          endpoint 'http://datastore/contracts/{id}'
         end
 
         class Entry < LHS::Record
-          endpoint ':datastore/entry/v1/:id.json'
+          endpoint '{+datastore}/entry/v1/{id}.json'
         end
 
         LHC.config.placeholder(:datastore, 'http://datastore')
@@ -264,7 +264,7 @@ describe LHS::Record do
     context 'includes all for parallel loaded ids' do
       before(:each) do
         class Place < LHS::Record
-          endpoint 'http://datastore/places/:id'
+          endpoint 'http://datastore/places/{id}'
         end
       end
 
@@ -366,11 +366,11 @@ describe LHS::Record do
         )
 
       class Place < LHS::Record
-        endpoint 'http://datastore/places/:id'
+        endpoint 'http://datastore/places/{id}'
       end
 
       class Contract < LHS::Record
-        endpoint 'http://datastore/places/:place_id/contracts'
+        endpoint 'http://datastore/places/{place_id}/contracts'
       end
     end
 

data/spec/record/includes_spec.rb

@@ -26,16 +26,16 @@ describe LHS::Record do
   context 'singlelevel includes' do
     before(:each) do
       class LocalEntry < LHS::Record
-        endpoint ':datastore/local-entries'
-        endpoint ':datastore/local-entries/:id'
+        endpoint '{+datastore}/local-entries'
+        endpoint '{+datastore}/local-entries/{id}'
       end
       class User < LHS::Record
-        endpoint ':datastore/users'
-        endpoint ':datastore/users/:id'
+        endpoint '{+datastore}/users'
+        endpoint '{+datastore}/users/{id}'
       end
       class Favorite < LHS::Record
-        endpoint ':datastore/favorites'
-        endpoint ':datastore/favorites/:id'
+        endpoint '{+datastore}/favorites'
+        endpoint '{+datastore}/favorites/{id}'
       end
       stub_request(:get, "#{datastore}/local-entries/1")
         .to_return(body: { company_name: 'local.ch' }.to_json)
@@ -74,8 +74,8 @@ describe LHS::Record do
   context 'multilevel includes' do
     before(:each) do
       class Feedback < LHS::Record
-        endpoint ':datastore/feedbacks'
-        endpoint ':datastore/feedbacks/:id'
+        endpoint '{+datastore}/feedbacks'
+        endpoint '{+datastore}/feedbacks/{id}'
       end
       stub_campaign_request
       stub_entry_request
@@ -153,7 +153,7 @@ describe LHS::Record do
 
       before(:each) do
         class Entry < LHS::Record
-          endpoint ':datastore/local-entries/:id'
+          endpoint '{+datastore}/local-entries/{id}'
         end
         LHC.config.interceptors = [interceptor]
       end
@@ -169,12 +169,12 @@ describe LHS::Record do
     context 'includes not present in response' do
       before :each do
         class Parent < LHS::Record
-          endpoint ':datastore/local-parents'
-          endpoint ':datastore/local-parents/:id'
+          endpoint '{+datastore}/local-parents'
+          endpoint '{+datastore}/local-parents/{id}'
         end
 
         class OptionalChild < LHS::Record
-          endpoint ':datastore/local-children/:id'
+          endpoint '{+datastore}/local-children/{id}'
         end
       end
 
@@ -224,8 +224,8 @@ describe LHS::Record do
   context 'links pointing to nowhere' do
     it 'sets nil for links that cannot be included' do
       class Feedback < LHS::Record
-        endpoint ':datastore/feedbacks'
-        endpoint ':datastore/feedbacks/:id'
+        endpoint '{+datastore}/feedbacks'
+        endpoint '{+datastore}/feedbacks/{id}'
       end
 
       stub_request(:get, "#{datastore}/feedbacks/123")
@@ -247,11 +247,11 @@ describe LHS::Record do
     before(:each) do
       module Services
         class LocalEntry < LHS::Record
-          endpoint ':datastore/local-entries'
+          endpoint '{+datastore}/local-entries'
         end
 
         class Feedback < LHS::Record
-          endpoint ':datastore/feedbacks'
+          endpoint '{+datastore}/feedbacks'
         end
       end
       stub_request(:get, "http://local.ch/v2/feedbacks?id=123")
@@ -266,8 +266,8 @@ describe LHS::Record do
   context 'arrays' do
     before(:each) do
       class Place < LHS::Record
-        endpoint ':datastore/place'
-        endpoint ':datastore/place/:id'
+        endpoint '{+datastore}/place'
+        endpoint '{+datastore}/place/{id}'
       end
     end
 
@@ -317,8 +317,8 @@ describe LHS::Record do
   context 'empty collections' do
     it 'skips including empty collections' do
       class Place < LHS::Record
-        endpoint ':datastore/place'
-        endpoint ':datastore/place/:id'
+        endpoint '{+datastore}/place'
+        endpoint '{+datastore}/place/{id}'
       end
 
       stub_request(:get, "#{datastore}/place/1")
@@ -337,8 +337,8 @@ describe LHS::Record do
   context 'extend items with arrays' do
     it 'extends base items with arrays' do
       class Place < LHS::Record
-        endpoint ':datastore/place'
-        endpoint ':datastore/place/:id'
+        endpoint '{+datastore}/place'
+        endpoint '{+datastore}/place/{id}'
       end
 
       stub_request(:get, "#{datastore}/place/1")
@@ -361,7 +361,7 @@ describe LHS::Record do
   context 'unexpanded response when requesting the included collection' do
     before(:each) do
       class Customer < LHS::Record
-        endpoint ':datastore/customer/:id'
+        endpoint '{+datastore}/customer/{id}'
       end
     end
 
@@ -430,12 +430,12 @@ describe LHS::Record do
   context 'includes with options' do
     before(:each) do
       class Customer < LHS::Record
-        endpoint ':datastore/customers/:id'
-        endpoint ':datastore/customers'
+        endpoint '{+datastore}/customers/{id}'
+        endpoint '{+datastore}/customers'
       end
 
       class Place < LHS::Record
-        endpoint ':datastore/places'
+        endpoint '{+datastore}/places'
       end
 
       stub_request(:get, "#{datastore}/places?forwarded_params=123")
@@ -476,7 +476,7 @@ describe LHS::Record do
   context 'more complex examples' do
     before(:each) do
       class Place < LHS::Record
-        endpoint 'http://datastore/places/:id'
+        endpoint 'http://datastore/places/{id}'
       end
     end
 
@@ -538,7 +538,7 @@ describe LHS::Record do
   context 'include and merge arrays when calling find in parallel' do
     before(:each) do
       class Place < LHS::Record
-        endpoint 'http://datastore/places/:id'
+        endpoint 'http://datastore/places/{id}'
       end
       stub_request(:get, 'http://datastore/places/1')
         .to_return(body: {