zammad_api 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42c75fd97c167f27bec8282ccd8214f3885e051691c042ad0e8e491651814d81
-  data.tar.gz: 949a756e4310f53f9ca929a9e973dcb30af4a80e494e55059da6cac345a8bc28
+  metadata.gz: e210909fb0d53e8184097f0ac41021ae674a5981b80e4e405631d33d6d07623e
+  data.tar.gz: 83e7ac5be2b238ce682b9f478d0bc7dbab3a00308367a01b95e5fc3c9ee586f5
 SHA512:
-  metadata.gz: b6625e7abed25c87ae3fe46bf543c9095cc092f61eacc23fded2af1a9807a0fc8ebf589221d6afbb57414704e3c732e9f629f89bf460791cffecd91448398a38
-  data.tar.gz: '0379ee29e881afe691eb7d47b0c2c3dbe01ae0a6eddd73e783d24ec8c07fc0dd635dca03148c9a539c006e5b2ad6c87173b944e5511024849727ffcff58be454'
+  metadata.gz: c8122abe30faebe219bea0e71ac5220a060b6c2f1ac08e2d86783987c4de5280daccd9341627a49da41e2e9eb24d88e7db84350b21d0f9f47feda364066deb8b
+  data.tar.gz: 72f47ce52a5f80a4a17f56bb652324cebee7b07c32ae944901065b09b5850d634081b0ae7278327074f6e546c9be6a68714ce842c078979c13294650f9b771f9

data/lib/zammad_api/json_helper.rb

@@ -0,0 +1,11 @@
+require 'json'
+
+module ZammadAPI
+  module JsonHelper
+    def safe_json_parse(string)
+      JSON.parse(string)
+    rescue JSON::ParserError
+      {}
+    end
+  end
+end

data/lib/zammad_api/list_base.rb

@@ -1,6 +1,9 @@
+require 'zammad_api/json_helper'
+
 module ZammadAPI
   class ListBase
     include Enumerable
+    include ZammadAPI::JsonHelper
 
     def initialize(resource, transport, parameter = {})
       @resource  = resource
@@ -59,7 +62,7 @@ module ZammadAPI
       }.join('&')
 
       response = @transport.get(url: url)
-      data = JSON.parse(response.body)
+      data = safe_json_parse(response.body)
       if response.status != 200
         raise "Can't get .#{request} of object (#{@resource.class.name}): #{data['error']}"
       end

data/lib/zammad_api/resources/base.rb

@@ -1,10 +1,13 @@
 require 'cgi'
-require 'json'
+require 'zammad_api/json_helper'
 require 'zammad_api/transport'
 
 module ZammadAPI
   module Resources
     class Base
+      include ZammadAPI::JsonHelper
+      extend ZammadAPI::JsonHelper
+
       attr_accessor :new_instance, :url, :attributes
       attr_reader :changes
 
@@ -41,7 +44,7 @@ module ZammadAPI
       def destroy
         response = @transport.delete(url: "#{@url}/#{@attributes[:id]}")
         if response.body.to_s != '' && response.body.to_s != ' '
-          data = JSON.parse(response.body)
+          data = safe_json_parse(response.body)
         end
         return true if response.status == 200
 
@@ -76,7 +79,7 @@ module ZammadAPI
 
       def self.find(transport, id)
         response = transport.get(url: "#{@url}/#{id}?expand=true")
-        data = JSON.parse(response.body)
+        data = safe_json_parse(response.body)
         if response.status != 200
           raise "Can't find object (#{self.class.name}): #{data['error']}"
         end
@@ -108,7 +111,7 @@ module ZammadAPI
 
       def save_new
         response   = @transport.post(url: "#{@url}?expand=true", params: @attributes)
-        attributes = JSON.parse(response.body)
+        attributes = safe_json_parse(response.body)
         return attributes if response.status == 201
 
         save_error(attributes)
@@ -120,7 +123,7 @@ module ZammadAPI
           attributes_to_post[name] = values[1]
         end
         response   = @transport.put(url: "#{@url}/#{@attributes[:id]}?expand=true", params: attributes_to_post)
-        attributes = JSON.parse(response.body)
+        attributes = safe_json_parse(response.body)
 
         return attributes if response.status == 200
 

data/lib/zammad_api/resources/ticket.rb

@@ -3,7 +3,7 @@ class ZammadAPI::Resources::Ticket < ZammadAPI::Resources::Base
 
   def articles
     response = @transport.get(url: "/api/v1/ticket_articles/by_ticket/#{id}?expand=true")
-    data = JSON.parse(response.body)
+    data = safe_json_parse(response.body)
     if response.status != 200
       raise "Can't get articles (#{self.class.name}): #{data['error']}"
     end

data/lib/zammad_api/resources/ticket_article_attachment.rb

@@ -13,7 +13,7 @@ class ZammadAPI::Resources::TicketArticleAttachment < ZammadAPI::Resources::Base
     response = @transport.get(url: "/api/v1/ticket_attachment/#{ticket_id}/#{article_id}/#{id}")
     return response.body if response.status == 200
 
-    data = JSON.parse(response.body)
+    data = safe_json_parse(response.body)
     raise "Can't get articles (#{self.class.name}): #{data['error']}"
   end
 end

data/lib/zammad_api/version.rb

@@ -1,3 +1,3 @@
 module ZammadAPI
-  VERSION = '1.3.0'.freeze
+  VERSION = '1.3.1'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zammad_api
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Martin Edenhofer
@@ -34,6 +34,7 @@ files:
 - lib/zammad_api.rb
 - lib/zammad_api/client.rb
 - lib/zammad_api/dispatcher.rb
+- lib/zammad_api/json_helper.rb
 - lib/zammad_api/list_all.rb
 - lib/zammad_api/list_base.rb
 - lib/zammad_api/list_search.rb