lhs 14.6.5 → 15.0.0

data/spec/record/includes_warning_spec.rb

@@ -4,7 +4,7 @@ describe LHS::Record do
   context 'includes warning' do
     before(:each) do
       class Customer < LHS::Record
-        endpoint 'http://datastore/customers/:id'
+        endpoint 'http://datastore/customers/{id}'
       end
     end
 

data/spec/record/item_key_spec.rb

@@ -5,7 +5,7 @@ describe LHS::Record do
     class Location < LHS::Record
       configuration item_key: [:response, :location]
       endpoint 'http://uberall/location'
-      endpoint 'http://uberall/location/:id'
+      endpoint 'http://uberall/location/{id}'
     end
   end
 

data/spec/record/loading_twice_spec.rb

@@ -6,11 +6,11 @@ describe LHS::Record do
 
     it 'is possible to load records twice' do
       class Feedback < LHS::Record
-        endpoint ':datastore/feedbacks'
+        endpoint '{+datastore}/feedbacks'
       end
 
       class Feedback < LHS::Record
-        endpoint ':datastore/feedbacks'
+        endpoint '{+datastore}/feedbacks'
       end
     end
   end

data/spec/record/mapping_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
 
@@ -50,7 +50,7 @@ describe LHS::Record do
 
     it 'clones mappings when using include' do
       class Agb < LHS::Record
-        endpoint ":datastore/agbs/active?agb_type=CC_TOU"
+        endpoint "{+datastore}/agbs/active?agb_type=CC_TOU"
         def pdf_url
           self['binary_url_pdf_de']
         end
@@ -84,8 +84,8 @@ describe LHS::Record do
         end
       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)

data/spec/record/model_name_spec.rb

@@ -4,7 +4,7 @@ describe LHS::Record do
   context 'model_name' do
     before(:each) do
       class LocalEntry < LHS::Record
-        endpoint ':datastore/local-entries'
+        endpoint '{+datastore}/local-entries'
       end
     end
 

data/spec/record/new_spec.rb

@@ -7,8 +7,8 @@ describe LHS::Record do
     before(:each) do
       LHC.config.placeholder('datastore', datastore)
       class Rating < LHS::Record
-        endpoint ':datastore/content-ads/:campaign_id/feedbacks'
-        endpoint ':datastore/feedbacks'
+        endpoint '{+datastore}/content-ads/{campaign_id}/feedbacks'
+        endpoint '{+datastore}/feedbacks'
       end
     end
 
@@ -29,7 +29,7 @@ describe LHS::Record do
     context 'initialise records with raw data' do
       before(:each) do
         class User < LHS::Record
-          endpoint ':datastore/users'
+          endpoint '{+datastore}/users'
         end
       end
 

data/spec/record/options_spec.rb

@@ -8,7 +8,7 @@ describe LHS::Record do
   before(:each) do
     LHC.config.placeholder('datastore', datastore)
     class Record < LHS::Record
-      endpoint ':datastore/records', validates: { persist: false }
+      endpoint '{+datastore}/records', validates: { persist: false }
     end
   end
 
@@ -143,7 +143,7 @@ describe LHS::Record do
         before(:each) do
           stub_request(:post, 'http://datastore/v2/records?persist=false').to_return(body: {}.to_json)
           expect(LHC).to receive(:request)
-            .with(options.merge(url: ':datastore/records', method: :post, params: { persist: false }, body: "{\"href\":\"http://datastore/v2/records/123\"}", headers: { "Content-Type" => "application/json" }))
+            .with(options.merge(url: '{+datastore}/records', method: :post, params: { persist: false }, body: "{\"href\":\"http://datastore/v2/records/123\"}", headers: { "Content-Type" => "application/json" }))
             .and_call_original
         end
 

data/spec/record/paginatable_collection_spec.rb

@@ -8,7 +8,7 @@ describe LHS::Record do
   context 'default pagination behaviour' do
     before(:each) do
       class Record < LHS::Record
-        endpoint ':datastore/feedbacks'
+        endpoint '{+datastore}/feedbacks'
       end
     end
 
@@ -52,7 +52,7 @@ describe LHS::Record do
     before(:each) do
       class Record < LHS::Record
         configuration pagination_strategy: 'offset', pagination_key: 'offset'
-        endpoint ':datastore/feedbacks'
+        endpoint '{+datastore}/feedbacks'
       end
     end
 
@@ -132,7 +132,7 @@ describe LHS::Record do
     before(:each) do
       class Record < LHS::Record
         configuration pagination_strategy: 'page', pagination_key: 'page'
-        endpoint ':datastore/feedbacks'
+        endpoint '{+datastore}/feedbacks'
       end
     end
 
@@ -210,7 +210,7 @@ describe LHS::Record do
     before(:each) do
       class Record < LHS::Record
         configuration pagination_strategy: 'start', pagination_key: 'start'
-        endpoint ':datastore/feedbacks'
+        endpoint '{+datastore}/feedbacks'
       end
     end
 

data/spec/record/pagination_chain_spec.rb

@@ -6,7 +6,7 @@ describe LHS::Record 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
 
@@ -59,7 +59,7 @@ describe LHS::Record do
         class Record < LHS::Record
           configuration pagination_strategy: 'start', pagination_key: 'start'
           endpoint 'http://local.ch/records'
-          endpoint 'http://local.ch/records/:id'
+          endpoint 'http://local.ch/records/{id}'
         end
       end
 
@@ -80,7 +80,7 @@ describe LHS::Record do
         class Record < LHS::Record
           configuration pagination_strategy: 'page', pagination_key: 'page'
           endpoint 'http://local.ch/records'
-          endpoint 'http://local.ch/records/:id'
+          endpoint 'http://local.ch/records/{id}'
         end
       end
 

data/spec/record/pagination_spec.rb

@@ -23,7 +23,7 @@ describe LHS::Record do
     before(:each) do
       LHC.config.placeholder('datastore', datastore)
       class Feedback < LHS::Record
-        endpoint ':datastore/feedbacks'
+        endpoint '{+datastore}/feedbacks'
       end
       stub_request(:get, 'http://local.ch/v2/feedbacks?entry_id=1')
         .to_return(body: body_json)

data/spec/record/persisted_spec.rb

@@ -7,7 +7,7 @@ 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}/content-ads/{campaign_id}/feedbacks'
       end
     end
 

data/spec/record/references_spec.rb

@@ -4,7 +4,7 @@ describe LHS::Record do
   context 'references' do
     before(:each) do
       class Customer < LHS::Record
-        endpoint 'http://datastore/customers/:id'
+        endpoint 'http://datastore/customers/{id}'
       end
     end
 

data/spec/record/reload_by_id_spec.rb

@@ -4,12 +4,12 @@ describe LHS::Record do
   before(:each) do
     class Record < LHS::Record
       endpoint 'http://datastore/records'
-      endpoint 'http://datastore/records/:id'
+      endpoint 'http://datastore/records/{id}'
     end
 
     class AnotherRecord < LHS::Record
       endpoint 'http://datastore/otherrecords'
-      endpoint 'http://datastore/otherrecords/:id'
+      endpoint 'http://datastore/otherrecords/{id}'
 
       def id
         another_id

data/spec/record/reload_spec.rb

@@ -4,7 +4,7 @@ describe LHS::Record do
   before(:each) do
     class Record < LHS::Record
       endpoint 'http://datastore/records'
-      endpoint 'http://datastore/records/:id'
+      endpoint 'http://datastore/records/{id}'
     end
   end
 
@@ -27,7 +27,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}'
 
         configuration item_key: [:response, :location], items_key: [:response, :locations]
       end

data/spec/record/request_spec.rb

@@ -3,7 +3,7 @@ require 'rails_helper'
 describe LHS::Record do
   before(:each) do
     class Record < LHS::Record
-      endpoint 'http://datastore/feedbacks/:id'
+      endpoint 'http://datastore/feedbacks/{id}'
     end
   end
 
@@ -13,8 +13,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
 
@@ -28,20 +28,20 @@ describe LHS::Record do
   context '#convert_options_to_endpoint' do
     before(:each) do
       class Record < LHS::Record
-        endpoint 'http://datastore/feedbacks/:id', params: { tracking: 123 }
+        endpoint 'http://datastore/feedbacks/{id}', params: { tracking: 123 }
       end
     end
 
     it 'identifies endpoint by given url and merges back endpoint template parameters' do
       options = LHS::Record.send(:convert_options_to_endpoints, url: 'http://datastore/feedbacks/1')
       expect(options[:params][:id]).to eq '1'
-      expect(options[:url]).to eq 'http://datastore/feedbacks/:id'
+      expect(options[:url]).to eq 'http://datastore/feedbacks/{id}'
     end
 
     it 'identifies endpoint by given url and merges back endpoint template parameters into an array, if array was given' do
       options = LHS::Record.send(:convert_options_to_endpoints, [{ url: 'http://datastore/feedbacks/1' }])
       expect(options[0][:params][:id]).to eq '1'
-      expect(options[0][:url]).to eq 'http://datastore/feedbacks/:id'
+      expect(options[0][:url]).to eq 'http://datastore/feedbacks/{id}'
     end
 
     it 'returnes nil if endpoint was not found for the given url' do

data/spec/record/save_spec.rb

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

data/spec/record/scope_chains_spec.rb

@@ -12,7 +12,7 @@ describe LHS::Record do
   before(:each) do
     LHC.config.placeholder('datastore', datastore)
     class Record < LHS::Record
-      endpoint ':datastore/records/'
+      endpoint '{+datastore}/records/'
       scope :blue, -> { where(color: 'blue') }
       scope :available, -> { where(availalbe: 'true') }
       scope :limited_to, ->(limit) { where(limit: limit) }

data/spec/record/to_json_spec.rb

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

data/spec/record/where_chains_spec.rb

@@ -12,7 +12,7 @@ describe LHS::Record do
   before(:each) do
     LHC.config.placeholder('datastore', datastore)
     class Record < LHS::Record
-      endpoint ':datastore/records/'
+      endpoint '{+datastore}/records/'
 
       def uppercase_name
         name.upcase

data/spec/record/where_spec.rb

@@ -8,8 +8,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/where_values_hash_spec.rb

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

data/spec/request_cycle_cache/main_spec.rb

@@ -13,7 +13,7 @@ describe 'Request Cycle Cache', type: :request do
   before(:each) do
     class User < LHS::Record
       endpoint 'http://datastore/v2/users'
-      endpoint 'http://datastore/v2/users/:id'
+      endpoint 'http://datastore/v2/users/{id}'
     end
     LHC.configure do |config|
       config.interceptors = [LHC::Caching]

data/spec/views/form_for_spec.rb

@@ -3,7 +3,7 @@ require 'capybara/rspec'
 
 describe 'form_for helper' do
   class Feedback < LHS::Record
-    endpoint ':datastore/v2/feedbacks'
+    endpoint '{+datastore}/v2/feedbacks'
   end
 
   before(:each) do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhs
 version: !ruby/object:Gem::Version
-  version: 14.6.5
+  version: 15.0.0
 platform: ruby
 authors:
 - https://github.com/local-ch/lhs/graphs/contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-13 00:00:00.000000000 Z
+date: 2018-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lhc
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.4.0
+        version: 7.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.4.0
+        version: 7.0.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -436,7 +436,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - Ruby >= 2.3.0
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Rails gem providing an easy, active-record-like interface for http json services