osc_ruby 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6f94c0e39eee367ce2ed2811ae2591a3ebe91bf
-  data.tar.gz: 3d3d0246225077d1a2089844a407d3f31dae51df
+  metadata.gz: f3699de5d5f0bfd43b0fa37ee16e2bbe47fed6ff
+  data.tar.gz: 31b35ce287cc0d343afb32e399b052fa9becff64
 SHA512:
-  metadata.gz: 8a7e3f17d1c8674716e8a3f8a7962d4c9d894a77da731b1b2d4765ac0682bb4ba56555e853be0fa04fcd885cdaa5754acad86b771e380bb1b4f2faadebe3d161
-  data.tar.gz: ba527034f663c100a58c42d0b97c79479ef3a9f5984c35e03ae87a3aafc574e0cb50f2f76e1789537bb23b943abf2a69b3769a9bb825a1d648b1d080709f94d0
+  metadata.gz: 3027967797e07efaecc469545382d6b521170d51ce5c5eb4bb43f1c8a046d0d3f42c32ee241b59485f36d53015eae58fa40ece9d62124d3d971c09b9416ea475
+  data.tar.gz: 760a5ce18c2dc9bcebe61b5fa31b8d4145228704d1bab14628dcea3e0bfb7abd89d805ca2160a49fdc67c94d436506809323c347de556ed1d0104993d5f21bcb

data/.travis.yml

@@ -1,6 +1,7 @@
 language: ruby
 rvm:
 - 2.2.0
+- jruby
 addons:
   code_climate:
     repo_token:

data/README.md

@@ -12,7 +12,7 @@ This gem was tested against Oracle Service Cloud November 2016 using Ruby versio
 
 The create, update, and destroy methods should work on any version of Oracle Service Cloud since version May 2015; however, there maybe some issues with querying items on any version before November 2016. This is because I am using the ROQL queries to generate values for Common Objects
 
-Currently supporting the following objects:
+Currently supporting the following objects from the REST API:
 
 	ServiceProduct
 
@@ -20,6 +20,8 @@ Currently supporting the following objects:
 
 	Answer
 
+	QueryResults (does not support CRUD)
+
 At this time, subclasses such as ServiceProduct.CategoryLinks are not currently supported. 
 
 I am trying to build a few more classes and have a pretty solid testing suite and codebase before implementing this functionality.

data/lib/ext/string.rb

@@ -2,4 +2,18 @@ class String
     def is_i?
        /\A[-+]?\d+\z/ === self
     end
+
+	def camel_case_lower
+		@class_to_array = self.split('')
+		@class_name_length = @class_to_array.length - 1
+		@output = @class_to_array.each_with_index do |letter,i|
+			if i ==0
+				letter.downcase!
+			elsif i == @class_name_length
+				letter.gsub!(/y/,'ie')
+			end
+		end.join
+
+		@output + 's'
+	end
 end

data/lib/osc_ruby.rb

@@ -2,6 +2,9 @@ module OSCRuby; end
 
 require 'osc_ruby/client'
 require 'osc_ruby/connect'
+require 'osc_ruby/service_class'
+require 'osc_ruby/product_category_shared'
 require 'osc_ruby/service_product'
 require 'osc_ruby/service_category'
-require 'osc_ruby/answer'
+require 'osc_ruby/answer'
+require 'osc_ruby/query_results'

data/lib/osc_ruby/answer.rb

@@ -1,20 +1,9 @@
-require 'osc_ruby/client'
-require 'osc_ruby/query_module'
-require 'osc_ruby/validations_module'
-require 'osc_ruby/class_factory_module'
-require 'json'
-require 'uri'
-
 module OSCRuby
 	
-	class Answer
-
-		include QueryModule
-		include ValidationsModule
-		include ClassFactoryModule
+	class Answer < ServiceClass
 		
 		attr_accessor :answerType, :language, :summary, :id, :lookupName, :createdTime, :updatedTime, :accessLevels, :name, :adminLastAccessTime, :expiresDate, :guidedAssistance, :keywords, :lastAccessTime, :lastNotificationTime, :nextNotificationTime, :originalReferenceNumber, :positionInList,
-			:publishOnDate, :question, :solution, :updatedByAccount, :uRL
+			:publishOnDate, :question, :solution, :updatedByAccount, :uRL, :categories
 
 	    def initialize(attributes = nil)
 
@@ -24,6 +13,7 @@ module OSCRuby
    				@summary = "Answer summary text"
    				@language = {}
    				@question = nil
+   				@categories = []
 
 			else
 
@@ -55,53 +45,6 @@ module OSCRuby
 
 	    end
 
-	    def create(client,return_json = false)
-
-			ClassFactoryModule.create(client,self,"/answers",return_json)
-
-	    end
-
-
-	    def self.find(client,id = nil,return_json = false)
-
-	    	ClassFactoryModule.find(client,id,'answers',return_json,OSCRuby::Answer)
-
-	    end
-
-
-	    def self.all(client, return_json = false)
-
-	    	ClassFactoryModule.all(client,'answers',return_json,OSCRuby::Answer)
-
-	    end
-
-	    def self.where(client, query = '', return_json = false)
-
-	    	ClassFactoryModule.where(client,query,'answers',return_json,OSCRuby::Answer)
-
-	    end
-
-	    def update(client, return_json = false)
-
-	    	ClassFactoryModule::update(client,self,"answers",return_json)
-
-	    end
-
-	    def destroy(client, return_json = false)
-
-	    	ClassFactoryModule.destroy(client,self,'answers',return_json)
-
-	    end
-
-
-
-
-
-
-
-
-
-
 
 	    # Convenience Methods for making the CRUD operations nicer to use
 

data/lib/osc_ruby/class_factory_module.rb

@@ -82,7 +82,7 @@ module OSCRuby
 
 				ValidationsModule::check_client(client)
 
-				ValidationsModule::check_query(query)
+				ValidationsModule::check_query(query,'where')
 
 				@query = URI.escape("queryResults/?query=select * from #{object_in_query} where #{query}")
 

data/lib/osc_ruby/product_category_shared.rb

@@ -0,0 +1,118 @@
+module OSCRuby
+	
+	class ProductCategoryShared < ServiceClass
+
+		attr_accessor :names,:parent,:displayOrder,:adminVisibleInterfaces,:endUserVisibleInterfaces,:id,:lookupName,:createdTime,:updatedTime,:name
+
+	    def initialize(attributes = nil)
+
+    		@names = []
+			@adminVisibleInterfaces = []
+			@endUserVisibleInterfaces = []
+
+			if attributes.nil?
+
+				@parent = {}
+				@displayOrder = 1
+
+			else
+
+				@id = attributes["id"]
+				@lookupName = attributes["lookupName"]
+				@createdTime = attributes["createdTime"]
+				@updatedTime = attributes["updatedTime"]
+				@displayOrder = attributes["displayOrder"]
+				@name = attributes["name"]
+				@parent = attributes["parent"]
+
+			end
+
+	    end
+
+	    # Convenience Methods for making the CRUD operations nicer to use
+
+		def set_attributes(response_body)
+
+			self.id = response_body["id"]
+
+    		self.name = response_body["lookupName"]
+
+    		self.lookupName = response_body["lookupName"]
+
+			self.displayOrder = response_body["displayOrder"]
+
+			if !response_body["parent"].nil?
+
+				self.parent = response_body["parent"]["links"][0]["href"].split('/').pop.to_i
+
+			else
+
+				self.parent = nil
+
+			end
+
+		end
+
+		def update_attributes(updated_product)
+
+			self.lookupName = updated_product.lookupName
+
+			self.createdTime = updated_product.createdTime
+
+			self.updatedTime = updated_product.updatedTime
+
+			self.name = updated_product.name
+
+			self.parent = updated_product.parent
+
+		end
+
+		def self.check_self(obj,is_update = false)
+
+			class_name = self.to_s.split('::')[1]
+
+			obj_attrs = ValidationsModule::extract_attributes(obj)
+
+			obj_attrs = ValidationsModule::check_interfaces(obj_attrs)
+
+			if is_update == true
+			
+				obj_attrs = remove_unused_new_attrs(obj_attrs)
+			
+			else
+
+				obj_attrs = ValidationsModule::check_for_names(obj_attrs,class_name)
+
+				obj_attrs = ValidationsModule::check_for_parents(obj_attrs)
+				
+			end
+
+			obj_attrs
+
+		end
+
+		def self.remove_unused_new_attrs(obj_attrs)
+
+			obj_attrs[0].delete('id')
+			
+			obj_attrs[0].delete('lookupName')
+			
+			obj_attrs[0].delete('createdTime')
+			
+			obj_attrs[0].delete('updatedTime')
+			
+			obj_attrs[0].delete('name')
+			
+			if !obj_attrs[0]['parent'].nil?
+			
+				obj_attrs[0].delete('parent')
+			
+			end
+
+			obj_attrs
+
+		end
+
+	end
+
+end

data/lib/osc_ruby/query_results.rb

@@ -0,0 +1,35 @@
+require 'osc_ruby/connect'
+require 'osc_ruby/validations_module'
+require 'json'
+
+module OSCRuby
+
+	class QueryResults
+
+		include QueryModule
+		include ValidationsModule
+
+		def initialize; end
+
+		def select(client,query)
+
+			ValidationsModule::check_client(client)
+
+			ValidationsModule::check_query(query,"select")
+
+			@query = URI.escape("queryResults/?query=#{query}")
+
+	    	response = QueryModule::find(client,@query)
+
+	    	json_response = JSON.parse(response) 
+
+	    	puts "Results for '#{query}'"
+	    	puts
+	    	puts json_response
+	    	puts
+	 
+		end
+	
+	end
+
+end

data/lib/osc_ruby/service_category.rb

@@ -1,214 +1,6 @@
-require 'osc_ruby/client'
-require 'osc_ruby/query_module'
-require 'osc_ruby/validations_module'
-require 'osc_ruby/class_factory_module'
-require 'json'
-require 'uri'
-
 module OSCRuby
-	
-	class ServiceCategory
-
-		include QueryModule
-		include ValidationsModule
-		include ClassFactoryModule
-		
-		attr_accessor :names,:parent,:displayOrder,:adminVisibleInterfaces,:endUserVisibleInterfaces,:id,:lookupName,:createdTime,:updatedTime,:name
-
-	    def initialize(attributes = nil)
-
-    		@names = []
-			@adminVisibleInterfaces = []
-			@endUserVisibleInterfaces = []
-
-			if attributes.nil?
-
-				@parent = {}
-				@displayOrder = 1
-
-			else
-
-				@id = attributes["id"]
-				@lookupName = attributes["lookupName"]
-				@createdTime = attributes["createdTime"]
-				@updatedTime = attributes["updatedTime"]
-				@displayOrder = attributes["displayOrder"]
-				@name = attributes["name"]
-				@parent = attributes["parent"]
-
-			end
-
-	    end
-
-	    
-	    def create(client,return_json = false)
-
-	    	ClassFactoryModule.create(client,self,"/serviceCategories",return_json)
-
-	    end
-
-	    
-	    def self.find(client,id = nil,return_json = false)
-
-	    	ClassFactoryModule.find(client,id,'serviceCategories',return_json,OSCRuby::ServiceCategory)
-
-	    end
-
-	    
-	    def self.all(client, return_json = false)
-
-	    	ClassFactoryModule.all(client,'serviceCategories',return_json,OSCRuby::ServiceCategory)
-
-	    end
-
-	    
-	    def self.where(client, query = '', return_json = false)
-
-			ClassFactoryModule.where(client,query,'serviceCategories',return_json,OSCRuby::ServiceCategory)
-
-	    end
-
-	    
-	    def update(client, return_json = false)
-
-	    	ClassFactoryModule::update(client,self,"serviceCategories",return_json)
-
-	    end
-
-
-	    def destroy(client, return_json = false)
-
-	    	ClassFactoryModule.destroy(client,self,'serviceCategories',return_json)
-
-	    end
-
-
-	    
-
-	    # Convenience Methods for making the CRUD operations nicer to use
-
-		def set_attributes(response_body)
-
-			self.id = response_body["id"]
-
-    		self.name = response_body["lookupName"]
-
-    		self.lookupName = response_body["lookupName"]
-
-			self.displayOrder = response_body["displayOrder"]
-
-			if !response_body["parent"].nil?
-
-				self.parent = response_body["parent"]["links"][0]["href"].split('/').pop.to_i
-
-			else
-
-				self.parent = nil
-
-			end
-
-		end
-
-		def update_attributes(updated_category)
-
-			self.lookupName = updated_category.lookupName
-
-			self.createdTime = updated_category.createdTime
-
-			self.updatedTime = updated_category.updatedTime
-
-			self.name = updated_category.name
-
-			self.parent = updated_category.parent
-
-		end
-
-		def self.check_self(obj,is_update = false)
-
-			obj_attrs = ValidationsModule::extract_attributes(obj)
-
-			obj_attrs = check_interfaces(obj_attrs)
-
-			if is_update == true
-			
-				obj_attrs = remove_unused_new_attrs(obj_attrs)
-			
-			else
-
-				obj_attrs = check_for_names(obj_attrs)
-
-				obj_attrs = check_for_parents(obj_attrs)
-				
-			end
-
-			obj_attrs
-
-		end
-
-		def self.check_for_names(obj_attrs)
-
-			if obj_attrs[0]['names'].count == 0 || obj_attrs[0]['names'][0]['labelText'].nil? || obj_attrs[0]['names'][0]['language'].nil?
-				
-				raise ArgumentError, 'ServiceCategory should at least have one name set (new_service_category.names[0] = {"labelText" => "QTH45-test", "language" => {"id" => 1}} )'
-			
-			end
-
-			obj_attrs
-
-		end
-
-		def self.check_for_parents(obj_attrs)
-
-			if !obj_attrs[0]['parent'].nil? && obj_attrs[0]['parent'].is_a?(Hash) && !obj_attrs[0]['parent'].key?('id') && !obj_attrs[0]['parent'].key?('lookupName')
-			
-				obj_attrs[0].delete('parent')
-			
-			end
-
-			obj_attrs
-
-		end
-
-		def self.remove_unused_new_attrs(obj_attrs)
-
-			obj_attrs[0].delete('id')
-			
-			obj_attrs[0].delete('lookupName')
-			
-			obj_attrs[0].delete('createdTime')
-			
-			obj_attrs[0].delete('updatedTime')
-			
-			obj_attrs[0].delete('name')
-			
-			if !obj_attrs[0]['parent'].nil?
-			
-				obj_attrs[0].delete('parent')
-			
-			end
-
-			obj_attrs
-
-		end
-
-		def self.check_interfaces(empty_arr)
-
-			if empty_arr[0]['adminVisibleInterfaces'].empty?
-				
-				empty_arr[0].delete('adminVisibleInterfaces')
-			
-			end
-
-			if empty_arr[0]['endUserVisibleInterfaces'].empty?
-				
-				empty_arr[0].delete('endUserVisibleInterfaces')
-			
-			end
-
-			empty_arr
-
-		end
 
+	class ServiceCategory < ProductCategoryShared
 	end
-
+	
 end

data/lib/osc_ruby/service_class.rb

@@ -0,0 +1,66 @@
+require 'osc_ruby/client'
+require 'osc_ruby/query_module'
+require 'osc_ruby/validations_module'
+require 'osc_ruby/class_factory_module'
+require 'json'
+require 'uri'
+require_relative '../ext/string'
+
+module OSCRuby
+	
+	class ServiceClass
+
+		include QueryModule
+		include ValidationsModule
+		include ClassFactoryModule
+
+	    def self.url
+
+	    	self.to_s.split('::')[1].camel_case_lower
+
+	    end
+	    
+	    def create(client,return_json = false)
+
+	    	ClassFactoryModule.create(client,self,self.class.url,return_json)
+
+	    end
+
+	    
+	    def self.find(client,id = nil,return_json = false)
+
+	    	ClassFactoryModule.find(client,id,url,return_json,self)
+
+	    end
+
+	    
+	    def self.all(client, return_json = false)
+
+	    	ClassFactoryModule.all(client,url,return_json,self)
+
+	    end
+
+	    
+	    def self.where(client, query = '', return_json = false)
+
+			ClassFactoryModule.where(client,query,url,return_json,self)
+
+	    end
+
+    
+	    def update(client, return_json = false)
+
+	    	ClassFactoryModule::update(client,self,self.class.url,return_json)
+
+	    end
+
+
+	    def destroy(client, return_json = false)
+
+	    	ClassFactoryModule.destroy(client,self,self.class.url,return_json)
+
+	    end
+
+	end
+
+end

data/lib/osc_ruby/service_product.rb

@@ -1,214 +1,6 @@
-require 'osc_ruby/client'
-require 'osc_ruby/query_module'
-require 'osc_ruby/validations_module'
-require 'osc_ruby/class_factory_module'
-require 'json'
-require 'uri'
-
 module OSCRuby
-	
-	class ServiceProduct
-
-		include QueryModule
-		include ValidationsModule
-		include ClassFactoryModule
-		
-		attr_accessor :names,:parent,:displayOrder,:adminVisibleInterfaces,:endUserVisibleInterfaces,:id,:lookupName,:createdTime,:updatedTime,:name
-
-	    def initialize(attributes = nil)
-
-    		@names = []
-			@adminVisibleInterfaces = []
-			@endUserVisibleInterfaces = []
-
-			if attributes.nil?
-
-				@parent = {}
-				@displayOrder = 1
-
-			else
-
-				@id = attributes["id"]
-				@lookupName = attributes["lookupName"]
-				@createdTime = attributes["createdTime"]
-				@updatedTime = attributes["updatedTime"]
-				@displayOrder = attributes["displayOrder"]
-				@name = attributes["name"]
-				@parent = attributes["parent"]
-
-			end
-
-	    end
-
-	    
-	    def create(client,return_json = false)
-
-	    	ClassFactoryModule.create(client,self,"/serviceProducts",return_json)
-
-	    end
-
-	    
-	    def self.find(client,id = nil,return_json = false)
-
-	    	ClassFactoryModule.find(client,id,'serviceproducts',return_json,OSCRuby::ServiceProduct)
-
-	    end
-
-	    
-	    def self.all(client, return_json = false)
-
-	    	ClassFactoryModule.all(client,'serviceproducts',return_json,OSCRuby::ServiceProduct)
-
-	    end
-
-	    
-	    def self.where(client, query = '', return_json = false)
-
-			ClassFactoryModule.where(client,query,'serviceproducts',return_json,OSCRuby::ServiceProduct)
-
-	    end
-
-	    
-	    def update(client, return_json = false)
-
-	    	ClassFactoryModule::update(client,self,"serviceProducts",return_json)
-
-	    end
-
-
-	    def destroy(client, return_json = false)
-
-	    	ClassFactoryModule.destroy(client,self,'serviceProducts',return_json)
-
-	    end
-
-
-	    
-
-	    # Convenience Methods for making the CRUD operations nicer to use
-
-		def set_attributes(response_body)
-
-			self.id = response_body["id"]
-
-    		self.name = response_body["lookupName"]
-
-    		self.lookupName = response_body["lookupName"]
-
-			self.displayOrder = response_body["displayOrder"]
-
-			if !response_body["parent"].nil?
-
-				self.parent = response_body["parent"]["links"][0]["href"].split('/').pop.to_i
-
-			else
-
-				self.parent = nil
-
-			end
-
-		end
-
-		def update_attributes(updated_product)
-
-			self.lookupName = updated_product.lookupName
-
-			self.createdTime = updated_product.createdTime
-
-			self.updatedTime = updated_product.updatedTime
-
-			self.name = updated_product.name
-
-			self.parent = updated_product.parent
-
-		end
-
-		def self.check_self(obj,is_update = false)
-
-			obj_attrs = ValidationsModule::extract_attributes(obj)
-
-			obj_attrs = check_interfaces(obj_attrs)
-
-			if is_update == true
-			
-				obj_attrs = remove_unused_new_attrs(obj_attrs)
-			
-			else
-
-				obj_attrs = check_for_names(obj_attrs)
-
-				obj_attrs = check_for_parents(obj_attrs)
-				
-			end
-
-			obj_attrs
-
-		end
-
-		def self.check_for_names(obj_attrs)
-
-			if obj_attrs[0]['names'].count == 0 || obj_attrs[0]['names'][0]['labelText'].nil? || obj_attrs[0]['names'][0]['language'].nil?
-				
-				raise ArgumentError, 'ServiceProduct should at least have one name set (new_service_product.names[0] = {"labelText" => "QTH45-test", "language" => {"id" => 1}} )'
-			
-			end
-
-			obj_attrs
-
-		end
-
-		def self.check_for_parents(obj_attrs)
-
-			if !obj_attrs[0]['parent'].nil? && obj_attrs[0]['parent'].is_a?(Hash) && !obj_attrs[0]['parent'].key?('id') && !obj_attrs[0]['parent'].key?('lookupName')
-			
-				obj_attrs[0].delete('parent')
-			
-			end
-
-			obj_attrs
-
-		end
-
-		def self.remove_unused_new_attrs(obj_attrs)
-
-			obj_attrs[0].delete('id')
-			
-			obj_attrs[0].delete('lookupName')
-			
-			obj_attrs[0].delete('createdTime')
-			
-			obj_attrs[0].delete('updatedTime')
-			
-			obj_attrs[0].delete('name')
-			
-			if !obj_attrs[0]['parent'].nil?
-			
-				obj_attrs[0].delete('parent')
-			
-			end
-
-			obj_attrs
-
-		end
-
-		def self.check_interfaces(empty_arr)
-
-			if empty_arr[0]['adminVisibleInterfaces'].empty?
-				
-				empty_arr[0].delete('adminVisibleInterfaces')
-			
-			end
-
-			if empty_arr[0]['endUserVisibleInterfaces'].empty?
-				
-				empty_arr[0].delete('endUserVisibleInterfaces')
-			
-			end
-
-			empty_arr
-
-		end
 
+	class ServiceProduct < ProductCategoryShared	
 	end
 
 end

data/lib/osc_ruby/validations_module.rb

@@ -61,11 +61,21 @@ module OSCRuby
 
 			end
 
-		    def check_query(query)
+		    def check_query(query,method_name = "where")
 
 				if query.empty?
 					
-					raise ArgumentError, 'A query must be specified when using the "where" method'
+					raise ArgumentError, "A query must be specified when using the '#{method_name}' method"
+
+				end
+
+		    end
+
+		    def check_attributes_request(attributes_request,class_name)
+
+				if attributes_request.empty?
+					
+					raise ArgumentError, "The attributes you are requesting for the #{class_name} object must be specified when using the 'select' method"
 
 				end
 
@@ -87,6 +97,48 @@ module OSCRuby
 
 			end
 
+			def check_for_names(obj_attrs,class_name)
+
+				if obj_attrs[0]['names'].count == 0 || obj_attrs[0]['names'][0]['labelText'].nil? || obj_attrs[0]['names'][0]['language'].nil?
+					
+					raise ArgumentError, "#{class_name} should at least have one name set"
+				
+				end
+
+				obj_attrs
+
+			end
+
+			def check_for_parents(obj_attrs)
+
+				if !obj_attrs[0]['parent'].nil? && obj_attrs[0]['parent'].is_a?(Hash) && !obj_attrs[0]['parent'].key?('id') && !obj_attrs[0]['parent'].key?('lookupName')
+				
+					obj_attrs[0].delete('parent')
+				
+				end
+
+				obj_attrs
+
+			end
+
+			def check_interfaces(empty_arr)
+
+				if empty_arr[0]['adminVisibleInterfaces'].empty?
+					
+					empty_arr[0].delete('adminVisibleInterfaces')
+				
+				end
+
+				if empty_arr[0]['endUserVisibleInterfaces'].empty?
+					
+					empty_arr[0].delete('endUserVisibleInterfaces')
+				
+				end
+
+				empty_arr
+
+			end
+
 		end
 
 	end

data/lib/osc_ruby/version.rb

@@ -1,3 +1,3 @@
 module OSCRuby
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

data/spec/core/answer_spec.rb

@@ -182,6 +182,25 @@ describe OSCRuby::Answer do
 
 		end
 
+		it 'should expect the categories to be an array' do
+
+			expect(new_answer.categories).to be_an(Array)
+
+		end
+
+		it 'should expect that a hash with an id key for categories should create an answer without issue', :vcr do
+
+			new_answer.language['id'] = 1
+			new_answer.answerType['lookupName'] = "HTML"
+
+			new_answer.categories[0] = {'id' => 6}
+
+			new_answer.create(client)
+
+			expect(new_answer).to be_a(OSCRuby::Answer)
+
+		end
+
 		it 'should return an instance of an OSCRuby::Answer if the json_response param is set to false (which it is by default)', :vcr do
 
 			new_answer.language['id'] = 1
@@ -337,7 +356,7 @@ describe OSCRuby::Answer do
 
 		it 'should raise an error if there is no query' do
 
-			expect{OSCRuby::Answer.where(client)}.to raise_error('A query must be specified when using the "where" method')
+			expect{OSCRuby::Answer.where(client)}.to raise_error("A query must be specified when using the 'where' method")
 
 		end
 

data/spec/core/query_results_spec.rb

@@ -0,0 +1,54 @@
+require 'core/spec_helper'
+require 'json'
+require 'uri'
+
+describe OSCRuby::QueryResults do
+
+	let(:client) { 
+
+		OSCRuby::Client.new do |config|
+		
+			config.interface = ENV['OSC_TEST_SITE']
+		
+			config.username = ENV['OSC_ADMIN']
+		
+			config.password = ENV['OSC_PASSWORD']
+		
+		end
+	}
+
+	let(:query_results){
+		OSCRuby::QueryResults.new
+	}
+
+	context "#select" do
+
+		it 'should expect client is an instance of OSCRuby::Client class and raise an error if does not' do
+
+			expect(client).to be_an(OSCRuby::Client)
+
+			client = nil
+
+			expect{query_results.select(client,'describe')}.to raise_error('Client must have some configuration set; please create an instance of OSCRuby::Client with configuration settings')
+
+		end
+
+		it 'should expect a query' do
+
+			expect(client).to be_an(OSCRuby::Client)
+
+			expect{query_results.select(client,"")}.to raise_error("A query must be specified when using the 'select' method")
+
+		end
+
+		it 'should put results in array of hashes',:vcr do 
+
+			expect(query_results.select(client,"describe")).to eq(nil)
+
+			expect(query_results.select(client,"describe answers")).to eq(nil)
+
+		end
+		
+	end
+
+end	

data/spec/core/service_category_spec.rb

@@ -121,7 +121,7 @@ describe OSCRuby::ServiceCategory do
 
 		it 'should check the object and make sure that it at least has a name set' do
 
-			expect{new_service_category.create(client)}.to raise_error('ServiceCategory should at least have one name set (new_service_category.names[0] = {"labelText" => "QTH45-test", "language" => {"id" => 1}} )')
+			expect{new_service_category.create(client)}.to raise_error('ServiceCategory should at least have one name set')
 
 		end
 
@@ -129,7 +129,7 @@ describe OSCRuby::ServiceCategory do
 
 			new_service_category.names[0] = "new category name"
 
-			expect{new_service_category.create(client)}.to raise_error('ServiceCategory should at least have one name set (new_service_category.names[0] = {"labelText" => "QTH45-test", "language" => {"id" => 1}} )')
+			expect{new_service_category.create(client)}.to raise_error('ServiceCategory should at least have one name set')
 
 		end
 
@@ -137,7 +137,7 @@ describe OSCRuby::ServiceCategory do
 
 			new_service_category.names[0] = {"labelText" => "New Category"}
 
-			expect{new_service_category.create(client)}.to raise_error('ServiceCategory should at least have one name set (new_service_category.names[0] = {"labelText" => "QTH45-test", "language" => {"id" => 1}} )')
+			expect{new_service_category.create(client)}.to raise_error('ServiceCategory should at least have one name set')
 
 		end
 
@@ -287,7 +287,7 @@ describe OSCRuby::ServiceCategory do
 
 		it 'should raise an error if there is no query' do
 
-			expect{OSCRuby::ServiceCategory.where(client)}.to raise_error('A query must be specified when using the "where" method')
+			expect{OSCRuby::ServiceCategory.where(client)}.to raise_error("A query must be specified when using the 'where' method")
 
 		end
 

data/spec/core/service_product_spec.rb

@@ -121,7 +121,7 @@ describe OSCRuby::ServiceProduct do
 
 		it 'should check the object and make sure that it at least has a name set' do
 
-			expect{new_service_product.create(client)}.to raise_error('ServiceProduct should at least have one name set (new_service_product.names[0] = {"labelText" => "QTH45-test", "language" => {"id" => 1}} )')
+			expect{new_service_product.create(client)}.to raise_error('ServiceProduct should at least have one name set')
 
 		end
 
@@ -129,7 +129,7 @@ describe OSCRuby::ServiceProduct do
 
 			new_service_product.names[0] = "new product name"
 
-			expect{new_service_product.create(client)}.to raise_error('ServiceProduct should at least have one name set (new_service_product.names[0] = {"labelText" => "QTH45-test", "language" => {"id" => 1}} )')
+			expect{new_service_product.create(client)}.to raise_error('ServiceProduct should at least have one name set')
 
 		end
 
@@ -137,7 +137,7 @@ describe OSCRuby::ServiceProduct do
 
 			new_service_product.names[0] = {"labelText" => "QTH45-test"}
 
-			expect{new_service_product.create(client)}.to raise_error('ServiceProduct should at least have one name set (new_service_product.names[0] = {"labelText" => "QTH45-test", "language" => {"id" => 1}} )')
+			expect{new_service_product.create(client)}.to raise_error('ServiceProduct should at least have one name set')
 
 		end
 
@@ -285,7 +285,7 @@ describe OSCRuby::ServiceProduct do
 
 		it 'should raise an error if there is no query' do
 
-			expect{OSCRuby::ServiceProduct.where(client)}.to raise_error('A query must be specified when using the "where" method')
+			expect{OSCRuby::ServiceProduct.where(client)}.to raise_error("A query must be specified when using the 'where' method")
 
 		end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: osc_ruby
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Rajan Davis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-16 00:00:00.000000000 Z
+date: 2017-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
@@ -147,8 +147,11 @@ files:
 - lib/osc_ruby/configuration.rb
 - lib/osc_ruby/connect.rb
 - lib/osc_ruby/incident.rb
+- lib/osc_ruby/product_category_shared.rb
 - lib/osc_ruby/query_module.rb
+- lib/osc_ruby/query_results.rb
 - lib/osc_ruby/service_category.rb
+- lib/osc_ruby/service_class.rb
 - lib/osc_ruby/service_product.rb
 - lib/osc_ruby/validations_module.rb
 - lib/osc_ruby/version.rb
@@ -157,6 +160,7 @@ files:
 - spec/core/client_spec.rb
 - spec/core/configuration_spec.rb
 - spec/core/connect_spec.rb
+- spec/core/query_results_spec.rb
 - spec/core/service_category_spec.rb
 - spec/core/service_product_spec.rb
 - spec/core/spec_helper.rb
@@ -190,7 +194,7 @@ test_files:
 - spec/core/client_spec.rb
 - spec/core/configuration_spec.rb
 - spec/core/connect_spec.rb
+- spec/core/query_results_spec.rb
 - spec/core/service_category_spec.rb
 - spec/core/service_product_spec.rb
 - spec/core/spec_helper.rb
-has_rdoc: