Skip to content

Commit 6994b3e

Browse files
committed
Rubocop fixes
1 parent ddb7429 commit 6994b3e

File tree

5 files changed

+20
-18
lines changed

5 files changed

+20
-18
lines changed

app/presenters/question_presenter.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ class QuestionPresenter < NodePresenter
66
:translate_option
77
] => :@renderer
88

9-
delegate :use_erb_template? => :@node
9+
delegate use_erb_template?: :@node
1010

1111
def initialize(i18n_prefix, node, state = nil, options = {})
1212
super(i18n_prefix, node, state)
1313
@renderer = options[:renderer]
1414
helpers = options[:helpers] || []
1515
if use_erb_template?
16-
@renderer ||= SmartAnswer::ErbRenderer.new(
16+
@renderer ||= SmartAnswer::ErbRenderer.new(
1717
template_directory: @node.template_directory.join('questions'),
1818
template_name: @node.filesystem_friendly_name,
1919
locals: @state.to_hash,

lib/smart_answer/flow.rb

+9-8
Original file line numberDiff line numberDiff line change
@@ -134,14 +134,15 @@ def normalize_responses(responses)
134134
class InvalidStatus < StandardError; end
135135

136136
private
137-
def add_question(klass, name, options = {}, &block)
138-
options.reverse_merge!(use_erb_template: @use_erb_templates_for_questions)
139-
add_node klass.new(self, name, options, &block)
140-
end
141137

142-
def add_node(node)
143-
raise "Node #{node.name} already defined" if node_exists?(node)
144-
@nodes << node
145-
end
138+
def add_question(klass, name, options = {}, &block)
139+
options.reverse_merge!(use_erb_template: @use_erb_templates_for_questions)
140+
add_node klass.new(self, name, options, &block)
141+
end
142+
143+
def add_node(node)
144+
raise "Node #{node.name} already defined" if node_exists?(node)
145+
@nodes << node
146+
end
146147
end
147148
end

lib/smart_answer/question/base.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ def initialize(flow, name, options = {}, &block)
1212
@permitted_next_nodes = []
1313
@predicate_stack = []
1414
@predicates = {}
15-
@use_erb_template = options[:use_erb_template]
15+
@uses_erb_template = options[:use_erb_template]
1616
super
1717
end
1818

@@ -128,7 +128,7 @@ def question?
128128
end
129129

130130
def use_erb_template?
131-
@use_erb_template
131+
@uses_erb_template
132132
end
133133

134134
private

script/convert-question-i18-yaml-to-erb-templates.rb

+5-4
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,17 @@ def normalize_blank_lines(string)
2626
rendered_options = options.inject([]) do |array, (key, value)|
2727
array << "#{key.to_s.inspect}: #{value.inspect}".indent(2)
2828
array
29-
end.join(",\n")
30-
options_erb = "<% options(\n#{rendered_options}\n) %>"
29+
end
30+
options_erb = "<% options(\n#{rendered_options.join(",\n")}\n) %>"
3131
end
3232
error_attributes = attributes.except(*%w(title options hint label suffix_label body post_body))
33-
errors_erb = error_attributes.inject([]) do |array, (key, value)|
33+
errors = error_attributes.inject([]) do |array, (key, value)|
3434
array << "<% content_for #{key.to_sym.inspect} do %>"
3535
array << value.indent(2)
3636
array << "<% end %>"
3737
array
38-
end.join("\n")
38+
end
39+
errors_erb = errors.join("\n")
3940
erb = File.read(Rails.root.join('script', 'templates', 'question.erb'))
4041
template = Erubis::Eruby.new(erb)
4142
template_name = question_key.sub(/\?$/, '') + '.govspeak.erb'

test/unit/question_presenter_with_erb_renderer_test.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@ class QuestionPresenterWithErbRendererTest < ActiveSupport::TestCase
7373
@renderer.stubs(:option_text).with(:option_two).returns('option-two-text')
7474
presenter = QuestionPresenter.new('i18n-prefix', question, state = nil, renderer: @renderer)
7575

76-
assert_equal ['option_one', 'option_two'], presenter.options.map(&:value)
77-
assert_equal ['option-one-text', 'option-two-text'], presenter.options.map(&:label)
76+
assert_equal %w(option_one option_two), presenter.options.map(&:value)
77+
assert_equal %w(option-one-text option-two-text), presenter.options.map(&:label)
7878
end
7979

8080
test '#error returns nil if there is no error' do

0 commit comments

Comments
 (0)