samanage 1.6.9 → 1.7.0

data/lib/samanage.rb

@@ -1,5 +1,5 @@
 $LOAD_PATH << File.dirname(__FILE__)
-require 'http'
+require 'httparty'
 
 require 'samanage/api'
 require 'samanage/api/users'

data/lib/samanage/api.rb

@@ -1,5 +1,6 @@
 module Samanage
 	class Api
+		include HTTParty
 		PATHS = {
 			hardware: 'hardwares.json',
 			user: 'users.json',
@@ -16,10 +17,10 @@ module Samanage
 		def initialize(token: nil, datacenter: nil, development_mode: false)
 			self.token = token if token
 			if !datacenter.nil? && datacenter.to_s.downcase != 'eu'
-				datacenter = nil
+				self.datacenter = nil
 			end
+			self.base_url =  "https://api#{self.datacenter}.samanage.com/"
 			self.datacenter = datacenter if datacenter
-			self.base_url = "https://api#{datacenter}.samanage.com/"
 			self.content_type = 'json'
 			self.admins = []
 			if development_mode
@@ -46,22 +47,35 @@ module Samanage
 		end
 
 		# Calling execute without a method defaults to GET
-		def execute(http_method: 'get', path: nil, payload: nil, verbose: nil, ssl_fix: false, token: nil)
+		def execute(http_method: 'get', path: nil, payload: nil, verbose: nil, ssl_fix: false)
+			if payload.class == String
+				begin
+				payload = JSON.parse(payload)
+				rescue => e
+					puts "Invalid JSON: #{payload.inspect}"
+					raise Samanage::Error(error: e, response: nil)
+				end
+			end
 			token = token ||= self.token
 			unless verbose.nil?
 				verbose = '?layout=long'
 			end
 
-			api_call = HTTP.headers(
+			headers = {
 				'Accept' => "application/vnd.samanage.v2.0+#{self.content_type}#{verbose}",
 				'Content-type'  => "application/#{self.content_type}",
-				'X-Samanage-Authorization' => 'Bearer ' + token
-			)
-			ctx = OpenSSL::SSL::SSLContext.new
-			if ssl_fix
-				ctx.verify_mode = OpenSSL::SSL::VERIFY_NONE
+				'X-Samanage-Authorization' => 'Bearer ' + self.token
+			}
+			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)
 			end
-			api_call = api_call.public_send(http_method.to_sym, self.base_url + Addressable::URI.encode_component(path, Addressable::URI::CharacterClasses::QUERY).gsub('+',"%2B"), :body => payload, ssl_context: ctx)
+
 			response = Hash.new
 			response[:code] = api_call.code.to_i
 			response[:json] = api_call.body
@@ -71,9 +85,6 @@ module Samanage
 			response[:total_pages] = 1 if response[:total_pages] == 0
 			response[:total_count] = api_call.headers['X-Total-Count'].to_i
 
-			# puts "Body Class: #{api_call.body.class}"
-			# puts "#{api_call.body}"
-			# Raise error if not Authentication or 200,201  == Success,Okay
 			# Error cases
 			case response[:code]
 			when 200..201
@@ -82,7 +93,7 @@ module Samanage
 			when 401
 				response[:data] = api_call.body
 				error = response[:response]
-				self.authorized =false
+				self.authorized = false
 				raise Samanage::AuthorizationError.new(error: error,response: response)
 			when 404
 				response[:data] = api_call.body
@@ -97,11 +108,6 @@ module Samanage
 				error = response[:response]
 				raise Samanage::InvalidRequest.new(error: error, response: response)
 			end
-			rescue HTTP::ConnectionError => e
-				error = e.class
-				response = nil
-				raise Samanage::Error.new(error: error, response: response)
-			# Always return response hash
 			response
 		end
 

data/samanage.gemspec

@@ -1,7 +1,7 @@
 $:.push File.expand_path("../lib", __FILE__)
 Gem::Specification.new do |s|
   s.name                    = 'samanage'
-  s.version                 = '1.6.9'
+  s.version                 = '1.7.0'
   s.date                    =  Date.today.strftime("%Y-%m-%d")
   s.summary                 = "Samanage Ruby Gem"
   s.description             = "Connect to Samanage using Ruby!"
@@ -12,6 +12,6 @@ Gem::Specification.new do |s|
   s.license                 = 'MIT'
   s.require_paths           = ["lib"]
   s.required_ruby_version   = '>= 2.3'
-  s.add_development_dependency 'http', ['~> 2.2']
-  s.add_runtime_dependency 'http', ['~> 2.2']
+  s.add_development_dependency 'httparty', ['~> 2.2']
+  s.add_runtime_dependency 'httparty', ['~> 2.2']
 end

data/spec/api/comments_spec.rb

@@ -19,7 +19,7 @@ describe Samanage::Api do
 					comment: {
 						body: rand_text,
 					}
-				}.to_json
+				}
 				api_call = @controller.create_comment(incident_id: incident_id, comment: comment)
 
 				expect(api_call.dig(:data,'body')).to eq(rand_text)

data/spec/api/samanage_hardware_spec.rb

@@ -1,5 +1,4 @@
 require 'samanage'
-
 describe Samanage::Api do
 	context 'Hardware' do
 		describe 'API Functions' do
@@ -20,16 +19,16 @@ describe Samanage::Api do
 				expect(hardwares).to be_an(Array)
 				expect(hardwares.size).to eq(hardware_count)
 			end
-			it 'create_hardware(payload: json): creates a hardware' do
+			it 'create_hardware(payload: payload): creates a hardware' do
 				hardware_name = "samanage-ruby-#{(rand*10**10).ceil}"
 				serial_number = (0...50).map { ('a'..'z').to_a[rand(26)] }.join
-				json = {
+				payload = {
 					:hardware => {
 						:name => hardware_name,
 						:bio => {:ssn => serial_number},
 					}
 				}
-				hardware_create = @controller.create_hardware(payload: json.to_json)
+				hardware_create = @controller.create_hardware(payload: payload)
 
 				expect(hardware_create[:data]['id']).to be_an(Integer)
 				expect(hardware_create[:data]['name']).to eq(hardware_name)
@@ -37,12 +36,12 @@ describe Samanage::Api do
 			end
 			it 'create_hardware: fails if no serial' do
 				hardware_name = "samanage-ruby-#{(rand*10**10).ceil}"
-				json = {
+				payload = {
 					:hardware => {
 						:name => hardware_name,
 					}
 				}
-				expect{@controller.create_hardware(payload: json.to_json)}.to raise_error(Samanage::InvalidRequest)
+				expect{@controller.create_hardware(payload: payload)}.to raise_error(Samanage::InvalidRequest)
 			end
 			it 'find_hardware: returns a hardware card by known id' do
 				hardwares = @controller.collect_hardwares
@@ -75,12 +74,12 @@ describe Samanage::Api do
 				hardwares = @controller.collect_hardwares
 				sample_id = hardwares.sample['id']
 				new_name = (0...50).map { ('a'..'z').to_a[rand(26)] }.join
-				json = {
+				payload = {
 					:hardware => {
 						:name => new_name
 					}
 				}
-				hardware_update = @controller.update_hardware(payload: json.to_json, id: sample_id)
+				hardware_update = @controller.update_hardware(payload: payload, id: sample_id)
 				expect(hardware_update[:data]["name"]).to eq(new_name)
 				expect(hardware_update[:code]).to eq(200).or(201)
 			end

data/spec/api/samanage_incident_spec.rb

@@ -29,7 +29,7 @@ describe Samanage::Api do
 						:description => "Description"
 					}
 				}
-				incident_create = @controller.create_incident(payload: json.to_json)
+				incident_create = @controller.create_incident(payload: json)
 
 				expect(incident_create[:data]['id']).to be_an(Integer)
 				expect(incident_create[:data]['name']).to eq(incident_name)
@@ -43,7 +43,7 @@ describe Samanage::Api do
 						:description => "Description"
 					}
 				}
-				expect{@controller.create_incident(payload: json.to_json)}.to raise_error(Samanage::InvalidRequest)
+				expect{@controller.create_incident(payload: json)}.to raise_error(Samanage::InvalidRequest)
 			end
 			it 'find_incident: returns a incident card by known id' do
 				incidents = @controller.collect_incidents
@@ -69,7 +69,7 @@ describe Samanage::Api do
 						:description => description
 					}
 				}
-				incident_update = @controller.update_incident(payload: incident_json.to_json, id: sample_id)
+				incident_update = @controller.update_incident(payload: incident_json, id: sample_id)
 				expect(incident_update[:data]['description']).to eq(description)
 				expect(incident_update[:code]).to eq(200).or(201)
 			end

data/spec/api/samanage_mobile_spec.rb

@@ -30,7 +30,7 @@ describe Samanage::Api do
 						serial_number:  serial_number,
 					}
 				}
-				mobile_create = @controller.create_mobile(payload: json.to_json)
+				mobile_create = @controller.create_mobile(payload: json)
 
 				expect(mobile_create[:data]['id']).to be_an(Integer)
 				expect(mobile_create[:data]['manufacturer']).to eq(mobile_name)
@@ -43,7 +43,7 @@ describe Samanage::Api do
 						manufacturer: mobile_name,
 					}
 				}
-				expect{@controller.create_mobile(payload: json.to_json)}.to raise_error(Samanage::InvalidRequest)
+				expect{@controller.create_mobile(payload: json)}.to raise_error(Samanage::InvalidRequest)
 			end
 			it 'find_mobile: returns a mobile card by known id' do
 				mobiles = @controller.collect_mobiles
@@ -68,7 +68,7 @@ describe Samanage::Api do
 						:manufacturer => new_name
 					}
 				}
-				mobile_update = @controller.update_mobile(payload: json.to_json, id: sample_id)
+				mobile_update = @controller.update_mobile(payload: json, id: sample_id)
 				expect(mobile_update[:data]["manufacturer"]).to eq(new_name)
 				expect(mobile_update[:code]).to eq(200).or(201)
 			end

data/spec/api/samanage_other_asset_spec.rb

@@ -29,7 +29,7 @@ describe Samanage::Api do
 					}
 				}
 
-				other_asset_create = @controller.create_other_asset(payload: json.to_json)
+				other_asset_create = @controller.create_other_asset(payload: json)
 				expect(other_asset_create[:data]['id']).to be_an(Integer)
 				expect(other_asset_create[:data]['name']).to eq(other_asset_name)
 				expect(other_asset_create[:code]).to eq(200).or(201)
@@ -45,7 +45,7 @@ describe Samanage::Api do
 					}
 				}
 				json[:other_asset].delete(json[:other_asset].keys.sample) # Delete random sample from the examples above
-				expect{@controller.create_other_asset(payload: json.to_json)}.to raise_error(Samanage::InvalidRequest)
+				expect{@controller.create_other_asset(payload: json)}.to raise_error(Samanage::InvalidRequest)
 			end
 
 			it 'find_other_asset: returns an other_asset card by known id' do
@@ -72,7 +72,7 @@ describe Samanage::Api do
 						:name => new_name
 					}
 				}
-				other_asset_update = @controller.update_other_asset(payload: json.to_json, id: sample_id)
+				other_asset_update = @controller.update_other_asset(payload: json, id: sample_id)
 				expect(other_asset_update[:data]["name"]).to eq(new_name)
 				expect(other_asset_update[:code]).to eq(200).or(201)
 			end

data/spec/api/samanage_user_spec.rb

@@ -29,7 +29,7 @@ describe Samanage::Api do
 						:email => email,
 					}
 				}
-				user_create = @controller.create_user(payload: json.to_json)
+				user_create = @controller.create_user(payload: json)
 				expect(user_create[:data]['email']).to eq(email)
 				expect(user_create[:data]['id']).to be_an(Integer)
 				expect(user_create[:data]['name']).to eq(user_name)
@@ -42,7 +42,7 @@ describe Samanage::Api do
             :name => user_name,
 					}
 				}
-				expect{@controller.create_user(payload: json.to_json)}.to raise_error(Samanage::InvalidRequest)
+				expect{@controller.create_user(payload: json)}.to raise_error(Samanage::InvalidRequest)
 			end
 			it 'find_user: returns a user card by known id' do
 				users = @controller.collect_users
@@ -78,7 +78,7 @@ describe Samanage::Api do
 						:name => new_name
 					}
 				}
-				user_update = @controller.update_user(payload: json.to_json, id: sample_id)
+				user_update = @controller.update_user(payload: json, id: sample_id)
 				expect(user_update[:data]["name"]).to eq(new_name)
 				expect(user_update[:code]).to eq(200).or(201)
 			end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: samanage
 version: !ruby/object:Gem::Version
-  version: 1.6.9
+  version: 1.7.0
 platform: ruby
 authors:
 - Chris Walls
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-14 00:00:00.000000000 Z
+date: 2017-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: http
+  name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.2'
 - !ruby/object:Gem::Dependency
-  name: http
+  name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -50,7 +50,8 @@ files:
 - Guardfile
 - LICENSE
 - README.md
-- changelog.txt
+- changelog.md
+- lib/data/cacert.pem
 - lib/samanage.rb
 - lib/samanage/api.rb
 - lib/samanage/api/comments.rb
@@ -64,7 +65,6 @@ files:
 - lib/samanage/api/users.rb
 - lib/samanage/error.rb
 - lib/samanage/url_builder.rb
-- lib/test.rb
 - samanage.gemspec
 - spec/api/comments_spec.rb
 - spec/api/samanage_custom_field_spec.rb

data/changelog.txt

@@ -1 +0,0 @@
-1.6.9 Added CRU support for Mobile Devices