lhs 14.6.5 → 15.0.0

data/lib/lhs/concerns/record/endpoints.rb

@@ -82,7 +82,7 @@ class LHS::Record
       # The best endpoint is the one where all placeholders are interpolated.
       def find_best_endpoint(params)
         sorted_endpoints.find do |endpoint|
-          endpoint.placeholders.all? { |match| endpoint.find_value(match, params) }
+          endpoint.placeholders.all? { |match| endpoint.find_value(match, params).present? }
         end
       end
 

data/lib/lhs/concerns/record/request.rb

@@ -77,7 +77,7 @@ class LHS::Record
 
       def parse_uri(url, options)
         URI.parse(
-          if url.match(LHC::Endpoint::PLACEHOLDER)
+          if url.match(Addressable::Template::EXPRESSION)
             compute_url(options[:params], url)
           else
             url

data/lib/lhs/version.rb

@@ -1,3 +1,3 @@
 module LHS
-  VERSION = '14.6.5'
+  VERSION = '15.0.0'
 end

data/spec/autoloading_spec.rb

@@ -7,12 +7,12 @@ describe LHS, type: :request do
     cleanup_before: false do
       all_endpoints = LHS::Record::Endpoints.all
       expect(all_endpoints['http://datastore/v2/users']).to be
-      expect(all_endpoints['http://datastore/v2/users/:id']).to be
+      expect(all_endpoints['http://datastore/v2/users/{id}']).to be
       expect(
         User.endpoints.detect { |endpoint| endpoint.url == 'http://datastore/v2/users' }
       ).to be
       expect(
-        User.endpoints.detect { |endpoint| endpoint.url == 'http://datastore/v2/users/:id' }
+        User.endpoints.detect { |endpoint| endpoint.url == 'http://datastore/v2/users/{id}' }
       ).to be
     end
   end

data/spec/collection/collection_items_spec.rb

@@ -8,7 +8,7 @@ describe LHS::Collection do
   before(:each) do
     LHC.config.placeholder('datastore', datastore)
     class Account < LHS::Record
-      endpoint ':datastore/accounts'
+      endpoint '{+datastore}/accounts'
     end
     stub_request(:get, "http://local.ch/v2/accounts")
       .to_return(body: response_data.to_json)

data/spec/collection/configurable_spec.rb

@@ -9,7 +9,7 @@ describe LHS::Collection do
     LHC.config.placeholder('search', search)
     class Search < LHS::Record
       configuration items_key: :docs, limit_key: :size, pagination_key: :start, pagination_strategy: :start, total_key: :totalResults
-      endpoint ':search/:type'
+      endpoint '{+search}/{type}'
     end
     stub_request(:get, "http://local.ch/search/phonebook?size=10").to_return(
       body: {

data/spec/collection/meta_data_spec.rb

@@ -29,12 +29,12 @@ describe LHS::Collection do
   before(:each) do
     LHC.config.placeholder('datastore', datastore)
     class Feedback < LHS::Record
-      endpoint ':datastore/feedbacks'
-      endpoint ':datastore/feedbacks/:id'
+      endpoint '{+datastore}/feedbacks'
+      endpoint '{+datastore}/feedbacks/{id}'
     end
     class User < LHS::Record
-      endpoint ':datastore/users'
-      endpoint ':datastore/users/:id'
+      endpoint '{+datastore}/users'
+      endpoint '{+datastore}/users/{id}'
     end
   end
 

data/spec/collection/without_object_items_spec.rb

@@ -6,7 +6,7 @@ describe LHS::Collection do
   before(:each) do
     LHC.config.placeholder('datastore', datastore)
     class Account < LHS::Record
-      endpoint ':datastore/accounts/:id'
+      endpoint '{+datastore}/accounts/{id}'
     end
   end
 

data/spec/data/collection_spec.rb

@@ -11,7 +11,7 @@ describe LHS::Data do
 
   before(:each) do
     class Record < LHS::Record
-      endpoint ':datastore/v2/data'
+      endpoint '{+datastore}/v2/data'
     end
   end
 

data/spec/data/inspect_spec.rb

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

data/spec/data/item_spec.rb

@@ -3,8 +3,8 @@ require 'rails_helper'
 describe LHS::Data do
   before(:each) do
     class Record < LHS::Record
-      endpoint ':datastore/v2/:campaign_id/feedbacks'
-      endpoint ':datastore/v2/feedbacks'
+      endpoint '{+datastore}/v2/{campaign_id}/feedbacks'
+      endpoint '{+datastore}/v2/feedbacks'
     end
   end
 

data/spec/data/merge_spec.rb

@@ -3,8 +3,8 @@ require 'rails_helper'
 describe LHS::Data do
   before(:each) do
     class Record < LHS::Record
-      endpoint ':datastore/v2/:campaign_id/feedbacks'
-      endpoint ':datastore/v2/feedbacks'
+      endpoint '{+datastore}/v2/{campaign_id}/feedbacks'
+      endpoint '{+datastore}/v2/feedbacks'
     end
   end
 

data/spec/data/raw_spec.rb

@@ -3,9 +3,9 @@ require 'rails_helper'
 describe LHS::Data do
   before(:each) do
     class Record < LHS::Record
-      endpoint ':datastore/v2/entries/:entry_id/content-ads/:campaign_id/feedbacks'
-      endpoint ':datastore/v2/:campaign_id/feedbacks'
-      endpoint ':datastore/v2/feedbacks'
+      endpoint '{+datastore}/v2/entries/{entry_id}/content-ads/{campaign_id}/feedbacks'
+      endpoint '{+datastore}/v2/{campaign_id}/feedbacks'
+      endpoint '{+datastore}/v2/feedbacks'
     end
   end
 

data/spec/data/root_spec.rb

@@ -3,9 +3,9 @@ require 'rails_helper'
 describe LHS::Data do
   before(:each) do
     class Record < LHS::Record
-      endpoint ':datastore/v2/entries/:entry_id/content-ads/:campaign_id/feedbacks'
-      endpoint ':datastore/v2/:campaign_id/feedbacks'
-      endpoint ':datastore/v2/feedbacks'
+      endpoint '{+datastore}/v2/entries/{entry_id}/content-ads/{campaign_id}/feedbacks'
+      endpoint '{+datastore}/v2/{campaign_id}/feedbacks'
+      endpoint '{+datastore}/v2/feedbacks'
     end
   end
 

data/spec/data/select_spec.rb

@@ -11,7 +11,7 @@ describe LHS::Data do
 
   before(:each) do
     class Record < LHS::Record
-      endpoint ':datastore/v2/data'
+      endpoint '{+datastore}/v2/data'
     end
   end
 

data/spec/data/to_json_spec.rb

@@ -3,8 +3,8 @@ require 'rails_helper'
 describe LHS::Data do
   before(:each) do
     class Record < LHS::Record
-      endpoint ':datastore/v2/:campaign_id/feedbacks'
-      endpoint ':datastore/v2/feedbacks'
+      endpoint '{+datastore}/v2/{campaign_id}/feedbacks'
+      endpoint '{+datastore}/v2/feedbacks'
     end
   end
 

data/spec/dummy/app/models/user.rb

@@ -1,4 +1,4 @@
 class User < LHS::Record
   endpoint 'http://datastore/v2/users'
-  endpoint 'http://datastore/v2/users/:id'
+  endpoint 'http://datastore/v2/users/{id}'
 end

data/spec/endpoint/for_url_spec.rb

@@ -4,22 +4,22 @@ describe LHS::Endpoint do
   context 'for url' do
     before(:each) do
       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 'provides the endpoint for a given url' do
       expect(
         LHS::Endpoint.for_url('http://local.ch/v2/entries/123/content-ads/456/feedbacks').url
-      ).to eq ':datastore/entries/:entry_id/content-ads/:campaign_id/feedbacks'
+      ).to eq '{+datastore}/entries/{entry_id}/content-ads/{campaign_id}/feedbacks'
       expect(
         LHS::Endpoint.for_url('http://local.ch/123/feedbacks').url
-      ).to eq ':datastore/:campaign_id/feedbacks'
+      ).to eq '{+datastore}/{campaign_id}/feedbacks'
       expect(
         LHS::Endpoint.for_url('http://local.ch/feedbacks').url
-      ).to eq ':datastore/feedbacks'
+      ).to eq '{+datastore}/feedbacks'
     end
   end
 end

data/spec/item/becomes_spec.rb

@@ -4,11 +4,11 @@ describe LHS::Item do
   before(:each) do
     class Location < LHS::Record
       endpoint 'http://sync/locations'
-      endpoint 'http://sync/locations/:id'
+      endpoint 'http://sync/locations/{id}'
     end
 
     class Synchronization < LHS::Record
-      endpoint 'http://sync/locations/:id/sync'
+      endpoint 'http://sync/locations/{id}/sync'
     end
 
     stub_request(:get, "http://sync/locations/1")

data/spec/item/delegate_spec.rb

@@ -3,8 +3,8 @@ require 'rails_helper'
 describe LHS::Item do
   before(:each) do
     class Record < LHS::Record
-      endpoint ':datastore/v2/:campaign_id/feedbacks'
-      endpoint ':datastore/v2/feedbacks'
+      endpoint '{+datastore}/v2/{campaign_id}/feedbacks'
+      endpoint '{+datastore}/v2/feedbacks'
     end
   end
 

data/spec/item/destroy_spec.rb

@@ -4,8 +4,8 @@ describe LHS::Item do
   before(:each) do
     LHC.config.placeholder('datastore', datastore)
     class Record < LHS::Record
-      endpoint ':datastore/v2/:campaign_id/feedbacks'
-      endpoint ':datastore/v2/feedbacks'
+      endpoint '{+datastore}/v2/{campaign_id}/feedbacks'
+      endpoint '{+datastore}/v2/feedbacks'
     end
   end
 
@@ -42,7 +42,7 @@ describe LHS::Item do
     context 'includes and empty response' do
       before(:each) do
         class AnotherRecord < LHS::Record
-          endpoint ':datastore/v2/:campaign_id/restaurants'
+          endpoint '{+datastore}/v2/:campaign_id/restaurants'
         end
       end
 

data/spec/item/dig_spec.rb

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

data/spec/item/errors_spec.rb

@@ -55,8 +55,8 @@ describe LHS::Item do
     I18n.backend.store_translations(:en, {}) if defined? translations
     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/item/fetch_spec.rb

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

data/spec/item/getter_spec.rb

@@ -3,8 +3,8 @@ require 'rails_helper'
 describe LHS::Item do
   before(:each) do
     class Record < LHS::Record
-      endpoint ':datastore/v2/:campaign_id/feedbacks'
-      endpoint ':datastore/v2/feedbacks'
+      endpoint '{+datastore}/v2/{campaign_id}/feedbacks'
+      endpoint '{+datastore}/v2/feedbacks'
     end
   end
 

data/spec/item/internal_data_structure_spec.rb

@@ -3,8 +3,8 @@ require 'rails_helper'
 describe LHS::Item do
   before(:each) do
     class Feedback < LHS::Record
-      endpoint ':datastore/v2/feedbacks'
-      endpoint ':datastore/v2/feedbacks/:id'
+      endpoint '{+datastore}/v2/feedbacks'
+      endpoint '{+datastore}/v2/feedbacks/{id}'
     end
   end
 

data/spec/item/map_spec.rb

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

data/spec/item/partial_update_spec.rb

@@ -3,8 +3,8 @@ require 'rails_helper'
 describe LHS::Item do
   before(:each) do
     class Record < LHS::Record
-      endpoint ':datastore/v2/:campaign_id/feedbacks'
-      endpoint ':datastore/v2/feedbacks'
+      endpoint '{+datastore}/v2/{campaign_id}/feedbacks'
+      endpoint '{+datastore}/v2/feedbacks'
     end
   end
 
@@ -65,7 +65,7 @@ describe LHS::Item do
     before(:each) do
       class Location < LHS::Record
         endpoint 'http://uberall/locations'
-        endpoint 'http://uberall/locations/:id'
+        endpoint 'http://uberall/locations/{id}'
       end
     end
 
@@ -83,7 +83,7 @@ describe LHS::Item do
       before(:each) do
         class Location < LHS::Record
           endpoint 'http://uberall/locations'
-          endpoint 'http://uberall/locations/:id'
+          endpoint 'http://uberall/locations/{id}'
           configuration item_created_key: [:response, :location], item_key: [:response, :location]
         end
       end

data/spec/item/save_spec.rb

@@ -3,8 +3,8 @@ require 'rails_helper'
 describe LHS::Item do
   before(:each) do
     class Record < LHS::Record
-      endpoint ':datastore/v2/:campaign_id/feedbacks'
-      endpoint ':datastore/v2/feedbacks'
+      endpoint '{+datastore}/v2/{campaign_id}/feedbacks'
+      endpoint '{+datastore}/v2/feedbacks'
     end
   end
 

data/spec/item/setter_spec.rb

@@ -3,8 +3,8 @@ require 'rails_helper'
 describe LHS::Item do
   before(:each) do
     class Record < LHS::Record
-      endpoint ':datastore/v2/:campaign_id/feedbacks'
-      endpoint ':datastore/v2/feedbacks'
+      endpoint '{+datastore}/v2/{campaign_id}/feedbacks'
+      endpoint '{+datastore}/v2/feedbacks'
     end
   end
 

data/spec/item/update_spec.rb

@@ -3,8 +3,8 @@ require 'rails_helper'
 describe LHS::Item do
   before(:each) do
     class Record < LHS::Record
-      endpoint ':datastore/v2/:campaign_id/feedbacks'
-      endpoint ':datastore/v2/feedbacks'
+      endpoint '{+datastore}/v2/{campaign_id}/feedbacks'
+      endpoint '{+datastore}/v2/feedbacks'
     end
   end
 

data/spec/item/validation_spec.rb

@@ -100,7 +100,7 @@ describe LHS::Item do
   context 'endpoint does not support validations' do
     before(:each) do
       class Favorite < LHS::Record
-        endpoint ':datastore/v2/favorites'
+        endpoint '{+datastore}/v2/favorites'
       end
     end
 
@@ -114,7 +114,7 @@ describe LHS::Item do
   context 'generate validation url from locally passed params' do
     before(:each) do
       class User < LHS::Record
-        endpoint 'http://datastore/v2/users/:user_id', validates: { params: { persist: false } }
+        endpoint 'http://datastore/v2/users/{user_id}', validates: { params: { persist: false } }
       end
     end
 

data/spec/pagination/pages_left_spec.rb

@@ -12,7 +12,7 @@ describe LHS::Record do
 
   before(:each) do
     class Record < LHS::Record
-      endpoint ':datastore/v2/data'
+      endpoint '{+datastore}/v2/data'
     end
   end
 

data/spec/proxy/create_sub_resource_spec.rb

@@ -3,11 +3,11 @@ require 'rails_helper'
 describe LHS::Item do
   before(:each) do
     class Feedback < LHS::Record
-      endpoint 'http://datastore/v2/feedbacks/:id'
+      endpoint 'http://datastore/v2/feedbacks/{id}'
     end
 
     class Review < LHS::Record
-      endpoint 'http://datastore/v2/feedbacks/:feedback_id/reviews'
+      endpoint 'http://datastore/v2/feedbacks/{feedback_id}/reviews'
     end
   end
 

data/spec/proxy/load_spec.rb

@@ -3,7 +3,7 @@ require 'rails_helper'
 describe LHS::Proxy do
   before(:each) do
     class Record < LHS::Record
-      endpoint ':datastore/v2/feedbacks'
+      endpoint '{+datastore}/v2/feedbacks'
     end
   end
 
@@ -46,7 +46,7 @@ describe LHS::Proxy do
   context 'endpoint options' do
     before(:each) do
       class AnotherRecord < LHS::Record
-        endpoint ':datastore/v2/feedbacks', params: { color: :blue }
+        endpoint '{+datastore}/v2/feedbacks', params: { color: :blue }
       end
     end