jekyll-redirect-from 0.14.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d896608ee5b8bb8f9e439f22a81cf4b31dbbec19439c32fac516807792fab749
-  data.tar.gz: c1270871822061bc5b6cc1b250d9a638f19ddaf997147538980189d725b12ba4
+  metadata.gz: e8fa3fc03dd67c563c6018790133a100fcc0f04912859e8622efb6762116fc08
+  data.tar.gz: fce8c765fea3f6f17ae338fee50ce01331c91cc1f083f26d4294681b709972eb
 SHA512:
-  metadata.gz: 6134b8983c7f06bf2e4d00113e22a6d908989a5ab4e48bcd1b2acf3b48022669f8af96f141ba33e943911e58b7d7f84b3689ce36873490655ae0364f5f396da9
-  data.tar.gz: 6f8cb2062c0c580d3a8c80bc68d7310d1759c047bf01ab94291968e41ee9542bd4b5529771acee5e6d8541e1c85bbd4674249cc883cd53823ead8a58573b407c
+  metadata.gz: 217696213cdf50a1f85dc636ced9efa29dd80567837989a00c87b7f68add82c84a74eb2319a547e3f04612b04eb8731685490d79a334ac85121fb78063d791fe
+  data.tar.gz: 01044dde063223161451b32fd6a4fa56cc17451eae306b88065f56a72e21b5f8f3b63f10fb0aba19bc7a6856e20b84d9fcad9ad920f7c7bc500e15ba70950c0a

data/.gitignore

@@ -13,6 +13,7 @@ pkg
 rdoc
 spec/reports
 spec/fixtures/.jekyll-metadata
+spec/fixtures/.jekyll-cache
 test/tmp
 test/version_tmp
 tmp

data/.rubocop.yml

@@ -1,23 +1,11 @@
+inherit_from: .rubocop_todo.yml
+
+require: rubocop-jekyll
+
 inherit_gem:
-  jekyll: .rubocop.yml
+  rubocop-jekyll: .rubocop.yml
 
 AllCops:
   TargetRubyVersion: 2.3
   Exclude:
     - vendor/**/*
-
-Metrics/BlockLength:
-  Exclude:
-    - spec/**/*
-
-Metrics/LineLength:
-  Exclude:
-    - spec/**/*
-
-Naming/MemoizedInstanceVariableName:
-  Exclude:
-    - lib/jekyll-redirect-from/page_without_a_file.rb
-
-Naming/UncommunicativeMethodParamName:
-  Exclude:
-    - lib/jekyll-redirect-from/redirect_page.rb

data/.rubocop_todo.yml

@@ -0,0 +1,40 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2018-12-06 11:51:19 +0100 using RuboCop version 0.61.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: 12
+# Configuration parameters: CountComments, Max, ExcludedMethods.
+# ExcludedMethods: refine
+Metrics/BlockLength:
+  Exclude:
+    - 'spec/integrations_spec.rb'
+    - 'spec/jekyll_redirect_from/generator_spec.rb'
+    - 'spec/jekyll_redirect_from/redirect_page_spec.rb'
+    - 'spec/jekyll_redirect_from/redirectable_spec.rb'
+    - 'spec/spec_helper.rb'
+
+# Offense count: 3
+# Configuration parameters: Max, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# URISchemes: http, https
+Metrics/LineLength:
+  Exclude:
+    - 'spec/jekyll_redirect_from/generator_spec.rb'
+    - 'spec/jekyll_redirect_from/redirect_page_spec.rb'
+
+# Offense count: 1
+# Configuration parameters: EnforcedStyleForLeadingUnderscores.
+# SupportedStylesForLeadingUnderscores: disallowed, required, optional
+Naming/MemoizedInstanceVariableName:
+  Exclude:
+    - 'lib/jekyll-redirect-from/page_without_a_file.rb'
+
+# Offense count: 2
+# Configuration parameters: MinNameLength, AllowNamesEndingInNumbers, AllowedNames, ForbiddenNames.
+# AllowedNames: io, id, to, by, on, in, at, ip, db
+Naming/UncommunicativeMethodParamName:
+  Exclude:
+    - 'lib/jekyll-redirect-from/redirect_page.rb'

data/.travis.yml

@@ -1,15 +1,19 @@
 language: ruby
-sudo: false
 cache: bundler
+rvm:
+  - &latest_ruby 2.6
+  - 2.4
+  - 2.3
+env:
+  - JEKYLL_VERSION="~> 3.8"
 matrix:
   include:
     - # GitHub Pages
-      rvm: 2.4.2
+      rvm: 2.5.3
       env: GH_PAGES=true
-rvm:
-  - 2.5
-  - 2.4
-  - 2.3
+    - rvm: *latest_ruby
+      env: JEKYLL_VERSION=">= 4.0.0.pre.alpha1"
+
 before_install:
 - gem update --system
 before_script: bundle update

data/Gemfile

@@ -3,6 +3,5 @@
 source "https://rubygems.org"
 gemspec
 
-if ENV["GH_PAGES"]
-  gem "github-pages"
-end
+gem "github-pages" if ENV["GH_PAGES"]
+gem "jekyll", ENV["JEKYLL_VERSION"] if ENV["JEKYLL_VERSION"]

data/History.markdown

@@ -1,3 +1,13 @@
+## 0.15.0 / 2019-03-23
+
+### Development Fixes
+
+  * chore(deps): rubocop-jekyll 0.3 (#187)
+
+### Bug Fixes
+
+  * Allow testing and using with Jekyll 4.x (#196)
+
 ## 0.14.0 / 2018-06-29
 
 ### Minor Enhancements

data/jekyll-redirect-from.gemspec

@@ -22,10 +22,13 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r!^(test|spec|features)/!)
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "jekyll", "~> 3.3"
-  spec.add_development_dependency "bundler", "~> 1.16"
+  spec.required_ruby_version = ">= 2.3.0"
+
+  spec.add_runtime_dependency "jekyll", ">= 3.3", "< 5.0"
+
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "jekyll-sitemap", "~> 1.0"
   spec.add_development_dependency "rake", "~> 12.0"
   spec.add_development_dependency "rspec", "~> 3.5"
-  spec.add_development_dependency "rubocop", "~> 0.57"
+  spec.add_development_dependency "rubocop-jekyll", "~> 0.4"
 end

data/lib/jekyll-redirect-from/generator.rb

@@ -17,6 +17,7 @@ module JekyllRedirectFrom
       # Must duplicate pages to modify while in loop
       (site.docs_to_write + site.pages.dup).each do |doc|
         next unless JekyllRedirectFrom::CLASSES.include?(doc.class)
+
         generate_redirect_from(doc)
         generate_redirect_to(doc)
       end
@@ -37,6 +38,7 @@ module JekyllRedirectFrom
 
     def generate_redirect_to(doc)
       return unless doc.redirect_to
+
       page = RedirectPage.redirect_to(doc, doc.redirect_to)
       doc.data.merge!(page.data)
       doc.content = doc.output = page.output
@@ -45,6 +47,7 @@ module JekyllRedirectFrom
 
     def generate_redirects_json
       return if File.exist? site.in_source_dir("redirects.json")
+
       page = PageWithoutAFile.new(site, "", "", "redirects.json")
       page.content = redirects.to_json
       page.data["layout"] = nil

data/lib/jekyll-redirect-from/redirect_page.rb

@@ -45,13 +45,13 @@ module JekyllRedirectFrom
     def set_paths(from, to)
       @context ||= context
       from = ensure_leading_slash(from)
-      data.merge!({
+      data.merge!(
         "permalink" => from,
         "redirect"  => {
           "from" => from,
           "to"   => to =~ %r!^https?://! ? to : absolute_url(to),
-        },
-      })
+        }
+      )
     end
 
     def redirect_from

data/lib/jekyll-redirect-from/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module JekyllRedirectFrom
-  VERSION = "0.14.0"
+  VERSION = "0.15.0"
 end

data/spec/jekyll_redirect_from/generator_spec.rb

@@ -142,7 +142,7 @@ RSpec.describe JekyllRedirectFrom::Generator do
 
       it "doesn't overwrite redirets.json" do
         expect(path).to exist
-        expect(redirects).to eql({ "foo" => "bar" })
+        expect(redirects).to eql("foo" => "bar")
       end
     end
   end

data/spec/spec_helper.rb

@@ -34,7 +34,7 @@ RSpec.configure do |config|
   end
 
   def config
-    Jekyll.configuration({
+    Jekyll.configuration(
       "source"      => fixtures_path.to_s,
       "destination" => fixtures_path.join("_site").to_s,
       "collections" => {
@@ -49,8 +49,8 @@ RSpec.configure do |config|
       "defaults"    => [{
         "scope"  => { "path" => "" },
         "values" => { "layout" => "layout" },
-      },],
-    }).backwards_compatibilize
+      }]
+    ).backwards_compatibilize
   end
 
   def site

metadata

@@ -1,43 +1,49 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-redirect-from
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.15.0
 platform: ruby
 authors:
 - Parker Moore
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-29 00:00:00.000000000 Z
+date: 2019-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: jekyll-sitemap
   requirement: !ruby/object:Gem::Requirement
@@ -81,19 +87,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.5'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rubocop-jekyll
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.57'
+        version: '0.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.57'
+        version: '0.4'
 description: 
 email:
 - parkrmoore@gmail.com
@@ -104,6 +110,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
+- ".rubocop_todo.yml"
 - ".travis.yml"
 - Gemfile
 - History.markdown
@@ -156,15 +163,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Seamlessly specify multiple redirection URLs for your pages and posts