jekyll-redirect-from 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 00b63d3652670cb824eac206484575da47507dd7
-  data.tar.gz: 4b21faeb8f35a76532c4473bf9df0fe79453b97a
+  metadata.gz: 5d84d547b4d8f64485f2a7628b4efe3a639f0e6b
+  data.tar.gz: 91b3cd70189abca2abc17040958303931e84e0ec
 SHA512:
-  metadata.gz: 37a01d9e02364740b8f76373e8a3f987df5ab2c46625cd8372fd221a88194fae4be7812d4069a93784116ba735811b916e9d9b7f6301fa1f08b5adf494c1e92a
-  data.tar.gz: af8280d5ab1735fdfc02dc1c3480b1ea514ef10c50e332bd97110537218b6a6ade3851ba47569135f82d43b80d33c05d3115d2f6853f1118e2be94dc40f98ca5
+  metadata.gz: 478002c1287ff8cb0f7c6d5f43c37d64f80036d04a252b15964b715ffee0eb591bf6656695068097c7e9c3aa38fde573de0a63480694b431a47e6e8d3ce795c9
+  data.tar.gz: 24b635e5e0ea0195a5423dce18f826d5ea767adc5b2dd701322810933b52b5c67d9681612c7a4ed191c9fdf05c4017d7dd52570c2177af96f0486b51bb5e1dee

data/History.markdown

@@ -1,5 +1,9 @@
 ## HEAD
 
+## 0.6.0 / 2014-08-22
+
+  * Support redirecting to/from collection documents (#40)
+
 ## 0.5.0 / 2014-08-10
 
 ### Minor Enhancements

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

@@ -6,6 +6,7 @@ module JekyllRedirectFrom
       original_pages = site.pages.dup
       generate_alt_urls(site, site.posts)
       generate_alt_urls(site, original_pages)
+      generate_alt_urls(site, site.docs_to_write)
     end
 
     def generate_alt_urls(site, list)

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

@@ -1,3 +1,3 @@
 module JekyllRedirectFrom
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

data/spec/fixtures/_articles/redirect-me-plz.md

@@ -0,0 +1,6 @@
+---
+title: Please redirect me, sir.
+redirect_from: /articles/23128432159832/mary-had-a-little-lamb
+---
+
+Yay.

data/spec/fixtures/_authors/kansaichris.md

@@ -0,0 +1,5 @@
+---
+redirect_from: /kansaichris/
+---
+
+Hi.

data/spec/fixtures/_config.yml

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

data/spec/integrations_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+describe("Integration Tests") do
+  it "writes the redirect pages for collection items which are outputted" do
+    expect(@dest.join("articles", "redirect-me-plz.html")).to exist
+    expect(@dest.join("articles", "23128432159832", "mary-had-a-little-lamb")).to exist
+  end
+
+  it "doesn't write redirect pages for collection items which are not outputted" do
+    expect(@dest.join("authors")).not_to exist
+    expect(@dest.join("kansaichris")).not_to exist
+  end
+end

data/spec/jekyll_redirect_from/redirector_spec.rb

@@ -3,6 +3,7 @@ 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(: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") }
@@ -12,6 +13,10 @@ describe JekyllRedirectFrom::Redirector do
     expect(redirector.has_alt_urls?(post_to_redirect)).to be_truthy
   end
 
+  it "knows if a document is requesting a redirect page" do
+    expect(redirector.has_alt_urls?(doc_to_redirect)).to be_truthy
+  end
+
   it "handles one redirect path" do
     expect(redirector.alt_urls(page_with_one)).to eql(["mencius/was/my/father"])
   end

data/spec/spec_helper.rb

@@ -14,15 +14,19 @@ RSpec.configure do |config|
     Jekyll.logger.log_level = :error
 
     @fixtures_path = Pathname.new(__FILE__).parent.join("fixtures")
-    @dest = @fixtures_path.join("_site")
-    @posts_src = File.join(@fixtures_path, "_posts")
-    @layouts_src = File.join(@fixtures_path, "_layouts")
-    @plugins_src = File.join(@fixtures_path, "_plugins")
+    @dest        = @fixtures_path.join("_site")
+    @posts_src   = @fixtures_path.join("_posts")
+    @layouts_src = @fixtures_path.join("_layouts")
+    @plugins_src = @fixtures_path.join("_plugins")
 
     @site = Jekyll::Site.new(Jekyll.configuration({
       "source"      => @fixtures_path.to_s,
       "destination" => @dest.to_s,
-      "plugins"     => @plugins_src
+      "plugins"     => @plugins_src.to_s,
+      "collections" => {
+        "articles" => {"output" => true},
+        "authors"  => {}
+      }
     }))
 
     @dest.rmtree if @dest.exist?
@@ -33,12 +37,20 @@ RSpec.configure do |config|
     @dest.rmtree if @dest.exist?
   end
 
+  def unpublished_doc
+    @site.collections["authors"].docs.first
+  end
+
+  def setup_doc
+    @site.collections["articles"].docs.first
+  end
+
   def setup_post(file)
-    Jekyll::Post.new(@site, @fixtures_path, '', file)
+    Jekyll::Post.new(@site, @fixtures_path.to_s, '', file)
   end
 
   def setup_page(file)
-    Jekyll::Page.new(@site, @fixtures_path, File.dirname(file), File.basename(file))
+    Jekyll::Page.new(@site, @fixtures_path.to_s, File.dirname(file), File.basename(file))
   end
 
   def destination_file_exists?(file)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-redirect-from
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Parker Moore
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-11 00:00:00.000000000 Z
+date: 2014-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -89,12 +89,15 @@ files:
 - script/bootstrap
 - script/cibuild
 - script/release
+- spec/fixtures/_articles/redirect-me-plz.md
+- spec/fixtures/_authors/kansaichris.md
 - spec/fixtures/_config.yml
 - 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/integrations_spec.rb
 - spec/jekyll_redirect_from/redirect_page_spec.rb
 - spec/jekyll_redirect_from/redirector_spec.rb
 - spec/spec_helper.rb
@@ -123,12 +126,15 @@ 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/_authors/kansaichris.md
 - spec/fixtures/_config.yml
 - 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/integrations_spec.rb
 - spec/jekyll_redirect_from/redirect_page_spec.rb
 - spec/jekyll_redirect_from/redirector_spec.rb
 - spec/spec_helper.rb