From 95bcdfe865f574044eba0ff196c5c99d4fdca446 Mon Sep 17 00:00:00 2001 From: thomashaw Date: Mon, 5 Feb 2018 15:19:15 +0000 Subject: [PATCH] organisations: added intro_paragraph parameter --- .../random_organisation/secgen_local/local.rb | 11 +++++++++-- .../random_organisation/secgen_metadata.xml | 4 ++++ .../realistic_organisation/secgen_local/local.rb | 11 +++++++++-- .../realistic_organisation/secgen_metadata.xml | 5 +++++ 4 files changed, 27 insertions(+), 4 deletions(-) diff --git a/modules/generators/structured_content/random_organisation/secgen_local/local.rb b/modules/generators/structured_content/random_organisation/secgen_local/local.rb index d6673b12c..229b98bce 100644 --- a/modules/generators/structured_content/random_organisation/secgen_local/local.rb +++ b/modules/generators/structured_content/random_organisation/secgen_local/local.rb @@ -12,6 +12,7 @@ class RandomOrganisationGenerator < StringEncoder attr_accessor :manager attr_accessor :employees attr_accessor :product_name + attr_accessor :intro_paragraph def initialize super @@ -26,6 +27,7 @@ class RandomOrganisationGenerator < StringEncoder self.manager = {} self.employees = [] self.product_name = '' + self.intro_paragraph = '' end def encode_all @@ -40,6 +42,7 @@ class RandomOrganisationGenerator < StringEncoder organisation_hash['manager'] = self.manager organisation_hash['employees'] = self.employees organisation_hash['product_name'] = self.product_name + organisation_hash['intro_paragraph'] = self.intro_paragraph self.outputs << organisation_hash.to_json end @@ -54,7 +57,8 @@ class RandomOrganisationGenerator < StringEncoder ['--industry', GetoptLong::REQUIRED_ARGUMENT], ['--manager', GetoptLong::REQUIRED_ARGUMENT], ['--employees', GetoptLong::REQUIRED_ARGUMENT], - ['--product_name', GetoptLong::REQUIRED_ARGUMENT]] + ['--product_name', GetoptLong::REQUIRED_ARGUMENT], + ['--intro_paragraph', GetoptLong::REQUIRED_ARGUMENT]] end def process_options(opt, arg) @@ -80,6 +84,8 @@ class RandomOrganisationGenerator < StringEncoder self.employees << JSON.parse(arg); when '--product_name' self.product_name << arg; + when '--intro_paragraph' + self.intro_paragraph << arg; end end @@ -93,7 +99,8 @@ class RandomOrganisationGenerator < StringEncoder 'industry: ' + self.industry.to_s + print_string_padding + 'manager: ' + self.manager.to_s + print_string_padding + 'employees: ' + self.employees.to_s + print_string_padding + - 'product_name: ' + self.product_name.to_s + 'product_name: ' + self.product_name.to_s + + 'intro_paragraph: ' + self.intro_paragraph.to_s end end diff --git a/modules/generators/structured_content/random_organisation/secgen_metadata.xml b/modules/generators/structured_content/random_organisation/secgen_metadata.xml index 71a36750f..88bb8054c 100644 --- a/modules/generators/structured_content/random_organisation/secgen_metadata.xml +++ b/modules/generators/structured_content/random_organisation/secgen_metadata.xml @@ -25,6 +25,7 @@ manager employees product_name + intro_paragraph @@ -58,6 +59,9 @@ + + + account diff --git a/modules/generators/structured_content/realistic_organisation/secgen_local/local.rb b/modules/generators/structured_content/realistic_organisation/secgen_local/local.rb index 5fb8d0e37..9cba0b1fc 100644 --- a/modules/generators/structured_content/realistic_organisation/secgen_local/local.rb +++ b/modules/generators/structured_content/realistic_organisation/secgen_local/local.rb @@ -12,6 +12,7 @@ class RealOrganisationGenerator < StringEncoder attr_accessor :manager attr_accessor :employees attr_accessor :product_name + attr_accessor :intro_paragraph attr_accessor :filler_char def initialize @@ -27,6 +28,7 @@ class RealOrganisationGenerator < StringEncoder self.manager = {} self.employees = [] self.product_name = '' + self.intro_paragraph = '' self.filler_char = %w(_ -).sample end @@ -59,6 +61,7 @@ class RealOrganisationGenerator < StringEncoder organisation_hash['manager'] = self.manager organisation_hash['employees'] = self.employees organisation_hash['product_name'] = self.product_name + organisation_hash['intro_paragraph'] = self.intro_paragraph self.outputs << organisation_hash.to_json end @@ -88,7 +91,8 @@ class RealOrganisationGenerator < StringEncoder ['--industry', GetoptLong::REQUIRED_ARGUMENT], ['--manager', GetoptLong::REQUIRED_ARGUMENT], ['--employees', GetoptLong::REQUIRED_ARGUMENT], - ['--product_name', GetoptLong::REQUIRED_ARGUMENT]] + ['--product_name', GetoptLong::REQUIRED_ARGUMENT], + ['--intro_paragraph', GetoptLong::REQUIRED_ARGUMENT]] end def process_options(opt, arg) @@ -114,6 +118,8 @@ class RealOrganisationGenerator < StringEncoder self.employees << JSON.parse(arg); when '--product_name' self.product_name << arg; + when '--intro_paragraph' + self.intro_paragraph << arg; end end @@ -127,7 +133,8 @@ class RealOrganisationGenerator < StringEncoder 'industry: ' + self.industry.to_s + print_string_padding + 'manager: ' + self.manager.to_s + print_string_padding + 'employees: ' + self.employees.to_s + print_string_padding + - 'product_name: ' + self.product_name.to_s + 'product_name: ' + self.product_name.to_s + + 'intro_paragraph: ' + self.intro_paragraph.to_s end end diff --git a/modules/generators/structured_content/realistic_organisation/secgen_metadata.xml b/modules/generators/structured_content/realistic_organisation/secgen_metadata.xml index e4c772e31..b3b7b9b8d 100644 --- a/modules/generators/structured_content/realistic_organisation/secgen_metadata.xml +++ b/modules/generators/structured_content/realistic_organisation/secgen_metadata.xml @@ -27,6 +27,7 @@ manager employees product_name + intro_paragraph @@ -60,6 +61,10 @@ + + + + account