leantesting 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0650b9de0f50228ddda2c8821f73fd84f0901ebb
-  data.tar.gz: 8377c2da73980950c3eee06b0d8f0ca7255196b7
+  metadata.gz: 6af9018276f7f7bdef8db3bcdbd4762d365944ed
+  data.tar.gz: a40e97d7dd8fff881555db24963bb22c14b7bf26
 SHA512:
-  metadata.gz: b86cfbfd27603d0b002d0011bba8f09c7f620b2e61691cc89c4c6eb97dcfc801cb698ae5fc553fbb673e45cdc1382d6ceb70e41dead27abdd00ef9d518c746e7
-  data.tar.gz: e63dbe3ff2aea21ef8a013d79dc4fe66375744d87d04f562baf7a1174e5d610446ce83dec7d09e8d9ae4d93424554db3de246be9034559486acd682e27026504
+  metadata.gz: 2021d0c2dbffa0179f4145e6f20ca1418b5d88abdf1e70fea7dde160564e543843d4ca70f9fa6f2dfd0848fc629059f21c36fb048d21f466450d4e98a831c60f
+  data.tar.gz: 265060dfd7d512d97983b0a82655bb3d11577f0ced7403e2a87089813c8c21d9f4a9c318e68f2398d49b5dfabf3f6826275aaf0fbc71d08e3190d77bbb69c857

data/README.md

@@ -39,7 +39,7 @@ projects = leantesting.projects.all()
 bugs = leantesting.projects.find(123).bugs.all()
 ```
 
-----
+## Methods
 
 - Get Current **Token**
 ```ruby
@@ -347,4 +347,4 @@ Install dependencies as mentioned above, then you can run the test suite:
 
 ```bash
 rake test
-```
+```

data/leantesting.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
 	s.name        = 'leantesting'
-	s.version     = '1.0.1'
+	s.version     = '1.0.2'
 	s.date        = '2015-11-20'
 	s.platform    = Gem::Platform::RUBY
 	s.summary     = 'Lean Testing Ruby SDK'

data/lib/BaseClass/APIRequest.rb

@@ -3,193 +3,196 @@
 #
 # An APIRequest's parameters can be modified on demand and can be executed multiple times for the same instance.
 #
-class APIRequest
-
-	#
-	# Constructs API request definition.
-	#
-	# Arguments:
-	#	origin   Client -- Originating client reference
-	#	endpoint String     -- API endpoint
-	#	method   String     -- Method for cURL call - supports GET, POST, PUT or DELETE only
-	#	opts     Hash       -- (optional) Additional options to pass to request.
-	#							Request parameters (if any) must bep assed here.
-	#
-	# Exceptions:
-	#	SDKInvalidArgException if method is non-string.
-	#	SDKInvalidArgException if unsupported method is provided.
-	#	SDKInvalidArgException if endpoint is non-string.
-	#	SDKInvalidArgException if opts param is not a hash.
-	#
-	def initialize(origin, endpoint, method, opts = nil)
-		@default_ops = {									# Basic support for extended opts
-			'base_uri'	=> 'https://api.leantesting.com',	# assumed default for API base
-			'form_data'	=> false,							# sets content type to multipart/form-data if true
-			'params'	=> {}								# params to be pased in request
-		}
-
-		if !opts
-			opts = {}
-		end
 
-		if !method.is_a? String
-			raise SDKInvalidArgException, '`method` must be a string'
-		elsif !['GET', 'POST', 'PUT', 'DELETE'].include? method
-			raise SDKInvalidArgException, 'unsupported ' + method + ' `method`'
-		elsif !endpoint.is_a? String
-			raise SDKInvalidArgException, '`endpoint` must be a string'
-		elsif !opts.is_a? Hash
-			raise SDKInvalidArgException, '`opts` must be a hash'
-		end
+module LeanTesting
+	class APIRequest
+
+		#
+		# Constructs API request definition.
+		#
+		# Arguments:
+		#	origin   Client -- Originating client reference
+		#	endpoint String     -- API endpoint
+		#	method   String     -- Method for cURL call - supports GET, POST, PUT or DELETE only
+		#	opts     Hash       -- (optional) Additional options to pass to request.
+		#							Request parameters (if any) must bep assed here.
+		#
+		# Exceptions:
+		#	SDKInvalidArgException if method is non-string.
+		#	SDKInvalidArgException if unsupported method is provided.
+		#	SDKInvalidArgException if endpoint is non-string.
+		#	SDKInvalidArgException if opts param is not a hash.
+		#
+		def initialize(origin, endpoint, method, opts = nil)
+			@default_ops = {									# Basic support for extended opts
+				'base_uri'	=> 'https://api.leantesting.com',	# assumed default for API base
+				'form_data'	=> false,							# sets content type to multipart/form-data if true
+				'params'	=> {}								# params to be pased in request
+			}
+
+			if !opts
+				opts = {}
+			end
 
-		@opts = @default_ops.clone
-		self.updateOpts(opts)
+			if !method.is_a? String
+				raise SDKInvalidArgException, '`method` must be a string'
+			elsif !['GET', 'POST', 'PUT', 'DELETE'].include? method
+				raise SDKInvalidArgException, 'unsupported ' + method + ' `method`'
+			elsif !endpoint.is_a? String
+				raise SDKInvalidArgException, '`endpoint` must be a string'
+			elsif !opts.is_a? Hash
+				raise SDKInvalidArgException, '`opts` must be a hash'
+			end
 
-		@origin		= origin
-		@endpoint	= endpoint
-		@method		= method
-	end
+			@opts = @default_ops.clone
+			self.updateOpts(opts)
 
-	#
-	# Updates options list inside API request definition.
-	#
-	# Arguments:
-	#	opts Hash -- (optional) Additional options array to merge with previous option values
-	#
-	# Exceptions:
-	#	SDKInvalidArgException if opts param is not a hash.
-	#	SDKInvalidArgException if provided parameter list is non-hash parameter.
-	#
-	def updateOpts(opts = nil)
-		if !opts
-			opts = {}
+			@origin		= origin
+			@endpoint	= endpoint
+			@method		= method
 		end
 
-		if !opts.is_a? Hash
-			raise SDKInvalidArgException, '`opts` must be a hash'
-		elsif opts.has_key? 'params' && !opts['params'].is_a?(Hash)
-			raise SDKInvalidArgException '`opts[\'params\']` must be a hash'
+		#
+		# Updates options list inside API request definition.
+		#
+		# Arguments:
+		#	opts Hash -- (optional) Additional options array to merge with previous option values
+		#
+		# Exceptions:
+		#	SDKInvalidArgException if opts param is not a hash.
+		#	SDKInvalidArgException if provided parameter list is non-hash parameter.
+		#
+		def updateOpts(opts = nil)
+			if !opts
+				opts = {}
+			end
+
+			if !opts.is_a? Hash
+				raise SDKInvalidArgException, '`opts` must be a hash'
+			elsif opts.has_key? 'params' && !opts['params'].is_a?(Hash)
+				raise SDKInvalidArgException '`opts[\'params\']` must be a hash'
+			end
+
+			@opts.merge!(opts)
 		end
 
-		@opts.merge!(opts)
-	end
+		#
+		# Executes cURL call as per current API definition state.
+		#
+		# Returns:
+		#	String -- Returns resulting data response from server (including errors and inconsistencies)
+		#
+		def call
 
-	#
-	# Executes cURL call as per current API definition state.
-	#
-	# Returns:
-	#	String -- Returns resulting data response from server (including errors and inconsistencies)
-	#
-	def call
+			ch = Curl::Easy.new
 
-		ch = Curl::Easy.new
+			callUrl = @opts['base_uri'] + @endpoint
 
-		callUrl = @opts['base_uri'] + @endpoint
+			if @origin.getCurrentToken.is_a? String
+				ch.headers['Authorization'] = 'Bearer ' + @origin.getCurrentToken
+			end
 
-		if @origin.getCurrentToken.is_a? String
-			ch.headers['Authorization'] = 'Bearer ' + @origin.getCurrentToken
-		end
+			ch.url = callUrl
 
-		ch.url = callUrl
+			ch.header_in_body = false
 
-		ch.header_in_body = false
+			case @method
+			when 'GET'
+				callUrl += '?' + Curl::postalize(@opts['params'])
+				ch.url = callUrl
 
-		case @method
-		when 'GET'
-			callUrl += '?' + Curl::postalize(@opts['params'])
-			ch.url = callUrl
+				ch.http_get
+			when 'POST'
+				if @opts['form_data'] == true && (@opts.has_key? 'file_path')
+					ch.headers['Content-Type'] = 'multipart/form-data'
+					ch.multipart_form_post = true
 
-			ch.http_get
-		when 'POST'
-			if @opts['form_data'] == true && (@opts.has_key? 'file_path')
-				ch.headers['Content-Type'] = 'multipart/form-data'
-				ch.multipart_form_post = true
+					ch.http_post(Curl::PostField.file('file', @opts['file_path']))
+				else
+					jsonData = JSON.generate(@opts['params'])
 
-				ch.http_post(Curl::PostField.file('file', @opts['file_path']))
-			else
+					ch.headers['Content-Type'] = 'application/json'
+					ch.headers['Content-Length'] = jsonData.length
+
+					ch.http_post(jsonData)
+				end
+			when 'PUT'
 				jsonData = JSON.generate(@opts['params'])
 
 				ch.headers['Content-Type'] = 'application/json'
 				ch.headers['Content-Length'] = jsonData.length
 
-				ch.http_post(jsonData)
+				ch.http_put(jsonData)
+			when 'DELETE'
+				ch.http_delete
 			end
-		when 'PUT'
-			jsonData = JSON.generate(@opts['params'])
 
-			ch.headers['Content-Type'] = 'application/json'
-			ch.headers['Content-Length'] = jsonData.length
+			curlData	= ch.body_str
+			curlStatus	= ch.status.to_i()
+
+			ch.close
+			ch = nil
 
-			ch.http_put(jsonData)
-		when 'DELETE'
-			ch.http_delete
+			{
+				'data' => curlData,
+				'status' => curlStatus
+			}
 		end
 
-		curlData	= ch.body_str
-		curlStatus	= ch.status.to_i()
+		#
+		# Does cURL data interpretation
+		#
+		# Exceptions:
+		#	SDKErrorResponseException   if the remote response is an error.
+		#		A server response is interpreted as an error if obtained status code differs from expected status code.
+		#		Expected status codes are `200 OK` for GET/POST/PUT, `204 No Content` for DELETE.
+		#	SDKBadJSONResponseException if the remote response contains erronated or invalid JSON contents
+		#
+		# Returns:
+		#	Hash    -- In case of successful request, a JSON decoded object is returned.
+		#	Boolean -- If a DELETE request is issued, returns true if call is successful (exception otherwise).
+		#
+		def exec
+			if @origin.debugReturn && @origin.debugReturn.has_key?('data') && @origin.debugReturn.has_key?('status')
+
+				curlData = @origin.debugReturn['data']
+				curlStatus = @origin.debugReturn['status']
 
-		ch.close
-		ch = nil
+			else
 
-		{
-			'data' => curlData,
-			'status' => curlStatus
-		}
-	end
+				callReturn = call
+				curlData = callReturn['data']
+				curlStatus = callReturn['status']
 
-	#
-	# Does cURL data interpretation
-	#
-	# Exceptions:
-	#	SDKErrorResponseException   if the remote response is an error.
-	#		A server response is interpreted as an error if obtained status code differs from expected status code.
-	#		Expected status codes are `200 OK` for GET/POST/PUT, `204 No Content` for DELETE.
-	#	SDKBadJSONResponseException if the remote response contains erronated or invalid JSON contents
-	#
-	# Returns:
-	#	Hash    -- In case of successful request, a JSON decoded object is returned.
-	#	Boolean -- If a DELETE request is issued, returns true if call is successful (exception otherwise).
-	#
-	def exec
-		if @origin.debugReturn && @origin.debugReturn.has_key?('data') && @origin.debugReturn.has_key?('status')
-
-			curlData = @origin.debugReturn['data']
-			curlStatus = @origin.debugReturn['status']
-
-		else
-
-			callReturn = call
-			curlData = callReturn['data']
-			curlStatus = callReturn['status']
+			end
 
-		end
+			if @method == 'DELETE'
+				expectedHTTPStatus = 204
+			else
+				expectedHTTPStatus = 200
+			end
 
-		if @method == 'DELETE'
-			expectedHTTPStatus = 204
-		else
-			expectedHTTPStatus = 200
-		end
+			if curlStatus != expectedHTTPStatus
+				raise SDKErrorResponseException, curlStatus.to_s() + ' - ' + curlData
+			end
 
-		if curlStatus != expectedHTTPStatus
-			raise SDKErrorResponseException, curlStatus.to_s() + ' - ' + curlData
-		end
+			if @method == 'DELETE'				# if DELETE request, expect no output
+				return true
+			end
 
-		if @method == 'DELETE'				# if DELETE request, expect no output
-			return true
-		end
+			begin
+				jsonData = JSON.parse(curlData)	# normally, expect JSON qualified output
+			rescue JSON::ParserError
+				raise SDKBadJSONResponseException, curlData
+			end
 
-		begin
-			jsonData = JSON.parse(curlData)	# normally, expect JSON qualified output
-		rescue JSON::ParserError
-			raise SDKBadJSONResponseException, curlData
-		end
+			if jsonData.length.zero?
+				raise SDKUnexpectedResponseException, 'Empty object received'
+			end
 
-		if jsonData.length.zero?
-			raise SDKUnexpectedResponseException, 'Empty object received'
-		end
+			return jsonData
 
-		return jsonData
+		end
 
 	end
-
-end
+end

data/lib/BaseClass/Entity.rb

@@ -1,33 +1,34 @@
 #
 # Represents a single Entity. All remote responses are decoded and parsed into one or more Entities.
 #
+module LeanTesting
+	class Entity
+		attr_accessor :data
 
-class Entity
-	attr_accessor :data
+		@origin	= nil # Reference to originating Client instance
+		@data	= nil # Internal entity object data
 
-	@origin	= nil # Reference to originating Client instance
-	@data	= nil # Internal entity object data
+		#
+		# Constructs an Entity instance
+		#
+		# Arguments:
+		#	origin Client -- Original client instance reference
+		#	data   Hash       -- Data to be contained in the new Entity. Must be non-empty.
+		#
+		# Exceptions:
+		#	SDKInvalidArgException if provided data param is not a hash.
+		#	SDKInvalidArgException if provided data param is empty. Entities cannot be empty.
+		#
+		def initialize(origin, data)
+			if !data.is_a? Hash
+				raise SDKInvalidArgException, '`data` must be a hash'
+			elsif data.length.zero?
+				raise SDKInvalidArgException, '`data` must be non-empty'
+			end
 
-	#
-	# Constructs an Entity instance
-	#
-	# Arguments:
-	#	origin Client -- Original client instance reference
-	#	data   Hash       -- Data to be contained in the new Entity. Must be non-empty.
-	#
-	# Exceptions:
-	#	SDKInvalidArgException if provided data param is not a hash.
-	#	SDKInvalidArgException if provided data param is empty. Entities cannot be empty.
-	#
-	def initialize(origin, data)
-		if !data.is_a? Hash
-			raise SDKInvalidArgException, '`data` must be a hash'
-		elsif data.length.zero?
-			raise SDKInvalidArgException, '`data` must be non-empty'
+			@origin	= origin
+			@data	= data
 		end
 
-		@origin	= origin
-		@data	= data
 	end
-
-end
+end

data/lib/BaseClass/EntityHandler.rb

@@ -8,176 +8,178 @@
 #	delete(id)          <=>  `Delete an Entity`
 #	update(id, fields)  <=>  `Update an Entity`
 #
-class EntityHandler
-
-	#
-	# Constructs an EntityHandler instance
-	#
-	# Keyword arguments:
-	#	origin Client -- Originating client reference
-	#
-	def initialize(origin)
-		@origin = origin # Reference to originating Client instance
-	end
-
-	#
-	# Function definition for creating a new entity. Base function checks for invalid parameters.
-	#
-	# Keyword arguments:
-	#	fields Hash -- Non-empty hash consisting of entity data to send for adding
-	#
-	# Exceptions:
-	#	SDKInvalidArgException if provided fields param is not a hash.
-	#	SDKInvalidArgException if provided fields param is empty.
-	#
-	def create(fields)
-		if !fields.is_a? Hash
-			raise SDKInvalidArgException, '`fields` must be a hash'
-		elsif fields.length.zero?
-			raise SDKInvalidArgException, '`fields` must be non-empty'
+module LeanTesting
+	class EntityHandler
+
+		#
+		# Constructs an EntityHandler instance
+		#
+		# Keyword arguments:
+		#	origin Client -- Originating client reference
+		#
+		def initialize(origin)
+			@origin = origin # Reference to originating Client instance
 		end
-	end
 
-	#
-	# Function definition for listing all entities. Base function checks for invalid parameters.
-	#
-	# Keyword arguments:
-	#	filters Hash -- (optional) Filters to apply to restrict listing. Currently supported: limit, page
-	#
-	# Exceptions:
-	#	SDKInvalidArgException if provided filters param is not a hash.
-	#	SDKInvalidArgException if invalid filter value found in filters hash.
-	#
-	def all(filters = nil)
-		if !filters
-			filters = {}
+		#
+		# Function definition for creating a new entity. Base function checks for invalid parameters.
+		#
+		# Keyword arguments:
+		#	fields Hash -- Non-empty hash consisting of entity data to send for adding
+		#
+		# Exceptions:
+		#	SDKInvalidArgException if provided fields param is not a hash.
+		#	SDKInvalidArgException if provided fields param is empty.
+		#
+		def create(fields)
+			if !fields.is_a? Hash
+				raise SDKInvalidArgException, '`fields` must be a hash'
+			elsif fields.length.zero?
+				raise SDKInvalidArgException, '`fields` must be non-empty'
+			end
 		end
 
-		if !filters.is_a? Hash
-			raise SDKInvalidArgException, '`filters` must be a hash'
-		else
-			filters.each do |k,|
-				if !['include', 'limit', 'page'].include? k
-					raise SDKInvalidArgException, 'unsupported ' + k + ' for `filters`'
+		#
+		# Function definition for listing all entities. Base function checks for invalid parameters.
+		#
+		# Keyword arguments:
+		#	filters Hash -- (optional) Filters to apply to restrict listing. Currently supported: limit, page
+		#
+		# Exceptions:
+		#	SDKInvalidArgException if provided filters param is not a hash.
+		#	SDKInvalidArgException if invalid filter value found in filters hash.
+		#
+		def all(filters = nil)
+			if !filters
+				filters = {}
+			end
+
+			if !filters.is_a? Hash
+				raise SDKInvalidArgException, '`filters` must be a hash'
+			else
+				filters.each do |k,|
+					if !['include', 'limit', 'page'].include? k
+						raise SDKInvalidArgException, 'unsupported ' + k + ' for `filters`'
+					end
 				end
 			end
-		end
 
-	end
+		end
 
-	#
-	# Function definition for retrieving an existing entity. Base function checks for invalid parameters.
-	#
-	# Keyword arguments:
-	#	id Fixnum -- ID field to look for in the entity collection
-	#
-	# Exceptions:
-	#	SDKInvalidArgException if provided id param is not an integer.
-	#
-	def find(id)
-		if !id.is_a? Fixnum
-			raise SDKInvalidArgException, '`id` must be of type Fixnum'
+		#
+		# Function definition for retrieving an existing entity. Base function checks for invalid parameters.
+		#
+		# Keyword arguments:
+		#	id Fixnum -- ID field to look for in the entity collection
+		#
+		# Exceptions:
+		#	SDKInvalidArgException if provided id param is not an integer.
+		#
+		def find(id)
+			if !id.is_a? Fixnum
+				raise SDKInvalidArgException, '`id` must be of type Fixnum'
+			end
 		end
-	end
 
-	#
-	# Function definition for deleting an existing entity. Base function checks for invalid parameters.
-	#
-	# Keyword arguments:
-	#	id Fixnum -- ID field of entity to delete in the entity collection
-	#
-	# Exceptions:
-	#	SDKInvalidArgException if provided id param is not an integer.
-	#
-	def delete(id)
-		if !id.is_a? Fixnum
-			raise SDKInvalidArgException, '`id` must be of type Fixnum'
+		#
+		# Function definition for deleting an existing entity. Base function checks for invalid parameters.
+		#
+		# Keyword arguments:
+		#	id Fixnum -- ID field of entity to delete in the entity collection
+		#
+		# Exceptions:
+		#	SDKInvalidArgException if provided id param is not an integer.
+		#
+		def delete(id)
+			if !id.is_a? Fixnum
+				raise SDKInvalidArgException, '`id` must be of type Fixnum'
+			end
 		end
-	end
 
-	#
-	# Function definition for updating an existing entity. Base function checks for invalid parameters.
-	#
-	# Keyword arguments:
-	#	id     Fixnum -- ID field of entity to update in the entity collection
-	#	fields Hash   -- Non-empty dictionary consisting of entity data to send for update
-	#
-	# Exceptions:
-	#	SDKInvalidArgException if provided id param is not an integer.
-	#	SDKInvalidArgException if provided fields param is not a hash.
-	#	SDKInvalidArgException if provided fields param is empty.
-	#
-	def update(id, fields)
-		if !id.is_a? Fixnum
-			raise SDKInvalidArgException, '`id` must be of type Fixnum'
-		elsif !fields.is_a? Hash
-			raise SDKInvalidArgException, '`fields` must be a hash'
-		elsif fields.length.zero?
-			raise SDKInvalidArgException, '`fields` must be non-empty'
+		#
+		# Function definition for updating an existing entity. Base function checks for invalid parameters.
+		#
+		# Keyword arguments:
+		#	id     Fixnum -- ID field of entity to update in the entity collection
+		#	fields Hash   -- Non-empty dictionary consisting of entity data to send for update
+		#
+		# Exceptions:
+		#	SDKInvalidArgException if provided id param is not an integer.
+		#	SDKInvalidArgException if provided fields param is not a hash.
+		#	SDKInvalidArgException if provided fields param is empty.
+		#
+		def update(id, fields)
+			if !id.is_a? Fixnum
+				raise SDKInvalidArgException, '`id` must be of type Fixnum'
+			elsif !fields.is_a? Hash
+				raise SDKInvalidArgException, '`fields` must be a hash'
+			elsif fields.length.zero?
+				raise SDKInvalidArgException, '`fields` must be non-empty'
+			end
 		end
-	end
 
-	private
-
-	#
-	# Helper function that enforces a structure based on a supported table:
-	#	- Forces use of REQUIRED fields
-	#	- Detects duplicate fields
-	#	- Detects unsupported fields
-	#
-	# Keyword arguments:
-	#	obj      Hash -- Hash to be enforced
-	#	supports Hash -- Support table consisting of REQUIRED and OPTIONAL keys to be used in enforcing
-	#
-	# Exceptions:
-	#	SDKUnsupportedRequestException if unsupported fields are found
-	#	SDKIncompleteRequestException  if any required field is missing
-	#	SDKDuplicateRequestException   if any duplicate field is found
-	#
-	def enforce(obj, supports)
-		sall = []				# All supported keys
-		sreq = []				# Mandatory supported keys
-
-		socc = supports.clone	# Key use occurances
-
-		unsup = []				# Unsupported key list
-		dupl  = []				# Duplicate key list
-		mreq  = []				# Missing required keys
-
-		supports.each do |sk, sv|
-			if sv == true
-				sreq.push(sk)
+		private
+
+		#
+		# Helper function that enforces a structure based on a supported table:
+		#	- Forces use of REQUIRED fields
+		#	- Detects duplicate fields
+		#	- Detects unsupported fields
+		#
+		# Keyword arguments:
+		#	obj      Hash -- Hash to be enforced
+		#	supports Hash -- Support table consisting of REQUIRED and OPTIONAL keys to be used in enforcing
+		#
+		# Exceptions:
+		#	SDKUnsupportedRequestException if unsupported fields are found
+		#	SDKIncompleteRequestException  if any required field is missing
+		#	SDKDuplicateRequestException   if any duplicate field is found
+		#
+		def enforce(obj, supports)
+			sall = []				# All supported keys
+			sreq = []				# Mandatory supported keys
+
+			socc = supports.clone	# Key use occurances
+
+			unsup = []				# Unsupported key list
+			dupl  = []				# Duplicate key list
+			mreq  = []				# Missing required keys
+
+			supports.each do |sk, sv|
+				if sv == true
+					sreq.push(sk)
+				end
+
+				sall.push(sk)
+				socc[sk] = 0
 			end
 
-			sall.push(sk)
-			socc[sk] = 0
-		end
+			obj.each do |k,|
+				if sall.include? k
+					socc[k] += 1
+				else
+					unsup.push(k)
+				end
+			end
 
-		obj.each do |k,|
-			if sall.include? k
-				socc[k] += 1
-			else
-				unsup.push(k)
+			socc.each do |ok, ov|
+				if ov > 1
+					dupl.push(ok)
+				elsif ov == 0 && sreq.include?(ok)
+					mreq.push(ok)
+				end
 			end
-		end
 
-		socc.each do |ok, ov|
-			if ov > 1
-				dupl.push(ok)
-			elsif ov == 0 && sreq.include?(ok)
-				mreq.push(ok)
+			if unsup.length.nonzero?
+				raise SDKUnsupportedRequestException, unsup
+			elsif mreq.length.nonzero?
+				raise SDKIncompleteRequestException, mreq
+			elsif dupl.length.nonzero?
+				raise SDKDuplicateRequestException, dupl
 			end
-		end
 
-		if unsup.length.nonzero?
-			raise SDKUnsupportedRequestException, unsup
-		elsif mreq.length.nonzero?
-			raise SDKIncompleteRequestException, mreq
-		elsif dupl.length.nonzero?
-			raise SDKDuplicateRequestException, dupl
+			true
 		end
 
-		true
 	end
-
-end
+end