diff --git a/lib/rgrb/plugin/random_generator/generator.rb b/lib/rgrb/plugin/random_generator/generator.rb index 297c46c0..36c7bfe2 100644 --- a/lib/rgrb/plugin/random_generator/generator.rb +++ b/lib/rgrb/plugin/random_generator/generator.rb @@ -31,7 +31,7 @@ def initialize def configure(config_data) super - load_data("#{@data_path}/**/*.yaml") + load_data!("#{@data_path}/**/*.yaml") self end @@ -90,6 +90,26 @@ def list end.keys.sort end + # 表のデータを読み込む + # @param [String] glob_pattern データファイル名のパターン + # @return [void] + def load_data!(glob_pattern) + # 表を格納するハッシュ + @table = {} + + Dir.glob(glob_pattern).each do |path| + begin + yaml = File.read(path, encoding: 'UTF-8') + table = Table.parse_yaml(yaml) + + @table[table.name] = table + rescue => e + logger.error("データファイル #{path} の読み込みに失敗しました") + logger.error(e) + end + end + end + private # 表から値を取得して返す @@ -141,26 +161,6 @@ def replace_var_with_value(str, root_table) str end - # 表のデータを読み込む - # @param [String] glob_pattern データファイル名のパターン - # @return [void] - def load_data(glob_pattern) - # 表を格納するハッシュ - @table = {} - - Dir.glob(glob_pattern).each do |path| - begin - yaml = File.read(path, encoding: 'UTF-8') - table = Table.parse_yaml(yaml) - - @table[table.name] = table - rescue => e - logger.error("データファイル #{path} の読み込みに失敗しました") - logger.error(e) - end - end - end - # 表が存在することを確かめる # @return [String] table_name 表名 # @return [true] 表が存在する場合 diff --git a/spec/rgrb/plugin/random_generator/generator_spec.rb b/spec/rgrb/plugin/random_generator/generator_spec.rb index 82d20fb7..a2208a30 100644 --- a/spec/rgrb/plugin/random_generator/generator_spec.rb +++ b/spec/rgrb/plugin/random_generator/generator_spec.rb @@ -7,11 +7,11 @@ describe RGRB::Plugin::RandomGenerator::Generator do let(:generator) do - obj = described_class.new - obj.send(:load_data, "#{__dir__}/data/*.yaml") - obj.send(:logger=, Lumberjack::Logger.new($stdout, progname: self.class.to_s)) + g = described_class.new + g.load_data!("#{__dir__}/data/*.yaml") + g.logger = Lumberjack::Logger.new($stdout, progname: self.class.to_s) - obj + g end describe '#desc' do diff --git a/spec/rgrb/plugin/server_connection_report/mail_generator_spec.rb b/spec/rgrb/plugin/server_connection_report/mail_generator_spec.rb index 558cd47b..a2267a54 100644 --- a/spec/rgrb/plugin/server_connection_report/mail_generator_spec.rb +++ b/spec/rgrb/plugin/server_connection_report/mail_generator_spec.rb @@ -33,10 +33,10 @@ } let(:mail_generator) { - obj = described_class.new - obj.send(:logger=, Lumberjack::Logger.new($stdout, progname: self.class.to_s)) + g = described_class.new + g.logger = Lumberjack::Logger.new($stdout, progname: self.class.to_s) - obj + g } describe '#initialize' do