samanage 1.8.91 → 1.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b82a02c5f07344fe1a33e1c6817bbf658ab8a31
-  data.tar.gz: 2ba9ee1d94717d38a60b3df233cd9270df12bb7d
+  metadata.gz: f8c02d4669579f854f505bf78ab70ccaeb5d3cc3
+  data.tar.gz: 48c449e4261c287a933a8ae556362f66e258ff4f
 SHA512:
-  metadata.gz: e15f279e3db1f215c199903f3cb39520d455828c673c006604411bb2e1e5d2a95e2334da604dfd76f05cfe48cc2d3b06694e9df421d632381f9010291b5d258e
-  data.tar.gz: 968e5e92f9a96041812a43bff596287815e7e092c2e8aab93b2e8c8fc6016722441f37070577b24490ef02544106c3e00e727f9fe1f7e420ae46e6573d1b1227
+  metadata.gz: 6845ac50e4c1718f5ff36899b0e8304c839db31c2eb4fa353cb396455cccebb09b4cb55aa182537b6348235ace14f135fbe86c147ec12d4339d56194656f432f
+  data.tar.gz: 7f0694ed93f51c163a60a6efafdd54b9937ce8f880094ddc05280f7b5a50c421a23149a6f30596c4c51315ed24b5fa3b65c82906c7177c1521602dbf915b4e5c

data/changelog.md

@@ -1,3 +1,9 @@
+# 1.9.1 
+- Adding items to contracts & faster tests
+
+# 1.9.0
+- Adding contracts 
+
 # 1.8.91 
 - Group case sensitivity fix
 

data/lib/samanage.rb

@@ -3,6 +3,7 @@ require 'httparty'
 
 require 'samanage/api'
 require 'samanage/api/category'
+require 'samanage/api/contracts'
 require 'samanage/api/comments'
 require 'samanage/api/custom_fields'
 require 'samanage/api/custom_forms'

data/lib/samanage/api.rb

@@ -4,6 +4,7 @@ module Samanage
 		MAX_RETRIES = 3
 		PATHS = {
 			category: 'categories.json',
+			contract: 'contracts.json',
 			custom_fields: 'custom_fields.json',
 			custom_forms: 'custom_forms.json',
 			department: 'departments.json',
@@ -88,7 +89,7 @@ module Samanage
 				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)
+					api_call = self.class.delete(full_path, query: payload, headers: headers)
 				else
 					raise Samanage::Error.new(response: {response: 'Unknown HTTP method'})
 				end

data/lib/samanage/api/contracts.rb

@@ -0,0 +1,54 @@
+module Samanage
+	class Api
+
+		# Get contract default path
+		def get_contracts(path: PATHS[:contract], options: {})
+			url = Samanage::UrlBuilder.new(path: path, options: options).url
+			self.execute(path: url)
+		end
+
+		# Get all contracts
+		def collect_contracts(options: {})
+			page = 1
+			contracts = Array.new
+			total_pages = self.get_contracts[:total_pages]
+			1.upto(total_pages) do |page|
+				puts "Collecting contracts page: #{page}/#{total_pages}" if options[:verbose]
+				contracts += self.execute(http_method: 'get', path: "contracts.json?page=#{page}")[:data]
+			end
+			contracts
+		end
+
+		# Create contract given json payload
+		def create_contract(payload: nil, options: {})
+			self.execute(path: PATHS[:contract], http_method: 'post', payload: payload)
+		end
+
+		# Find contract given id
+		def find_contract(id: nil)
+			path = "contracts/#{id}.json"
+			self.execute(path: path)
+		end
+		
+		# Check for contract using URL builder
+		def check_contract(options: {})
+			url = Samanage::UrlBuilder.new(path: PATHS[:contract], options: options).url
+			self.execute(path: url)
+		end
+
+		# Update contract given id
+		def update_contract(payload: nil, id: nil, options: {})
+			path = "contracts/#{id}.json"
+			self.execute(path: path, http_method: 'put', payload: payload)
+		end
+
+    def add_item_to_contract(id: nil, payload: nil)
+      path = "contracts/#{id}/items.json"
+      self.execute(path: path, http_method: 'post', payload: payload)
+    end
+
+
+
+	alias_method :contracts, :collect_contracts
+	end
+end

data/lib/samanage/api/utils.rb

@@ -1,6 +1,5 @@
 module Samanage
   class Api
-    # returns
     def send_activation_email(email: )
       user_id = self.find_user_id_by_email(email: email)
       raise Samanage::Error.new(error: 'Invalid Email', response: {}) unless user_id

data/lib/samanage/url_builder.rb

@@ -33,6 +33,8 @@ module Samanage
 				url += 'sites'
 			when /department/
 				url += 'departments'
+			when /contract/
+				url += 'contracts'
 			when /group/
 				url += 'groups'
 			end

data/lib/samanage/version.rb

@@ -1,3 +1,3 @@
 module Samanage
-  VERSION = '1.8.91'
+  VERSION = '1.9.1'
 end

data/spec/api/samanage_comments_spec.rb

@@ -4,16 +4,17 @@ describe Samanage::Api do
 		before(:all) do
 			TOKEN ||= ENV['SAMANAGE_TEST_API_TOKEN']
 			@samanage = Samanage::Api.new(token: TOKEN)
+			@incidents = @samanage.get_incidents[:data]
 		end
 		describe 'API Functions' do
 			it 'gets comments' do
-				incident_id = @samanage.get_incidents()[:data].sample.dig('id')
+				incident_id = @incidents.sample.dig('id')
 				comments = @samanage.get_comments(incident_id: incident_id)
 				expect(comments).to be_a(Hash)
 			end
 
 			it 'creates a comment' do
-				incident_id = @samanage.get_incidents()[:data].sample.dig('id')
+				incident_id = @incidents.sample.dig('id')
 				rand_text = ('a'..'z').to_a.shuffle[0,8].join
 				comment = {
 					comment: {
@@ -26,13 +27,10 @@ describe Samanage::Api do
 			end
 
 			it 'collects all comments' do
-				## incident_id = @samanage.get_incidents()[:data].sample.dig('id')
-				# incident_id = 19394209
-				# comments_api = @samanage.get_comments(incident_id: incident_id)
-				# comments_found = @samanage.collect_comments(incident_id: incident_id)
-
+				incident_id = @incidents.sample.dig('id')
+				comments = @samanage.collect_comments(incident_id: incident_id)
 				# Total count bug
-				# expect(comments_api[:total_count]).to eq(comments_found.size)
+				# expect(comments).to be(Array)
 			end
 		end
 	end

data/spec/api/samanage_contract_spec.rb

@@ -0,0 +1,89 @@
+require 'samanage'
+
+describe Samanage::Api do
+  context 'Contract' do 
+    describe 'API Fucntions' do
+      before(:all) do 
+        TOKEN ||= ENV['SAMANAGE_TEST_API_TOKEN']
+				@samanage = Samanage::Api.new(token: TOKEN)
+				@contracts = @samanage.contracts
+      end
+      it 'get_contracts: it returns API call of contracts' do
+				api_call = @samanage.get_contracts
+				expect(api_call).to be_a(Hash)
+				expect(api_call[:total_count]).to be_an(Integer)
+				expect(api_call).to have_key(:response)
+				expect(api_call).to have_key(:code)
+			end
+			it 'collect_contracts: collects array of contracts' do
+				contract_count = @samanage.get_contracts[:total_count]
+				expect(@contracts).to be_an(Array)
+				expect(@contracts.size).to eq(contract_count)
+			end
+			it 'create_contract(payload: json): creates a contract' do
+				manufacturer_name = "samanage-ruby-#{(rand*10**10).ceil}"
+				random_name = (0...50).map { ('a'..'z').to_a[rand(26)] }.join
+				json = {
+					contract: {
+						type: 'SoftwareLicense',
+            manufacturer_name: 'Adobe',
+            status: 'Active',
+						name:  random_name,
+					}
+				}
+				contract_create = @samanage.create_contract(payload: json)
+
+				expect(contract_create[:data]['id']).to be_an(Integer)
+				expect(contract_create[:data]['name']).to eq(random_name)
+			end
+			it 'create_contract: fails if no status' do
+				contract_name = "samanage-ruby-#{(rand*10**10).ceil}"
+				json = {
+					:contract => {
+						model: 'test',
+						manufacturer_name: contract_name,
+					}
+				}
+				expect{@samanage.create_contract(payload: json)}.to raise_error(Samanage::InvalidRequest)
+			end
+			it 'find_contract: returns a contract card by known id' do
+				sample_id = @contracts.sample['id']
+				contract = @samanage.find_contract(id: sample_id)
+
+				expect(contract[:data]['id']).to eq(sample_id)  # id should match found contract
+				expect(contract[:data]).to have_key('manufacturer_name')
+				expect(contract[:data]).to have_key('name')
+				expect(contract[:data]).to have_key('id')
+			end
+			it 'find_contract: returns nothing for an invalid id' do
+				sample_id = (0..10).entries.sample
+				expect{@samanage.find_contract(id: sample_id)}.to raise_error(Samanage::NotFound)  # id should match found contract
+			end
+			it 'update_contract: update_contract by id' do
+				sample_id = @contracts.sample['id']
+				new_name = (0...50).map {('a'..'z').to_a[rand(26)] }.join
+				json = {
+					contract: {
+						manufacturer_name: new_name
+					}
+				}
+				contract_update = @samanage.update_contract(payload: json, id: sample_id)
+				expect(contract_update[:data]["manufacturer_name"]).to eq(new_name)
+				expect(contract_update[:code]).to eq(200).or(201)
+      end
+      it 'adds an item to a contract by id' do
+        sample_id = @contracts.sample['id']
+        item = {
+          item: {
+            name: "name",
+            version:" 123",
+            qty: "2",
+            tag: "tag",
+          }
+        }
+        add_item = @samanage.add_item_to_contract(id: sample_id, payload: item)
+        expect(add_item[:code]).to eq(200).or(201)
+      end
+		end
+	end
+end

data/spec/api/samanage_group_spec.rb

@@ -5,7 +5,7 @@ describe Samanage::Api do
 			TOKEN ||= ENV['SAMANAGE_TEST_API_TOKEN']
 			@samanage = Samanage::Api.new(token: TOKEN)
 			@groups = @samanage.groups
-			@users = @samanage.users
+			@users = @samanage.get_users[:data]
 		end
 		it 'get_users: it returns API call of users' do
 			api_call = @samanage.get_groups

data/spec/api/samanage_hardware_spec.rb

@@ -5,7 +5,7 @@ describe Samanage::Api do
 			before(:all) do
 				TOKEN ||= ENV['SAMANAGE_TEST_API_TOKEN']
 				@samanage = Samanage::Api.new(token: TOKEN)
-				@hardwares = @samanage.hardwares
+				@hardwares = @samanage.get_hardwares[:data]
 			end
 			it 'get_hardwares: it returns API call of hardwares' do
 				api_call = @samanage.get_hardwares

data/spec/api/samanage_incident_spec.rb

@@ -81,7 +81,8 @@ describe Samanage::Api do
 			end
 			it 'finds more audit archives for option[:audit_archives] = true' do
 				incident_keys = @incidents_with_archives.sample.keys
-				expect(incident_keys).to include('audits')
+				expect(incident_keys).to include
+				('audits')
 			end
 			it 'finds audit archives for options: {audit_archives: true, layout: "long"}' do
 				full_incident_keys = @incidents_with_archives.sample.keys

data/spec/api/samanage_other_asset_spec.rb

@@ -6,7 +6,7 @@ describe Samanage::Api do
 		before(:all) do
 			TOKEN ||= ENV['SAMANAGE_TEST_API_TOKEN']
 			@samanage = Samanage::Api.new(token: TOKEN)
-			@other_assets = @samanage.other_assets
+			@other_assets = @samanage.get_other_assets[:data]
 		end
 			it 'get_other_assets: it returns API call of other_assets' do
 				api_call = @samanage.get_other_assets

data/spec/api/samanage_util_spec.rb

@@ -5,7 +5,7 @@ describe Samanage::Api do
       before(:each) do 
         TOKEN ||= ENV['SAMANAGE_TEST_API_TOKEN']
         @samanage = Samanage::Api.new(token: TOKEN)
-        @users = @samanage.users
+        @users = @samanage.get_users[:data]
       end
       it 'sends an activation email' do
         valid_email = @users.sample['email'] 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: samanage
 version: !ruby/object:Gem::Version
-  version: 1.8.91
+  version: 1.9.1
 platform: ruby
 authors:
 - Chris Walls
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-16 00:00:00.000000000 Z
+date: 2018-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -56,6 +56,7 @@ files:
 - lib/samanage/api.rb
 - lib/samanage/api/category.rb
 - lib/samanage/api/comments.rb
+- lib/samanage/api/contracts.rb
 - lib/samanage/api/custom_fields.rb
 - lib/samanage/api/custom_forms.rb
 - lib/samanage/api/departments.rb
@@ -75,6 +76,7 @@ files:
 - samanage.gemspec
 - spec/api/samanage_category_spec.rb
 - spec/api/samanage_comments_spec.rb
+- spec/api/samanage_contract_spec.rb
 - spec/api/samanage_custom_field_spec.rb
 - spec/api/samanage_custom_form_spec.rb
 - spec/api/samanage_department_spec.rb