haveapi 0.29.7 → 0.29.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3555b00c36ae85444baaa5d2da5e69e70343a8d9528e6fee181ed947bf762d6
-  data.tar.gz: 19613608cf068c2ec9ed2ecb8eda34fbdfab5da9515708a9786f8648059bfd48
+  metadata.gz: 95586ec69cf401aeed18079bfc5a7aecacc43f3be5ef7a40d2615561e57b7172
+  data.tar.gz: 5bec012deda81d4c2692cbb9bb3f765e3f025db2c861fd10a516df521413e720
 SHA512:
-  metadata.gz: 8658ea7fb6d61350395fa2a3e9a7ac11467d732c27e4b460cb3105e53bbd2f3784f2426bcdc4760c672cce876af1ef111aaba61fa9a2b79be9bbda90fc7954a8
-  data.tar.gz: c03998dc485dca010fc82ab5156e463c3c673b2365e8caed997d08393203907addbb86ae8a01faf280be5b0453cd323c165ed6b6bf428a009a4412114a593b6d
+  metadata.gz: c45317265ea0efa68b51a1f18c1200a44a4d430396c8e3f2f0b353f83754d5dce8ed12cc6c95e45b02370a77a7ec765748ec14f81e06ea541921c3aa4f6acf34
+  data.tar.gz: d5bae0700f7795dfad85cd974f4dda4ce2c56361b9e04ef5230b5d456d9ef66ebf3f0f8ddc52221b5341dbe314e22495c250fb55e58229078917bbbc0caf7ab6

data/haveapi.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.required_ruby_version = ">= #{File.read('../../.ruby-version').strip}"
 
   s.add_dependency 'activesupport', '>= 7.1'
-  s.add_dependency 'haveapi-client', '~> 0.29.7'
+  s.add_dependency 'haveapi-client', '~> 0.29.8'
   s.add_dependency 'i18n', '>= 1.6', '< 2'
   s.add_dependency 'json'
   s.add_dependency 'mail'

data/lib/haveapi/client_examples/php_client.rb

@@ -148,20 +148,26 @@ module HaveAPI::ClientExamples
 
     def format_parameters(dir, params, prefix = '')
       ret = params.map do |k, v|
-        if action[dir][:parameters][k][:type] == 'Custom'
-          "#{prefix}  \"#{k}\" => custom type}"
-        else
-          "#{prefix}  \"#{k}\" => #{value(v)}"
-        end
+        "#{prefix}  #{value(k.to_s)} => #{value(v)}"
       end
 
       "#{prefix}[\n#{ret.join(",\n")}\n#{prefix}]"
     end
 
     def value(v)
-      return v if v.is_a?(::Numeric) || v === true || v === false
-
-      "\"#{v}\""
+      case v
+      when ::NilClass
+        'null'
+      when ::Numeric, true, false
+        v.to_s
+      when ::Array
+        "[#{v.map { |item| value(item) }.join(', ')}]"
+      when ::Hash
+        "[#{v.map { |key, item| "#{value(key.to_s)} => #{value(item)}" }.join(', ')}]"
+      else
+        escaped = v.to_s.gsub(/[\\']/) { |char| "\\#{char}" }
+        "'#{escaped}'"
+      end
     end
   end
 end

data/lib/haveapi/version.rb

@@ -1,4 +1,4 @@
 module HaveAPI
   PROTOCOL_VERSION = '2.0'.freeze
-  VERSION = '0.29.7'.freeze
+  VERSION = '0.29.8'.freeze
 end

data/spec/client_examples/syntax_spec.rb

@@ -20,7 +20,8 @@ describe HaveAPI::ClientExamples do
         namespace: :widget,
         parameters: {
           name: { type: 'String' },
-          enabled: { type: 'Boolean' }
+          enabled: { type: 'Boolean' },
+          group_by: { type: 'Custom' }
         }
       },
       output: {
@@ -36,7 +37,11 @@ describe HaveAPI::ClientExamples do
   let(:sample) do
     {
       path_params: [101],
-      request: { name: 'documented widget', enabled: true },
+      request: {
+        name: "documented \"widget\" with $value and an apostrophe's backslash \\",
+        enabled: true,
+        group_by: ['vps_id', "owner's $group\\path"]
+      },
       response: { id: 101, name: 'documented widget' },
       status: true,
       message: nil,
@@ -77,6 +82,12 @@ describe HaveAPI::ClientExamples do
     status, output = syntax_check(%w[php -l], "<?php\n#{source}", '.php')
 
     expect(status).to be_success, output
+    expect(source).to include(
+      "'group_by' => ['vps_id', 'owner\\'s $group\\\\path']"
+    )
+    expect(source).to include(
+      "'name' => 'documented \"widget\" with $value and an apostrophe\\'s backslash \\\\'"
+    )
   end
 
   it 'generates valid Ruby' do
@@ -102,8 +113,9 @@ describe HaveAPI::ClientExamples do
     expect(request_lines).to include('Host: api.example.test', 'Content-Type: application/json')
     expect(JSON.parse(request_body)).to eq(
       'widget' => {
-        'name' => 'documented widget',
-        'enabled' => true
+        'name' => "documented \"widget\" with $value and an apostrophe's backslash \\",
+        'enabled' => true,
+        'group_by' => ['vps_id', "owner's $group\\path"]
       }
     )
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: haveapi
 version: !ruby/object:Gem::Version
-  version: 0.29.7
+  version: 0.29.8
 platform: ruby
 authors:
 - Jakub Skokan
@@ -29,14 +29,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.29.7
+        version: 0.29.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.29.7
+        version: 0.29.8
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement