remove rubocop_todo.yml

Signed-off-by: zhustec <zhustec@foxmail.com>
zhustec · Apr 26, 2020 · 3e54d15 · 3e54d15
1 parent 006b5a1
commit 3e54d15
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 19 deletions.
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -1,5 +1,3 @@
-inherit_from: .rubocop_todo.yml
-
 require:
   - rubocop-rspec
 
@@ -48,4 +46,4 @@ RSpec/MultipleExpectations:
   Max: 3
 
 RSpec/SubjectStub:
-  Enabled: false
+  Enabled: false
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
diff --git a/lib/jekyll-diagrams/basic_block.rb b/lib/jekyll-diagrams/basic_block.rb
@@ -20,11 +20,13 @@ def initialize(tag_name, markup, _tokens)
       end
 
       def render(context)
+        # rubocop:disable Style/GuardClause
         if "#{@markup} " =~ Utils::INLINE_OPTIONS_SYNTAX
           inline_options = Utils.parse_inline_options(@markup)
         else
           raise Errors::InlineOptionsSyntaxError, @markup
         end
+        # rubocop:enable Style/GuardClause
 
         self.class.renderer.render(
           context, super.to_s, {

diff --git a/lib/jekyll-diagrams/blockdiag/renderer.rb b/lib/jekyll-diagrams/blockdiag/renderer.rb
@@ -18,7 +18,7 @@ def render_svg(code, config)
         end
 
         def build_command(config)
-          command = +"#{@diagram} -T svg --nodoctype"
+          command = +"#{@diagram_name} -T svg --nodoctype"
 
           switches = self.class.const_get(:SWITCHES)
 

diff --git a/lib/jekyll-diagrams/vega/renderer.rb b/lib/jekyll-diagrams/vega/renderer.rb
@@ -7,7 +7,7 @@ module Diagrams
         const_set :CONFIGURATIONS, %w[scale].freeze
 
         def render_svg(code, config)
-          if @diagram == 'vegalite'
+          if @diagram_name == 'vegalite'
             code = render_with_stdin_stdout('vl2vg', code)
           end
 

diff --git a/spec/jekyll-diagrams/vega_renderer_spec.rb b/spec/jekyll-diagrams/vega_renderer_spec.rb
@@ -22,7 +22,7 @@
         allow(renderer).to receive(:build_command)
         allow(renderer).to receive(:render_with_stdin_stdout).and_return(+'')
 
-        renderer.instance_variable_set(:@diagram, 'vegalite')
+        renderer.instance_variable_set(:@diagram_name, 'vegalite')
         renderer.render_svg('', {})
 
         expect(renderer).to have_received(:render_with_stdin_stdout).twice