haveapi-client 0.27.1 → 0.27.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 76af7a26a3c98c60928fc23c3896e5255724e5e2b2e9160d2a88f697cce07e69
-  data.tar.gz: 9cd78f4423ccd72bd19745da0486340cc6782c6277593fc5b188209083bf4ece
+  metadata.gz: f19892484687b15ed8dc7c1316dd17d45bd087f156adf9cd6ad5a225dce8dedd
+  data.tar.gz: 422dea297e175322052513f595328cdf685c11e04cfe1fbcf15a014caa7c99aa
 SHA512:
-  metadata.gz: d24001fb7089a9b5fbc3677272d0695adbd9a469a99b5e1d78f6925713bc4ccc73f31915f754eaf4fe339f141737f9e82df5a271bfe09c23cac12d63c0ce6139
-  data.tar.gz: e341cb82a02a92551be6c4eeb5c055e8391e4e75787fe5a15e24a93f1fa3dc959491a10cea9b4d0cd1e43495fdae01022bd85889a9a9353faaad7e08f023fb4d
+  metadata.gz: f1cd0cb7f2278a71879e9575dc5fc71064b1bdb61cf87a65b17f3ae47f6e7ba754d8019cffefd1afeed275fea333bab67df2b7746f8fdd0e09b4ff443cd370a0
+  data.tar.gz: 24f159b459283e909da0b70568b6b10565d2f61d5016f11423ac0f612601ddd7df4480fcac8fdb48ebcf84a30100ff637bdadaa4518539fed9b98b3c45ce0bc4

data/lib/haveapi/client/communicator.rb

@@ -140,19 +140,13 @@ module HaveAPI::Client
         get_params = {}
 
         params.each do |k, v|
-          desc = action.input_params&.[](k) || action.input_params&.[](k.to_sym)
-
           get_params["#{input_namespace}[#{k}]"] =
-            if v.nil? && desc&.[](:type) == 'Resource'
-              ''
-            else
-              v
-            end
+            v.nil? ? '' : v
         end
 
         if meta
           meta.each do |k, v|
-            get_params["_meta[#{k}]"] = v # FIXME: read _meta namespace from the description
+            get_params["_meta[#{k}]"] = v.nil? ? '' : v # FIXME: read _meta namespace from the description
           end
         end
 

data/lib/haveapi/client/parameters/resource.rb

@@ -4,6 +4,7 @@ module HaveAPI::Client
 
     def initialize(params, desc, value)
       @errors = []
+      @desc = desc
       @value = coerce(value)
     end
 
@@ -18,7 +19,19 @@ module HaveAPI::Client
     protected
 
     def coerce(v)
-      return nil if v.nil?
+      if v.nil?
+        return nil if @desc[:nullable]
+
+        @errors << 'cannot be null'
+        return nil
+      end
+
+      if v.is_a?(::String) && v.strip.empty?
+        return nil if @desc[:nullable]
+
+        @errors << 'not a valid resource id'
+        return nil
+      end
 
       if !v.is_a?(::Integer) && /\A\d+\z/ !~ v
         @errors << 'not a valid resource id'

data/lib/haveapi/client/parameters/typed.rb

@@ -32,7 +32,16 @@ module HaveAPI::Client
     protected
 
     def coerce(raw)
-      return nil if raw.nil?
+      if raw.nil?
+        return nil if @desc[:nullable]
+
+        @errors << 'cannot be null'
+        return nil
+      end
+
+      if raw.is_a?(::String) && raw.strip.empty? && @desc[:nullable]
+        return nil
+      end
 
       type = @desc[:type]
 

data/lib/haveapi/client/version.rb

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

data/spec/integration/typed_input_spec.rb

@@ -119,4 +119,22 @@ RSpec.describe HaveAPI::Client::Client do
     expect(res[:project_nil]).to be(true)
     expect(res[:project]).to be_nil
   end
+
+  it 'accepts nil for optional typed params' do
+    res = client.test.echo_optional(dt: nil)
+
+    expect(res).to be_a(HaveAPI::Client::Response)
+    expect(res[:dt_provided]).to be(true)
+    expect(res[:dt_nil]).to be(true)
+    expect(res[:dt]).to be_nil
+  end
+
+  it 'accepts nil for optional typed params via GET' do
+    res = client.test.echo_optional_get(dt: nil)
+
+    expect(res).to be_a(HaveAPI::Client::Response)
+    expect(res[:dt_provided]).to be(true)
+    expect(res[:dt_nil]).to be(true)
+    expect(res[:dt]).to be_nil
+  end
 end

metadata

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