lhs 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 43644dd5ced6e07d1930e1b8377070475780b45d
-  data.tar.gz: 0a1ae22b03cec9fa31f2d311419972ecf8f919c3
+  metadata.gz: 371888c99881b65fa1571b7ab9d0639b784a66de
+  data.tar.gz: 41bcc0e2446cf6ea11b8469d0bb8c78494bf3708
 SHA512:
-  metadata.gz: b2196aa94fc0e7653a055b81faa2ce04a1152713e77ed61b8f899cd36c172b133e2a1ccc0b595aca498bac5d107f970171a053b60a48ede60f946f1360e48ec0
-  data.tar.gz: 96abeddb6c2b0c2b6bbd25890ca5b4f16b7cdcf907d12e470a1bb1e4b2122fe15b4e1de7f0bbf477d11b17b4d4a05bf2f8a75bdeab75c4be443186bc68c407d1
+  metadata.gz: 8bed4523267443a431e667ab516589d69c49da957cdcccf798e302cbc4775638b039f29eada8e1e8643435be196513005176e36119d4b468fac2b81ce22ee342
+  data.tar.gz: 22f46fdcab0190ec3f890b2f2191120d55eb9c7bf822bfcdf5be180d43561cdb33098a20cd354518364829399ffbb28c91173a77fd26cbd62f3060dc6e9374c9

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

@@ -21,8 +21,8 @@ class LHS::Item < LHS::Proxy
       else
         service.instance.find_endpoint(data).compile(data)
       end
-      response = service.instance.request(method: :post, url: url, body: data.to_json, headers: {'Content-Type' => 'application/json'})
-      self._data.merge!(response)
+      data = service.instance.request(method: :post, url: url, body: data.to_json, headers: {'Content-Type' => 'application/json'})
+      self._data.merge_raw!(data)
       true
     end
   end

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

@@ -16,8 +16,8 @@ class LHS::Item < LHS::Proxy
     def update!(params)
       service = _data._root._service
       data = _data._raw.dup
-      response = service.instance.request(method: :post, url: href, body: data.merge(params).to_json, headers: {'Content-Type' => 'application/json'})
-      self._data.merge!(response)
+      data = service.instance.request(method: :post, url: href, body: data.merge(params).to_json, headers: {'Content-Type' => 'application/json'})
+      self._data.merge_raw!(data)
       true
     end
   end

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

@@ -7,9 +7,15 @@ class LHS::Service
 
     module ClassMethods
 
+      # Should be an edge case but sometimes all objects from a certain resource
+      # are required. In this case we load the first page with the default max limit,
+      # compute the amount of left over requests, do all the the left over requests
+      # for the following pages and concatenate all the results in order to return
+      # all the objects for a given resource.
       def all(params = {})
         all = []
-        data = instance.request(params: params.merge(limit: 100))
+        default_max_limit = 100
+        data = instance.request(params: params.merge(limit: default_max_limit))
         all.concat(data._raw['items'])
         total_left = data._raw['total'] - data.count
         limit = data._raw['limit'] || data.count

data/lib/lhs/data.rb

@@ -18,7 +18,7 @@ class LHS::Data
 
   # merging data
   # e.g. when loading remote data via link
-  def merge!(data)
+  def merge_raw!(data)
     return false unless data._raw.is_a?(Hash)
     _raw.merge! data._raw
   end

data/lib/lhs/proxy.rb

@@ -19,7 +19,7 @@ class LHS::Proxy
     fail 'No href found' unless _data.href
     service = _data._root._service
     data = service.instance.request(url: _data.href, method: :get)
-    merge!(data)
+    _data.merge_raw!(data)
     self._loaded = true
     self
   end

data/lib/lhs/version.rb

@@ -1,3 +1,3 @@
 module LHS
-  VERSION = "1.2.0"
+  VERSION = "1.2.1"
 end

data/spec/data/merge_spec.rb

@@ -25,7 +25,7 @@ describe LHS::Data do
   context 'merging' do
 
     it 'merges data' do
-      data.merge!(loaded_data)
+      data.merge_raw!(loaded_data)
       expect(data.id).to eq loaded_data.id
     end
   end

data/spec/proxy/load_spec.rb

@@ -32,14 +32,14 @@ describe LHS::Proxy do
   context 'load' do
 
     it 'is loading data remotely when not present yet' do
-      link.load!.id
+      expect(link.load!.id).to be
+      expect(link.id).to be
     end
 
     it 'can be reloaded' do
-      link.load!.id
+      expect(link.load!.id).to be
       stub_request(:get, 'http://datastore-stg.lb-service.sunrise.intra.local.ch/v2/content-ads/51dfc5690cf271c375c5a12d')
         .to_return(status: 404)
-      link.load!.id
       expect(-> { link.reload!.id })
         .to raise_error LHC::NotFound
     end

metadata

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