RubyGems - jekyll-redirect-from - Versions diffs - 0.10.0 → 0.11.0 - Mend

jekyll-redirect-from 0.10.0 → 0.11.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (13) hide show

checksums.yaml +4 -4
data/History.markdown +7 -0
data/README.md +2 -1
data/lib/jekyll-redirect-from/redirect_page.rb +3 -1
data/lib/jekyll-redirect-from/redirector.rb +8 -3
data/lib/jekyll-redirect-from/version.rb +1 -1
data/spec/fixtures/_articles/redirect-somewhere-else-im-a-permalink.html +7 -0
data/spec/fixtures/_layouts/layout.html +6 -0
data/spec/fixtures/tags/how we work.md +4 -0
data/spec/jekyll_redirect_from/redirect_page_spec.rb +1 -1
data/spec/jekyll_redirect_from/redirector_spec.rb +47 -14
data/spec/spec_helper.rb +5 -1
metadata +9 -3

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9fa3f92815ea1139cb6a777eec89fea9088c969a
-  data.tar.gz: c2eacde6b4baf40005a2bcdfeabdad17583c3f87
+  metadata.gz: 2d791a13d885f60395b4ae51369248e46e4b049b
+  data.tar.gz: d4bb94fb82a1dca865b49d404ec035ce037b3e65
 SHA512:
-  metadata.gz: 1fa268f45a18a89bc730731c3bf607cb83eaba4305b5e0d661675699179f791e818092b2b5b10a568bcc8120344dc96b07d82630ae748dbcecf8cdb7d56743e5
-  data.tar.gz: 76bf75329d712007916612d41258a977e1ef3b7e48bb3408d3de734b3fa9ee181f7a65814e47dd8ef6d140f94092c53ec0ae4d6bbb187787f47e9a20e513a0fc
+  metadata.gz: d918ab960428cd3d81738dddf6c8b66a68560ea686db49d29c775d0c722ea5ea3cd5d4722e1ffa67f7ad6eaf6ab802a91332a9a30a5bd3c16a316d2afd82cc39
+  data.tar.gz: a9c2dd79f38008c59b9fca3314bea0a4d3c1b1a51bb218e60e4837bcf75f33ba7fcc3be67dd55a6aa4e2011c9f6c9eaf6074503e4318764485a75cded95e19c0

data/History.markdown CHANGED Viewed

@@ -1,3 +1,10 @@
+## 0.11.0 / 2016-07-06
+  * Redirect page should not have any layout (#106)
+  * Include absolute path in canonical url (#109)
+  * Add <html> tag and language (#100)
+  * Ensure redirect_to links produce an HTML file. (#111)
 ## 0.10.0 / 2016-03-16
   * Ensure output extension is assigned (#96)

data/README.md CHANGED Viewed

@@ -117,7 +117,8 @@ redirect_to:
 If you have multiple `redirect_to`s set, only the first one will be respected.
-**Note**: if using `redirect_to` with collections, your collection's extension **must** end in *.html* in order for `redirect_to` to properly process.
+**Note**: Using `redirect_to` or `redirect_from` with collections will only work with files which are output to HTML, such as `.md`, `.textile`, `.html` etc.
 ## Contributing

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

@@ -15,7 +15,7 @@ module JekyllRedirectFrom
       @name = name
       self.process(name)
-      self.data = {}
+      self.data = { "layout" => nil }
       data.default_proc = proc do |_, key|
         site.frontmatter_defaults.find(File.join(dir, name), type, key)
@@ -27,6 +27,7 @@ module JekyllRedirectFrom
     def generate_redirect_content(item_url)
       self.output = self.content = <<-EOF
 <!DOCTYPE html>
+<html lang="en-US">
 <meta charset="utf-8">
 <title>Redirecting…</title>
 <link rel="canonical" href="#{item_url}">
@@ -34,6 +35,7 @@ module JekyllRedirectFrom
 <h1>Redirecting…</h1>
 <a href="#{item_url}">Click here if you are not redirected.</a>
 <script>location="#{item_url}"</script>
+</html>
 EOF
     end
   end

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

@@ -23,7 +23,10 @@ module JekyllRedirectFrom
         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)
@@ -69,7 +72,7 @@ module JekyllRedirectFrom
     end
     def redirect_prefix(site)
-      config_github_url(site) || config_baseurl(site) || ""
+      config_github_url(site) || config_url(site)
     end
     def config_github_url(site)
@@ -79,8 +82,10 @@ module JekyllRedirectFrom
       end
     end
-    def config_baseurl(site)
-      site.config.fetch('baseurl', nil)
+    def config_url(site)
+      url = site.config.fetch('url', nil) || ""
+      baseurl = site.config.fetch('baseurl', nil) || ""
+      File.join url, baseurl
     end
   end
 end

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

@@ -1,3 +1,3 @@
 module JekyllRedirectFrom
-  VERSION = "0.10.0"
+  VERSION = "0.11.0"
 end

data/spec/fixtures/_articles/redirect-somewhere-else-im-a-permalink.html ADDED Viewed

@@ -0,0 +1,7 @@
+---
+title: Please redirect away from me and my permalink.
+permalink: /tags/our projects/
+redirect_to: /tags/our-projects/
+---
+Bye.

data/spec/fixtures/_layouts/layout.html ADDED Viewed

@@ -0,0 +1,6 @@
+---
+---
+LAYOUT INCLUDED
+{{ content }}

data/spec/fixtures/tags/how we work.md ADDED Viewed

@@ -0,0 +1,4 @@
+---
+redirect_to: "/tags/how-we-work/"
+permalink: "/tags/how we work/"
+---

data/spec/jekyll_redirect_from/redirect_page_spec.rb CHANGED Viewed

@@ -10,7 +10,7 @@ describe JekyllRedirectFrom::RedirectPage do
   context "#generate_redirect_content" do
     it "sets the #content to the generated refresh page" do
-      expect(page_content).to eq("<!DOCTYPE html>\n<meta charset=\"utf-8\">\n<title>Redirecting…</title>\n<link rel=\"canonical\" href=\"#{item_url}\">\n<meta http-equiv=\"refresh\" content=\"0; url=#{item_url}\">\n<h1>Redirecting…</h1>\n<a href=\"#{item_url}\">Click here if you are not redirected.</a>\n<script>location=\"#{item_url}\"</script>\n")
+      expect(page_content).to eq("<!DOCTYPE html>\n<html lang=\"en-US\">\n<meta charset=\"utf-8\">\n<title>Redirecting…</title>\n<link rel=\"canonical\" href=\"#{item_url}\">\n<meta http-equiv=\"refresh\" content=\"0; url=#{item_url}\">\n<h1>Redirecting…</h1>\n<a href=\"#{item_url}\">Click here if you are not redirected.</a>\n<script>location=\"#{item_url}\"</script>\n</html>\n")
     end
     it "contains the meta refresh tag" do

data/spec/jekyll_redirect_from/redirector_spec.rb CHANGED Viewed

@@ -5,10 +5,12 @@ describe JekyllRedirectFrom::Redirector do
   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?
@@ -26,6 +28,10 @@ describe JekyllRedirectFrom::Redirector 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
@@ -71,6 +77,12 @@ describe JekyllRedirectFrom::Redirector do
       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">|)
@@ -80,36 +92,57 @@ describe JekyllRedirectFrom::Redirector 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.github.url as the redirect prefix" do
-      @site.config['github'] = { "url" => "http://example.github.io/test" }
-      expect(redirector.redirect_url(@site, page_with_one)).to start_with("http://example.github.io/test")
+    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 "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 start_with("http://example.github.io/test")
+    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.baseurl as the redirect prefix when site.github.url is not set" do
+    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 start_with("/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.baseurl" do
+    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" }
-      @site.config['baseurl'] = "/fancy/baseurl"
-      expect(redirector.redirect_url(@site, page_with_one)).to start_with("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 "no-ops when site.github.url and site.baseurl are not set" do
-      expect(redirector.redirect_url(@site, page_with_one)).to eql("/one_redirect_url.html")
+    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 "no-ops when site.github is set but site.github.url is not" do
+    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

data/spec/spec_helper.rb CHANGED Viewed

@@ -26,7 +26,11 @@ RSpec.configure do |config|
       "collections" => {
         "articles" => {"output" => true},
         "authors"  => {}
-      }
+      },
+      "defaults"    => [{
+        "scope" => { "path" => "" },
+        "values" => { "layout" => "layout" }
+      }]
     }))
     @dest.rmtree if @dest.exist?

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-redirect-from
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Parker Moore
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-03-16 00:00:00.000000000 Z
+date: 2016-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -105,14 +105,17 @@ files:
 - script/release
 - script/test
 - spec/fixtures/_articles/redirect-me-plz.md
+- 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_tos.md
 - spec/fixtures/multiple_redirect_urls.md
 - spec/fixtures/one_redirect_to.md
 - spec/fixtures/one_redirect_url.md
+- spec/fixtures/tags/how we work.md
 - spec/integrations_spec.rb
 - spec/jekyll_redirect_from/redirect_page_spec.rb
 - spec/jekyll_redirect_from/redirector_spec.rb
@@ -137,20 +140,23 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.5.1
+rubygems_version: 2.4.8
 signing_key:
 specification_version: 4
 summary: Seamlessly specify multiple redirection URLs for your pages and posts
 test_files:
 - spec/fixtures/_articles/redirect-me-plz.md
+- 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_tos.md
 - spec/fixtures/multiple_redirect_urls.md
 - spec/fixtures/one_redirect_to.md
 - spec/fixtures/one_redirect_url.md
+- spec/fixtures/tags/how we work.md
 - spec/integrations_spec.rb
 - spec/jekyll_redirect_from/redirect_page_spec.rb
 - spec/jekyll_redirect_from/redirector_spec.rb