silo_manager 0.0.1 → 0.0.2

data/bin/silo_manager

@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
-# encoding: utf-8
 # TODO: Fix multi-byte problem (copied and pasted from PDF)
 
 require 'rubygems'
@@ -32,9 +31,9 @@ SILO_CONFIG_ATTRS = ['id:string:required', 'name:string:required', 'silo-profile
 'description:string:optional', 'max-assets:integer:required', 'max-hosted-assets:integer:required',
 'max-users:integer:required']
 
-MERCHANT_ATTRS = ['acquirer-relationship:boolean:required', 'agent‐relationship:boolean:required',
-'payment-application:string:required', 'payment‐version:string:required', 'ecommerce:boolean:required',
-'grocery:boolean:required', 'mail-order:boolean:required', 'petroleum:boolean:required', 'retail:boolean:required',
+MERCHANT_ATTRS = ['acquirer-relationship:boolean:required', 'agent-relationship:boolean:required',
+'payment-application:string:required', 'payment-version:string:required', 'ecommerce:boolean:required',
+'grocery:boolean:required', 'mail-order:boolean:required', 'petroleum:boolean:required', 'retail:boolean:required',
 'telecommunication:boolean:required', 'travel:boolean:required', 'url:string:required', 'company:string:required',
 'email-address:string:optional', 'first-name:string:required', 'last-name:string:required', 'phone-number:string:required',
 'title:string:optional']
@@ -176,7 +175,7 @@ def get_value_array integer=false, restricted_values=[]
 				   end
 				end
 
-			   output << integer ? part.to_i : part.to_s
+			   output << (integer ? part.to_i : part.to_s)
 			end
 			success = true
 		rescue Exception

data/lib/nexpose.rb

@@ -564,7 +564,7 @@ module NexposeAPI
 	#-------------------------------------------------------------------------
 	def create_silo_profile silo_profile_config, permissions
 		xml = make_xml 'SiloProfileCreateRequest'
-		xml.add_element make_xml('SiloProfileConfig', silo_profile_config, '', false)
+		spc_xml = make_xml('SiloProfileConfig', silo_profile_config, '', false)
 
 		# Add the permissions
 		if permissions['global_report_templates']
@@ -572,7 +572,7 @@ module NexposeAPI
 			permissions['global_report_templates'].each do |name|
 				grt_xml.add_element make_xml('GlobalReportTemplate', {'name' => name}, '', false)
 			end
-			xml.add_element grt_xml
+			spc_xml.add_element grt_xml
 		end
 
 		if permissions['global_scan_engines']
@@ -580,7 +580,7 @@ module NexposeAPI
 			permissions['global_scan_engines'].each do |name|
 				gse_xml.add_element make_xml('GlobalScanEngine', {'name' => name}, '', false)
 			end
-			xml.add_element gse_xml
+			spc_xml.add_element gse_xml
 		end
 
 		if permissions['global_scan_templates']
@@ -588,7 +588,7 @@ module NexposeAPI
 			permissions['global_scan_templates'].each do |name|
 				gst_xml.add_element make_xml('GlobalScanTemplate', {'name' => name}, '', false)
 			end
-			xml.add_element gst_xml
+			spc_xml.add_element gst_xml
 		end
 
 		if permissions['licensed_modules']
@@ -596,7 +596,7 @@ module NexposeAPI
 			permissions['licensed_modules'].each do |name|
 				lm_xml.add_element make_xml('LicensedModule', {'name' => name}, '', false)
 			end
-			xml.add_element lm_xml
+			spc_xml.add_element lm_xml
 		end
 
 		if permissions['restricted_report_formats']
@@ -604,7 +604,7 @@ module NexposeAPI
 			permissions['restricted_report_formats'].each do |name|
 				rrf_xml.add_element make_xml('RestrictedReportFormat', {'name' => name}, '', false)
 			end
-			xml.add_element rrf_xml
+			spc_xml.add_element rrf_xml
 		end
 
 		if permissions['restricted_report_sections']
@@ -612,9 +612,10 @@ module NexposeAPI
 			permissions['restricted_report_sections'].each do |name|
 				rrs_xml.add_element make_xml('RestrictedReportSection', {'name' => name}, '', false)
 			end
-			xml.add_element rrs_xml
+			spc_xml.add_element rrs_xml
 		end
 
+		xml.add_element spc_xml
 		r = execute xml, '1.2'
 		r.success
 	end
@@ -643,7 +644,7 @@ module NexposeAPI
 
 		# Add Organization info
 		if silo_config['organization']
-			org_xml = make_xml 'Organization', silo_config['organization'], '', false
+			org_xml = make_xml 'Organization', {}, '', false
 			silo_config['organization'].keys.each do |key|
 				if not 'address'.eql? key
 					org_xml.attributes[key] = silo_config['organization'][key]
@@ -659,17 +660,20 @@ module NexposeAPI
 		if silo_config['merchant']
 		 	merchant_xml = make_xml 'Merchant', {}, '', false
 
-			# add attributes only
 			silo_config['merchant'].keys.each do |key|
 				if not 'dba'.eql? key and not 'other_industries'.eql? key and not 'qsa'.eql? key and not 'address'.eql? key
-					merchant_xml.attributes[key] = silo_config[key]
+					merchant_xml.attributes[key] = silo_config['merchant'][key]
 				end
 			end
 
-			#Now add the complex data types
-			if silo_config['merchant']['dba']
-				dba_xml = make_xml 'DBAs', {}, '', false
-				silo_config['merchant']['dbas'].each do |name|
+			 # Add the merchant address
+			 merchant_address_xml = make_xml 'Address', silo_config['merchant']['address'], '', false
+			 merchant_xml.add_element merchant_address_xml
+
+			 #Now add the complex data types
+			 if silo_config['merchant']['dba']
+				 dba_xml = make_xml 'DBAs', {}, '', false
+				 silo_config['merchant']['dba'].each do |name|
 					dba_xml.add_element make_xml('DBA', {'name' => name}, '', false)
 				end
 				merchant_xml.add_element dba_xml

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: silo_manager
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-05 00:00:00.000000000 -07:00
+date: 2011-10-06 00:00:00.000000000 -07:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nexpose
-  requirement: &23695404 !ruby/object:Gem::Requirement
+  requirement: &24325236 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,7 +22,7 @@ dependencies:
         version: 0.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *23695404
+  version_requirements: *24325236
 description: ! '  This is a tool is used to provide CRUD silo operations.
 
 '
@@ -37,7 +37,7 @@ files:
 - lib/test.rb
 - bin/silo_manager
 has_rdoc: true
-homepage: https://github.com/chrlee/Nexpose_silo_manager
+homepage: https://github.com/chrlee/silo_manager
 licenses: []
 post_install_message: 
 rdoc_options: []