samanage 1.9.33 → 2.0.03

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb610ead1f5436f3437f5549b2e19ba42c4fc96c
-  data.tar.gz: 7ae398a40f0356665519c677874b5c0a0fcf288d
+  metadata.gz: 1d50b17cbf967d11c283e611f81604dbaa706a2e
+  data.tar.gz: 431c0c26fbceb0b2f7ad044b94437ca36c00fd11
 SHA512:
-  metadata.gz: fcb4f4bc10aed1358a560e5a2a133a5799cfb1a7e7b8bbe2b0e0aaaa87b2a55fb22bc19cdd36efc367106b52c01f1223cb344f90c2e35b089920a360b984cf6b
-  data.tar.gz: 8be7ca8d4bc073bfdb95532628c38a17c27314b7c8e65890a17edd2a26130d067855d41398276f30718fbd13d96ac6d055a72188de955c9d54d631119a22007e
+  metadata.gz: ff9a40bd713209bb3f37b22bf7b6ff93b7a57e3074e92e9c27e0b21c27f127061b9865d3da7b2c8de2dedbe3feafdee7948cc304238416c677c2512815136e2d
+  data.tar.gz: cdd09ce93a1200a5335dadbc0997792f0e8a93f07fa72abe188fd2063fb9f2e2ae7067334ce8ac4a3a716b5910371269b490827bdd407b59011f0b767320fdc0

data/Gemfile

@@ -2,8 +2,8 @@ source "https://rubygems.org"
 
 gem 'rspec'
 
-gem 'httparty'
+gem 'httparty', '0.15.7'
 
 group :development do
-	gem 'guard-rspec', require: false
+  gem 'guard-rspec', require: false
 end

data/Gemfile.lock

@@ -1,14 +1,14 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    coderay (1.1.1)
+    coderay (1.1.2)
     diff-lcs (1.3)
-    ffi (1.9.18)
+    ffi (1.9.23)
     formatador (0.2.5)
-    guard (2.14.1)
+    guard (2.14.2)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
-      lumberjack (~> 1.0)
+      lumberjack (>= 1.0.12, < 2.0)
       nenv (~> 0.1)
       notiffany (~> 0.0)
       pry (>= 0.9.12)
@@ -19,50 +19,48 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    httparty (0.15.6)
+    httparty (0.15.7)
       multi_xml (>= 0.5.2)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
     lumberjack (1.0.12)
-    method_source (0.8.2)
+    method_source (0.9.0)
     multi_xml (0.6.0)
     nenv (0.3.0)
     notiffany (0.1.1)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    pry (0.10.4)
+    pry (0.11.3)
       coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    rb-fsevent (0.9.8)
-    rb-inotify (0.9.8)
-      ffi (>= 0.5.0)
-    rspec (3.6.0)
-      rspec-core (~> 3.6.0)
-      rspec-expectations (~> 3.6.0)
-      rspec-mocks (~> 3.6.0)
-    rspec-core (3.6.0)
-      rspec-support (~> 3.6.0)
-    rspec-expectations (3.6.0)
+      method_source (~> 0.9.0)
+    rb-fsevent (0.10.2)
+    rb-inotify (0.9.10)
+      ffi (>= 0.5.0, < 2)
+    rspec (3.7.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+    rspec-core (3.7.1)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-mocks (3.6.0)
+      rspec-support (~> 3.7.0)
+    rspec-mocks (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-support (3.6.0)
+      rspec-support (~> 3.7.0)
+    rspec-support (3.7.1)
     ruby_dep (1.5.0)
     shellany (0.0.1)
-    slop (3.6.0)
-    thor (0.19.4)
+    thor (0.20.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   guard-rspec
-  httparty
+  httparty (= 0.15.7)
   rspec
 
 BUNDLED WITH

data/changelog.md

@@ -1,3 +1,16 @@
+# 2.0.03
+- Bugfix for custom fields (fix httparty version)
+
+# 2.0.0
+- Support for responding to blocks in all paginated collection methods
+- Added Changes (itsm)
+
+# 1.9.35
+- Solve warnings
+
+# 1.9.34
+- Solve warnings
+
 # 1.9.33
 - Using new cert
 

data/lib/samanage.rb

@@ -2,7 +2,9 @@ $LOAD_PATH << File.dirname(__FILE__)
 require 'httparty'
 
 require 'samanage/api'
+require 'samanage/api/attachments'
 require 'samanage/api/category'
+require 'samanage/api/changes'
 require 'samanage/api/contracts'
 require 'samanage/api/comments'
 require 'samanage/api/custom_fields'
@@ -23,5 +25,4 @@ require 'samanage/url_builder'
 require 'samanage/version'
 
 module Samanage
-	
 end

data/lib/samanage/api.rb

@@ -1,156 +1,152 @@
 require 'open-uri'
 module Samanage
-	class Api
-		include HTTParty
-		MAX_RETRIES = 3
-		PATHS = {
-			category: 'categories.json',
-			contract: 'contracts.json',
-			custom_fields: 'custom_fields.json',
-			custom_forms: 'custom_forms.json',
-			department: 'departments.json',
-			group: 'groups.json',
-			hardware: 'hardwares.json',
-			incident: 'incidents.json',
-			mobile: 'mobiles.json',
-			other_asset: 'other_assets.json',
-			site: 'sites.json',
-			user: 'users.json',
-		}
-		ssl_ca_file "#{File.expand_path('..')}/data/gd-class2-root.crt"
-		attr_accessor :datacenter, :content_type, :base_url, :token, :custom_forms, :authorized, :admins, :max_retries
+  class Api
+    include HTTParty
+    MAX_RETRIES = 3
+    PATHS = {
+      category: 'categories.json',
+      contract: 'contracts.json',
+      change: 'changes.json',
+      custom_fields: 'custom_fields.json',
+      custom_forms: 'custom_forms.json',
+      department: 'departments.json',
+      group: 'groups.json',
+      hardware: 'hardwares.json',
+      incident: 'incidents.json',
+      mobile: 'mobiles.json',
+      other_asset: 'other_assets.json',
+      site: 'sites.json',
+      user: 'users.json',
+    }
+    attr_accessor :datacenter, :content_type, :base_url, :token, :custom_forms, :authorized, :admins, :max_retries
 
-		# Development mode forces authorization & pre-populates admins and custom forms / fields
-		# datacenter should equal 'eu' or blank
-		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
-			self.datacenter ||= datacenter.to_s.downcase
-			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
-				end
-				self.custom_forms = self.organize_forms
-				self.admins = self.list_admins
-			end
-		end
+    # Development mode forces authorization & pre-populates admins and custom forms / fields
+    # datacenter should equal 'eu' or blank
+    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
+      self.datacenter ||= datacenter.to_s.downcase
+      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
+        end
+        self.custom_forms = self.organize_forms
+        self.admins = self.list_admins
+      end
+    end
 
-		def authorized?
-			self.authorized
-		end
+    def authorized?
+      self.authorized
+    end
 
-		# Check token against api.json
-		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
+    # Check token against api.json
+    def authorize
+      self.execute(path: 'api.json')
+      self.authorized = true
+    end
 
-		# Calling execute without a method defaults to GET
-		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
+    # Calling execute without a method defaults to GET
+    def execute(http_method: 'get', path: nil, payload: nil, verbose: nil, headers: {})
+      if payload.class == String
+        begin
+          payload = JSON.parse(payload)
+        rescue => e
+          puts "Invalid JSON: #{payload.inspect}"
+          raise Samanage::Error.new(error: e, response: nil)
+        end
+      end
+      token = token ||= self.token
+      unless verbose.nil?
+        verbose = '?layout=long'
+      end
 
-			headers = {
-				'Accept' => "application/vnd.samanage.v2.0+#{self.content_type}#{verbose}",
-				'Content-type'  => "application/#{self.content_type}",
-				'X-Samanage-Authorization' => 'Bearer ' + self.token
-			}
-			@options = {
-				headers: headers,
-				payload: payload
-			}
-			full_path = self.base_url + path
-			retries = 0
-			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)
-				when 'delete'
-					api_call = self.class.delete(full_path, query: payload, headers: headers)
-				else
-					raise Samanage::Error.new(response: {response: 'Unknown HTTP method'})
-				end
-			rescue Errno::ECONNREFUSED, Net::OpenTimeout, Errno::ETIMEDOUT, OpenSSL::SSL::SSLError => e
-				puts "Error:[#{e.class}] #{e} -  Retry: #{retries}/#{self.max_retries}"
-				sleep 3
-				retries += 1
-				retry if retries < self.max_retries
-				error = e
-				response = e.class
-				raise Samanage::InvalidRequest.new(error: error, response: response)
-			end
+      headers = headers.merge({
+        'Accept' => "application/vnd.samanage.v2.0+#{self.content_type}#{verbose}",
+        'Content-type'  => "application/#{self.content_type}",
+        'X-Samanage-Authorization' => 'Bearer ' + self.token
+      })
+      @options = {
+        headers: headers,
+        payload: payload
+      }
+      full_path = self.base_url + path
+      retries = 0
+      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)
+        when 'delete'
+          api_call = self.class.delete(full_path, query: payload, headers: headers)
+        else
+          raise Samanage::Error.new(response: {response: 'Unknown HTTP method'})
+        end
+      rescue Errno::ECONNREFUSED, Net::OpenTimeout, Errno::ETIMEDOUT, OpenSSL::SSL::SSLError => e
+        puts "Error:[#{e.class}] #{e} -  Retry: #{retries}/#{self.max_retries}"
+        sleep 3
+        retries += 1
+        retry if retries < self.max_retries
+        error = e
+        response = e.class
+        raise Samanage::InvalidRequest.new(error: error, response: response)
+      end
 
-			response = Hash.new
-			response[:code] = api_call.code.to_i
-			response[:json] = api_call.body
-			response[:response] = api_call
-			response[:headers] = api_call.headers
-			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 = Hash.new
+      response[:code] = api_call.code.to_i
+      response[:json] = api_call.body
+      response[:response] = api_call
+      response[:headers] = api_call.headers
+      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
 
-			# Error cases
-			case response[:code]
-			when 200..201
-				begin
-					response[:data] = JSON.parse(api_call.body)
-				rescue JSON::ParserError => e
-					response[:data] = api_call.body
-					puts "** Warning **#{e.class}"
-					puts e
-				end
-				response
-			when 401
-				response[:data] = api_call.body
-				error = response[:response]
-				self.authorized = false
-				raise Samanage::AuthorizationError.new(error: error,response: response)
-			when 404
-				response[:data] = api_call.body
-				error = response[:response]
-				raise Samanage::NotFound.new(error: error, response: response)
-			when 422
-				response[:data] = api_call.body
-				error = response[:response]
-				raise Samanage::InvalidRequest.new(error: error, response: response)
-			else
-				response[:data] = api_call.body
-				error = response[:response]
-				raise Samanage::InvalidRequest.new(error: error, response: response)
-			end
-		end
+      # Error cases
+      case response[:code]
+      when 200..201
+        begin
+          response[:data] = JSON.parse(api_call.body)
+        rescue JSON::ParserError => e
+          response[:data] = api_call.body
+          puts "** Warning **#{e.class}"
+          puts e
+        end
+        response
+      when 401
+        response[:data] = api_call.body
+        error = response[:response]
+        self.authorized = false
+        raise Samanage::AuthorizationError.new(error: error,response: response)
+      when 404
+        response[:data] = api_call.body
+        error = response[:response]
+        raise Samanage::NotFound.new(error: error, response: response)
+      when 422
+        response[:data] = api_call.body
+        error = response[:response]
+        raise Samanage::InvalidRequest.new(error: error, response: response)
+      else
+        response[:data] = api_call.body
+        error = response[:response]
+        raise Samanage::InvalidRequest.new(error: error, response: response)
+      end
+    end
 
 
-		# Return all admins in the account
-		def list_admins
-			admin_role_id = self.execute(path: 'roles.json')[:data].select{|role| role['name'] == 'Administrator'}.first['id']
-			self.admins.push(
-				self.execute(path: "users.json?role=#{admin_role_id}")[:data].map{|u| u['email']}
-			).flatten
-		end
-	end
+    # Return all admins in the account
+    def list_admins
+      admin_role_id = self.execute(path: 'roles.json')[:data].select{|role| role['name'] == 'Administrator'}.first['id']
+      self.admins.push(
+        self.execute(path: "users.json?role=#{admin_role_id}")[:data].map{|u| u['email']}
+      ).flatten
+    end
+  end
 end

data/lib/samanage/api/attachments.rb

@@ -0,0 +1,21 @@
+module Samanage
+  class Api
+    def download_attachment(attachment: {}, filename: nil, path: nil)
+      attachable_type = attachment['attachable_type']
+      attachable_id = attachment['attachable_id'].to_s
+      filename = filename || attachment['filename']
+      url = attachment['url']
+      
+      file_path = path ?  path : File.join(Dir.pwd,attachable_type,attachable_id)
+      unless File.directory?(file_path)
+        FileUtils.mkpath(file_path)
+      end
+      
+      exact_path = File.join(file_path,filename)
+      downloaded_attachment = open(exact_path, "wb+") do |file|
+        file << open(url).read
+      end
+      downloaded_attachment
+    end
+  end
+end