jekyll-redirect-from 0.11.0 → 0.12.0

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-redirect-from
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Parker Moore
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-06 00:00:00.000000000 Z
+date: 2017-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.1
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.43'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.43'
 description: Seamlessly specify multiple redirection URLs for your pages and posts
 email:
 - parkrmoore@gmail.com
@@ -89,6 +103,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - ".travis.yml"
 - Gemfile
 - History.markdown
@@ -97,8 +112,12 @@ files:
 - Rakefile
 - jekyll-redirect-from.gemspec
 - lib/jekyll-redirect-from.rb
+- lib/jekyll-redirect-from/context.rb
+- lib/jekyll-redirect-from/generator.rb
+- lib/jekyll-redirect-from/layout.rb
+- lib/jekyll-redirect-from/redirect.html
 - lib/jekyll-redirect-from/redirect_page.rb
-- lib/jekyll-redirect-from/redirector.rb
+- lib/jekyll-redirect-from/redirectable.rb
 - lib/jekyll-redirect-from/version.rb
 - script/bootstrap
 - script/cibuild
@@ -108,17 +127,20 @@ files:
 - spec/fixtures/_articles/redirect-somewhere-else-im-a-permalink.html
 - spec/fixtures/_articles/redirect-somewhere-else-plz.html
 - spec/fixtures/_authors/kansaichris.md
-- spec/fixtures/_config.yml
 - spec/fixtures/_layouts/layout.html
 - spec/fixtures/_posts/2014-01-03-redirect-me-plz.md
+- spec/fixtures/multiple_redirect_froms.md
 - spec/fixtures/multiple_redirect_tos.md
-- spec/fixtures/multiple_redirect_urls.md
-- spec/fixtures/one_redirect_to.md
-- spec/fixtures/one_redirect_url.md
+- spec/fixtures/one_redirect_from.md
+- spec/fixtures/one_redirect_to_path.md
+- spec/fixtures/one_redirect_to_url.md
 - spec/fixtures/tags/how we work.md
 - spec/integrations_spec.rb
+- spec/jekyll_redirect_from/context_spec.rb
+- spec/jekyll_redirect_from/generator_spec.rb
+- spec/jekyll_redirect_from/layout_spec.rb
 - spec/jekyll_redirect_from/redirect_page_spec.rb
-- spec/jekyll_redirect_from/redirector_spec.rb
+- spec/jekyll_redirect_from/redirectable_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/jekyll/jekyll-redirect-from
 licenses:
@@ -140,7 +162,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Seamlessly specify multiple redirection URLs for your pages and posts
@@ -149,15 +171,18 @@ test_files:
 - spec/fixtures/_articles/redirect-somewhere-else-im-a-permalink.html
 - spec/fixtures/_articles/redirect-somewhere-else-plz.html
 - spec/fixtures/_authors/kansaichris.md
-- spec/fixtures/_config.yml
 - spec/fixtures/_layouts/layout.html
 - spec/fixtures/_posts/2014-01-03-redirect-me-plz.md
+- spec/fixtures/multiple_redirect_froms.md
 - spec/fixtures/multiple_redirect_tos.md
-- spec/fixtures/multiple_redirect_urls.md
-- spec/fixtures/one_redirect_to.md
-- spec/fixtures/one_redirect_url.md
+- spec/fixtures/one_redirect_from.md
+- spec/fixtures/one_redirect_to_path.md
+- spec/fixtures/one_redirect_to_url.md
 - spec/fixtures/tags/how we work.md
 - spec/integrations_spec.rb
+- spec/jekyll_redirect_from/context_spec.rb
+- spec/jekyll_redirect_from/generator_spec.rb
+- spec/jekyll_redirect_from/layout_spec.rb
 - spec/jekyll_redirect_from/redirect_page_spec.rb
-- spec/jekyll_redirect_from/redirector_spec.rb
+- spec/jekyll_redirect_from/redirectable_spec.rb
 - spec/spec_helper.rb

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

@@ -1,91 +0,0 @@
-module JekyllRedirectFrom
-  class Redirector < Jekyll::Generator
-    safe true
-
-    def generate(site)
-      original_pages = site.pages.dup
-      generate_alt_urls(site, site.posts) if Jekyll::VERSION < '3.0.0'
-      generate_alt_urls(site, original_pages)
-      generate_alt_urls(site, site.docs_to_write)
-    end
-
-    def generate_alt_urls(site, list)
-      list.each do |item|
-        if has_alt_urls?(item)
-          alt_urls(item).each do |alt_url|
-            redirect_page = RedirectPage.new(site, site.source, "", "redirect.html")
-            redirect_page.data['permalink'] = alt_url
-            redirect_page.data['sitemap'] = false
-            redirect_page.generate_redirect_content(redirect_url(site, item))
-            site.pages << redirect_page
-          end
-        end
-        if has_redirect_to_url?(item)
-          redirect_to_url(item).flatten.each do |alt_url|
-            item.data['sitemap'] = false
-
-            item.url << "index.html" if item.url.end_with?("/")
-            redirect_page = RedirectPage.new(site, site.source, File.dirname(item.url), File.basename(item.url))
-
-            redirect_page.data['permalink'] = item.url
-            redirect_page.data['sitemap'] = false
-            redirect_page.generate_redirect_content(alt_url)
-            if item.is_a?(Jekyll::Document)
-              item.content = item.output = redirect_page.content
-            else
-              site.pages << redirect_page
-            end
-          end
-        end
-      end
-    end
-
-    def is_dynamic_document?(page_or_post)
-      page_or_post.is_a?(Jekyll::Page) ||
-        page_or_post.is_a?(Jekyll::Document) ||
-        (Jekyll::VERSION < '3.0.0' &&
-          page_or_post.is_a?(Jekyll::Post))
-    end
-
-    def has_alt_urls?(page_or_post)
-      is_dynamic_document?(page_or_post) &&
-        page_or_post.data.has_key?('redirect_from') &&
-        !alt_urls(page_or_post).empty?
-    end
-
-    def alt_urls(page_or_post)
-      Array[page_or_post.data['redirect_from']].flatten.compact
-    end
-
-    def has_redirect_to_url?(page_or_post)
-      is_dynamic_document?(page_or_post) &&
-        page_or_post.data.has_key?('redirect_to') &&
-        !redirect_to_url(page_or_post).empty?
-    end
-
-    def redirect_to_url(page_or_post)
-      [Array[page_or_post.data['redirect_to']].flatten.first].compact
-    end
-
-    def redirect_url(site, item)
-      File.join redirect_prefix(site), item.url
-    end
-
-    def redirect_prefix(site)
-      config_github_url(site) || config_url(site)
-    end
-
-    def config_github_url(site)
-      github_config = site.config['github']
-      if github_config.is_a?(Hash) && github_config['url']
-        github_config['url'].to_s
-      end
-    end
-
-    def config_url(site)
-      url = site.config.fetch('url', nil) || ""
-      baseurl = site.config.fetch('baseurl', nil) || ""
-      File.join url, baseurl
-    end
-  end
-end

data/spec/fixtures/_config.yml

@@ -1,7 +0,0 @@
-url: http://jekyllrb.com
-gems:
-  - jekyll-redirect-from
-  - jekyll-sitemap
-collections:
-  articles:
-    output: true

data/spec/fixtures/one_redirect_url.md

@@ -1,6 +0,0 @@
----
-title: I only have one redirect url.
-redirect_from: mencius/was/my/father
----
-
-One redirect url

data/spec/jekyll_redirect_from/redirector_spec.rb

@@ -1,149 +0,0 @@
-require "spec_helper"
-
-describe JekyllRedirectFrom::Redirector do
-  let(:redirector)                  { described_class.new }
-  let(:post_to_redirect)            { setup_post("2014-01-03-redirect-me-plz.md") }
-  let(:doc_to_redirect_from)        { setup_doc("redirect-me-plz.md") }
-  let(:doc_to_redirect_to)          { setup_doc("redirect-somewhere-else-plz.html") }
-  let(:doc_to_redirect_to_permalnk) { setup_doc("redirect-somewhere-else-im-a-permalink.html") }
-  let(:page_with_one)               { setup_page("one_redirect_url.md") }
-  let(:page_with_many)              { setup_page("multiple_redirect_urls.md") }
-  let(:page_with_one_redirect_to)   { setup_page("one_redirect_to.md") }
-  let(:page_with_many_redirect_to)  { setup_page("multiple_redirect_tos.md") }
-  let(:page_to_redirect_to_permlnk) { setup_page("tags/how we work.md") }
-
-  it "knows if a page or post is requesting a redirect page" do
-    if JekyllRedirectFrom.jekyll_3?
-      skip "Don't need to test posts in Jekyll 3"
-    else
-      expect(redirector.has_alt_urls?(post_to_redirect)).to be_truthy
-    end
-  end
-
-  it "knows if a document is requesting a redirect page" do
-    expect(redirector.has_alt_urls?(doc_to_redirect_from)).to be_truthy
-  end
-
-  it "knows if a document is requesting a redirect away" do
-    expect(redirector.redirect_to_url(doc_to_redirect_to)).to eql(["http://www.zombo.com"])
-  end
-
-  it "knows if a document is requesting a redirect away" do
-    expect(redirector.redirect_to_url(doc_to_redirect_to_permalnk)).to eql(["/tags/our-projects/"])
-  end
-
-  it "handles one redirect path" do
-    expect(redirector.alt_urls(page_with_one)).to eql(["mencius/was/my/father"])
-  end
-
-  it "handles many redirect paths" do
-    expect(redirector.alt_urls(page_with_many)).to eql(["help", "contact", "let-there/be/light-he-said", "/geepers/mccreepin"])
-  end
-
-  it "handles a single redirect_to url" do
-    expect(redirector.redirect_to_url(page_with_one_redirect_to)).to eql(["https://www.github.com"])
-  end
-
-  it "handles a many redirect_to urls" do
-    expect(redirector.redirect_to_url(page_with_many_redirect_to)).to eql(["https://www.jekyllrb.com"])
-  end
-
-  it "does not include pages with a redirect in sitemap" do
-    expect(destination_sitemap).not_to include(%|one_redirect_to.html|)
-  end
-
-  context "refresh page generation" do
-    before(:each) do
-      described_class.new.generate(@site)
-    end
-
-    it "generates the refresh page for the post properly" do
-      expect(dest_dir("posts/23128432159832/mary-had-a-little-lamb#{forced_output_ext}")).to exist
-    end
-
-    it "generates the refresh pages for the page with multiple redirect_from urls" do
-      expect(dest_dir("help")).to be_truthy
-      expect(dest_dir("contact")).to be_truthy
-      expect(dest_dir("let-there/be/light-he-said")).to be_truthy
-      expect(dest_dir("/geepers/mccreepin")).to be_truthy
-    end
-
-    it "generates the refresh page for the page with one redirect_from url" do
-      expect(dest_dir("mencius/was/my/father#{forced_output_ext}")).to exist
-    end
-
-    it "generates the refresh page for the collection with one redirect_to url" do
-      expect(dest_dir("articles", "redirect-somewhere-else-plz.html")).to exist
-      expect(dest_dir("articles", "redirect-somewhere-else-plz.html").read).to include(%|<meta http-equiv="refresh" content="0; url=http://www.zombo.com">|)
-    end
-
-    it "generates the refresh page for the collection with one redirect_to url and a permalink" do
-      expect(dest_dir("tags", "our projects", "index")).not_to exist
-      expect(dest_dir("tags", "our projects", "index.html")).to exist
-      expect(dest_dir("tags", "our projects", "index.html").read).to include(%|<meta http-equiv="refresh" content="0; url=/tags/our-projects/">|)
-    end
-
-    it "generates the refresh page for the page with one redirect_to url" do
-      expect(dest_dir("one_redirect_to.html")).to exist
-      expect(dest_dir("one_redirect_to.html").read).to include(%|<meta http-equiv="refresh" content="0; url=https://www.github.com">|)
-    end
-
-    it "generates the refresh page for the page with multiple redirect_to urls" do
-      expect(dest_dir("multiple_redirect_tos.html")).to exist
-      expect(dest_dir("multiple_redirect_tos.html").read).to include(%|<meta http-equiv="refresh" content="0; url=https://www.jekyllrb.com">|)
-    end
-
-    it "does not include any default layout" do
-      expect(dest_dir("multiple_redirect_tos.html")).to exist
-      expect(dest_dir("multiple_redirect_tos.html").read).not_to include('LAYOUT INCLUDED')
-    end
-
-    it "generates the refresh page for the page with one redirect_to url and a permalink" do
-      expect(dest_dir("tags", "how we work", "index")).not_to exist
-      expect(dest_dir("tags", "how we work", "index.html")).to exist
-      expect(dest_dir("tags", "how we work", "index.html").read).to include(%|<meta http-equiv="refresh" content="0; url=/tags/how-we-work/">|)
-    end
-  end
-
-  context "prefix" do
-    it "uses site.url as the redirect prefix when site.github.url is not set" do
-      @site.config['url'] = "http://notgithub.io"
-      @site.config['baseurl'] = nil
-      expect(redirector.redirect_url(@site, page_with_one)).to eql("http://notgithub.io/one_redirect_url.html")
-    end
-
-    it "uses site.baseurl as the redirect prefix when site.github.url is not set" do
-      @site.config['url'] = nil
-      @site.config['baseurl'] = "/fancy/prefix"
-      expect(redirector.redirect_url(@site, page_with_one)).to eql("/fancy/prefix/one_redirect_url.html")
-    end
-
-    it "uses site.url + site.baseurl as the redirect prefix when site.github.url is not set" do
-      @site.config['url'] = "http://notgithub.io"
-      @site.config['baseurl'] = "/fancy/prefix"
-      expect(redirector.redirect_url(@site, page_with_one)).to eql("http://notgithub.io/fancy/prefix/one_redirect_url.html")
-    end
-
-    it "prefers site.github.url over site.url or site.baseurl" do
-      @site.config['url'] = "http://notgithub.io"
-      @site.config['baseurl'] = "/fancy/prefix"
-      @site.config['github'] = { "url" => "http://example.github.io/test" }
-      expect(redirector.redirect_url(@site, page_with_one)).to eql("http://example.github.io/test/one_redirect_url.html")
-    end
-
-    it "converts non-string values in site.github.url to strings" do
-      @site.config['github'] = { "url" => TestStringContainer.new("http://example.github.io/test") }
-      expect(redirector.redirect_url(@site, page_with_one)).to eql("http://example.github.io/test/one_redirect_url.html")
-    end
-
-    it "uses site.url when site.github is set but site.github.url is not" do
-      @site.config['github'] = "username"
-      expect(redirector.redirect_url(@site, page_with_one)).to eql("http://jekyllrb.com/one_redirect_url.html")
-    end
-
-    it "no-ops when site.github.url and site.baseurl and site.url are not set" do
-      @site.config['url'] = nil
-      expect(redirector.redirect_url(@site, page_with_one)).to eql("/one_redirect_url.html")
-    end
-  end
-end