make rubocop (and travis) happy (again)

prawnpdf · Jul 19, 2017 · ec2d24d · ec2d24d
1 parent 827639a
commit ec2d24d
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 13 deletions.
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -29,7 +29,7 @@ Metrics/ModuleLength:
 Metrics/PerceivedComplexity:
   Enabled: false
 
-Style/AlignParameters:
+Layout/AlignParameters:
   EnforcedStyle: with_fixed_indentation
 
 # We need to reference non-ascii characters when testing and explaining
@@ -43,16 +43,16 @@ Style/Documentation:
 Style/Encoding:
   EnforcedStyle: never
 
-Style/FirstArrayElementLineBreak:
+Layout/FirstArrayElementLineBreak:
   Enabled: true
 
-Style/FirstHashElementLineBreak:
+Layout/FirstHashElementLineBreak:
   Enabled: true
 
-Style/FirstMethodArgumentLineBreak:
+Layout/FirstMethodArgumentLineBreak:
   Enabled: true
 
-Style/FirstParameterIndentation:
+Layout/FirstParameterIndentation:
   EnforcedStyle: consistent
 
 Style/GuardClause:
@@ -63,16 +63,16 @@ Style/GuardClause:
 Style/IfUnlessModifier:
   Enabled: false
 
-Style/IndentArray:
+Layout/IndentArray:
   EnforcedStyle: consistent
 
-Style/IndentHash:
+Layout/IndentHash:
   EnforcedStyle: consistent
 
-Style/MultilineMethodCallIndentation:
+Layout/MultilineMethodCallIndentation:
   EnforcedStyle: indented
 
-Style/MultilineOperationIndentation:
+Layout/MultilineOperationIndentation:
   EnforcedStyle: indented
   Exclude:
     - prawn-templates.gemspec
@@ -90,7 +90,7 @@ Style/PercentLiteralDelimiters:
     '%W': '[]'
     '%x': '()'
 
-Style/SpaceAroundOperators:
+Layout/SpaceAroundOperators:
   AllowForAlignment: false
 
 Style/WhileUntilModifier:

diff --git a/Rakefile b/Rakefile
@@ -5,7 +5,7 @@ require 'rake'
 require 'rspec/core/rake_task'
 require 'rubocop/rake_task'
 
-task default: [:spec, :rubocop]
+task default: %i[spec rubocop]
 
 desc 'Run all rspec files'
 RSpec::Core::RakeTask.new('spec') do |c|

diff --git a/lib/pdf/core/page.rb b/lib/pdf/core/page.rb
@@ -100,7 +100,7 @@ def init_new_page(options)
           Contents: content
         )
 
-        resources[:ProcSet] = [:PDF, :Text, :ImageB, :ImageC, :ImageI]
+        resources[:ProcSet] = %i[PDF Text ImageB ImageC ImageI]
       end
     end
   end

diff --git a/lib/prawn/templates.rb b/lib/prawn/templates.rb
@@ -130,7 +130,6 @@ def import_page(input, page_num)
             load_object_graph(hash, ref).identifier
           )
         end
-
       rescue PDF::Reader::MalformedPDFError,
              PDF::Reader::InvalidObjectError => e
         msg = 'Error reading template file. If you are sure it\'s a valid PDF,'\