samanage 1.5.1 → 1.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e49ce72a751f5236319e16bc11da84747b6af2b
-  data.tar.gz: b919e086c1293a6253ff9b365d0331962c25378c
+  metadata.gz: 49cf085d75e8e4de2a1fa11fdd19e6d99c38b421
+  data.tar.gz: 243c926d4445e5f58f2adea3179641e892239050
 SHA512:
-  metadata.gz: 9056b29ff625771ac418e12ec935e7f089f411b0e52d6561d827d32954e3bc0c76e215e8391a1522d7267d4d615f2e4405d2ebbdd4ca486b2a44ac2e0015314d
-  data.tar.gz: cd9fcee69f53de525ee2a519e89c9d114a14a2aa7a51931287e906e4842cac216fb9658cf43c8d68304634b88cef829fd805a576bdd37bedb34f483f385347ee
+  metadata.gz: 70a262365ad0a58e9ad3b89e6f66e6828d68c80086ef136c81ece7766e1ff06a03d349a8ed5db285866d86feaecfcd50f9a6f71d17ed9ecec7597db7d2b3677e
+  data.tar.gz: 3f120fdc1a1f6d37e4826bf2a41d24c96cd0af2259640a3981d3efc40bbbf9e132398b4fd144efbb9d1175045e841c973db82fd27f7c7c92221a07ed24d2dbc5

data/README.md

@@ -1 +1,38 @@
-# samanage-ruby
+# samanage-ruby
+
+## Requirements
+- Ruby >= 2.3.1
+
+## Installation
+gem install samanage
+
+
+
+## Usage
+### Queries
+
+```ruby
+    api_controller = Samanage::Api.new(token: api_token)
+    query = api_controller.execute(http_method: 'get',
+     path: 'users.json')
+```
+Returns query returns a Hash with keys:
+- `:response`*:* unparsed `http` response
+- `:code`*:* http status code
+- `:json`*:* Samanage API json response
+- `:headers`*:* Response headers
+- `:total_pages`*:* Total pages
+- `:total_count`*:* Total count of records
+- `:data`*:* Hash containing response body
+
+### Function examples
+#### Return all Samanage Users
+```ruby
+users = api_controller.collect_users
+```
+
+#### Update hardware
+```ruby
+hardware = {'hardware':{'name':'My Computer'}}
+result = api_controller.update_hardware(id: 123, payload: hardware)
+```

data/lib/samanage/api.rb

@@ -8,25 +8,32 @@ module Samanage
 			custom_fields: 'custom_fields.json',
 			custom_forms: 'custom_forms.json',
 		}
-		attr_accessor :datacenter, :content_type, :base_url, :token, :custom_forms
+		attr_accessor :datacenter, :content_type, :base_url, :token, :custom_forms, :authorized
 		def initialize(token: '', dacenter: '', development_mode: false)
 			self.token = token
 			self.datacenter = nil || datacenter
 			self.base_url = "https://api#{datacenter}.samanage.com/"
 			# self.content_type = content_type || 'json'
 			self.content_type = 'json'
-			self.authorize
+			if self.authorized != true
+				self.authorize
+			end
 			if development_mode
 				self.custom_forms = self.organize_forms
 			end
 		end
 
+		def authorized?
+			self.authorized
+		end
+
 		def authorize
 			self.execute(path: 'api.json')
 			rescue OpenSSL::SSL::SSLError => e
 				puts "Raised: #{e} #{e.class}"
 				puts 'Disabling Local SSL Verification'
 				self.execute(path: 'api.json', ssl_fix: true)
+			self.authorized = true
 		end
 
 		# Defaults to GET
@@ -53,7 +60,6 @@ module Samanage
 			response[:total_pages] = api_call.headers['X-Total-Pages'].to_i
 			response[:total_pages] = 1 if response[:total_pages] == 0
 			response[:total_count] = api_call.headers['X-Total-Count'].to_i
-			response[:total_count] = 1 if response[:total_count] == 0
 
 			# puts "Body Class: #{api_call.body.class}"
 			# puts "#{api_call.body}"
@@ -66,22 +72,19 @@ module Samanage
 			when 401
 				response[:data] = api_call.body
 				error = response[:response]
-				puts "Returned 401: #{error}"
+				self.authorized =false
 				raise Samanage::AuthorizationError.new(error: error,response: response)
 			when 404
 				response[:data] = api_call.body
 				error = response[:response]
-				puts "Returned 404: #{error}"
 				raise Samanage::NotFound.new(error: error, response: response)
 			when 422
 				response[:data] = api_call.body
 				error = response[:response]
-				puts "Returned 422: #{error}"
 				raise Samanage::InvalidRequest.new(error: error, response: response)
 			else
 				response[:data] = api_call.body
 				error = response[:response]
-				puts "Returned #{response[:code]}: #{error}"
 				raise Samanage::InvalidRequest.new(error: error, response: response)
 			end
 		# Always return response hash

data/lib/samanage/error.rb

@@ -5,7 +5,7 @@ module Samanage
 			self.status_code = response[:code]
 			self.response = response[:data] ||= response[:response]
 			self.error = error
-			puts "Response: #{self.status_code}: #{self.response}"
+			puts "[Error] #{self.status_code}: #{self.response}"
 		end
 
 	end

data/samanage.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'samanage'
-  s.version     = '1.5.1'
+  s.version     = '1.5.4'
   s.date        = '2017-01-01'
   s.summary     = "Samanage Ruby Gem"
   s.description = "Connect to Samanage using Ruby!"
@@ -8,6 +8,8 @@ Gem::Specification.new do |s|
   s.email       = 'chris.walls@samanage.com'
   s.files       = `git ls-files`.split("\n")
   s.require_paths = ["lib"]
+  s.add_development_dependency 'http', ['~> 2.2']
+  s.add_runtime_dependency 'http', ["~> 2.2"]
   s.homepage    = 'http://rubygems.org/gems/samanage'
   s.license     = 'MIT'
 end

data/spec/samanage_api_spec.rb

@@ -6,7 +6,6 @@ describe Samanage do
 		end
 	  context 'on creation' do
 	  	it 'Requires Email & Token' do
-	  		expect{ Samanage::Api.new() }.to raise_error(ArgumentError)
 	  		expect{ Samanage::Api.new(token: "invalid token") }.to raise_error(Samanage::AuthorizationError)
 	  		expect{ Samanage::Api.new(token: TOKEN) }.to_not raise_error
 	  	end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: samanage
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.4
 platform: ruby
 authors:
 - Chris Walls
@@ -9,7 +9,35 @@ autorequire:
 bindir: bin
 cert_chain: []
 date: 2017-01-01 00:00:00.000000000 Z
-dependencies: []
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: http
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
+- !ruby/object:Gem::Dependency
+  name: http
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
 description: Connect to Samanage using Ruby!
 email: chris.walls@samanage.com
 executables: []