osc_ruby 0.1.9 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 147fb6cc739484cf85fab9b8b43f6ab197eeb240
-  data.tar.gz: afd7a03fc798c644d2d275a6e285528a32c01746
+  metadata.gz: ca63de8b887f3fd7a4f053fa2169013a9ec0121a
+  data.tar.gz: d51fe8fd736021ed2bcd74cf68b758e92ba0f25e
 SHA512:
-  metadata.gz: 632fa408fe9ac6b9e7eac7521caceeed202b594f5f0d06607dbebf7c62b688eb98f4fb98b3351d38f583d52dc8773b77b4e63a3ab58bb57aba3c07fd8d4a331f
-  data.tar.gz: 2906a3b6b5a8208ed770aa9e4e3e010304226605058f7c3f2e6429f760a48a8e52a6701b74b81ff545a2feea5f99c7d806cb4855a88f050c396c7cfcf604b311
+  metadata.gz: c907042c7cbad989ae25e304bfc85182b92295fd55c07eeb3159ff1af9695f93577383c68c27dd0a693bfb28b609e388b60efd805aaab044100d627fa50d7f41
+  data.tar.gz: e6340ed3dc8cf652e92cbfcac44abc7b184ef42c509e22c2f39c19144e6d358f04ebba1d8e6815348aca1a285313db841e54e0bdfa254b97e036c27501ebe757

data/lib/osc_ruby/service_product.rb

@@ -87,7 +87,7 @@ module OSCRuby
 
 	    end
 
-	    def self.find(client,id = nil)
+	    def self.find(client,id = nil,return_json = false)
 
 	    	check_client(client)
 
@@ -101,23 +101,39 @@ module OSCRuby
 
 	    	service_product_json = QueryModule::find(client,resource)
 
-	    	service_product_json_final = JSON.parse(service_product_json)
+	    	if return_json == true
 
-	      	new_from_fetch(service_product_json_final[0])
+	    		service_product_json
+
+	    	else
+
+		    	service_product_json_final = JSON.parse(service_product_json)
+
+		      	new_from_fetch(service_product_json_final[0])
+
+			end
 
 	    end
 
-	    # def self.all(client)
+	    def self.all(client, return_json = false)
 	    	
-	    # 	resource = URI.escape("queryResults/?query=select * from serviceproducts")
+	    	resource = URI.escape("queryResults/?query=select * from serviceproducts")
 
-	    # 	service_product_json = QueryModule::find(client,resource)
+	    	service_product_json = QueryModule::find(client,resource)
 
-	    # 	service_product_json_final = JSON.parse(service_product_json)
+	    	if return_json == true
 
-	    # 	service_product_json_final.map { |attributes| new_from_fetch(attributes) }
+	    		service_product_json
 
-	    # end
+	    	else
+
+		    	service_product_json_final = JSON.parse(service_product_json)
+
+		    	service_product_json_final.map { |attributes| new_from_fetch(attributes) }
+
+		    end
+
+	    end
 
 		def self.new_from_fetch(attributes)
 

data/lib/osc_ruby/version.rb

@@ -1,3 +1,3 @@
 module OSCRuby
-  VERSION = "0.1.9"
+  VERSION = "0.1.10"
 end

data/spec/core/service_product_spec.rb

@@ -210,7 +210,7 @@ describe OSCRuby::ServiceProduct do
 			OSCRuby::ServiceProduct.find(client, 100)
 		}
 
-		it 'should return an instance of a new OSC::ServiceProduct object with at least a name and displayOrder' do
+		it 'should return an instance of a new OSCRuby::ServiceProduct object with at least a name and displayOrder' do
 
 			expect(known_working_product).to be_an(OSCRuby::ServiceProduct)
 
@@ -220,6 +220,48 @@ describe OSCRuby::ServiceProduct do
 
 		end
 
+		it 'should return the raw json response if the return_json parameter is set to true' do
+
+			known_working_product_in_json = OSCRuby::ServiceProduct.find(client, 100, true)
+
+			expect(known_working_product_in_json).to be_an(String)
+
+		end
+
+	end
+
+	context '#all' do
+
+		it 'should return multiple instances of OSCRuby::ServiceProduct' do
+
+			products = OSCRuby::ServiceProduct.all(client)
+
+			expect(products.size).to be > 0
+
+			puts "Checking if OSCRuby::ServiceProduct.all produces multiple instances of products"
+
+			products.each_with_index do |p,i|
+
+				if i < 10
+
+					expect(p).to be_an(OSCRuby::ServiceProduct)
+
+				end
+
+			end
+
+		end
+
+		it 'should just return JSON if the return_json parameter is set to true' do
+
+			expect(OSCRuby::ServiceProduct.all(client,true)).to be_a(String)
+
+		end
+
+	end
+
+	contect '#where' do
+
 	end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: osc_ruby
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors:
 - Rajan Davis