samanage 2.1.01 → 2.1.02

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b80680119ee4b58f79e671c7a8f52a8c828a1d9d
-  data.tar.gz: 14984ffdcc1356df27c96af099e4def041533820
+  metadata.gz: 2d7d09cd7b743a00cce08f1c7b97900486fe9d43
+  data.tar.gz: 7f69ddd25f6b5f1520644754b3f5667dfe2afafd
 SHA512:
-  metadata.gz: e49c1a93f61074ae57582091a6c28691526e111ac2e7af679d066955e7f82fe2dae50b5893cfbb081e8fc2b271f7907307f47e153c04f4446f812c4718d123df
-  data.tar.gz: eced4a164597e9182f54e3e88a16f4c67263fe25952ddaa3b366150aceb6953f2293bfa249ec9fb1a688dfd154fc0b7fd9b402d8ed0e428a8c351fd6c7996eb8
+  metadata.gz: a8babe5f601a40d89064fbff102d5f3295dbf1f085e003efc0d2713261438c02471200a8716b02173cec2f3e89ae3b6ece9be63a786a13fb81d2da44cf25f990
+  data.tar.gz: afcb46b087604c66217f2e2a7536430b840e88e3e9cfb6a3c01a51fb7edf58c1dad229561a424d466eb34264a0b5981d55e97865cdceac1749afc5b6938f6fdb

data/changelog.md

@@ -1,3 +1,6 @@
+# 2.1.02
+- Use parmas in all collections
+
 # 2.1.01
 - Added solutions
 

data/lib/samanage/api/category.rb

@@ -1,8 +1,9 @@
 module Samanage
   class Api
     def get_categories(path: PATHS[:category], options: {})
-      url = Samanage::UrlBuilder.new(path: path, options: options).url
-      self.execute(path: url)
+      params = self.set_params(options: options)
+      path = 'categories.json?' + params
+      self.execute(path: path)
     end
 
 

data/lib/samanage/api/changes.rb

@@ -3,8 +3,9 @@ module Samanage
 
     # Default get change path
     def get_changes(path: PATHS[:change], options: {})
-      url = Samanage::UrlBuilder.new(path: path, options: options).url
-      self.execute(path: url)
+      params = self.set_params(options: options)
+      path = 'changes.json?' + params
+      self.execute(path: path)
     end
 
 
@@ -14,7 +15,7 @@ module Samanage
     #   - layout: 'long'
     def collect_changes(options: {})
       changes = Array.new
-      total_pages = self.get_changes[:total_pages]
+      total_pages = self.get_changes(options: options)[:total_pages]
       1.upto(total_pages) do |page|
         options[:page] = page
         params = self.set_params(options: options)

data/lib/samanage/api/contracts.rb

@@ -3,14 +3,15 @@ module Samanage
 
     # Get contract default path
     def get_contracts(path: PATHS[:contract], options: {})
-      url = Samanage::UrlBuilder.new(path: path, options: options).url
-      self.execute(path: url)
+      params = self.set_params(options: options)
+      path = 'contracts.json?' + params
+      self.execute(path: path)
     end
 
     # Get all contracts
     def collect_contracts(options: {})
       contracts = Array.new
-      total_pages = self.get_contracts[:total_pages]
+      total_pages = self.get_contracts(options: options)[:total_pages]
       1.upto(total_pages) do |page|
         options[:page] = page
         params = self.set_params(options: options)

data/lib/samanage/api/custom_fields.rb

@@ -3,14 +3,15 @@ module Samanage
 
     # Get custom fields default url
     def get_custom_fields(path: PATHS[:custom_fields], options:{})
-      url = Samanage::UrlBuilder.new(path: path, options: options).url
-      self.execute(path: url)
+      params = self.set_params(options: options)
+      path = 'custom_fields.json?' + params
+      self.execute(path: path)
     end
 
     # Gets all custom fields
     def collect_custom_fields(options: {})
       custom_fields = Array.new
-      total_pages = self.get_custom_fields[:total_pages] ||= 2
+      total_pages = self.get_custom_fields(options: options)[:total_pages] ||= 2
       1.upto(total_pages) do |page|
         options[:page] = page
         params = self.set_params(options: options)

data/lib/samanage/api/custom_forms.rb

@@ -2,14 +2,15 @@ module Samanage
   class Api
     # Get custom forms path
     def get_custom_forms(path: PATHS[:custom_forms], options: {})
-      url = Samanage::UrlBuilder.new(path: path, options: options).url
-      self.execute(path: url)
+      params = self.set_params(options: options)
+      path = 'custom_forms.json?' + params
+      self.execute(path: path)
     end
 
     # Get all custom forms
     def collect_custom_forms(options: {})
       custom_forms = Array.new
-      total_pages = self.get_custom_forms[:total_pages]
+      total_pages = self.get_custom_forms(options: options)[:total_pages]
       1.upto(total_pages) do |page|
         options[:page] = page
         params = self.set_params(options: options)

data/lib/samanage/api/departments.rb

@@ -1,13 +1,14 @@
 module Samanage
   class Api
     def get_departments(path: PATHS[:department], options: {})
-      url = Samanage::UrlBuilder.new(path: path, options: options).url
-      self.execute(path: url)
+      params = self.set_params(options: options)
+      path = 'departments.json?' + params
+      self.execute(path: path)
     end
 
     def collect_departments(options: {})
       departments = Array.new
-      total_pages = self.get_departments[:total_pages]
+      total_pages = self.get_departments(options: options)[:total_pages]
       1.upto(total_pages) do |page|
         options[:page] = page
         params = self.set_params(options: options)

data/lib/samanage/api/groups.rb

@@ -1,13 +1,14 @@
 module Samanage
   class Api
     def get_groups(path: PATHS[:group], options: {})
-      url = Samanage::UrlBuilder.new(path: path, options: options).url
-      self.execute(path: url)
+      params = self.set_params(options: options)
+      path = 'groups.json?' + params
+      self.execute(path: path)
     end
 
     def collect_groups(options: {})
       groups = Array.new
-      total_pages = self.get_groups[:total_pages]
+      total_pages = self.get_groups(options: options)[:total_pages]
       1.upto(total_pages) do |page|
         options[:page] = page
         params = self.set_params(options: options)

data/lib/samanage/api/hardwares.rb

@@ -3,14 +3,15 @@ module Samanage
 
     # Get hardware default path
     def get_hardwares(path: PATHS[:hardware], options: {})
-      url = Samanage::UrlBuilder.new(path: path, options: options).url
-      self.execute(path: url)
+      params = self.set_params(options: options)
+      path = 'hardwares.json?' + params
+      self.execute(path: path)
     end
 
     # Get all hardwares
     def collect_hardwares(options: {})
       hardwares = Array.new
-      total_pages = self.get_hardwares[:total_pages]
+      total_pages = self.get_hardwares(options: options)[:total_pages]
       1.upto(total_pages) do |page|
         options[:page] = page
         params = self.set_params(options: options)

data/lib/samanage/api/incidents.rb

@@ -15,7 +15,7 @@ module Samanage
     #   - layout: 'long'
     def collect_incidents(options: {})
       incidents = Array.new
-      total_pages = self.get_incidents[:total_pages]
+      total_pages = self.get_incidents(options: options)[:total_pages]
       puts "Pulling Incidents with Audit Archives (this may take a while)" if options[:audit_archives] && options[:verbose]
       1.upto(total_pages) do |page|
         puts "Collecting Incidents page: #{page}/#{total_pages}" if options[:verbose]

data/lib/samanage/api/mobiles.rb

@@ -3,14 +3,16 @@ module Samanage
 
     # Get mobile default path
     def get_mobiles(path: PATHS[:mobile], options: {})
-      url = Samanage::UrlBuilder.new(path: path, options: options).url
-      self.execute(path: url)
+      params = self.set_params(options: options)
+      path = 'mobiles.json' + params
+      self.execute(path: path)
+
     end
 
     # Get all mobiles
     def collect_mobiles(options: {})
       mobiles = Array.new
-      total_pages = self.get_mobiles[:total_pages]
+      total_pages = self.get_mobiles(options: options)[:total_pages]
       1.upto(total_pages) do |page|
         options[:page] = page
         params = self.set_params(options: options)

data/lib/samanage/api/other_assets.rb

@@ -3,14 +3,15 @@ module Samanage
 
     # Default get other_assets path
     def get_other_assets(path: PATHS[:other_asset], options: {})
-      url = Samanage::UrlBuilder.new(path: path, options: options).url
-      self.execute(path: url)
+      params = self.set_params(options: options)
+      path = 'other_assets.json' + params
+      self.execute(path: path)
     end
 
     # Returns all other assets
     def collect_other_assets(options: {})
       other_assets = Array.new
-      total_pages = self.get_other_assets[:total_pages]
+      total_pages = self.get_other_assets(options: options)[:total_pages]
       other_assets = []
       1.upto(total_pages) do |page|
         options[:page] = page

data/lib/samanage/api/sites.rb

@@ -1,13 +1,14 @@
 module Samanage
   class Api
     def get_sites(path: PATHS[:site], options: {})
-      url = Samanage::UrlBuilder.new(path: path, options: options).url
-      self.execute(path: url)
+      params = self.set_params(options: options)
+      path = 'sites.json' + params
+      self.execute(path: path)
     end
 
     def collect_sites(options: {})
       sites = Array.new
-      total_pages = self.get_sites[:total_pages]
+      total_pages = self.get_sites(options: options)[:total_pages]
       1.upto(total_pages) do |page|
         options[:page] = page
         params = self.set_params(options: options)

data/lib/samanage/api/solutions.rb

@@ -1,13 +1,14 @@
 module Samanage
   class Api
     def get_solutions(path: PATHS[:solution], options: {})
-      url = Samanage::UrlBuilder.new(path: path, options: options).url
-      self.execute(path: url)
+      params = self.set_params(options: options)
+      path = 'solutions.json' + params
+      self.execute(path: path)
     end
 
     def collect_solutions(options: {})
       solutions = Array.new
-      total_pages = self.get_solutions[:total_pages]
+      total_pages = self.get_solutions(options: options)[:total_pages]
       1.upto(total_pages) do |page|
         options[:page] = page
         params = self.set_params(options: options)

data/lib/samanage/api/users.rb

@@ -4,15 +4,14 @@ module Samanage
   # Get users, using URL builder
   def get_users(path: PATHS[:user], options: {})
     params = self.set_params(options: options)
-    path = path + params
-    url = Samanage::UrlBuilder.new(path: path, options: options).url
-    self.execute(path: url)
+    path = 'users.json' + params
+    self.execute(path: path)
   end
 
   # Returns all users in the account
     def collect_users(options: {})
       users = Array.new
-      total_pages = self.get_users[:total_pages]
+      total_pages = self.get_users(options: options)[:total_pages]
       1.upto(total_pages) do |page|
         options[:page] = page
         params = self.set_params(options: options)

data/lib/samanage/version.rb

@@ -1,3 +1,3 @@
 module Samanage
-  VERSION = '2.1.01'
+  VERSION = '2.1.02'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: samanage
 version: !ruby/object:Gem::Version
-  version: 2.1.01
+  version: 2.1.02
 platform: ruby
 authors:
 - Chris Walls