Merge pull request #854 from fwininger/remove_old_ruby

Remove support for old ruby versions

.rubocop.yml

@@ -1,7 +1,7 @@
 inherit_from: .rubocop_todo.yml
 
 AllCops:
-  TargetRubyVersion: 1.9
+  TargetRubyVersion: 2.2
   Exclude:
     - 'test/dummy/**/*'
 

.rubocop_todo.yml

@@ -1,63 +1,191 @@
-# This configuration was generated by `rubocop --auto-gen-config`
-# on 2015-11-08 18:41:57 -0500 using RuboCop version 0.32.1.
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2019-10-02 17:54:14 +0200 using RuboCop version 0.68.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-
 # Offense count: 9
-Metrics/AbcSize:
-  Max: 45
+# Cop supports --auto-correct.
+# Configuration parameters: TreatCommentsAsGroupSeparators, Include.
+# Include: **/*.gemfile, **/Gemfile, **/gems.rb
+Bundler/OrderedGems:
+  Exclude:
+    - 'gemfiles/4.0.gemfile'
+    - 'gemfiles/4.1.gemfile'
+    - 'gemfiles/4.2.gemfile'
+    - 'gemfiles/5.0.gemfile'
+    - 'gemfiles/5.1.gemfile'
+    - 'gemfiles/5.2.gemfile'
+    - 'gemfiles/rails_edge.gemfile'
 
 # Offense count: 2
-Metrics/BlockNesting:
-  Max: 4
+# Cop supports --auto-correct.
+# Configuration parameters: TreatCommentsAsGroupSeparators, Include.
+# Include: **/*.gemspec
+Gemspec/OrderedDependencies:
+  Exclude:
+    - 'wicked_pdf.gemspec'
+
+# Offense count: 16
+# Cop supports --auto-correct.
+Layout/EmptyLineAfterGuardClause:
+  Exclude:
+    - 'Rakefile'
+    - 'lib/wicked_pdf.rb'
+    - 'lib/wicked_pdf/pdf_helper.rb'
+    - 'lib/wicked_pdf/wicked_pdf_helper/assets.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+Layout/LeadingBlankLines:
+  Exclude:
+    - 'test/unit/wkhtmltopdf_location_test.rb'
+    - 'wicked_pdf.gemspec'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Layout/RescueEnsureAlignment:
+  Exclude:
+    - 'lib/wicked_pdf.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: final_newline, final_blank_line
+Layout/TrailingBlankLines:
+  Exclude:
+    - 'gemfiles/4.0.gemfile'
+
+# Offense count: 11
+Metrics/AbcSize:
+  Max: 45
 
 # Offense count: 2
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
-  Max: 300
+  Max: 292
 
-Metrics/ModuleLength:
-  Max: 160
-
-# Offense count: 5
+# Offense count: 7
 Metrics/CyclomaticComplexity:
   Max: 11
 
-# Offense count: 92
-# Configuration parameters: AllowURI, URISchemes.
-Metrics/LineLength:
-  Max: 563
-
-# Offense count: 14
-# Configuration parameters: CountComments.
+# Offense count: 17
+# Configuration parameters: CountComments, ExcludedMethods.
 Metrics/MethodLength:
   Max: 30
 
-# Offense count: 4
+# Offense count: 2
+# Configuration parameters: CountComments.
+Metrics/ModuleLength:
+  Max: 147
+
+# Offense count: 6
 Metrics/PerceivedComplexity:
   Max: 12
 
 # Offense count: 2
 Naming/AccessorMethodName:
-  Enabled: false
+  Exclude:
+    - 'lib/wicked_pdf/middleware.rb'
+    - 'lib/wicked_pdf/pdf_helper.rb'
+
+# Offense count: 1
+Security/Open:
+  Exclude:
+    - 'lib/wicked_pdf/wicked_pdf_helper/assets.rb'
 
 # Offense count: 1
 Style/CaseEquality:
-  Enabled: false
+  Exclude:
+    - 'lib/wicked_pdf/wicked_pdf_helper.rb'
 
 # Offense count: 1
 Style/ClassVars:
-  Enabled: false
+  Exclude:
+    - 'lib/wicked_pdf.rb'
 
-# Offense count: 15
+# Offense count: 10
 Style/Documentation:
-  Enabled: false
+  Exclude:
+    - 'spec/**/*'
+    - 'test/**/*'
+    - 'generators/wicked_pdf/wicked_pdf_generator.rb'
+    - 'lib/wicked_pdf.rb'
+    - 'lib/wicked_pdf/middleware.rb'
+    - 'lib/wicked_pdf/pdf_helper.rb'
+    - 'lib/wicked_pdf/progress.rb'
+    - 'lib/wicked_pdf/railtie.rb'
+    - 'lib/wicked_pdf/tempfile.rb'
+    - 'lib/wicked_pdf/wicked_pdf_helper.rb'
+    - 'lib/wicked_pdf/wicked_pdf_helper/assets.rb'
 
-# Offense count: 5
+# Offense count: 2
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, AllowInnerSlashes.
+Style/ExpandPathArguments:
+  Exclude:
+    - 'test/test_helper.rb'
+    - 'wicked_pdf.gemspec'
+
+# Offense count: 8
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, UseHashRocketsWithSymbolValues, PreferHashRocketsForNonAlnumEndingSymbols.
+# SupportedStyles: ruby19, hash_rockets, no_mixed_keys, ruby19_no_mixed_keys
+Style/HashSyntax:
+  Exclude:
+    - 'gemfiles/4.0.gemfile'
+    - 'gemfiles/4.1.gemfile'
+    - 'gemfiles/4.2.gemfile'
+    - 'gemfiles/5.0.gemfile'
+    - 'gemfiles/5.1.gemfile'
+    - 'gemfiles/5.2.gemfile'
+    - 'gemfiles/rails_edge.gemfile'
+
+# Offense count: 3
+# Cop supports --auto-correct.
+Style/IfUnlessModifier:
+  Exclude:
+    - 'Rakefile'
+    - 'lib/wicked_pdf.rb'
+    - 'lib/wicked_pdf/railtie.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: literals, strict
+Style/MutableConstant:
+  Exclude:
+    - 'lib/wicked_pdf/wicked_pdf_helper/assets.rb'
+
+# Offense count: 6
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, AllowInnerSlashes.
+# SupportedStyles: slashes, percent_r, mixed
 Style/RegexpLiteral:
-  Enabled: false
+  Exclude:
+    - 'lib/wicked_pdf/middleware.rb'
+    - 'lib/wicked_pdf/wicked_pdf_helper/assets.rb'
+    - 'test/unit/wicked_pdf_test.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, ConsistentQuotesInMultiline.
+# SupportedStyles: single_quotes, double_quotes
+Style/StringLiterals:
+  Exclude:
+    - 'gemfiles/4.0.gemfile'
+
+# Offense count: 29
+# Cop supports --auto-correct.
+# Configuration parameters: MinSize.
+# SupportedStyles: percent, brackets
+Style/SymbolArray:
+  EnforcedStyle: brackets
+
+# Offense count: 111
+# Cop supports --auto-correct.
+# Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# URISchemes: http, https
+Metrics/LineLength:
+  Max: 563

.travis.yml

@@ -17,21 +17,9 @@ script:
   - bundle exec rake
 matrix:
   include:
-    - rvm: 1.8.7
-      before_install:
-        - sudo apt-get update -qq
-        - gem update --system 1.8.25
-        - gem --version
-      gemfile: gemfiles/2.3.gemfile
-    - rvm: 1.9.2
-      gemfile: gemfiles/3.0.gemfile
-    - rvm: 1.9.3
-      gemfile: gemfiles/3.1.gemfile
-    - rvm: 2.0
-      gemfile: gemfiles/3.2.gemfile
-    - rvm: 2.0
+    - rvm: 2.2
       gemfile: gemfiles/4.0.gemfile
-    - rvm: 2.1
+    - rvm: 2.2
       gemfile: gemfiles/4.1.gemfile
     - rvm: 2.2
       gemfile: gemfiles/4.2.gemfile
@@ -77,8 +65,6 @@ matrix:
       before_install:
         - gem install bundler -v '~> 2'
   allow_failures:
-    - rvm: 1.8.7
-    - rvm: 1.9.2
     - rvm: 2.5
       gemfile: gemfiles/rails_edge.gemfile
     - rvm: 2.6

README.md

@@ -4,7 +4,7 @@
 
 Wicked PDF uses the shell utility [wkhtmltopdf](http://wkhtmltopdf.org) to serve a PDF file to a user from HTML.  In other words, rather than dealing with a PDF generation DSL of some sort, you simply write an HTML view as you would normally, then let Wicked PDF take care of the hard stuff.
 
-_Wicked PDF has been verified to work on Ruby versions 1.8.7 through 2.6; Rails 2 through 5.2_
+_Wicked PDF has been verified to work on Ruby versions 2.2 through 2.6; Rails 4 through 5.2_
 
 ### Installation
 

lib/generators/wicked_pdf_generator.rb

@@ -1,11 +1,7 @@
-if defined?(Rails) && Rails::VERSION::MAJOR != 2
-
-  # Rails3 generator invoked with 'rails generate wicked_pdf'
-  class WickedPdfGenerator < Rails::Generators::Base
-    source_root(File.expand_path(File.dirname(__FILE__) + '/../../generators/wicked_pdf/templates'))
-    def copy_initializer
-      copy_file 'wicked_pdf.rb', 'config/initializers/wicked_pdf.rb'
-    end
+# Rails generator invoked with 'rails generate wicked_pdf'
+class WickedPdfGenerator < Rails::Generators::Base
+  source_root(File.expand_path(File.dirname(__FILE__) + '/../../generators/wicked_pdf/templates'))
+  def copy_initializer
+    copy_file 'wicked_pdf.rb', 'config/initializers/wicked_pdf.rb'
   end
-
 end

lib/wicked_pdf.rb

@@ -4,24 +4,10 @@
 require 'logger'
 require 'digest/md5'
 require 'rbconfig'
+require 'open3'
 
-if (RbConfig::CONFIG['target_os'] =~ /mswin|mingw/) && (RUBY_VERSION < '1.9')
-  require 'win32/open3'
-else
-  require 'open3'
-end
-
-begin
-  require 'active_support/core_ext/module/attribute_accessors'
-rescue LoadError
-  require 'active_support/core_ext/class/attribute_accessors'
-end
-
-begin
-  require 'active_support/core_ext/object/blank'
-rescue LoadError
-  require 'active_support/core_ext/blank'
-end
+require 'active_support/core_ext/module/attribute_accessors'
+require 'active_support/core_ext/object/blank'
 
 require 'wicked_pdf/version'
 require 'wicked_pdf/railtie'