osc_ruby 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7154ec098d33292ea2c167a8443f8eb85912f39d
-  data.tar.gz: f578948e3d1410817933616b553fd02b9bc051ef
+  metadata.gz: a8d284a7e12fb44a4449480d36377dfa3e479f75
+  data.tar.gz: e4e486c461fb682b4712818716fa9fdde154e873
 SHA512:
-  metadata.gz: 30250017bcfabab6bbd37eeab2ff35cfd235baaa9c9c083b0d5e76de0e0f929ba4714d44bf866ab0993f0a11286e160ae3f21c94472060e352385793ad0dc86f
-  data.tar.gz: 8a739cb4033a488966ffe799b7ec7ebf2074a49c578cbd8fdba984886fdeca2c5d5ac5b8aa2b7a35eceb3007f8e0a7edef3181d8486ec3806c46a8a99d2212c5
+  metadata.gz: 40bdbcbfa817333418177cbd4ba8febf261640658762af2a8d429a95568a0b388c1d961326fde976dd3cd5bb77fb2b22652df01a5ff34ea7776f26b756d19ead
+  data.tar.gz: e77a12902ff14c5a6289a12817c408e317fbc88dc0803ac71873dde7fce843e587c5de694021fcfb1e85cf7b3fd262e48c1db244056606f15f8a6bef45b42093

data/lib/osc_ruby/query_module.rb

@@ -19,9 +19,7 @@ module OSCRuby
 
 		def self.create(rn_client,resource,json_content)
 
-			obj_to_find = OSCRuby::Connect.post_or_patch(rn_client,resource,json_content)
-
-			obj_to_find.body
+			OSCRuby::Connect.post_or_patch(rn_client,resource,json_content)
 
 		end
 

data/lib/osc_ruby/service_product.rb

@@ -47,7 +47,7 @@ module OSCRuby
 
 	    end
 
-	    def create(client)
+	    def create(client,return_json = false)
 
 	    	self.class.check_client(client)
 
@@ -57,7 +57,23 @@ module OSCRuby
 
 	    	resource = URI.escape("/serviceProducts")
 
-	    	QueryModule::create(client,resource,final_json)
+	    	response = QueryModule::create(client,resource,final_json)
+
+	    	if response.code == 200 && return_json == false
+
+	    		prod_json = JSON.parse(response.body)
+
+	    		final_prod = new_from_fetch(service_product_json_final[0])
+
+	    		puts "New product ${final_prod.name} was created"
+
+	    		final_prod
+
+	    	elsif return_json == true
+
+	    		response.body
+
+	    	end
 
 	    end
 
@@ -93,9 +109,6 @@ module OSCRuby
 
 	    # end
 
-
-	    protected
-
 		def self.new_from_fetch(attributes)
 
 	    	check_attributes(attributes)
@@ -114,8 +127,8 @@ module OSCRuby
 			
 			empty_arr[0] = json_content
 
-			if empty_arr[0]['names'].count == 0
-				raise ArgumentError, 'ServiceProduct should at least have one name set (new_service_product.names[0] = "new product name" )'
+			if empty_arr[0]['names'].count == 0 || empty_arr[0]['names'][0]['labelText'].nil? || empty_arr[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
 
 			if empty_arr[0]['adminVisibleInterfaces'].empty?

data/lib/osc_ruby/version.rb

@@ -1,3 +1,3 @@
 module OSCRuby
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/spec/core/service_product_spec.rb

@@ -121,15 +121,43 @@ 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] = "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}} )')
 
 		end
 
-		it 'should return the body object if it was created or not' do
+		it 'should expect the name in a hash as the value of the labelText key' do
 
 			new_service_product.names[0] = "new product name"
 
-			expect(new_service_product.create(client)).to be_a(String)
+			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}} )')
+
+		end
+
+		it 'should expect a language => id key pair within the hash' 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}} )')
+
+		end
+
+		it 'should return an instance of an OSCRuby::ServiceProduct if the json_response param is set to false (which it is by default)' do
+
+			new_service_product.names[0] = {"labelText" => "QTH45-test", "language" => {"id" => 1}}
+			new_service_product.names[1] = {'labelText' => 'QTH45-test', 'language' => {'id' => 11}} 		
+
+			new_service_product.create(client)
+
+			expect(new_service_product).to be_a(OSCRuby::ServiceProduct)
+
+		end
+
+
+		it 'should return the body object if the json_response param is set to true' do
+
+			new_service_product.names[0] = {"labelText" => "QTH45-test", "language" => {"id" => 1}} 		
+
+			expect(new_service_product.create(client,true)).to be_a(String)
 
 		end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: osc_ruby
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Rajan Davis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-03 00:00:00.000000000 Z
+date: 2017-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -69,7 +69,6 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- example.rb
 - lib/ext/string.rb
 - lib/osc_ruby.rb
 - lib/osc_ruby/client.rb

data/example.rb

@@ -1,42 +0,0 @@
-require 'osc_ruby'
-
-rn_client = OSCRuby::Client.new do |config|
-	config.username = ENV['OSC_ADMIN']
-	config.password = ENV['OSC_PASSWORD']
-	config.interface = ENV['OSC_TEST_SITE']
-end
-
-
-# ServiceProduct fetch example
-
-	product = ServiceProduct.find(rn_client,100)
-
-	puts product
-
-	# => #<ServiceProduct:0x007fd0fa87e588>
-
-	puts product.name
-
-	# => QR404
-
-	puts product.displayOrder
-
-	# => 3
-
-# ServiceProduct fetch all example
-
-	products = OSCRuby::ServiceProduct.all(rn_client)
-
-	products.each do |p|
-
-		puts p.name
-
-	end
-
-	# => Unsure
-	# => DVR/NVR
-	# => QC Series
-	# => QR Series
-	# => QR404
-	# => QS Series
-	# => QT Series