zammad_api 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad3db8f4610b32b84270108afc10bd8a4881e7fd
-  data.tar.gz: e4ddc8bcd938de762c1135eb93fc2f89ad9638da
+  metadata.gz: 0f34fd120446932dde693b5e5e364c7b3d39c038
+  data.tar.gz: f352194c6b650b5522579df5ffa68878e5f6014f
 SHA512:
-  metadata.gz: cc9807c9138cefb50ff3946b2637f0a40e2bec5227c3da677f052b0b992e68c2f9e4649510ad9b7ceaab141e8426e5061ab1c816bc031a464a865b1c368cf8b0
-  data.tar.gz: 7d54671ef307d30e4a180c8b767292d4a4dbf4d350f9cee402de40a168366dafcffa404391b6b84e96654be7711af34b960b064eeceb40818de42e374e4d63d5
+  metadata.gz: ff79410da2f92e251a5e8383802b4d1dd1f2d721bf65bb1e4eed1ae35ebb3e2f2dfd5534849c82762a9bfbe0cc9c7d34a50491de87549f93ba9874ce4846b8b2
+  data.tar.gz: a539ce959dc74ffcf223669289feca88751379191d9e54c26c2a6c210397f2603e82051d25b837d69bebbf449e8485f5b0e772318d6458407457740efc2172f6

data/lib/zammad_api/resources/base.rb

@@ -22,12 +22,11 @@ module ZammadAPI
       end
 
       def method_missing(method, *args)
-        if method.to_s[-1, 1] == '='
-          method              = method.to_s[0, method.length - 1].to_sym
-          @changes[method]    = [@attributes[method], args[0]]
-          @attributes[method] = args[0]
-        end
-        @attributes[method]
+        return @attributes[method] if !method.end_with?('=')
+        method              = method.to_s[0, method.length - 1].to_sym
+        @changes[method]    = [@attributes[method], args[0]]
+        @attributes[method] = args[0]
+        nil
       end
 
       def new_record?
@@ -35,8 +34,7 @@ module ZammadAPI
       end
 
       def changed?
-        return false if @changes.empty?
-        true
+        @changes.present?
       end
 
       def destroy
@@ -44,35 +42,17 @@ module ZammadAPI
         if response.body.to_s != '' && response.body.to_s != ' '
           data = JSON.parse(response.body)
         end
-        if response.status != 200
-          raise "Can't destroy object (#{self.class.name}): #{data['error']}"
-        end
-        true
+        return true if response.status == 200
+        raise "Can't destroy object (#{self.class.name}): #{data['error']}"
       end
 
       def save
-        if @new_instance
-          response = @transport.post(url: "#{@url}?expand=true", params: @attributes)
-          attributes = JSON.parse(response.body)
-          if response.status != 201
-            raise "Can't create new object (#{self.class.name}): #{attributes['error']}"
-          end
-        else
-          attributes_to_post = {}
-          @changes.each { |name, values|
-            attributes_to_post[name] = values[1]
-          }
-          response = @transport.put(url: "#{@url}/#{@attributes[:id]}?expand=true", params: attributes_to_post)
-          attributes = JSON.parse(response.body)
-          if response.status != 200
-            raise "Can't update new object (#{self.class.name}): #{attributes['error']}"
-          end
-        end
+        attributes = saved_attributes
         symbolize_keys_deep!(attributes)
         attributes.delete(:article)
-        @attributes = attributes
+        @attributes   = attributes
         @new_instance = false
-        @changes = {}
+        @changes      = {}
         true
       end
 
@@ -117,6 +97,34 @@ module ZammadAPI
 
       private
 
+      def saved_attributes
+        return save_new if @new_instance
+        save_existing
+      end
+
+      def save_new
+        response   = @transport.post(url: "#{@url}?expand=true", params: @attributes)
+        attributes = JSON.parse(response.body)
+        return attributes if response.status == 201
+        save_error(attributes)
+      end
+
+      def save_existing
+        attributes_to_post = {}
+        @changes.each { |name, values|
+          attributes_to_post[name] = values[1]
+        }
+        response   = @transport.put(url: "#{@url}/#{@attributes[:id]}?expand=true", params: attributes_to_post)
+        attributes = JSON.parse(response.body)
+
+        return attributes if response.status == 200
+        save_error(attributes)
+      end
+
+      def save_error(attributes)
+        raise "Can't save object (#{self.class.name}): #{attributes['error']}"
+      end
+
       def symbolize_keys_deep!(hash)
         hash.keys.each do |key|
           key_symbol       = key.respond_to?(:to_sym) ? key.to_sym : key

data/lib/zammad_api/resources/ticket.rb

@@ -7,17 +7,16 @@ class ZammadAPI::Resources::Ticket < ZammadAPI::Resources::Base
     if response.status != 200
       raise "Can't get articles (#{self.class.name}): #{data['error']}"
     end
-    articles = []
-    data.each { |raw|
+
+    data.collect { |raw|
       item = ZammadAPI::Resources::TicketArticle.new(@transport, raw)
       item.new_instance = false
-      articles.push item
+      item
     }
-    articles
   end
 
   def article(data)
-    data['ticket_id'] = @attributes[:id]
+    data[:ticket_id] = @attributes[:id]
     item = ZammadAPI::Resources::TicketArticle.new(@transport, data)
     item.save
     item

data/lib/zammad_api/resources/ticket_article.rb

@@ -1,3 +1,12 @@
 class ZammadAPI::Resources::TicketArticle < ZammadAPI::Resources::Base
   url '/api/v1/ticket_articles'
+
+  def attachments
+    @attributes[:attachments].collect { |raw|
+      raw[:ticket_id]  = @attributes[:ticket_id]
+      raw[:article_id] = @attributes[:id]
+      ZammadAPI::Resources::TicketArticleAttachment.new(@transport, raw)
+    }
+  end
+
 end

data/lib/zammad_api/resources/ticket_article_attachment.rb

@@ -0,0 +1,20 @@
+class ZammadAPI::Resources::TicketArticleAttachment < ZammadAPI::Resources::Base
+
+  def initialize(transport, attributes = {})
+    @transport  = transport
+    @attributes = attributes
+    symbolize_keys_deep!(@attributes)
+  end
+
+  def method_missing(method, *_args)
+    @attributes[method.to_sym]
+  end
+
+  def download
+    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)
+    raise "Can't get articles (#{self.class.name}): #{data['error']}"
+  end
+
+end

data/lib/zammad_api/resources.rb

@@ -7,6 +7,7 @@ require 'zammad_api/resources/group'
 require 'zammad_api/resources/organization'
 require 'zammad_api/resources/ticket'
 require 'zammad_api/resources/ticket_article'
+require 'zammad_api/resources/ticket_article_attachment'
 require 'zammad_api/resources/ticket_state'
 require 'zammad_api/resources/ticket_priority'
 

data/lib/zammad_api/version.rb

@@ -1,3 +1,3 @@
 module ZammadAPI
-  VERSION = '1.0.1'.freeze
+  VERSION = '1.0.2'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zammad_api
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Martin Edenhofer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-06 00:00:00.000000000 Z
+date: 2017-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -101,6 +101,7 @@ files:
 - lib/zammad_api/resources/organization.rb
 - lib/zammad_api/resources/ticket.rb
 - lib/zammad_api/resources/ticket_article.rb
+- lib/zammad_api/resources/ticket_article_attachment.rb
 - lib/zammad_api/resources/ticket_priority.rb
 - lib/zammad_api/resources/ticket_state.rb
 - lib/zammad_api/resources/user.rb