samanage 2.1.09 → 2.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b27ba531435e04046290dc044b89fc0e2f51125
-  data.tar.gz: 203d7b74e6757cc0e8e97344e0e79b7fc97851de
+  metadata.gz: 439421b219ee958f5a42756436880b91c47e2132
+  data.tar.gz: 91cb5850c80ecbd66f10940d72764dcecb0f8b9f
 SHA512:
-  metadata.gz: e44d497c9ff424afe653e29344904dae7290cec74af9c6f3695c00ae376db34136b47f179f83ad9025f46c35e82a31e342deee7a9216640618627fef1112da3b
-  data.tar.gz: 63f2235a968316f2c4617401c15f5e7fef12cf3e463c00621a7baa8e3d2c9d13b37ba89d4331ed4f3daa8853c4154c18e5164ff696c590d80ca6a4995e331a69
+  metadata.gz: c3ce720d571f2623e31255828e2e8e9432cb586ae287a06e5ef8e23ccbf80ac3485b6d88474ed7eb35a3bd3d8cc1a15b2c72c2df728f7becb07523124495bbdf
+  data.tar.gz: 163f88a491b6e918f7732af08e63c7c8273d35e09b62ef77083f4de4a1d81cf7052c96fc122a89d062c487e626eac2f1ef6b77c21ac52904ba358a2b3f991bd3

data/changelog.md

@@ -1,3 +1,7 @@
+### 2.1.10
+- Attachments for Windows
+- Handle Socket Errors
+
 ### 2.1.09
 - Updated HTTParty to 0.16.4
 - Optimize heavy audit+layout incident collection

data/lib/samanage/api.rb

@@ -58,7 +58,9 @@ module Samanage
     def execute(http_method: 'get', path: nil, payload: nil, verbose: nil, headers: {})
       if payload.class == Hash && self.content_type == 'json'
         begin
-          payload = payload.to_json
+          if path != 'attachments.json'
+            payload = payload.to_json
+          end
         rescue => e
           puts "Invalid JSON: #{payload.inspect}"
           raise Samanage::Error.new(error: e, response: nil)
@@ -93,7 +95,7 @@ module Samanage
         else
           raise Samanage::Error.new(response: {response: 'Unknown HTTP method'})
         end
-      rescue Errno::ECONNREFUSED, Net::OpenTimeout, Errno::ETIMEDOUT, OpenSSL::SSL::SSLError, Errno::ENETDOWN, Errno::ECONNRESET, Errno::ENOENT, EOFError, Net::HTTPTooManyRequests => e
+      rescue Errno::ECONNREFUSED, Net::OpenTimeout, Errno::ETIMEDOUT, OpenSSL::SSL::SSLError, Errno::ENETDOWN, Errno::ECONNRESET, Errno::ENOENT, EOFError, Net::HTTPTooManyRequests, SocketError => e
         puts "[Warning] #{e.class}: #{e} -  Retry: #{retries}/#{self.max_retries}"
         sleep 5
         retries += 1

data/lib/samanage/api/attachments.rb

@@ -23,9 +23,10 @@ module Samanage
         puts "Cannot find filepath: '#{filepath.inspect}'"
         return
       end
-      self.class.post(
-        self.base_url + 'attachments.json',
-        body: {
+      self.execute(
+        path: 'attachments.json',
+        http_method: 'post',
+        payload: {
           'file[attachable_type]' =>  attachable_type,
           'file[attachable_id]' =>  attachable_id,
           'file[attachment]' =>  File.open(filepath, 'r')

data/lib/samanage/version.rb

@@ -1,3 +1,3 @@
 module Samanage
-  VERSION = '2.1.09'
+  VERSION = '2.1.10'
 end

data/spec/api/samanage_attachment_spec.rb

@@ -3,41 +3,41 @@ require 'samanage'
 describe Samanage::Api do
   context 'Attachments' do
     describe 'API Functions' do
-    before(:all) do 
-      TOKEN ||= ENV['SAMANAGE_TEST_API_TOKEN']
-      @samanage = Samanage::Api.new(token: TOKEN)
-      @users = @samanage.get_users[:data]
-      @incidents = @samanage.incidents
+      before(:all) do 
+        TOKEN ||= ENV['SAMANAGE_TEST_API_TOKEN']
+        @samanage = Samanage::Api.new(token: TOKEN)
+        @users = @samanage.get_users[:data]
+        @incidents = @samanage.incidents
+      end
+      it 'uploads an attachment' do
+        filename = 'sample_file.txt'
+        filepath = File.join(Dir.pwd, filename)
+        incident_id = @incidents.sample.dig('id')
+        attach = @samanage.create_attachment(
+          filepath: filepath,
+          attachable_id: incident_id,
+          attachable_type: 'Incident'
+        )
+        expect(attach[:code]).to eq(200).or(201)
+        expect(filename).to eq(attach[:data]['filename'])
+        expect(File.open(filepath).size).to eq(attach[:data]['size'])
+      end
+      it 'downloads an attachment' do
+        incident_id = @incidents.sample.dig('id')
+        filename = 'sample_file.txt'
+        filepath = File.join(Dir.pwd, filename)
+        attach = @samanage.create_attachment(
+          filepath: filepath,
+          attachable_id: incident_id,
+          attachable_type: 'Incident'
+        )
+        expect(attach[:code]).to eq(200).or(201)
+        attachable_incident_id = incident_id # Need filter for has attachment?
+        incident = @samanage.find_incident(id: attachable_incident_id, options: {layout: 'long'})
+        attachment = @samanage.download_attachment(attachment: incident[:data]['attachments'].first)
+        expect(attachment.class).to be(File)
+        expect(attachment.path.split('/').last).to eq(filename)
+      end
     end
-    # it 'uploads an attachment' do
-    #   filename = 'sample_file.txt'
-    #   attachment = File.open(filename)
-    #   incident_id = @incidents.sample.dig('id')
-    #   attach = @samanage.upload_attachment(
-    #     attachment: attachment,
-    #     attachable_id: incident_id,
-    #     attachable_type: 'Incident'
-    #   )
-    #   expect(attach[:code]).to eq(200).or(201)
-    #   expect(filename).to eq(attach[:data]['filename'])
-    #   expect(attachment.size).to eq(attach[:data]['size'])
-    # end
-    # it 'downloads an attachment' do
-    #   incident_id = @incidents.sample.dig('id')
-    #   filename = 'sample_file.txt'
-    #   attachment = File.open(filename)
-    #   attach = @samanage.upload_attachment(
-    #     attachment: attachment,
-    #     attachable_id: incident_id,
-    #     attachable_type: 'Incident'
-    #   )
-    #   attachable_incident_id = incident_id # Need filter for has attachment?
-    #   incident = @samanage.find_incident(id: attachable_incident_id, options: {layout: 'long'})
-    #   attachment = @samanage.download_attachment(attachment: incident[:data]['attachments'].first)
-    #   expect(attachment.class).to be(File)
-    #   expect(attach[:code]).to eq(200)
-    #   expect(attachment.path.split('/').last).to eq(filename)
-    # end
-  end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: samanage
 version: !ruby/object:Gem::Version
-  version: 2.1.09
+  version: 2.1.10
 platform: ruby
 authors:
 - Chris Walls
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-28 00:00:00.000000000 Z
+date: 2019-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty