Lint with rubocop-jekyll (#128)

Merge pull request 128

.rubocop.yml

@@ -1,15 +1,22 @@
+require: rubocop-jekyll
+
 inherit_gem:
-  jekyll: .rubocop.yml
+  rubocop-jekyll: .rubocop.yml
 
 AllCops:
-  TargetRubyVersion: 2.1
+  TargetRubyVersion: 2.2
   Exclude:
     - vendor/**/*
 
 Lint/ShadowingOuterLocalVariable:
   Exclude:
     - lib/jekyll-archives.rb
 
+# Remove once Jekyll core has dropped explicit support for Ruby 2.2
+Lint/SafeNavigationConsistency:
+  Exclude:
+    - lib/jekyll-archives/archive.rb
+
 Metrics/BlockLength:
   Exclude:
     - test/**/*.rb

.travis.yml

@@ -3,20 +3,19 @@ script : script/cibuild
 cache: bundler
 sudo: false
 
-before_install: 
+before_install:
   - gem update --system
   - bundle update
 rvm:
-  - 2.2
   - 2.3
   - 2.4
   - 2.5
 env:
   - ""
-  - JEKYLL_VERSION=3.6
+  - JEKYLL_VERSION=3.7.4
 
 matrix:
   include:
     - # GitHub Pages
-      rvm: 2.4.0
+      rvm: 2.5.1
       env: GH_PAGES=true

Gemfile

@@ -8,6 +8,3 @@ if ENV["GH_PAGES"]
 elsif ENV["JEKYLL_VERSION"]
   gem "jekyll", "~> #{ENV["JEKYLL_VERSION"]}"
 end
-
-# Support for Ruby < 2.2.2 & activesupport
-gem "activesupport", "~> 4.2" if RUBY_VERSION < "2.2.2"

jekyll-archives.gemspec

@@ -14,14 +14,16 @@ Gem::Specification.new do |s|
   s.homepage    = "https://github.com/jekyll/jekyll-archives"
   s.licenses    = ["MIT"]
 
-  all_files       = `git ls-files -z`.split("\x0")
-  s.files         = all_files.grep(%r!^(lib)/!)
+  all_files     = `git ls-files -z`.split("\x0")
+  s.files       = all_files.grep(%r!^(lib)/!)
 
-  s.add_dependency "jekyll", ">= 3.1"
+  s.required_ruby_version = ">= 2.2.0"
 
-  s.add_development_dependency  "minitest"
-  s.add_development_dependency  "rake"
-  s.add_development_dependency  "rdoc"
-  s.add_development_dependency  "rubocop", "0.51"
-  s.add_development_dependency  "shoulda"
+  s.add_dependency "jekyll", "~> 3.6"
+
+  s.add_development_dependency "minitest"
+  s.add_development_dependency "rake"
+  s.add_development_dependency "rdoc"
+  s.add_development_dependency "rubocop-jekyll", "~> 0.2.0"
+  s.add_development_dependency "shoulda"
 end

lib/jekyll-archives/archive.rb

@@ -78,11 +78,11 @@ def url_placeholders
       #
       # Returns the String url.
       def url
-        @url ||= URL.new({
+        @url ||= URL.new(
           :template     => template,
           :placeholders => url_placeholders,
-          :permalink    => nil,
-        }).to_s
+          :permalink    => nil
+        ).to_s
       rescue ArgumentError
         raise ArgumentError, "Template \"#{template}\" provided is invalid."
       end

test/helper.rb

@@ -16,32 +16,30 @@
 SOURCE_DIR   = File.expand_path("source", TEST_DIR)
 DEST_DIR     = File.expand_path("destination", TEST_DIR)
 
-class Minitest::Test
-  def fixture_site(config = {})
-    Jekyll::Site.new(
-      Jekyll::Utils.deep_merge_hashes(
+module Minitest
+  class Test
+    def fixture_site(config = {})
+      Jekyll::Site.new(
         Jekyll::Utils.deep_merge_hashes(
-          Jekyll::Configuration::DEFAULTS,
-          {
+          Jekyll::Utils.deep_merge_hashes(
+            Jekyll::Configuration::DEFAULTS,
             "source"      => SOURCE_DIR,
-            "destination" => DEST_DIR,
-          }
-        ),
-        config
+            "destination" => DEST_DIR
+          ),
+          config
+        )
       )
-    )
-  end
+    end
 
-  def archive_exists?(site, path)
-    site.config["archives"].any? { |archive| archive.path == path }
-  end
+    def archive_exists?(site, path)
+      site.config["archives"].any? { |archive| archive.path == path }
+    end
+
+    def read_file(path)
+      read_path = File.join(DEST_DIR, path)
+      return false unless File.exist?(read_path)
 
-  def read_file(path)
-    read_path = File.join(DEST_DIR, path)
-    if File.exist? read_path
       File.read(read_path).strip
-    else
-      return false
     end
   end
 end

test/test_jekyll_archives.rb

@@ -65,14 +65,14 @@ class TestJekyllArchives < Minitest::Test
 
   context "the jekyll-archives plugin with type-specific layout" do
     setup do
-      @site = fixture_site({
+      @site = fixture_site(
         "jekyll-archives" => {
           "enabled" => true,
           "layouts" => {
             "year" => "archive-too",
           },
-        },
-      })
+        }
+      )
       @site.process
     end
 
@@ -85,16 +85,16 @@ class TestJekyllArchives < Minitest::Test
 
   context "the jekyll-archives plugin with custom permalinks" do
     setup do
-      @site = fixture_site({
+      @site = fixture_site(
         "jekyll-archives" => {
           "enabled"    => true,
           "permalinks" => {
             "year"     => "/year/:year/",
             "tag"      => "/tag-:name.html",
             "category" => "/category-:name.html",
           },
-        },
-      })
+        }
+      )
       @site.process
     end