osc_ruby 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 577cfee3d6df8ff91d8b6a066f8f0f7a053d97f4
-  data.tar.gz: 6bd02a2717606ac0d830e8500f2436b593c42865
+  metadata.gz: 9dd900e4ff39818907a2bcd69c651e70531d76f6
+  data.tar.gz: a7e53c3d031a15e5f3ffdeed169ff57057a14813
 SHA512:
-  metadata.gz: 66505f1778ad733d0c19208c3167bbad6f14092eac4e080e98f2d2cd0732ab42daea9b898d9ab75f6e3eb6e0b2167d5c2a054b8c64374567a50c79bd96fffb17
-  data.tar.gz: affc28237a55753fc882e67ecf4c3201e811dde465bcde5d07da23baa0891ceb7fac7c4b4f530513517c77834f85cddf9f1d24cb3d30f8033bc859186042200c
+  metadata.gz: a106b666faf3e699c10dcfa532dafcf8a536ab12ce678d8ea882679ee83d8df279ea466331c4d9df85f2ecc8c1ac5334b0e89ae0706f485bb81dd27bce9172e8
+  data.tar.gz: e83331741a6a0ef99eee2c870beecc48f56636dec1d6d37c3f17bc3c9e937abeb8e85a87d9c88243cba4d17c29d43ee2071b3c7e85bcfbfb2f348667eaad164a

data/README.md

@@ -225,13 +225,13 @@ product_to_delete.destroy(rn_client)
 
 - [x] Make version default to 1.3 but an option to be set in the config class
 
-- [ ] Follow with next Classes (Accounts,ServiceCategories, Answers, Incidents)
+- [x] Need to update QueryResults to split the queries
 
-- [ ] Need to update QueryResults to split the queries
+- [x] Need to update QueryResults to be able to manipulate the results
 
-- [ ] Need to update QueryResults to be able to manipulate the results
+- [ ] Figure out subclasses
 
-- [ ] Need to finish up the Account object
+- [ ] Follow with next Classes (Accounts,ServiceCategories, Incidents)
 
 - [ ] Allow for the prefer:exclude-null-properties header => update config and connect class, update tests
 

data/lib/osc_ruby/query_module.rb

@@ -59,10 +59,6 @@ module OSCRuby
 
 					final_hash = []
 
-					query_capture = URI.unescape(resource).split('=')[1]
-
-					queries = query_capture.split(';')
-
 					json_input['items'].each do |item|
 
 						item['rows'].each_with_index do |row,row_i|
@@ -75,7 +71,7 @@ module OSCRuby
 
 							final_hash.push(obj_hash)
 
-							if json_input['items'].count > 1 && (item['rows'].count-1 == row_i)
+							if json_input['items'].count > 1 && (item['rows'].count-1 <= row_i)
 
 								final_hash.push("\n")
 
@@ -103,6 +99,37 @@ module OSCRuby
 
 			end
 
+			def query_injection(query,json_response)
+
+				queries = query.split(';')
+
+				count = 0
+
+				json_response.each_with_index do |hash,i|
+					if hash == "\n" && queries.count > 1
+						json_response[i] = "Results for #{queries[count]}:"
+						count += 1
+					elsif hash == "\n"
+						json_response.delete_at(i)
+					elsif json_response.last == "\n" 
+						json_response.delete_at(json_response.count - 1)
+					end
+				end
+
+				json_response
+
+			end
+
+			def remove_new_lines(json_response)
+				json_response.each_with_index do |hash,i|
+					if hash == "\n"
+						json_response.delete_at(i)
+					end
+				end
+
+				json_response
+			end
+
 		end
 		
 	end

data/lib/osc_ruby/query_results.rb

@@ -11,11 +11,11 @@ module OSCRuby
 
 		def initialize; end
 
-		def select(client,query)
+		def query(client,query,return_json = false)
 
 			ValidationsModule::check_client(client)
 
-			ValidationsModule::check_query(query,"select")
+			ValidationsModule::check_query(query,"query")
 
 			@query = URI.escape("queryResults/?query=#{query}")
 
@@ -23,9 +23,15 @@ module OSCRuby
 
 	    	json_response = JSON.parse(response) 
 
-	    	puts json_response
-	    	puts
-	 
+	    	json_response.unshift("\n")
+
+	    	if return_json == true
+	    		json_response_final = QueryModule::query_injection(query,json_response)
+	    		puts json_response_final
+	    	end
+
+	    	QueryModule::remove_new_lines(json_response)
+ 
 		end
 	
 	end

data/lib/osc_ruby/version.rb

@@ -1,3 +1,3 @@
 module OSCRuby
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

data/spec/core/query_results_spec.rb

@@ -21,7 +21,7 @@ describe OSCRuby::QueryResults do
 		OSCRuby::QueryResults.new
 	}
 
-	context "#select" do
+	context "#query" do
 
 		it 'should expect client is an instance of OSCRuby::Client class and raise an error if does not' do
 
@@ -29,7 +29,7 @@ describe OSCRuby::QueryResults do
 
 			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')
+			expect{query_results.query(client,'describe')}.to raise_error('Client must have some configuration set; please create an instance of OSCRuby::Client with configuration settings')
 
 		end
 
@@ -37,17 +37,41 @@ describe OSCRuby::QueryResults 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")
+			expect{query_results.query(client,"")}.to raise_error("A query must be specified when using the 'query' method")
 
 		end
 
 		it 'should put results in array of hashes',:vcr do 
 
-			expect(query_results.select(client,"describe")).to eq(nil)
+			# expect(query_results.query(client,"describe")).not_to eq(nil)
 
-			expect(query_results.select(client,"describe answers")).to eq(nil)
+			expect(query_results.query(client,"describe")).to be_an(Array)
 
-			expect(query_results.select(client,"describe answers;describe servicecategories")).to eq(nil)
+			# expect(query_results.query(client,"describe answers")).not_to eq(nil)
+
+			expect(query_results.query(client,"describe answers;describe serviceproducts",true)).to be_an(Array)
+
+			# expect(query_results.query(client,"describe answers;describe servicecategories")).not_to eq(nil)
+
+			expect(query_results.query(client,"describe answers;describe servicecategories")).to be_an(Array)
+
+		end
+
+		it 'should be able to manipulate and assign results data',:vcr do 
+
+			@answers = query_results.query(client,"select * from answers where ID > 2500")
+
+			@answers.each do |answer|
+
+				expect(answer['id'].to_i).to be_a(Integer)
+
+				expect(answer['answerType']).not_to be(nil)
+
+				expect(answer['answerType']).not_to eq("\n")
+
+				expect{@answer = OSCRuby::Answer.new(answer)}.not_to raise_error
+
+			end 
 
 		end
 		

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: osc_ruby
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Rajan Davis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-02 00:00:00.000000000 Z
+date: 2017-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov