lhs 5.6.2 → 5.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a43dbce3e42155e7cfee8eb357280b08bc7edff
-  data.tar.gz: 531ad3f58fc5580ddaf3bdde2dbf4cb5e5819147
+  metadata.gz: 34f496f9c15ded84fe153a6c53a61a726046e070
+  data.tar.gz: 241dbdff9b5b737d9476816e07de14da3a32050a
 SHA512:
-  metadata.gz: 35debe93f1bd53eac8c4996466c19fa0dc48f2ee1ba6e050beb4d7eaa52930ca807f956bbe6bacfd3c98ec2f4ce59d8f29a5eba315733f725f3ddbf4dece7baf
-  data.tar.gz: ce24d6cfd4c0cc123ff49594a6f66d9253e5fe4419192623ffb53ee53b834cfcd07670bad42b8c2eaf611996da66844e264037c6a2f32e7f07f30973bd2c5ecd
+  metadata.gz: 75566527a546a2891143b5c1c5caf21f78a0f85e87aab6568bbd8600c4ed799c022cb964436a885158384f1533cb20e1e79cc27c43948164e504e05ec95db519
+  data.tar.gz: a380b71d2751fb01a0a5fe7ec1364b11409a6ad7dc4df102a3f969902d69ab5015057030ca62f0873b5d151449d6b873f3e1b6c4b504ef9a330696bb01224ff3

data/README.md

@@ -38,6 +38,9 @@ class Feedback < LHS::Record
 end
 ```
 
+Please use placeholders when configuring endpoints also for hosts. Otherwise LHS will match them strictly, which can result in problems when mixing URLs containing `http`, `https` or no protocol at all.
+[https://github.com/local-ch/lhc/blob/master/docs/configuration.md#placeholders](LHC Placeholder Configuration)
+
 If you try to setup a LHS::Record with clashing endpoints it will immediately raise an exception.
 
 ```ruby
@@ -479,6 +482,15 @@ unless user.valid?
 end
 ```
 
+In case endpoints define other parameter names for validation like `publish` you can configure those with passing a string to `validates`:
+
+```ruby
+class User < LHS::Record
+  endpoint ':datastore/v2/users', validates: 'publish'
+end
+```
+
+
 ## Pagination
 
 LHS supports paginated APIs and it also supports various pagination strategies and by providing configuration possibilities.

data/lib/lhs/concerns/item/validation.rb

@@ -11,7 +11,9 @@ class LHS::Item < LHS::Proxy
       fail 'No validation endpoint found!' unless validation_endpoint
       record = LHS::Record.for_url(validation_endpoint.url)
       validation_params = validation_endpoint.options[:validates] == true ? { persist: false } : { validation_endpoint.options[:validates] => false }
-      params = validation_endpoint.options.fetch(:params, {}).merge(validation_params)
+      params = validation_endpoint.options.fetch(:params, {})
+        .merge(params_from_embeded_href)
+        .merge(validation_params)
       begin
         record.request(
           options.merge(
@@ -33,11 +35,20 @@ class LHS::Item < LHS::Proxy
     private
 
     def validation_endpoint
-      endpoint = _data._record.find_endpoint(_data._raw)
-      endpoint ||= LHS::Endpoint.for_url(_data.href) if _data.href
+      endpoint = embeded_endpoint if _data.href # take embeded first
+      endpoint ||= _data._record.find_endpoint(_data._raw)
       validates = endpoint.options && endpoint.options.fetch(:validates, false)
       fail 'Endpoint does not support validations!' unless validates
       endpoint
     end
+
+    def embeded_endpoint
+      LHS::Endpoint.for_url(_data.href)
+    end
+
+    def params_from_embeded_href
+      return {} if !_data.href || !embeded_endpoint
+      LHC::Endpoint.values_as_params(embeded_endpoint.url, _data.href)
+    end
   end
 end

data/lib/lhs/version.rb

@@ -1,3 +1,3 @@
 module LHS
-  VERSION = "5.6.2"
+  VERSION = "5.6.3"
 end

data/spec/item/validation_spec.rb

@@ -108,4 +108,22 @@ describe LHS::Item do
       end
     end
   end
+
+  context 'pick right endpoint' do
+    before(:each) do
+      class Record < LHS::Record
+        endpoint 'http://datastore/v2/records'
+        endpoint 'http://datastore/v2/records/:id', validates: true
+      end
+      stub_request(:get, "http://datastore/v2/records/1")
+        .to_return(body: { href: 'http://datastore/v2/records/1' }.to_json)
+      stub_request(:post, "http://datastore/v2/records/1?persist=false")
+        .to_return(body: {}.to_json)
+    end
+
+    it 'takes the right endpoint for validation' do
+      record = Record.find(1)
+      record.valid?
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhs
 version: !ruby/object:Gem::Version
-  version: 5.6.2
+  version: 5.6.3
 platform: ruby
 authors:
 - https://github.com/local-ch/lhs/graphs/contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-06 00:00:00.000000000 Z
+date: 2016-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lhc
@@ -344,7 +344,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - Ruby >= 1.9.2
 rubyforge_project: 
-rubygems_version: 2.2.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Rails gem providing an easy, active-record-like interface for http json services