lhs 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d2fe9d241de70e1547f04ecc340becf4758a22e
-  data.tar.gz: 9203ee6326411236cf93485beb289862fd3ec060
+  metadata.gz: bd943de16b65c840dc1b4b5c05ff7a8909dcf2d7
+  data.tar.gz: ef07ef221571d7de7c2a426983b1fe060b2868c9
 SHA512:
-  metadata.gz: 6d5169f5bc32a55a05e0ed1ffbe5e236e79f65714a7f7ae177516517c0dbd3d6f06082dfb5393e3188294db94b9fb958fe9bda6459ef1bfc3da77e13a8fc4c2f
-  data.tar.gz: 6d86b6cc756b977d07a991794b91665b82b0e426ff5d0321a1f4dcad0bfdbdfb1ea4bbdce65adf62015675c07d54e1ae25c7736c192da863f9ed7131c4b2e56d
+  metadata.gz: c1e7a9dec8966d5fcef164e81ab77b8e39e8d07d2991ccd94794c606b1615f80f1a312c0799a7d0e516cee408a2171ea312ea68013ce6148cfbd74e7f0ac9004
+  data.tar.gz: 45ac1316587e3b26fe8c21bee179fe0a021cb7616eac8ec9cebf2c2869d646db007864cfa2cb8d2200c261c079d2ba5f86b370d327b06df8347e8d769883d995

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

@@ -60,14 +60,25 @@ class LHS::Service
       else
         url_option_for(data, key)
       end
+      addition = load_includes(includes, options, key, data)
+      extend(data, addition, key)
+    end
+
+    # Load additional resources that are requested with include
+    def load_includes(includes, options, key, data)
       service = service_for_options(options) || self
       options = convert_options_to_endpoints(options) if service_for_options(options)
-      addition = if (further_keys = includes.fetch(key, nil) if includes.is_a? Hash)
-        service.class.includes(further_keys).instance.request(options)
+      further_keys = includes.fetch(key, nil) if includes.is_a? Hash
+      service_class = if further_keys
+        service.class.includes(further_keys)
       else
-        service.class.includes(nil).instance.request(options)
+        service.class.includes(nil)
+      end
+      begin
+        service_class.instance.request(options)
+      rescue LHC::NotFound
+        LHS::Data.new({}, data, service)
       end
-      extend(data, addition, key)
     end
 
     # Merge explicit params nested in 'params' namespace with original hash.

data/lib/lhs/version.rb

@@ -1,3 +1,3 @@
 module LHS
-  VERSION = "1.3.0"
+  VERSION = "1.3.1"
 end

data/spec/service/includes_spec.rb

@@ -115,4 +115,27 @@ describe LHS::Service do
       end
     end
   end
+
+  context 'links pointing to nowhere' do
+
+    it 'sets nil for links that cannot be included' do
+      class Feedback < LHS::Service
+        endpoint ':datastore/feedbacks'
+        endpoint ':datastore/feedbacks/:id'
+      end
+
+      stub_request(:get, "#{datastore}/feedbacks/123")
+        .to_return(status: 200, body: {
+          'href' => "#{datastore}/feedbacks/-Sc4_pYNpqfsudzhtivfkA",
+          'campaign' => { 'href' => "#{datastore}/content-ads/51dfc5690cf271c375c5a12d" }
+        }.to_json)
+
+      stub_request(:get, "#{datastore}/content-ads/51dfc5690cf271c375c5a12d")
+        .to_return(status: 404)
+
+      feedback = Feedback.includes(campaign: :entry).find(123)
+      expect(feedback.campaign._raw.keys.count).to eq 1
+      expect(feedback.campaign.href).to be
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lhs
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - local.ch