lhs 15.2.1 → 15.2.2.pre.favorites.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b22ab9cad00592e285064f9e5423a0068cf0924c
-  data.tar.gz: '079d61d3f7a12423f689e64de210bb67243ec239'
+  metadata.gz: 0aee048c57cc0d33d0460f7b1887576f387896bd
+  data.tar.gz: 9bcbc261eacb20732cf29313dc0757b2f822c903
 SHA512:
-  metadata.gz: 94b77bb8a7a211acdf05d62f21138442a8d0a68e75fe6bde7190f939595287f7495a51c754f8cc50013ef019ac6a996e8a838a5bd318c62bdbec70530e424458
-  data.tar.gz: 5dc21e72c816d3437677965059f0ac9ae009e3b41f355aec95927b95b8885ba1a42b086ba685b113279bcf25a4cc75f45e12a7ee39d39e1590b3cf4d494a6e01
+  metadata.gz: b44c9ca36f2fd2d2154b27810394d6dfcc565e25712695bf7ef0dee0483ad4db2a8063a52e3882b0fa174060a734c66979c61725b2ce33054a7222789c72da72
+  data.tar.gz: 43d5d60d653ce74d32a3d7f7392f90cb98f8ebf1923ee8d5b7b4862a24600e910ab588dbc90e9ee6fcd4ad5a697a43c00f3ca04dc463212a092fc7b8000b90db

data/README.md

@@ -53,8 +53,39 @@ class Record < 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)
+### Configuring endpoint hosts
+
+Please use placeholders when configuring hosts for endpoints. Otherwise LHS will match them strictly, which can result in problems when a services dynamically returns `hrefs` and mixes `http`, `https` or no protocol at all. See: [LHC Placeholder Configuration](https://github.com/local-ch/lhc/blob/master/docs/configuration.md#placeholders)
+
+Please DO NOT mix host placeholders with endpoints (paths), LHS need to know what part of an endpoint is a host and what part of an endpoint is a path, if you use a placeholders in your records endpoint configuration:
+
+**DO**
+```ruby
+LHC.configure do |config|
+  config.placeholder(:search_service, 'http://tel.search.ch')
+end
+
+class Record < LHS::Record
+
+  endpoint '{+search_service}/api/search.json'
+
+end
+```
+
+**DON'T**
+```ruby
+LHC.configure do |config|
+  config.placeholder(:search_service, 'http://tel.search.ch/api/search.json')
+end
+
+class Record < LHS::Record
+
+  endpoint '{+search_service}'
+  
+end
+```
+
+### Endpoint clashing
 
 If you try to setup a LHS::Record with clashing endpoints it will immediately raise an exception.
 
@@ -399,7 +430,7 @@ end
   )
 ```
 
-See [Validation](#Validation) for handling validation errors when creating records.
+See [Validation](#validation) for handling validation errors when creating records.
 
 ### Endpoint paramters and paramter injection during creation
 
@@ -842,6 +873,8 @@ or with parameters:
 
 In order to validate LHS::Records before persisting them, you can use the `valid?` (`validate` alias) method.
 
+It's not recommended to validate records anywhere but with the endpoint that also provides to create them.
+
 The specific endpoint has to support validations without persistence. An endpoint has to be enabled (opt-in) for validations in the service configuration.
 
 ```ruby

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

@@ -267,14 +267,18 @@ class LHS::Record
 
       def load_and_merge_set_of_paginated_collections!(data, options)
         options_for_this_batch = []
-        options.each_with_index do |_, index|
+        data_record = data._record
+        data = data.compact
+        options.compact.each_with_index do |_, index|
           record = data[index]._record
           pagination = record.pagination(data[index])
           next if pagination.pages_left.zero?
           options_for_this_batch.push(options_for_next_batch(record, pagination, options[index], data[index]))
         end
-        data._record.request(options_for_this_batch.flatten).each do |batch_data|
-          merge_batch_data_with_parent!(batch_data, batch_data._request.options[:parent_data])
+        if data_record.present?
+          data_record.request(options_for_this_batch.flatten).each do |batch_data|
+            merge_batch_data_with_parent!(batch_data, batch_data._request.options[:parent_data])
+          end
         end
       end
 

data/lib/lhs/version.rb

@@ -1,3 +1,3 @@
 module LHS
-  VERSION = '15.2.1'
+  VERSION = '15.2.2-favorites.1'
 end

data/spec/concerns/record/request_spec.rb

@@ -73,4 +73,40 @@ describe LHS::Record::Request do
                            params: { limit: 100 })
     end
   end
+
+  describe 'load_and_merge_set_of_paginated_collections!' do
+    let(:options) do
+      [
+        {
+          url: 'http://localhost:3000/test/resource?abc=def&limit=1&offset=3&test=1',
+          all: true,
+          auth: { bearer: 'xxx' },
+          params: { limit: 100 }
+        },
+        nil,
+        {
+          url: 'http://localhost:3000/test/resource?abc=def&limit=1&offset=3&test=3',
+          all: true,
+          auth: { bearer: 'xxx' },
+          params: { limit: 100 }
+        },
+      ]
+    end
+
+    let(:data_array) do
+      [
+        LHS::Record.new,
+        nil,
+        LHS::Record.new,
+      ]
+    end
+
+    let(:data) do
+      LHS::Record.new(data_array)
+    end
+
+    it 'does not raise an error when data has nil objects' do
+      expect(subject.send(:load_and_merge_set_of_paginated_collections!, data, options)).to_not be_nil
+    end
+  end
 end

data/spec/record/includes_all_spec.rb

@@ -381,4 +381,88 @@ describe LHS::Record do
       expect(place.contracts.first.customer.name).to eq 'Swisscom Directories AG'
     end
   end
+
+  context 'nested includes_all' do
+    context 'with optional children' do
+      before do
+        class Favorite < LHS::Record
+          endpoint 'http://datastore/favorites'
+        end
+
+        class Place < LHS::Record
+          endpoint 'http://datastore/places/{id}'
+        end
+
+        class Contract < LHS::Record
+          endpoint 'http://datastore/places/{place_id}/contracts'
+        end
+
+        stub_request(:get, %r{http://datastore/favorites})
+          .to_return(
+            body: {
+              items: [{
+                href: "http://datastore/favorites/1",
+                place: {
+                  href: "http://datastore/places/1"
+                }
+              }, {
+                href: "http://datastore/favorite/2",
+                place: {
+                  href: "http://datastore/places/2"
+                }
+              }],
+              total: 2,
+              offset: 0,
+              limit: 100
+            }.to_json
+          )
+
+        stub_request(:get, %r{http://datastore/places/1})
+          .to_return(
+            body: {
+              href: "http://datastore/places/1",
+              name: 'Place 1',
+              contracts: {
+                href: "http://datastore/places/1/contracts"
+              }
+            }.to_json
+          )
+
+        stub_request(:get, %r{http://datastore/places/1/contracts})
+          .to_return(
+            body: {
+              items: [{
+                href: "http://datastore/places/1/contracts/1",
+                name: 'Contract 1'
+              }],
+              total: 1,
+              offset: 0,
+              limit: 10
+            }.to_json
+          )
+
+        stub_request(:get, %r{http://datastore/places/2})
+          .to_return(
+            body: {
+              href: "http://datastore/places/2",
+              name: 'Place 2'
+            }.to_json
+          )
+      end
+
+      it 'includes nested objects when they exist' do
+        favorites = Favorite.includes(:place).includes_all(place: :contracts).all
+
+        expect(favorites.first.place.name).to eq('Place 1')
+        expect(favorites.first.place.contracts.first.name).to eq('Contract 1')
+      end
+
+      it 'does not include nested objects when they are not there' do
+        favorites = Favorite.includes(:place).includes_all(place: :contracts).all
+
+        expect(favorites.last.place.name).to eq('Place 2')
+        expect(favorites.last.place.contracts).to be(nil)
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhs
 version: !ruby/object:Gem::Version
-  version: 15.2.1
+  version: 15.2.2.pre.favorites.1
 platform: ruby
 authors:
 - https://github.com/local-ch/lhs/graphs/contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-26 00:00:00.000000000 Z
+date: 2018-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lhc
@@ -431,13 +431,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements:
 - Ruby >= 2.3.0
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Rails gem providing an easy, active-record-like interface for http json services