samanage 1.9.33 → 2.0.03

data/lib/samanage/api/groups.rb

@@ -1,48 +1,52 @@
 module Samanage
-	class Api
-		def get_groups(path: PATHS[:group], options: {})
-			url = Samanage::UrlBuilder.new(path: path, options: options).url
-			self.execute(path: url)
-		end
+  class Api
+    def get_groups(path: PATHS[:group], options: {})
+      url = Samanage::UrlBuilder.new(path: path, options: options).url
+      self.execute(path: url)
+    end
 
-		def collect_groups(options: {})
-			page = 1
-			groups = Array.new
-			total_pages = self.get_groups[:total_pages]
-			1.upto(total_pages) do |page|
-				puts "Collecting Groups page: #{page}/#{total_pages}" if options[:verbose]
-				groups += self.execute(http_method: 'get', path: "groups.json?page=#{page}")[:data]
-			end
-			groups
-		end
+    def collect_groups(options: {})
+      groups = Array.new
+      total_pages = self.get_groups[:total_pages]
+      1.upto(total_pages) do |page|
+        puts "Collecting Groups page: #{page}/#{total_pages}" if options[:verbose]
+        self.execute(http_method: 'get', path: "groups.json?page=#{page}")[:data].each do |group|
+          if block_given?
+            yield group
+          end
+          groups << group
+        end
+      end
+      groups
+    end
 
-		def create_group(payload: , options: {})
-			self.execute(path: PATHS[:group], http_method: 'post', payload: payload)
-		end
+    def create_group(payload: , options: {})
+      self.execute(path: PATHS[:group], http_method: 'post', payload: payload)
+    end
 
-		def find_group_id_by_name(group: )
-			group_api = self.execute(path: "groups.json?name=#{group}")
-			if !group_api[:data].empty? && group == group_api[:data].first['name']
-				return group_api[:data].first['id']
-			end
-		end
+    def find_group_id_by_name(group: )
+      group_api = self.execute(path: "groups.json?name=#{group}")
+      if !group_api[:data].empty? && group == group_api[:data].first['name']
+        return group_api[:data].first['id']
+      end
+    end
 
-		def find_group(id: )
-			path = "groups/#{id}.json"
-			self.execute(path: path)
-		end
+    def find_group(id: )
+      path = "groups/#{id}.json"
+      self.execute(path: path)
+    end
 
-		def add_member_to_group(email: , group_id: nil, group_name: nil)
-			group_id = group_id ||= self.find_group_id_by_name(group: group_name)
-			user_id = self.find_user_id_by_email(email: email)
-			member_path = "memberships.json?group_id=#{group_id}.json&user_ids=#{user_id}"
-			self.execute(path: member_path, http_method: 'post')
-		end
-		
-		def delete_group(id: )
+    def add_member_to_group(email: , group_id: nil, group_name: nil)
+      group_id = group_id ||= self.find_group_id_by_name(group: group_name)
+      user_id = self.find_user_id_by_email(email: email)
+      member_path = "memberships.json?group_id=#{group_id}.json&user_ids=#{user_id}"
+      self.execute(path: member_path, http_method: 'post')
+    end
+    
+    def delete_group(id: )
       self.execute(path: "groups/#{id}.json", http_method: 'delete')
     end
-		
-		alias_method :groups, :collect_groups
-	end
+    
+    alias_method :groups, :collect_groups
+  end
 end

data/lib/samanage/api/hardwares.rb

@@ -1,58 +1,62 @@
 module Samanage
-	class Api
-
-		# Get hardware default path
-		def get_hardwares(path: PATHS[:hardware], options: {})
-			url = Samanage::UrlBuilder.new(path: path, options: options).url
-			self.execute(path: url)
-		end
-
-		# Get all hardwares
-		def collect_hardwares(options: {})
-			page = 1
-			hardwares = Array.new
-			total_pages = self.get_hardwares[:total_pages]
-			1.upto(total_pages) do |page|
-				puts "Collecting Hardwares page: #{page}/#{total_pages}" if options[:verbose]
-				hardwares += self.execute(http_method: 'get', path: "hardwares.json?page=#{page}")[:data]
-			end
-			hardwares
-		end
-
-		# Create hardware given json payload
-		def create_hardware(payload: , options: {})
-			self.execute(path: PATHS[:hardware], http_method: 'post', payload: payload)
-		end
-
-		# Find hardware given id
-		def find_hardware(id: )
-			path = "hardwares/#{id}.json"
-			self.execute(path: path)
-		end
-
-		# Find hardware given a serial number
-		def find_hardwares_by_serial(serial_number: )
-			path = "hardwares.json?serial_number[]=#{serial_number}"
-			self.execute(path: path)
-		end
-
-
-		# Check for hardware using URL builder
-		def check_hardware(options: {})
-			url = Samanage::UrlBuilder.new(path: PATHS[:hardware], options: options).url
-			self.execute(path: url)
-		end
-
-		# Update hardware given id
-		def update_hardware(payload: , id: , options: {})
-			path = "hardwares/#{id}.json"
-			self.execute(path: path, http_method: 'put', payload: payload)
-		end
-
-		def delete_hardware(id: )
+  class Api
+
+    # Get hardware default path
+    def get_hardwares(path: PATHS[:hardware], options: {})
+      url = Samanage::UrlBuilder.new(path: path, options: options).url
+      self.execute(path: url)
+    end
+
+    # Get all hardwares
+    def collect_hardwares(options: {})
+      hardwares = Array.new
+      total_pages = self.get_hardwares[:total_pages]
+      1.upto(total_pages) do |page|
+        puts "Collecting Hardwares page: #{page}/#{total_pages}" if options[:verbose]
+        self.execute(http_method: 'get', path: "hardwares.json?page=#{page}")[:data].each do |hardware|
+          if block_given?
+            yield hardware
+          end
+          hardwares << hardware
+        end
+      end
+      hardwares
+    end
+
+    # Create hardware given json payload
+    def create_hardware(payload: , options: {})
+      self.execute(path: PATHS[:hardware], http_method: 'post', payload: payload)
+    end
+
+    # Find hardware given id
+    def find_hardware(id: )
+      path = "hardwares/#{id}.json"
+      self.execute(path: path)
+    end
+
+    # Find hardware given a serial number
+    def find_hardwares_by_serial(serial_number: )
+      path = "hardwares.json?serial_number[]=#{serial_number}"
+      self.execute(path: path)
+    end
+
+
+    # Check for hardware using URL builder
+    def check_hardware(options: {})
+      url = Samanage::UrlBuilder.new(path: PATHS[:hardware], options: options).url
+      self.execute(path: url)
+    end
+
+    # Update hardware given id
+    def update_hardware(payload: , id: , options: {})
+      path = "hardwares/#{id}.json"
+      self.execute(path: path, http_method: 'put', payload: payload)
+    end
+
+    def delete_hardware(id: )
       self.execute(path: "hardwares/#{id}.json", http_method: 'delete')
     end
 
-	alias_method :hardwares, :collect_hardwares
-	end
+  alias_method :hardwares, :collect_hardwares
+  end
 end

data/lib/samanage/api/incidents.rb

@@ -1,64 +1,73 @@
 module Samanage
-	class Api
+  class Api
 
-		# Default get incident path
-		def get_incidents(path: PATHS[:incident], options: {})
-			url = Samanage::UrlBuilder.new(path: path, options: options).url
-			self.execute(path: url)
-		end
+    # Default get incident path
+    def get_incidents(path: PATHS[:incident], options: {})
+      url = Samanage::UrlBuilder.new(path: path, options: options).url
+      self.execute(path: url)
+    end
 
 
-		# Returns all incidents. 
-		# Options: 
-		#   - audit_archives: true
-		#   - layout: 'long'
-		def collect_incidents(options: {})
-			incidents = Array.new
-			total_pages = self.get_incidents[: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]
-				if options[:audit_archives]
-					archives = 'layout=long&audit_archive=true'
-					paginated_incidents = self.execute(path: "incidents.json?page=#{page}")[:data]
-					paginated_incidents.map do |incident|
-						archive_path = "incidents/#{incident['id']}.json?#{archives}"
-						incidents << self.execute(path: archive_path)[:data]
-					end
-				else
-					layout = options[:layout] == 'long' ? '&layout=long' : nil
-					incidents += self.execute(http_method: 'get', path: "incidents.json?page=#{page}#{layout}")[:data]
-				end
-			end
-			incidents
-		end
+    # Returns all incidents. 
+    # Options: 
+    #   - audit_archives: true
+    #   - layout: 'long'
+    def collect_incidents(options: {})
+      incidents = Array.new
+      total_pages = self.get_incidents[: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]
+        if options[:audit_archives]
+          archives_params = 'layout=long&audit_archive=true'
+          paginated_incidents = self.execute(path: "incidents.json?page=#{page}")[:data]
+          paginated_incidents.map do |incident|
+            archive_uri = "incidents/#{incident['id']}.json?#{archives_params}"
+            incident_with_archive = self.execute(path: archive_uri)[:data]
+            if block_given?
+              yield incident_with_archive
+            end
+            incidents.push(incident_with_archive)
+          end
+        else
+          layout = options[:layout] == 'long' ? '&layout=long' : nil
+          self.execute(http_method: 'get', path: "incidents.json?page=#{page}#{layout}")[:data].each do |incident|
+            if block_given?
+              yield incident
+            end
+            incidents.push(incident)
+          end
+        end
+      end
+      incidents
+    end
 
 
-		# Create an incident given json
-		def create_incident(payload: nil, options: {})
-			self.execute(path: PATHS[:incident], http_method: 'post', payload: payload)
-		end
+    # Create an incident given json
+    def create_incident(payload: nil, options: {})
+      self.execute(path: PATHS[:incident], http_method: 'post', payload: payload)
+    end
 
-		# Find incident by ID
-		def find_incident(id: , options: {})
-			path = "incidents/#{id}.json"
-			if options[:layout] == 'long'
-				path += '?layout=long'
-			end
-			self.execute(path: path)
-		end
+    # Find incident by ID
+    def find_incident(id: , options: {})
+      path = "incidents/#{id}.json"
+      if options[:layout] == 'long'
+        path += '?layout=long'
+      end
+      self.execute(path: path)
+    end
 
-		# Update an incident given id and json
-		def update_incident(payload: , id: , options: {})
-			path = "incidents/#{id}.json"
-			self.execute(path: path, http_method: 'put', payload: payload)
-		end
+    # Update an incident given id and json
+    def update_incident(payload: , id: , options: {})
+      path = "incidents/#{id}.json"
+      self.execute(path: path, http_method: 'put', payload: payload)
+    end
 
-		def delete_incident(id: )
+    def delete_incident(id: )
       self.execute(path: "incidents/#{id}.json", http_method: 'delete')
     end
 
 
-	alias_method :incidents, :collect_incidents
-	end
-end
+  alias_method :incidents, :collect_incidents
+  end
+end

data/lib/samanage/api/mobiles.rb

@@ -1,52 +1,56 @@
 module Samanage
-	class Api
-
-		# Get mobile default path
-		def get_mobiles(path: PATHS[:mobile], options: {})
-			url = Samanage::UrlBuilder.new(path: path, options: options).url
-			self.execute(path: url)
-		end
-
-		# Get all mobiles
-		def collect_mobiles(options: {})
-			page = 1
-			mobiles = Array.new
-			total_pages = self.get_mobiles[:total_pages]
-			1.upto(total_pages) do |page|
-				puts "Collecting Mobiles page: #{page}/#{total_pages}" if options[:verbose]
-				mobiles += self.execute(http_method: 'get', path: "mobiles.json?page=#{page}")[:data]
-			end
-			mobiles
-		end
-
-		# Create mobile given json payload
-		def create_mobile(payload: nil, options: {})
-			self.execute(path: PATHS[:mobile], http_method: 'post', payload: payload)
-		end
-
-		# Find mobile given id
-		def find_mobile(id: nil)
-			path = "mobiles/#{id}.json"
-			self.execute(path: path)
-		end
-		
-		# Check for mobile using URL builder
-		def check_mobile(options: {})
-			url = Samanage::UrlBuilder.new(path: PATHS[:mobile], options: options).url
-			self.execute(path: url)
-		end
-
-		# Update mobile given id
-		def update_mobile(payload: , id: , options: {})
-			path = "mobiles/#{id}.json"
-			self.execute(path: path, http_method: 'put', payload: payload)
-		end
-
-		def delete_mobile(id: )
+  class Api
+
+    # Get mobile default path
+    def get_mobiles(path: PATHS[:mobile], options: {})
+      url = Samanage::UrlBuilder.new(path: path, options: options).url
+      self.execute(path: url)
+    end
+
+    # Get all mobiles
+    def collect_mobiles(options: {})
+      mobiles = Array.new
+      total_pages = self.get_mobiles[:total_pages]
+      1.upto(total_pages) do |page|
+        puts "Collecting Mobiles page: #{page}/#{total_pages}" if options[:verbose]
+        self.execute(http_method: 'get', path: "mobiles.json?page=#{page}")[:data].each do |mobile|
+          if block_given? 
+            yield mobiles
+          end
+          mobiles << mobile
+        end
+      end
+      mobiles
+    end
+
+    # Create mobile given json payload
+    def create_mobile(payload: nil, options: {})
+      self.execute(path: PATHS[:mobile], http_method: 'post', payload: payload)
+    end
+
+    # Find mobile given id
+    def find_mobile(id: nil)
+      path = "mobiles/#{id}.json"
+      self.execute(path: path)
+    end
+    
+    # Check for mobile using URL builder
+    def check_mobile(options: {})
+      url = Samanage::UrlBuilder.new(path: PATHS[:mobile], options: options).url
+      self.execute(path: url)
+    end
+
+    # Update mobile given id
+    def update_mobile(payload: , id: , options: {})
+      path = "mobiles/#{id}.json"
+      self.execute(path: path, http_method: 'put', payload: payload)
+    end
+
+    def delete_mobile(id: )
       self.execute(path: "mobiles/#{id}.json", http_method: 'delete')
     end
 
 
-	alias_method :mobiles, :collect_mobiles
-	end
+  alias_method :mobiles, :collect_mobiles
+  end
 end

data/lib/samanage/api/other_assets.rb

@@ -1,49 +1,53 @@
 module Samanage
-	class Api
-
-		# 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)
-		end
-
-		# Returns all other assets
-		def collect_other_assets(options: {})
-			page = 1
-			other_assets = Array.new
-			total_pages = self.get_other_assets[:total_pages]
-			other_assets = []
-			1.upto(total_pages) do |page|
-				puts "Collecting Other Assets page: #{page}/#{total_pages}" if options[:verbose]
-				other_assets += self.execute(http_method: 'get', path: "other_assets.json?page=#{page}")[:data]
-			end
-			other_assets.uniq
-		end
-
-
-		# Create an other_asset given json
-		def create_other_asset(payload: , options: {})
-			self.execute(path: PATHS[:other_asset], http_method: 'post', payload: payload)
-		end
-
-
-		# Find other_asset by id
-		def find_other_asset(id: )
-			path = "other_assets/#{id}.json"
-			self.execute(path: path)
-		end
-
- 		# Update other_asset given json and id
-		def update_other_asset(payload: , id: , options: {})
-			path = "other_assets/#{id}.json"
-			self.execute(path: path, http_method: 'put', payload: payload)
-		end
-
-		def delete_other_asset(id: )
+  class Api
+
+    # 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)
+    end
+
+    # Returns all other assets
+    def collect_other_assets(options: {})
+      other_assets = Array.new
+      total_pages = self.get_other_assets[:total_pages]
+      other_assets = []
+      1.upto(total_pages) do |page|
+        puts "Collecting Other Assets page: #{page}/#{total_pages}" if options[:verbose]
+        self.execute(http_method: 'get', path: "other_assets.json?page=#{page}")[:data].each do |other_asset|
+          if block_given?
+            yield other_asset
+          end
+          other_assets << other_asset
+        end
+      end
+      other_assets
+    end
+
+
+    # Create an other_asset given json
+    def create_other_asset(payload: , options: {})
+      self.execute(path: PATHS[:other_asset], http_method: 'post', payload: payload)
+    end
+
+
+    # Find other_asset by id
+    def find_other_asset(id: )
+      path = "other_assets/#{id}.json"
+      self.execute(path: path)
+    end
+
+     # Update other_asset given json and id
+    def update_other_asset(payload: , id: , options: {})
+      path = "other_assets/#{id}.json"
+      self.execute(path: path, http_method: 'put', payload: payload)
+    end
+
+    def delete_other_asset(id: )
       self.execute(path: "other_assets/#{id}.json", http_method: 'delete')
     end
 
 
-	alias_method :other_assets, :collect_other_assets
-	end
+  alias_method :other_assets, :collect_other_assets
+  end
 end