Rubocop pass

.rubocop.yml

@@ -4,9 +4,11 @@ require:
 AllCops:
   TargetRubyVersion: 2.5
   Include:
-    - '**/Rakefile'
-    - '**/Gemfile'
+    - '**/*.rb'
+    - Rakefile
+    - Gemfile
   Exclude:
+    - fixtures/**/*
   NewCops: disable
   SuggestExtensions: false
 
@@ -16,13 +18,21 @@ Layout/EndAlignment:
   EnforcedStyleAlignWith: variable
 Layout/LineLength:
   Enabled: false
-Layout/SpaceAroundEqualsInParameterDefault:
-  EnforcedStyle: no_space
 
 Lint/AssignmentInCondition:
   Enabled: false
 Lint/SuppressedException:
   Enabled: false
+Lint/MissingSuper:
+  Enabled: false
+Lint/AmbiguousRegexpLiteral:
+  Enabled: false
+Lint/AmbiguousBlockAssociation:
+  Enabled: false
+Lint/UriEscapeUnescape:
+  Enabled: false
+Lint/ShadowedException:
+  Enabled: false
 
 Metrics/AbcSize:
   Enabled: false
@@ -34,6 +44,10 @@ Metrics/MethodLength:
   Enabled: false
 Metrics/PerceivedComplexity:
   Enabled: false
+Metrics/BlockLength:
+  Enabled: false
+Metrics/ModuleLength:
+  Enabled: false
 
 Style/BlockDelimiters:
   Enabled: false
@@ -65,6 +79,25 @@ Style/SpecialGlobalVars:
   Enabled: false
 Style/TrivialAccessors:
   Enabled: false
+Style/EvalWithLocation:
+  Enabled: false
+Style/ClassVars:
+  Enabled: false
+Style/GlobalVars:
+  Enabled: false
+Style/ClassAndModuleChildren:
+  Enabled: false
+Style/MissingRespondToMissing:
+  Enabled: false
+
+Naming/FileName:
+  Enabled: false
+Naming/MethodParameterName:
+  Enabled: false
+Naming/MemoizedInstanceVariableName:
+  Enabled: false
+Naming/HeredocDelimiterNaming:
+  Enabled: false
 
 Bundler/OrderedGems:
   Enabled: false

Gemfile

@@ -26,4 +26,4 @@ gem 'nokogiri', RUBY_VERSION < '2.6' ? '~> 1.12.0' : '>= 0', require: false
 # Code Quality
 gem 'rubocop', require: false
 gem 'rubocop-performance', require: false
-gem 'simplecov', '~> 0.10', require: false
+gem 'simplecov', require: false

Rakefile

@@ -13,7 +13,7 @@ Cucumber::Rake::Task.new(:cucumber, 'Run features that should pass') do |t|
 end
 
 desc 'Run tests, both RSpec and Cucumber'
-task test: %i[rubocop spec cucumber]
+task test: %i[spec cucumber]
 
 require 'rspec/core/rake_task'
 desc 'Run RSpec'

features/support/time_steps.rb

@@ -11,13 +11,13 @@
 
 Given /the (date|time|date and time) is (.+?)$/ do |datetime, value|
   time = case datetime
-         when 'date'
-           Date.parse(value)
-         when 'time'
-           Time.parse(value)
-         when 'date and time'
-           Time.zone.parse(value)
-         end
+  when 'date'
+    Date.parse(value)
+  when 'time'
+    Time.parse(value)
+  when 'date and time'
+    Time.zone.parse(value)
+  end
 
   Timecop.travel time
 end

lib/middleman-blog/blog_article.rb

@@ -206,10 +206,10 @@ def date
 
         # First get the date from frontmatter
         @_date = if frontmatter_date.is_a? Time
-                   frontmatter_date.in_time_zone
-                 else
-                   Time.zone.parse(frontmatter_date.to_s)
-                 end
+          frontmatter_date.in_time_zone
+        else
+          Time.zone.parse(frontmatter_date.to_s)
+        end
 
         # Next figure out the date from the filename
         source_vars = blog_data.source_template.variables

lib/middleman-blog/blog_data.rb

@@ -51,7 +51,7 @@ def initialize(app, controller, options)
       # @return [Array<Middleman::Sitemap::Resource>]
       ##
       def articles
-        @_articles.select(&(options.filter || proc { |a| a })).sort_by(&:date).reverse
+        @_articles.select(&options.filter || proc { |a| a }).sort_by(&:date).reverse
       end
 
       ##

lib/middleman-blog/calendar_pages.rb

@@ -33,12 +33,12 @@ def initialize(app, blog_controller)
       # @return [String]
       def link(year, month = nil, day = nil)
         template = if day
-                     @day_link_template
-                   elsif month
-                     @month_link_template
-                   else
-                     @year_link_template
-                   end
+          @day_link_template
+        elsif month
+          @month_link_template
+        else
+          @year_link_template
+        end
 
         apply_uri_template template, date_to_params(Date.new(year, month || 1, day || 1))
       end

lib/middleman-blog/commands/article.rb

@@ -79,10 +79,10 @@ def article
         end
 
         blog_inst = if options[:blog]
-                      app.extensions[:blog].find { |_key, instance| instance.options[:name] == options[:blog] }[ 1 ]
-                    else
-                      app.extensions[:blog].values.first
-                    end
+          app.extensions[:blog].find { |_key, instance| instance.options[:name] == options[:blog] }[ 1 ]
+        else
+          app.extensions[:blog].values.first
+        end
 
         unless blog_inst
           msg = 'Could not find an active blog instance'

lib/middleman-blog/extension.rb

@@ -81,18 +81,18 @@ def initialize(app, options_hash = {}, &block)
       end
 
       # If "prefix" option is specified, all other paths are relative to it.
-      if options.prefix
-        options.prefix = "/#{options.prefix}" unless options.prefix.start_with? '/'
-        options.permalink = File.join(options.prefix, options.permalink)
-        options.sources = File.join(options.prefix, options.sources)
-        options.taglink = File.join(options.prefix, options.taglink)
-        options.year_link = File.join(options.prefix, options.year_link)
-        options.month_link = File.join(options.prefix, options.month_link)
-        options.day_link = File.join(options.prefix, options.day_link)
-
-        options.custom_collections.each do |_key, opts|
-          opts[:link] = File.join(options.prefix, opts[:link])
-        end
+      return unless options.prefix
+
+      options.prefix = "/#{options.prefix}" unless options.prefix.start_with? '/'
+      options.permalink = File.join(options.prefix, options.permalink)
+      options.sources = File.join(options.prefix, options.sources)
+      options.taglink = File.join(options.prefix, options.taglink)
+      options.year_link = File.join(options.prefix, options.year_link)
+      options.month_link = File.join(options.prefix, options.month_link)
+      options.day_link = File.join(options.prefix, options.day_link)
+
+      options.custom_collections.each do |_key, opts|
+        opts[:link] = File.join(options.prefix, opts[:link])
       end
     end
 

lib/middleman-blog/truncate_html.rb

@@ -50,7 +50,7 @@ def truncate(max_length, ellipsis)
   module TextNode
     def truncate(max_length, ellipsis)
       # Don't break in the middle of a word
-      trimmed_content = content.match(/(.{1,#{max_length}}[\w]*)/m).to_s
+      trimmed_content = content.match(/(.{1,#{max_length}}\w*)/m).to_s
       trimmed_content << ellipsis if trimmed_content.length < content.length
 
       Nokogiri::XML::Text.new(trimmed_content, parent)

lib/middleman-blog/uri_templates.rb

@@ -60,7 +60,7 @@ def safe_parameterize(str, sep = '-')
 
         # Reimplementation of http://api.rubyonrails.org/classes/ActiveSupport/Inflector.html#method-i-parameterize that preserves un-transliterate-able multibyte chars.
         parameterized_string = ::ActiveSupport::Inflector.transliterate(str.to_s).downcase
-        parameterized_string.gsub!(/[^a-z0-9\-_\?]+/, sep)
+        parameterized_string.gsub!(/[^a-z0-9\-_?]+/, sep)
 
         # Check for multibytes and sub back in
         parameterized_string.chars.to_a.each_with_index do |char, i|

middleman-blog.gemspec

@@ -13,8 +13,6 @@ Gem::Specification.new do | s |
   s.files                 = `git ls-files -z`.split( "\0" )
   s.test_files            = `git ls-files -z -- {fixtures,features}/*`.split( "\0" )
   s.require_paths         = [ "lib" ]
-  s.required_ruby_version = '>= 2.3.0'
-
   s.add_dependency("middleman-core", ">= 4.0.0")
   s.add_dependency("tzinfo", ">= 0.3.0")
   s.add_dependency("addressable", "~> 2.3")

spec/spec_helper.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 
 require 'simplecov'
-SimpleCov.root(File.expand_path(File.dirname(__FILE__) + '/..'))
+SimpleCov.root(File.expand_path("#{File.dirname(__FILE__)}/.."))