lhs 14.3.1 → 14.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 592b02ea75646240c5b91bedd2c780898ed87a4b
-  data.tar.gz: b91803f278dbdc05c0b1c5405a75d7daa3191116
+  metadata.gz: 23918846d8c64e8753d97597980490a1e81727db
+  data.tar.gz: 0b7aa7f5dc6a6621959f76391aab092b69655b46
 SHA512:
-  metadata.gz: 61c954708c2abf0147112c0d34ec044ef0f9dd4e53f75b26db3a26f430b138ff203127e1dc49a45066fe02c1cce9806a6b0dab7338fc207fc8b87547890aa29a
-  data.tar.gz: 088c03a54f417a2844bc6a85e318e42ea0d2a12540cc3745a2c1c20940448848c2760413eb180a5b8c0154b829a737eb76a04ab4296036c45a1cabad487039ce
+  metadata.gz: ed8155be2929a3ba33c54f3f26b8f3c7d3dc55ab86a71b235eda98001e4132e4b979d2e294c6e066950aa770fc839ee9498461a554ae69123f5354fd4df15dfe
+  data.tar.gz: 85f20098c747b9e2f3596169ef1f48e2577f95e5f53cc0b97c39aeaaaa86c226b62a5db6c9d97357bf8f99c04624e9c677d9f41b9f248946396cba412c83ad65

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

@@ -34,12 +34,11 @@ class LHS::Item < LHS::Proxy
 
     def create_and_merge_data!(options)
       direct_response_data = record.request(options)
-      nested_path = record.item_created_key ? record.item_created_key : nil
-      _data.merge_raw!(direct_response_data, nested_path)
+      _data.merge_raw!(direct_response_data.unwrap(:item_created_key))
       response_headers = direct_response_data._request.response.headers
       if response_headers && response_headers['Location']
         location_data = record.request(options.merge(url: response_headers['Location'], method: :get, body: nil))
-        _data.merge_raw!(location_data, nested_path)
+        _data.merge_raw!(location_data.unwrap(:item_created_key))
       end
       true
     end

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

@@ -26,8 +26,7 @@ class LHS::Item < LHS::Proxy
     def update!(params, options = {}, partial_update = false)
       options ||= {}
       partial_data = LHS::Data.new(params, _data.parent, record)
-      nested_path = record.item_created_key ? record.item_created_key : nil
-      _data.merge_raw!(partial_data, nested_path)
+      _data.merge_raw!(partial_data)
       data_sent = partial_update ? partial_data : _data
       url = href || record.find_endpoint(id: id).compile(id: id)
       response_data = record.request(
@@ -38,8 +37,7 @@ class LHS::Item < LHS::Proxy
           headers: { 'Content-Type' => 'application/json' }
         )
       )
-      nested_path = record.item_created_key ? record.item_created_key : nil
-      _data.merge_raw!(response_data, nested_path)
+      _data.merge_raw!(response_data.unwrap(:item_created_key))
       true
     end
   end

data/lib/lhs/data.rb

@@ -28,11 +28,18 @@ class LHS::Data
 
   # merging data
   # e.g. when loading remote data via link
-  def merge_raw!(data, nested_path = nil)
+  def merge_raw!(data)
     return false if data.blank? || !data._raw.is_a?(Hash)
-    raw = data._raw.dig(*nested_path) if nested_path
-    raw ||= data._raw
-    _raw.merge! raw
+    _raw.merge! data._raw
+  end
+
+  # Unwraps data for certain use cases
+  # like items_created_key for CREATE, UPDATED etc.
+  # like item_key for GET etc.
+  def unwrap(usecase)
+    nested_path = record.send(usecase) if record
+    return LHS::Data.new(dig(*nested_path) || _raw, nil, self.class) if nested_path
+    self
   end
 
   def _root

data/lib/lhs/proxy.rb

@@ -38,7 +38,7 @@ class LHS::Proxy
     data = _data.class.request(
       options.merge(method: :get).merge(reload_options)
     )
-    _data.merge_raw!(data)
+    _data.merge_raw!(data.unwrap(:item_key))
     self._loaded = true
     return becomes(_record) if _record
     self

data/lib/lhs/version.rb

@@ -1,3 +1,3 @@
 module LHS
-  VERSION = '14.3.1'
+  VERSION = '14.3.2'
 end

data/spec/record/reload_spec.rb

@@ -21,4 +21,43 @@ describe LHS::Record do
       expect(record.reload!).to be_kind_of Record
     end
   end
+
+  context 'nested items' do
+
+    before(:each) do
+      class Location < LHS::Record
+        endpoint 'http://uberall/locations'
+        endpoint 'http://uberall/locations/:id'
+
+        configuration item_key: [:response, :location], items_key: [:response, :locations]
+      end
+    end
+
+    it 'merges reloads properly' do
+      stub_request(:get, "http://uberall/locations?identifier=http://places/1&limit=1")
+        .to_return(
+          body: {
+            response: {
+              locations: [{
+                id: 1,
+                name: 'Fridolin'
+              }]
+            }
+          }.to_json
+        )
+      location = Location.find_by(identifier: 'http://places/1')
+      stub_request(:get, "http://uberall/locations/1")
+        .to_return(
+          body: {
+            response: {
+              location: {
+                normalizationStatus: 'NORMALIZED'
+              }
+            }
+          }.to_json
+        )
+      location.reload!
+      expect(location.normalizationStatus).to eq 'NORMALIZED'
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhs
 version: !ruby/object:Gem::Version
-  version: 14.3.1
+  version: 14.3.2
 platform: ruby
 authors:
 - https://github.com/local-ch/lhs/graphs/contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-03 00:00:00.000000000 Z
+date: 2017-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lhc