jekyll-redirect-from 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aec13092a90f8e5d5e8c9b4484b2e78c7dccdd6b
-  data.tar.gz: 18270a4f1c6667b89bda14064042cce909370686
+  metadata.gz: f48702f5b873fef8239a201f6a7dc3d759f605f2
+  data.tar.gz: b50321198ad8c462591127c64bb94484f97e7c56
 SHA512:
-  metadata.gz: b108df3637aaf1355a1be30b15432816545fe29c905acc41607008c76b4a1fc9b2418c025eba1bd620315917284dcf2e7b88ea8f3cbb491dd60ede933126d4c2
-  data.tar.gz: e9328c6da23831ac226d13266f0b01fe620c59c8c02c7a8df0dfc06856b0607e9b08599a06bc1cb991eefe37ef94b44f93d5c199de3c0b9ea5901242388e14cc
+  metadata.gz: cba68960c4460e460bd89aeaf21493fcaa8d2475953d9ac1650f21b8ecbc1d542c7c572b58937f0e8317e5ca754e6234b8e8736b9e35b9d63f014ca9ef61f615
+  data.tar.gz: 2a66c019939be98292d157227ed8d84f23192743fbd8e9bea94a61a7b659dc21d01c5dd071fd791b6919fb13f42cbc0d7562a63f25dce8b4d85d252a7126bed2

data/History.markdown

@@ -8,6 +8,16 @@
 
 ### Development Fixes
 
+## 0.3.0 / 2014-01-15
+
+### Major Enhancements
+
+  * `redirect_from` items are now proper permalinks rooted in site source (#8)
+
+### Development Fixes
+
+  * Add forgotten `s` to `gems` in README.md (#7)
+
 ## 0.2.0 / 2014-01-04
 
 ### Minor Enhancements

data/README.md

@@ -28,7 +28,7 @@ Or install it yourself as:
 Once it's installed into your evironment, add it to your `_config.yml`:
 
 ```yaml
-gem:
+gems:
   - jekyll-redirect-from
 ```
 
@@ -49,14 +49,13 @@ redirect_from:
 This will generate the following pages in the destination:
 
 ```text
-/post/123456789/index.html
-/post/123456789/my-amazing-post/index.html
+/post/123456789
+/post/123456789/my-amazing-post
 ```
 
 These pages will contain an HTTP-REFRESH meta tag which redirect to your URL.
 
-You can also specify just one url like this:
-
+You can also specify just **one url** like this:
 
 ```text
 title: My other awesome post

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

@@ -10,7 +10,8 @@ module JekyllRedirectFrom
       list.each do |item|
         if has_alt_urls?(item)
           alt_urls(item).flatten.each do |alt_url|
-            redirect_page = RedirectPage.new(site, site.source, File.dirname(alt_url), File.basename(alt_url))
+            redirect_page = RedirectPage.new(site, site.source, "", "")
+            redirect_page.data['permalink'] = alt_url
             redirect_page.generate_redirect_content(item.url)
             site.pages << redirect_page
           end

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

@@ -1,3 +1,3 @@
 module JekyllRedirectFrom
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/script/release

@@ -0,0 +1,3 @@
+#! /bin/bash
+
+bundle exec rake release

data/spec/jekyll_redirect_from/redirect_page_spec.rb

@@ -1,7 +1,8 @@
 require "spec_helper"
 
 describe JekyllRedirectFrom::RedirectPage do
-  let(:redirect_page) { described_class.new(@site, @site.source, "posts/12435151125", "larry-had-a-little-lamb") }
+  let(:permalink)     { "/posts/12435151125/larry-had-a-little-lamb" }
+  let(:redirect_page) { new_redirect_page(permalink) }
   let(:item_url)      { File.join(@site.config["url"], "2014", "01", "03", "moving-to-jekyll.md") }
   let(:page_content)  { redirect_page.generate_redirect_content(item_url) }
 
@@ -27,6 +28,23 @@ describe JekyllRedirectFrom::RedirectPage do
     end
   end
 
+  context "when determining the write destination" do
+    context "of a redirect page meant to be a dir" do
+      let(:permalink_dir) { "/posts/1914798137981389/larry-had-a-little-lamb/" }
+      let(:redirect_page) { new_redirect_page(permalink_dir) }
+
+      it "knows to add the index.html if it's a folder" do
+        expect(redirect_page.destination("/")).to eql("/posts/1914798137981389/larry-had-a-little-lamb/index.html")
+      end
+    end
+
+    context "of a redirect page meant to be a file" do
+      it "knows not to add the index.html if it's not a folder" do
+        expect(redirect_page.destination("/")).to eql("/posts/12435151125/larry-had-a-little-lamb")
+      end
+    end
+  end
+
   context "when writing to disk" do
     let(:redirect_page_full_path) { redirect_page.destination(@site.dest) }
 
@@ -36,7 +54,7 @@ describe JekyllRedirectFrom::RedirectPage do
     end
 
     it "fetches the path properly" do
-      expect(redirect_page_full_path).to match /\/spec\/fixtures\/\_site\/posts\/12435151125\/larry-had-a-little-lamb/
+      expect(redirect_page_full_path).to match /\/spec\/fixtures\/\_site\/posts\/12435151125\/larry-had-a-little-lamb$/
     end
 
     it "is written to the proper location" do
@@ -47,4 +65,4 @@ describe JekyllRedirectFrom::RedirectPage do
       expect(File.read(redirect_page_full_path)).to eql(page_content)
     end
   end
-end
+end

data/spec/spec_helper.rb

@@ -45,4 +45,10 @@ RSpec.configure do |config|
   def destination_file_exists?(file)
     File.exists?(File.join(@dest.to_s, file))
   end
+
+  def new_redirect_page(permalink)
+    page = JekyllRedirectFrom::RedirectPage.new(@site, @site.source, "", "")
+    page.data['permalink'] = permalink
+    page
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-redirect-from
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Parker Moore
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-05 00:00:00.000000000 Z
+date: 2014-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -88,6 +88,7 @@ files:
 - lib/jekyll-redirect-from/version.rb
 - script/bootstrap
 - script/cibuild
+- script/release
 - spec/fixtures/_config.yml
 - spec/fixtures/_posts/2014-01-03-redirect-me-plz.md
 - spec/fixtures/multiple_redirect_urls.md