jekyll-redirect-from 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3748b8949a4ce56e23c6f7e6a20a2e3302d4df62
-  data.tar.gz: f4075f5f4f505b59701a48b44e6cc91dfb38a8cd
+  metadata.gz: 47035373089df8e9b0a6f22de4b389a6d11947c6
+  data.tar.gz: c93eed49a5d32f3cd5831460909f905d13d24799
 SHA512:
-  metadata.gz: 99d1ececc18c3862930d563f60cc3383bb647d198eac0aa486ebe6fa442ed92be7e043d1d20f9b7d0d072de0920027705c7bb74ee1128fbf6dc980b895df0fda
-  data.tar.gz: a22197a5c8ea7c3b914571a71ccd1da7daac4f2b4bde1932ce50d2d4426944eedce1a5a19e6b4910e8450c1f5d8a2cfddc94b52934e7500996ec7bbf284a3843
+  metadata.gz: 5f0c2d2340649cc9de1ad797ce127dcba66d5720a3e3f9f8af30f1bf5c85b6f364637129c9f862e72af0843b79699f307f6fc73d3f732b81044ee96a5066c4f4
+  data.tar.gz: 34b91e287cd20a980c737470d3e80921a0f305865e963a55ca455d27c8cb64637dd4e03fea5cdc4ebaf750d88c49c42309819db2788a9ebbd66a6523984390cf

data/History.markdown

@@ -1,5 +1,9 @@
 ## HEAD
 
+## 0.6.2 / 2014-09-12
+
+  * Fixed error where `redirect_to` `Document`s were not being output properly (#46)
+
 ## 0.6.1 / 2014-09-08
 
   * Fixed error when the `site.github` config key is not a `Hash` (#43)

data/README.md

@@ -89,6 +89,20 @@ This is useful for scenarios where a site isn't available from the domain root,
 
 **_Note_**: If you are hosting your Jekyll site on [GitHub Pages](https://pages.github.com/), the prefix is set to the pages domain name i.e. `http://example.github.io/project` or a custom `CNAME`.
 
+### Redirect To
+
+Sometimes, you may want to redirect a site page to a totally different website. This plugin also supports that with the `redirect_to` key:
+
+```yaml
+title: My amazing post
+redirect_to:
+  - www.github.com
+```
+
+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.
+
 ## Contributing
 
 1. Fork it

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

@@ -24,7 +24,11 @@ module JekyllRedirectFrom
             redirect_page = RedirectPage.new(site, site.source, File.dirname(item.url), File.basename(item.url))
             redirect_page.data['permalink'] = item.url
             redirect_page.generate_redirect_content(alt_url)
-            site.pages << redirect_page
+            if item.is_a?(Jekyll::Document)
+              item.content = item.output = redirect_page.content
+            else
+              site.pages << redirect_page
+            end
           end
         end
       end

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

@@ -1,3 +1,3 @@
 module JekyllRedirectFrom
-  VERSION = "0.6.1"
+  VERSION = "0.6.2"
 end

data/spec/fixtures/_articles/redirect-somewhere-else-plz.html

@@ -0,0 +1,6 @@
+---
+title: Please redirect away from me, sir.
+redirect_to: "http://www.zombo.com"
+---
+
+Boo.

data/spec/jekyll_redirect_from/redirector_spec.rb

@@ -3,7 +3,8 @@ 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)             { setup_doc }
+  let(:doc_to_redirect_from)        { setup_doc("redirect-me-plz.md") }
+  let(:doc_to_redirect_to)          { setup_doc("redirect-somewhere-else-plz.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") }
@@ -14,7 +15,11 @@ describe JekyllRedirectFrom::Redirector do
   end
 
   it "knows if a document is requesting a redirect page" do
-    expect(redirector.has_alt_urls?(doc_to_redirect)).to be_truthy
+    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 "handles one redirect path" do
@@ -53,6 +58,11 @@ describe JekyllRedirectFrom::Redirector do
       expect(destination_file_exists?("mencius/was/my/father")).to be_truthy
     end
 
+    it "generates the refresh page for the collection with one redirect_to url" do
+      expect(@dest.join("articles", "redirect-somewhere-else-plz.html")).to exist
+      expect(destination_doc_contents("articles", "redirect-somewhere-else-plz.html")).to include(%|<meta http-equiv=refresh content="0; url=http://www.zombo.com">|)
+    end
+
     it "generates the refresh page for the page with one redirect_to url" do
       expect(destination_file_exists?("one_redirect_to.html")).to be_truthy
       expect(destination_file_contents("one_redirect_to.html")).to include(%|<meta http-equiv=refresh content="0; url=https://www.github.com">|)
@@ -80,7 +90,7 @@ describe JekyllRedirectFrom::Redirector do
       @site.config['baseurl'] = "/fancy/baseurl"
       expect(redirector.redirect_url(@site, page_with_one)).to start_with("http://example.github.io/test")
     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")
     end

data/spec/spec_helper.rb

@@ -41,8 +41,8 @@ RSpec.configure do |config|
     @site.collections["authors"].docs.first
   end
 
-  def setup_doc
-    @site.collections["articles"].docs.first
+  def setup_doc(doc_filename)
+    @site.collections["articles"].docs.find { |d| d.relative_path.match(doc_filename) }
   end
 
   def setup_post(file)
@@ -61,6 +61,10 @@ RSpec.configure do |config|
     File.read(File.join(@dest.to_s, file))
   end
 
+  def destination_doc_contents(collection, file)
+    File.read(File.join(@dest.to_s, collection, file))
+  end
+
   def new_redirect_page(permalink)
     page = JekyllRedirectFrom::RedirectPage.new(@site, @site.source, "", "")
     page.data['permalink'] = permalink

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-redirect-from
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Parker Moore
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-08 00:00:00.000000000 Z
+date: 2014-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -90,6 +90,7 @@ files:
 - script/cibuild
 - script/release
 - spec/fixtures/_articles/redirect-me-plz.md
+- spec/fixtures/_articles/redirect-somewhere-else-plz.html
 - spec/fixtures/_authors/kansaichris.md
 - spec/fixtures/_config.yml
 - spec/fixtures/_posts/2014-01-03-redirect-me-plz.md
@@ -127,6 +128,7 @@ 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-plz.html
 - spec/fixtures/_authors/kansaichris.md
 - spec/fixtures/_config.yml
 - spec/fixtures/_posts/2014-01-03-redirect-me-plz.md