samanage 1.8.7 → 1.8.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1dc65a5a8e92d420166469ca9959c5555e1538f
-  data.tar.gz: c15598bf31ea9488ba0d7f8897484bd0c0ad7756
+  metadata.gz: 4cedeeea723b8028baf7e86f24cd0fdc19e92ab1
+  data.tar.gz: e5c30e6130bed20c7ab1307af38fad03ecaad412
 SHA512:
-  metadata.gz: db8cc22baef9596bcbb263be8c51efda54e5c99656fcc2b2825e98033c8342a69bf1795e1621f50a39b6159dcfeb46f6066cc4c32d095cc18a511d48cb9814ab
-  data.tar.gz: 33d2093ce8704852315ca18edcc9b40433da36f16c9453de3637bb737ca9663cdf79aeef2044484ab7ca0862349668378eb6c8278d203bcd06c51b8900c64066
+  metadata.gz: 80188be6d78b1eab07e99d5a076485fed80ddd2ba7c2cfc400817a0df3173d7ec45252e7fdb88f096e61f0abcc4e9ad5b64652fcefbaa15a7695b1483cd9a12f
+  data.tar.gz: fda39d8acf665d196c624102ddb1aa50fdd6d01dcba93eb9e640a4a34894f4968d6a7186ea96e608f704cb6ecbec4d506199da70f09968391a80557e89777f3f

data/changelog.md

@@ -1,3 +1,8 @@
+# 1.8.8
+- Base level .execute delete functionality
+- Error message for invalid http methods
+- Added audit_archive to incident options
+
 # 1.8.7
 - Fixing retry bug
 

data/lib/samanage/api.rb

@@ -20,9 +20,8 @@ module Samanage
 
 		# Development mode forzes authorization & prepopulates custom forms/fields and admins
 		# datacenter should equal 'eu' or blank
-		def initialize(token: nil, datacenter: nil, development_mode: false, max_retries: MAX_RETRIES)
-			self.max_retries = max_retries
-			self.token = token if token
+		def initialize(token: , datacenter: nil, development_mode: false, max_retries: MAX_RETRIES)
+			self.token = token
 			if !datacenter.nil? && datacenter.to_s.downcase != 'eu'
 				datacenter = nil
 			end
@@ -30,6 +29,7 @@ module Samanage
 			self.base_url =  "https://api#{self.datacenter.to_s.downcase}.samanage.com/"
 			self.content_type = 'json'
 			self.admins = []
+			self.max_retries = max_retries
 			if development_mode
 				if self.authorized? != true
 					self.authorize
@@ -87,8 +87,12 @@ module Samanage
 					api_call = self.class.post(full_path, query: payload, headers: headers)
 				when 'put'
 					api_call = self.class.put(full_path, query: payload, headers: headers)
+				when 'delete'
+					api_call = self.class.put(full_path, query: payload, headers: headers)
+				else
+					raise Samanage::Error.new(response: {response: 'Unknown HTTP method'})
 				end
-			rescue Errno::ECONNREFUSED, Net::OpenTimeout => e
+			rescue Errno::ECONNREFUSED, Net::OpenTimeout, Errno::ETIMEDOUT => e
 				puts "#{e} - #{e.class}"
 				puts "Retry: #{retries}/#{self.max_retries}"
 				retries += 1

data/lib/samanage/api/incidents.rb

@@ -8,15 +8,25 @@ module Samanage
 		end
 
 
-		# Returns all incidents
+		# Returns all incidents. 
+		# Options: 
+		#   - audit_archives: true
+		#   - layout: 'long'
 		def collect_incidents(options: {})
-			page = 1
 			incidents = Array.new
 			total_pages = self.get_incidents[:total_pages]
-			layout = options[:layout] == 'long' ? '&layout=long' : nil
-			while page <= total_pages
-				incidents += self.execute(http_method: 'get', path: "incidents.json?page=#{page}#{layout}")[:data]
-				page += 1
+			1.upto(total_pages) do |page|
+				if options[:audit_archives]
+					archives = 'layout=long&audit_archive=true'
+					paginated_incidents = self.execute(path: "incidents.json?page=#{page}")[:data]
+					paginated_incidents.map do |incident|
+						archive_path = "incidents/#{incident['id']}.json?#{archives}"
+						incidents << self.execute(path: archive_path)[:data]
+					end
+				else
+					layout = options[:layout] == 'long' ? '&layout=long' : nil
+					incidents += self.execute(http_method: 'get', path: "incidents.json?page=#{page}#{layout}")[:data]
+				end
 			end
 			incidents
 		end

data/lib/samanage/error.rb

@@ -1,8 +1,9 @@
 module Samanage
-	# Errors in gem
 	class Error < StandardError
 		attr_accessor :status_code, :response, :error
+		
 		def initialize(error: nil, response: {})
+			self.error = error
 			if response.class == Hash
 				self.status_code = response[:code]
 				self.response = response[:data] ||= response[:response]
@@ -11,10 +12,8 @@ module Samanage
 				self.response = response
 			end
 
-			self.error = error
 			puts "[Error] #{self.status_code}: #{self.response}"
 		end
-
 	end
 
 	# API Errors

data/lib/samanage/version.rb

@@ -1,3 +1,3 @@
 module Samanage
-  VERSION = '1.8.7'
+  VERSION = '1.8.8'
 end

data/spec/api/samanage_comments_spec.rb

@@ -26,10 +26,10 @@ describe Samanage::Api do
 			end
 
 			it 'collects all comments' do
-				incident_id = @controller.get_incidents()[:data].sample.dig('id')
-				incident_id = 19394209
-				comments_api = @controller.get_comments(incident_id: incident_id)
-				comments_found = @controller.collect_comments(incident_id: incident_id)
+				## incident_id = @controller.get_incidents()[:data].sample.dig('id')
+				# incident_id = 19394209
+				# comments_api = @controller.get_comments(incident_id: incident_id)
+				# comments_found = @controller.collect_comments(incident_id: incident_id)
 
 				# Total count bug
 				# expect(comments_api[:total_count]).to eq(comments_found.size)

data/spec/api/samanage_incident_spec.rb

@@ -74,10 +74,20 @@ describe Samanage::Api do
 				expect(incident_update[:code]).to eq(200).or(201)
 			end
 			it 'finds more data for option[:layout] = "long"' do
+				full_layout_incident_keys = @controller.incidents(options: {layout: 'long'}).first.keys
+				basic_incident_keys = @controller.incidents.sample.keys
+				expect(basic_incident_keys.size).to be < full_layout_incident_keys.size
+			end
+			it 'finds more audit archives for option[:audit_archives] = true' do
+				incident_keys = @controller.incidents(options: {audit_archives: true}).sample.keys
+				expect(incident_keys).to include('audits')
+			end
+			it 'finds audit archives for options: {audit_archives: true, layout: "long"}' do
+				full_incident_keys = @controller.incidents(options: {audit_archives: true}).sample.keys
 				basic_incident_keys = @controller.incidents.sample.keys
-				full_incident_keys = @controller.incidents(options: {layout: 'long'}).sample.keys
 				expect(basic_incident_keys.size).to be < full_incident_keys.size
+				expect(full_incident_keys).to include('audits')
 			end
 		end
 	end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: samanage
 version: !ruby/object:Gem::Version
-  version: 1.8.7
+  version: 1.8.8
 platform: ruby
 authors:
 - Chris Walls
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-27 00:00:00.000000000 Z
+date: 2018-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty