haveapi-client 0.28.2 → 0.28.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2dbe0c45c2f130042f4882ad7d488e4de383d23c02eb80149d868a39474daa8f
-  data.tar.gz: 938ab9d040c489e4a31692b7ef768ed05a6632759e131695e6cde6d7400cd508
+  metadata.gz: 5d5b9a0b6a02e5392f62d84bdaf6f963a2d44849e3ab85796f00bb020d6a2d64
+  data.tar.gz: 97266ac6c8f294605b2675220ad132e9a9dd4da4ea85fe86c4e18df0db3d2cf4
 SHA512:
-  metadata.gz: 5c92027518f591bf86d59ab85bded78de04980b2d1eefb36851f7156356f1d298ff61501625174c207eb3ab24312dce64130f9107e94c2f01f256590c3fd98eb
-  data.tar.gz: 627ace71f67b2a410d0c363c7177b8f1f3a262495102652a87c146a4ab4d1fa5a1afb0bfa4fdb693023e02042a5db1cb1fb066e2e6290a799912c49ebaf04182
+  metadata.gz: 0f541b66f23eb38fd7b25fd0940263beadfe394459706ab4e50c6015f0d742e72de193670355cc91608868638e5e0114b0858056959901d52c11f44fa2a00ba2
+  data.tar.gz: 733ce6a8d34dbfa4db2055eb1b6007a1e79aa6efc2ee3cb0a0609ca4beca5a35f8e9183409659ed3f9d14b4d16e3f57e277d820809576f0739fcf04ce3be75db

data/lib/haveapi/client/resource_instance.rb

@@ -23,16 +23,15 @@ module HaveAPI::Client
       if response
         if response.is_a?(Hash)
           @params = response
-          @prepared_args = response[:_meta][:path_params]
-          @meta ||= response[:_meta]
+          @meta ||= response[:_meta] || {}
 
         else
           @response = response
           @params = response.response
-          @prepared_args = response.meta[:path_params]
-          @meta ||= response.meta
+          @meta ||= response.meta || {}
         end
 
+        @prepared_args = path_params_from(@meta)
         setup_from_clone(resource)
         define_attributes
       end
@@ -79,14 +78,16 @@ module HaveAPI::Client
     def resolve
       return self if @resolved
 
-      @action.provide_args(*@meta[:path_params])
+      @action.provide_args(*path_params_from(@meta))
+      raise ArgumentError, 'one or more object ids missing' if @action.unresolved_args?
+
       @response = Response.new(@action, @action.execute({}))
       @params = @response.response
 
       setup_from_clone(@resource)
       define_attributes
 
-      @prepared_args = @response.meta[:path_params]
+      @prepared_args = path_params_from(@response.meta)
       @resolved = true
       self
     end
@@ -167,6 +168,10 @@ module HaveAPI::Client
       define_singleton_method(name, &block) unless respond_to?(name)
     end
 
+    def path_params_from(meta)
+      meta&.fetch(:path_params, []) || []
+    end
+
     # Define nil references to resource attributes.
     # Used only for not-persistent objects.
     def define_implicit_attributes
@@ -207,14 +212,16 @@ module HaveAPI::Client
       end
 
       # FIXME: read _meta namespace from description
+      meta = res_val[:_meta] || {}
+
       ResourceInstance.new(
         @client,
         @api,
         tmp,
         action: tmp.actions[:show],
-        resolved: res_val[:_meta][:resolved],
-        response: res_val[:_meta][:resolved] ? res_val : nil,
-        meta: res_val[:_meta]
+        resolved: meta[:resolved],
+        response: meta[:resolved] ? res_val : nil,
+        meta: meta
       )
     end
 

data/lib/haveapi/client/version.rb

@@ -1,6 +1,6 @@
 module HaveAPI
   module Client
     PROTOCOL_VERSION = '2.0'.freeze
-    VERSION = '0.28.2'.freeze
+    VERSION = '0.28.3'.freeze
   end
 end

data/spec/integration/client_spec.rb

@@ -58,6 +58,23 @@ RSpec.describe HaveAPI::Client::Client do
     expect(task.label).to eq('Do it')
   end
 
+  it 'handles project responses without path params' do
+    client = described_class.new(base_url)
+    client.authenticate(:basic, user: 'user', password: 'pass')
+
+    project = client.project.list.first
+
+    public_project = client.project.public_show(project.id)
+    expect(public_project.name).to eq('Alpha')
+
+    public_projects = client.project.public_list
+    expect(public_projects.size).to be >= 2
+    expect(public_projects.first.name).to eq('Alpha')
+
+    expect { public_projects.first.find }
+      .to raise_error(ArgumentError, /object ids missing/)
+  end
+
   it 'raises validation error on missing required params' do
     client = described_class.new(base_url)
     client.authenticate(:basic, user: 'user', password: 'pass')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: haveapi-client
 version: !ruby/object:Gem::Version
-  version: 0.28.2
+  version: 0.28.3
 platform: ruby
 authors:
 - Jakub Skokan