samanage 1.8.2 → 1.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e3b9e74fc9dd73dbe2989f205691068facee01d
-  data.tar.gz: e3114f63ef4ee17a0c3546da722f9a9ba0bce80b
+  metadata.gz: f1a73bd9d0ecff83e8c95ca29b389260d73eb3e7
+  data.tar.gz: b2a98bff4c554c017ac670f172981676a3ac9128
 SHA512:
-  metadata.gz: 80cbe3721a4b62f9512501c9cd83d30a6a3eed9a2e7b2d752cf93b6bf66f53323c1db29b5efeb2168253c6c5f0767d59e9aa4d5aab1b97c6563be31658df9c1e
-  data.tar.gz: aa249b7fb1dee0adb3a8b5d8839ab91452d7cb169e1121c14b0f6d858ba07b80bf2264d0df15f1365109bcceb853a911e28da13985856fc70352ce3f86c51887
+  metadata.gz: 0caa861127343267e8c33fe1a730acdf48a722244a2c9464178d9445d60576ed92e85ce9b1dd5cc1db7f53ec24590663cc8c8c35f61a4edbcdf91386f5874ccc
+  data.tar.gz: ddc7ad10f2e7f6f1642b08dd5d18d745d0956600b24fb6532a46c9049d83197e0098fdbc559aca3048b1874697edffe7dace52c57cc341bc0371d9ad43925a37

data/lib/samanage.rb

@@ -17,7 +17,8 @@ require 'samanage/api/sites'
 require 'samanage/api/users'
 require 'samanage/error'
 require 'samanage/url_builder'
+require 'samanage/version'
 
 module Samanage
-	VERSION = '1.8.2'
+	
 end

data/lib/samanage/api.rb

@@ -1,9 +1,7 @@
 module Samanage
 	class Api
 		include HTTParty
-		ssl_ca_file "#{File.expand_path('..')}/data/cacert.pem"
-
-
+		MAX_RETRIES = 3
 		PATHS = {
 			category: 'categories.json',
 			custom_fields: 'custom_fields.json',
@@ -17,11 +15,13 @@ module Samanage
 			site: 'sites.json',
 			user: 'users.json',
 		}
-		attr_accessor :datacenter, :content_type, :base_url, :token, :custom_forms, :authorized, :admins
+		ssl_ca_file "#{File.expand_path('..')}/data/cacert.pem"
+		attr_accessor :datacenter, :content_type, :base_url, :token, :custom_forms, :authorized, :admins, :retries
 
 		# 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)
+		def initialize(token: nil, datacenter: nil, development_mode: false, max_retries: MAX_RETRIES)
+			self.retries = 0
 			self.token = token if token
 			if !datacenter.nil? && datacenter.to_s.downcase != 'eu'
 				datacenter = nil
@@ -73,14 +73,28 @@ module Samanage
 				'Content-type'  => "application/#{self.content_type}",
 				'X-Samanage-Authorization' => 'Bearer ' + self.token
 			}
+			@options = {
+				headers: headers,
+				payload: payload
+			}
 			full_path = self.base_url + path
-			case http_method.to_s.downcase
-			when 'get'
-				api_call = HTTParty.get(full_path, headers: headers)
-			when 'post'
-				api_call = HTTParty.post(full_path, query: payload, headers: headers)
-			when 'put'
-				api_call = HTTParty.put(full_path, query: payload, headers: headers)
+			begin
+				case http_method.to_s.downcase
+				when 'get'
+					api_call = self.class.get(full_path, headers: headers)
+				when 'post'
+					api_call = self.class.post(full_path, query: payload, headers: headers)
+				when 'put'
+					api_call = self.class.put(full_path, query: payload, headers: headers)
+				end
+			rescue Errno::ECONNREFUSED => e
+				puts "#{e} - #{e.class}"
+				puts "Retry: #{self.retries}/#{self.max_retries}"
+				self.retries += 1
+				retry if self.retries < self.max_retries
+				error = e
+				response = e.class
+				raise Samanage::InvalidRequest.new(error: error, response: response)
 			end
 
 			response = Hash.new
@@ -115,10 +129,6 @@ module Samanage
 				error = response[:response]
 				raise Samanage::InvalidRequest.new(error: error, response: response)
 			end
-			rescue Errno::ECONNREFUSED => e
-				error = e
-				response = e.class
-				raise Samanage::InvalidRequest.new(error: error, response: response)
 		end
 
 

data/lib/samanage/api/custom_forms.rb

@@ -39,7 +39,5 @@ module Samanage
 			end
 			self.custom_forms[object_type]
 		end
-
-	alias_method :custom_forms, :collect_custom_forms
 	end
 end

data/lib/samanage/version.rb

@@ -0,0 +1,3 @@
+module Samanage
+  VERSION = '1.8.3'
+end

data/spec/api/samanage_category_spec.rb

@@ -6,7 +6,6 @@ describe Samanage::Api do
 			@controller = Samanage::Api.new(token: TOKEN)
 		end
 		it 'collects all categories' do
-			puts "Category methods: #{@controller.methods}"
 			categories = @controller.collect_categories
 			expect(categories).to be_an(Array)
 		end
@@ -24,7 +23,7 @@ describe Samanage::Api do
 
 			expect(category_create[:data]['id']).to be_an(Integer)
 			expect(category_create[:data]['name']).to eq(category_name)
-			expect(category_create[:code]).to eq(201).or(200)
+			expect(category_create[:code]).to eq(200).or(201)
 		end
 	end
 end

data/spec/samanage_api_spec.rb

@@ -27,7 +27,7 @@ describe Samanage do
   			api_controller = Samanage::Api.new(token: TOKEN, development_mode: true)
   			expect(api_controller).to be_an_instance_of(Samanage::Api)
   			expect(api_controller.custom_forms).not_to be(nil)
-  			expect(api_controller.custom_forms).to be_a(Array)
+  			expect(api_controller.custom_forms).to be_a(Hash)
   		end
   		it 'Fails with invalid token in development mode' do
   			expect{ Samanage::Api.new(token: 'Invalid Token', development_mode: true)}.to raise_error(Samanage::AuthorizationError)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: samanage
 version: !ruby/object:Gem::Version
-  version: 1.8.2
+  version: 1.8.3
 platform: ruby
 authors:
 - Chris Walls
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-15 00:00:00.000000000 Z
+date: 2017-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -69,6 +69,7 @@ files:
 - lib/samanage/api/users.rb
 - lib/samanage/error.rb
 - lib/samanage/url_builder.rb
+- lib/samanage/version.rb
 - samanage.gemspec
 - spec/api/samanage_category_spec.rb
 - spec/api/samanage_comments_spec.rb
@@ -106,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Samanage Ruby Gem