CiscoWebex 0.0.4 → 0.0.7

data/lib/Devices/Workspaces.rb

@@ -35,14 +35,14 @@ module CiscoWebex
 		end
 
 		def delete(id)
-			return CiscoWebex::Rest.delete(@auth_token, "/v1/workspaces/#{id}") rescue false
+			return CiscoWebex::Rest.delete(@auth_token, "/v1/workspaces", id) rescue false
 		end
 
-		def update(id, params)
-			return CiscoWebex::Rest.put(@auth_token, "/v1/workspaces/#{id}", params) rescue false
+		def update(params)
+			return CiscoWebex::Rest.put(@auth_token, "/v1/workspaces", params) rescue false
 		end
 
-		def patch(id, params)
+		def patch(params, id=nil)
 			STDERR.puts "CiscoWebex::Devices::Workspaces.patch() - Metod not implemented"
 			return False
 		end

data/lib/Devices/Xapi.rb

@@ -61,12 +61,12 @@ module CiscoWebex
 			return false
 		end
 
-		def update(id, params)
+		def update(params)
 			STDERR.puts "Error: CicoWebex::Devices::XAPI.update(): Not implemented."
 			return false
 		end
 
-		def patch(id, params)
+		def patch(params, id=nil)
 			STDERR.puts "CiscoWebex::Devices::XAPI.patch() - Metod not implemented"
 			return False
 		end

data/lib/Meetings/ControlStatus.rb

@@ -40,8 +40,11 @@ module CiscoWebex
 			return false
 		end
 
-		def update(id, params)
-			return CiscoWebex::Rest.put(@auth_token, "/v1/meetings/controls?meetingId=#{id}", {}) rescue false
+		def update(params)
+			if params.class == Hash and params.has_key?('meetingId')
+				meeting_id = params['meetingId']
+			end
+			return CiscoWebex::Rest.put(@auth_token, "/v1/meetings/controls?meetingId=#{meeting_id}", params) rescue false
 		end
 
 		def patch(id, params)

data/lib/Meetings/Invitees.rb

@@ -36,14 +36,14 @@ module CiscoWebex
 		end
 
 		def delete(id)
-			return CiscoWebex::Rest.delete(@auth_token, "/v1/meetingInvitees/#{id}", {}) rescue false
+			return CiscoWebex::Rest.delete(@auth_token, "/v1/meetingInvitees", id) rescue false
 		end
 
-		def update(id, params)
-			return CiscoWebex::Rest.put(@auth_token, "/v1/meetingInvitees/#{id}", params) rescue false
+		def update(params)
+			return CiscoWebex::Rest.put(@auth_token, "/v1/meetingInvitees", params) rescue false
 		end
 
-		def patch(id, params)
+		def patch(params, id=nil)
 			STDERR.puts "CiscoWebex::Meetings::Invitees.patch() - Metod not implemented"
 			return false
 		end

data/lib/Meetings/Participants.rb

@@ -39,11 +39,11 @@ module CiscoWebex
 			STDERR.puts "CiscoWebex::Meetings::Participants.patch() - Metod not implemented"
 			return false		end
 
-		def update(id, params)
-			return CiscoWebex::Rest.put(@auth_token, "/v1/meetingParticipants/#{id}", params) rescue false
+		def update(params)
+			return CiscoWebex::Rest.put(@auth_token, "/v1/meetingParticipants", params) rescue false
 		end
 
-		def patch(id, params)
+		def patch(params, id=nil)
 			STDERR.puts "CiscoWebex::Meetings::Participants.patch() - Metod not implemented"
 			return false
 		end

data/lib/Meetings/Qualities.rb

@@ -41,12 +41,12 @@ module CiscoWebex
 			return false
 		end
 
-		def update(id, params)
+		def update(params)
 			STDERR.puts "CiscoWebex::Meetings::Qualities.update() - Metod not implemented"
 			return false		
 		end
 
-		def patch(id, params)
+		def patch(params, id=nil)
 			STDERR.puts "CiscoWebex::Meetings::Qualities.patch() - Metod not implemented"
 			return false
 		end

data/lib/Meetings/Registrations.rb

@@ -41,12 +41,12 @@ module CiscoWebex
 			return false
 		end
 
-		def update(id, params)
+		def update(params)
 			STDERR.puts "CiscoWebex::Meetings::Registrations.update() - Metod not implemented"
 			return false
 		end
 
-		def patch(id, params)
+		def patch(params, id=nil)
 			STDERR.puts "CiscoWebex::Meetings::Registrations.patch() - Metod not implemented"
 			return false
 		end

data/lib/Meetings/SessionTypes.rb

@@ -43,12 +43,12 @@ module CiscoWebex
 			return false
 		end
 
-		def update(id, params)
+		def update(params)
 			STDERR.puts "CiscoWebex::Meetings::SessionsTypes.update() - Metod not implemented"
 			return false
 		end
 
-		def patch(id, params)
+		def patch(params, id=nil)
 			STDERR.puts "CiscoWebex::Meetings::SessionsTypes.patch() - Metod not implemented"
 			return false
 		end

data/lib/Meetings/Templates.rb

@@ -43,12 +43,12 @@ module CiscoWebex
 			return false
 		end
 
-		def update(id, params)
+		def update(params)
 			STDERR.puts "CiscoWebex::Meetings::Templates.update() - Metod not implemented"
 			return false
 		end
 
-		def patch(id, params)
+		def patch(params, id=nil)
 			STDERR.puts "CiscoWebex::Meetings::Templates.patch() - Metod not implemented"
 			return false
 		end

data/lib/Meetings/Transcripts.rb

@@ -46,7 +46,7 @@ module CiscoWebex
 			return false
 		end
 
-		def patch(id, params)
+		def patch(params, id=nil)
 			STDERR.puts "CiscoWebex::Meetings::Transcripts.patch() - Metod not implemented"
 			return false
 		end

data/lib/Meetings/WebexMeetings.rb

@@ -92,14 +92,14 @@ module CiscoWebex
 		end
 
 		def delete(id)
-			return CiscoWebex::Rest.delete(@auth_token, "/v1/meetings/#{id}") rescue false
+			return CiscoWebex::Rest.delete(@auth_token, "/v1/meetings", id) rescue false
 		end
 
-		def update(id, params)
-			return CiscoWebex::Rest.put(@auth_token, "/v1/meetings/#{id}", params) rescue false
+		def update(params)
+			return CiscoWebex::Rest.put(@auth_token, "/v1/meetings", params) rescue false
 		end
 
-		def patch(id, params)
+		def patch(params, id=nil)
 			STDERR.puts "CiscoWebex::Meetings::WebexMeetings.patch() - Metod not implemented"
 			return false
 		end

data/lib/Messaging/Attachements.rb

@@ -46,12 +46,12 @@ module CiscoWebex
 			return false
 		end
 
-		def update(id, params)
+		def update(params)
 			STDERR.puts "CiscoWebex::Messaging::Messages::Attachments.update() - Metod not implemented"
 			return false
 		end
 
-		def patch(id, params)
+		def patch(params, id=nil)
 			STDERR.puts "CiscoWebex::Messaging::Messages::Attachments.patch() - Metod not implemented"
 			return false
 		end

data/lib/Messaging/Classifications.rb

@@ -50,12 +50,12 @@ module CiscoWebex
 			return false
 		end
 
-		def update(id, params)
+		def update(params)
 			STDERR.puts "CiscoWebex::Messaging::Classifications.patch() - Metod not implemented"
 			return false
 		end
 
-		def patch(id, params)
+		def patch(params, id=nil)
 			STDERR.puts "CiscoWebex::Messaging::Classifications.patch() - Metod not implemented"
 			return false
 		end

data/lib/Messaging/Events.rb

@@ -46,12 +46,12 @@ module CiscoWebex
 			return false
 		end
 
-		def update(id, params)
+		def update(params)
 			STDERR.puts "CiscoWebex::Messaging::Events.update() - Metod not implemented"
 			return false
 		end
 
-		def patch(id, params)
+		def patch(params, id=nil)
 			STDERR.puts "CiscoWebex::Messaging::Events.patch() - Metod not implemented"
 			return false
 		end

data/lib/Messaging/Memberships.rb

@@ -43,14 +43,14 @@ module CiscoWebex
 		end
 
 		def delete(id)
-			return CiscoWebex::Rest.delete(@auth_token, "/v1/memberships/#{id}") rescue false
+			return CiscoWebex::Rest.delete(@auth_token, "/v1/memberships", id) rescue false
 		end
 
-		def update(id, params)
-			return CiscoWebex::Rest.put(@auth_token, "/v1/memberships/#{id}", params) rescue false
+		def update(params)
+			return CiscoWebex::Rest.put(@auth_token, "/v1/memberships", params) rescue false
 		end
 
-		def patch(id, params)
+		def patch(params, id=nil)
 			STDERR.puts "CiscoWebex::Messaging::Memberships.patch() - Metod not implemented"
 			return false
 		end

data/lib/Messaging/Messages.rb

@@ -18,7 +18,7 @@ module CiscoWebex
 		end
 
 		def template()
-			return OpenStruct.new({ 	
+			return { 	
 						"roomId"=>"", 
 						"parentId"=>"", 
 						"toPersonId"=>"", 
@@ -27,7 +27,7 @@ module CiscoWebex
 						"markdown"=>"", 
 						"files"=>[], 
 						"attachments"=>[]
-					})
+					}
 		end
 
 		def get(id)
@@ -48,14 +48,14 @@ module CiscoWebex
 		end
 
 		def delete(id)
-			return CiscoWebex::Rest.delete(@auth_token, "/v1/messages/#{id}") rescue false
+			return CiscoWebex::Rest.delete(@auth_token, "/v1/messages", id) rescue false
 		end
 
-		def update(id, params)
-			return CiscoWebex::Rest.put(@auth_token, "/v1/messages/#{id}", params) rescue false
+		def update(params)
+			return CiscoWebex::Rest.put(@auth_token, "/v1/messages", params) rescue false
 		end
 
-		def patch(id, params)
+		def patch(params, id=nil)
 			STDERR.puts "CiscoWebex::Messaging::Messages.patch() - Metod not implemented"
 			return false
 		end
@@ -88,7 +88,7 @@ module CiscoWebex
 			end
 
 			def get(id)
-				return CiscoWebex::Rest.get(@auth_token, "#{@base_uri}/#{id}", {}, limit).data rescue false
+				return CiscoWebex::Rest.get(@auth_token, "#{@base_uri}/#{id}", {}, limit) rescue false
 			end
 
 			def list(params={}, limit=5000)
@@ -102,8 +102,7 @@ module CiscoWebex
 			end
 
 			def create(params)
-				return CiscoWebex::Rest.post(@auth_token, @base_uri, params, limit).data rescue false
-				return false
+				return CiscoWebex::Rest.post(@auth_token, @base_uri, params, limit) rescue false
 			end
 
 			def delete(id)
@@ -111,12 +110,12 @@ module CiscoWebex
 				return false
 			end
 
-			def update(id, params)
+			def update(params)
 				STDERR.puts "CiscoWebex::Messaging::Messages::Attachments.update() - Metod not implemented"
 				return false
 			end
 
-			def patch(id, params)
+			def patch(params, id=nil)
 				STDERR.puts "CiscoWebex::Messaging::Messages::Attachments.patch() - Metod not implemented"
 				return false
 			end

data/lib/Messaging/People.rb

@@ -52,7 +52,7 @@ module CiscoWebex
 				else
 					params = { "displayName"=> params }
 				end
-			elsif param.is_a?(Hash)
+			elsif params.is_a?(Hash)
 				STDERR.puts "CiscoWebex::Messaging::MessagingPeople.search - require email or displayname for search or custom Hash"
 				return false
 			else
@@ -65,14 +65,14 @@ module CiscoWebex
 		end
 
 		def delete(id)
-			return CiscoWebex::Rest.delete(@auth_token, "/v1/people/#{id}") rescue false
+			return CiscoWebex::Rest.delete(@auth_token, "/v1/people", id) rescue false
 		end
 
-		def update(id, params)
-			return CiscoWebex::Rest.put(@auth_token, "/v1/people/#{id}", params) rescue false
+		def update(params)
+			return CiscoWebex::Rest.put(@auth_token, "/v1/people", params) rescue false
 		end
 
-		def patch(id, params)
+		def patch(params, id=nil)
 			STDERR.puts "CiscoWebex::Messaging::MessagingPeople.patch() - Metod not implemented"
 			return false
 		end

data/lib/Messaging/Rooms.rb

@@ -18,13 +18,13 @@ module CiscoWebex
 		end
 
 		def template()
-			return OpenStruct.new({
-									  "title"=> "",
-									  "teamId"=> "",
-									  "classificationId"=> "",
-									  "isLocked"=> false,
-									  "isAnnouncementOnly"=> false
-									})
+			return {
+					  "title"=> "",
+					  "teamId"=> "",
+					  "classificationId"=> "",
+					  "isLocked"=> false,
+					  "isAnnouncementOnly"=> false
+					}
 		end
 
 		def tabs()
@@ -49,14 +49,14 @@ module CiscoWebex
 		end
 
 		def delete(id)
-			return CiscoWebex::Rest.delete(@auth_token, "/v1/rooms/#{id}") rescue false
+			return CiscoWebex::Rest.delete(@auth_token, "/v1/rooms", id) rescue false
 		end
 
-		def update(id, params)
-			return CiscoWebex::Rest.put(@auth_token, "/v1/rooms/#{id}", params) rescue false
+		def update(params)
+			return CiscoWebex::Rest.put(@auth_token, "/v1/rooms", params) rescue false
 		end
 
-		def patch(id, params)
+		def patch(params, id=nil)
 			STDERR.puts "CiscoWebex::Messaging::Rooms.patch() - Metod not implemented"
 			return false
 		end
@@ -89,15 +89,15 @@ module CiscoWebex
 		end
 
 		def get(id)
-			return CiscoWebex::Rest.get(@auth_token, "/v1/rooms/tabs/#{id}", {}, limit).data rescue false
+			return CiscoWebex::Rest.get(@auth_token, "/v1/rooms/tabs/#{id}", {}, limit) rescue false
 		end
 
 		def list(params={}, limit=5000)
-			return CiscoWebex::Rest.get(@auth_token, "/v1/rooms/tabs", params, limit).data rescue false
+			return CiscoWebex::Rest.get(@auth_token, "/v1/rooms/tabs", params, limit) rescue false
 		end
 
 		def search(params={}, limit=5000)
-			return CiscoWebex::Rest.get(@auth_token, "/v1/rooms/tabs", params, limit).data rescue false				
+			return CiscoWebex::Rest.get(@auth_token, "/v1/rooms/tabs", params, limit) rescue false				
 		end
 
 		def create(params)
@@ -105,14 +105,14 @@ module CiscoWebex
 		end
 
 		def delete(id)
-			return CiscoWebex::Rest.delete(@auth_token, "/v1/rooms/tabs/#{id}") rescue false
+			return CiscoWebex::Rest.delete(@auth_token, "/v1/rooms/tabs", id) rescue false
 		end
 
-		def update(id, params)
-			return CiscoWebex::Rest.put(@auth_token, "/v1/rooms/tabs/#{id}", params) rescue false
+		def update(params)
+			return CiscoWebex::Rest.put(@auth_token, "/v1/rooms/tabs", params) rescue false
 		end
 
-		def patch(id, params)
+		def patch(params, id=nil)
 			STDERR.puts "CiscoWebex::Messaging::Rooms.patch() - Metod not implemented"
 			return false
 		end

data/lib/Messaging/Teams.rb

@@ -84,15 +84,15 @@ module CiscoWebex
 			end
 
 			def get(id)
-				return CiscoWebex::Rest.get(@auth_token, "/v1/teams/membership/#{id}", {}, limit).data rescue false
+				return CiscoWebex::Rest.get(@auth_token, "/v1/teams/membership/#{id}", {}, limit) rescue false
 			end
 
 			def list(params={}, limit=5000)
-				return CiscoWebex::Rest.get(@auth_token, "/v1/teams/membership", params, limit).data rescue false
+				return CiscoWebex::Rest.get(@auth_token, "/v1/teams/membership", params, limit) rescue false
 			end
 
 			def search(params={}, limit=5000)
-				return CiscoWebex::Rest.get(@auth_token, "/v1/teams/membership", params, limit).data rescue false				
+				return CiscoWebex::Rest.get(@auth_token, "/v1/teams/membership", params, limit) rescue false				
 			end
 
 			def create(params)

data/lib/REST/Rest.rb

@@ -19,7 +19,7 @@ module CiscoWebex
 				https.use_ssl = true
 				request = Net::HTTP::Get.new(uri)
 				request["Authorization"] = "Bearer #{@auth_token}"
-				request["User-Agent"] = "Webex Rudy Library"
+				request["User-Agent"] = "CiscoWebex for Ruby by Cloverhound"
 
 				return [ https, request ]
 	        else
@@ -35,7 +35,11 @@ module CiscoWebex
 				params = params.to_h
 			end
 
-			params = params.delete_if { |key, value| value.to_s.strip == '' } # delete any unused keys
+			for param in params.each()
+				if param[1] == nil || ( params[1].class == String && param[1] == "" ) || ( ( params.class == Array || params.class == Hash ) && params.length == 0 )
+					params.delete(param[0])
+				end
+			end
 
 			case return_format
 			when "json"
@@ -55,6 +59,8 @@ module CiscoWebex
 			while true
 				response = rest.request(request)
 				case response.code
+				when "204"
+					return true
 				when "200"
 					# if REST success then parse body to JSON
 					response, headers = [ JSON.parse(response.body), response.each_header.to_h ]
@@ -99,7 +105,7 @@ module CiscoWebex
 			https.use_ssl = true
 			request = Net::HTTP::Get.new(uri)
 			request["Authorization"] = "Bearer #{@auth_token}"
-			request["User-Agent"] = "Webex Rudy Library"
+			request["User-Agent"] = "CiscoWebex for Ruby by Cloverhound"
 
 			return send_rest(https, request, limit) # send REST call 
 		end
@@ -119,7 +125,7 @@ module CiscoWebex
 			https.use_ssl = true
 			request = Net::HTTP::Head.new(uri)
 			request["Authorization"] = "Bearer #{auth_token}"
-			request["User-Agent"] = "Webex Rudy Library"
+			request["User-Agent"] = "CiscoWebex for Ruby by Cloverhound"
 
 			return send_rest(https, request) # send REST call
 		end
@@ -129,8 +135,10 @@ module CiscoWebex
 			# set REST client headers, body etc
 			if params.class == String
 				uri = "#{uri}/#{params}"
+				params = {}
 			elsif params.to_h.has_key?("id")
 				uri = "#{uri}/#{params.to_h['id']}"
+				params = {}
 			end
 
 			uri = URI("#{BASE_URL}#{uri}")
@@ -139,14 +147,14 @@ module CiscoWebex
 			https.use_ssl = true
 			request = Net::HTTP::Delete.new(uri)
 			request["Authorization"] = "Bearer #{auth_token}"
-			request["User-Agent"] = "Webex Rudy Library"
+			request["User-Agent"] = "CiscoWebex for Ruby by Cloverhound"
 
 			return send_rest(https, request) # send REST call
 		end
 
 		# basic REST POST for Webex
 		def self.post(auth_token, uri, params)
-			if params.class != Hash || params.lenth == 0
+			if params.class != Hash || params.length == 0
 				STDERR.puts "CiscoWebex::Rest.post(): Must supply `params` as hash for post"
 				return False
 			end
@@ -158,7 +166,7 @@ module CiscoWebex
 			request["Authorization"] = "Bearer #{auth_token}"
 			request["Content-Type"] = "application/json"
 			request["Accept"] = "*/*"
-			request["User-Agent"] = "Webex Rudy Library"
+			request["User-Agent"] = "CiscoWebex for Ruby by Cloverhound"
 			request.body = parse_params(params) # format params as json body
 
 			return send_rest(https, request) # send REST call
@@ -166,7 +174,7 @@ module CiscoWebex
 
 		# basic REST PUT for Webex
 		def self.put(auth_token, uri, params)
-			if params.class != Hash || params.lenth == 0
+			if params.class != Hash || params.length == 0
 				STDERR.puts "CiscoWebex::Rest.put(): Must supply `params` as hash for update"
 				return False
 			elsif params.to_h.has_key?("id")
@@ -180,7 +188,7 @@ module CiscoWebex
 			request["Authorization"] = "Bearer #{auth_token}"
 			request["Content-Type"] = "application/json"
 			request["Accept"] = "*/*"
-			request["User-Agent"] = "Webex Rudy Library"
+			request["User-Agent"] = "CiscoWebex for Ruby by Cloverhound"
 			request.body = parse_params(params) # format params as json body
 
 			return send_rest(https, request) # send REST call
@@ -189,7 +197,7 @@ module CiscoWebex
 		# basic REST PUT for Webex
 		def self.patch(auth_token, uri, params)
 			# build REST client/headers/body etc
-			if params.class != Hash || params.lenth == 0
+			if params.class != Hash || params.length == 0
 				STDERR.puts "CiscoWevex::Rest.patch(): Must supply `params` as hash for update"
 				return False
 			elsif params.to_h.has_key?("id")
@@ -203,7 +211,7 @@ module CiscoWebex
 			request["Authorization"] = "Bearer #{auth_token}"
 			request["Content-Type"] = "application/json"
 			request["Accept"] = "*/*"
-			request["User-Agent"] = "Webex Rudy Library"
+			request["User-Agent"] = "CiscoWebex for Ruby by Cloverhound"
 			request.body = parse_params(params) # format params as json body
 
 			return send_rest(https, request) # send REST call