jekyll-redirect-from 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be35d32000a38e8196e925dbc03fd3225c10fec6
-  data.tar.gz: 7b6cfa49ff96566b9ffba2d4fe08f4fe14c2db81
+  metadata.gz: 112381245761df69cddfd8b8c7d67755d6037cd8
+  data.tar.gz: fcd9362806dba6253fa56680db4142b1b401f996
 SHA512:
-  metadata.gz: cc6d1b88d705641ab96e46ecc7d5f4d696e329ff1bb76fbd3e7aa459b9f59a93fd62e992815254d8688d2a566c9935f288138268d6807a79f95ee1396b910124
-  data.tar.gz: 8e334e2c2fe5785ce20966ad14dff66cde601d5b519acbc675c165b4c8a597ce167fd3c16a527b372614f1af8f12f22e64ed1738b7413a8093d3f8f017069b17
+  metadata.gz: 40503272424d63e5baf7df133bada0382c3cd4478c16d41671b4201a311e74537a0690259d86b30b22bd22a613c7ceda4d4fdce9dd0f38825b2b2e6d07924f38
+  data.tar.gz: 65ed493e7b3a3e34c6c86da859f3626460ae8e4f477de5e984d27b135458e9f5c6a9df9f8a8363fb8ccc276725ad1286a6b2c1a806e3605ccf8b0fb09a2ee1c2

data/History.markdown

@@ -8,6 +8,20 @@
 
 ### Development Fixes
 
+## 0.4.0 / 2014-05-06
+
+### Major Enhancements
+
+  * Upgrade to Jekyll 2.0 (#27)
+
+### Minor Enhancements
+
+  * Shorten resulting HTML to make redirects quicker (#20)
+
+### Development Fixes
+
+  * Use SVG Travis badge in README (#21)
+
 ## 0.3.1 / 2014-01-22
 
 ### Bug Fixes

data/README.md

@@ -3,13 +3,13 @@
 Give your Jekyll posts and pages multiple URLs.
 
 When importing your posts and pages from, say, Tumblr, it's annoying and
-impractical to create new pages in the proper subdirectories so they, e.g. 
+impractical to create new pages in the proper subdirectories so they, e.g.
 `/post/123456789/my-slug-that-is-often-incompl`, redirect to the new post URL.
 
 Instead of dealing with maintaining those pages for redirection, let
 `jekyll-redirect-from` handle it for you.
 
-[![Build Status](https://travis-ci.org/jekyll/jekyll-redirect-from.png?branch=master)](https://travis-ci.org/jekyll/jekyll-redirect-from)
+[![Build Status](https://travis-ci.org/jekyll/jekyll-redirect-from.svg?branch=master)](https://travis-ci.org/jekyll/jekyll-redirect-from)
 
 ## Installation
 
@@ -35,31 +35,52 @@ gems:
 ## Usage
 
 The object of this gem is to allow an author to specify multiple URLs for a
-page, such that the alternative URLs redirect to the new Jekyll URL. This is 
+page, such that the alternative URLs redirect to the new Jekyll URL. This is
 
 To use it, simply add the array to the YAML front-matter of your page or post:
 
 ```yaml
 title: My amazing post
 redirect_from:
-  - /post/123456789
+  - /post/123456789/
+  - /post/123456789/my-amazing-post/
+```
+
+Redirects including a trailing slash will generate a corresponding subdirectory containing an `index.html`, while redirects without a trailing slash will generate a corresponding `filename` without an extension, and without a subdirectory.
+
+For example...
+
+```text
+redirect_from:
   - /post/123456789/my-amazing-post
 ```
 
-This will generate the following pages in the destination:
+...will generate the following page in the destination:
 
 ```text
-/post/123456789
 /post/123456789/my-amazing-post
 ```
 
+While...
+
+```text
+redirect_from:
+  - /post/123456789/my-amazing-post/
+```
+
+...will generate the following page in the destination:
+
+```text
+/post/123456789/my-amazing-post/index.html
+```
+
 These pages will contain an HTTP-REFRESH meta tag which redirect to your URL.
 
 You can also specify just **one url** like this:
 
 ```text
 title: My other awesome post
-redirect_from: /post/123456798
+redirect_from: /post/123456798/
 ```
 
 ## Contributing

data/jekyll-redirect-from.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "jekyll", "~> 1.4"
+  spec.add_runtime_dependency "jekyll", "~> 2.0"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

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

@@ -19,21 +19,13 @@ module JekyllRedirectFrom
     def generate_redirect_content(item_url)
       self.output = self.content = <<-EOF
       <!DOCTYPE html>
-      <html>
-      <head>
+      <meta charset=utf-8>
       <title>Redirecting...</title>
-      <link rel="canonical" href="#{item_url}"/>
-      <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-      <meta http-equiv="refresh" content="0; url=#{item_url}" />
-      </head>
-      <body>
-        <p><strong>Redirecting...</strong></p>
-        <p><a href='#{item_url}'>Click here if you are not redirected.</a></p>
-        <script>
-          document.location.href = "#{item_url}";
-        </script>
-      </body>
-      </html>
+      <link rel=canonical href="#{item_url}">
+      <meta http-equiv=refresh content="0; url=#{item_url}">
+      <h1>Redirecting...</h1>
+      <a href="#{item_url}">Click here if you are not redirected.</a>
+      <script>location='#{item_url}'</script>
       EOF
     end
   end

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

@@ -1,3 +1,3 @@
 module JekyllRedirectFrom
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

data/spec/jekyll_redirect_from/redirect_page_spec.rb

@@ -8,23 +8,23 @@ 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      <html>\n      <head>\n      <title>Redirecting...</title>\n      <link rel=\"canonical\" href=\"http://jekyllrb.com/2014/01/03/moving-to-jekyll.md\"/>\n      <meta http-equiv=\"content-type\" content=\"text/html; charset=utf-8\" />\n      <meta http-equiv=\"refresh\" content=\"0; url=http://jekyllrb.com/2014/01/03/moving-to-jekyll.md\" />\n      </head>\n      <body>\n        <p><strong>Redirecting...</strong></p>\n        <p><a href='http://jekyllrb.com/2014/01/03/moving-to-jekyll.md'>Click here if you are not redirected.</a></p>\n        <script>\n          document.location.href = \"http://jekyllrb.com/2014/01/03/moving-to-jekyll.md\";\n        </script>\n      </body>\n      </html>\n")
+      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")
     end
 
     it "contains the meta refresh tag" do
-      expect(page_content).to include("<meta http-equiv=\"refresh\" content=\"0; url=#{item_url}\" />")
+      expect(page_content).to include("<meta http-equiv=refresh content=\"0; url=#{item_url}\">")
     end
 
     it "contains JavaScript redirect" do
-      expect(page_content).to include("document.location.href = \"http://jekyllrb.com/2014/01/03/moving-to-jekyll.md\";")
+      expect(page_content).to include("location='http://jekyllrb.com/2014/01/03/moving-to-jekyll.md'")
     end
 
     it "contains canonical link in header" do
-      expect(page_content).to include("<link rel=\"canonical\" href=\"http://jekyllrb.com/2014/01/03/moving-to-jekyll.md\"/>")
+      expect(page_content).to include("<link rel=canonical href=\"http://jekyllrb.com/2014/01/03/moving-to-jekyll.md\">")
     end
 
     it "contains a clickable link to redirect" do
-      expect(page_content).to include("<a href='http://jekyllrb.com/2014/01/03/moving-to-jekyll.md'>Click here if you are not redirected.</a>")
+      expect(page_content).to include("<a href=\"http://jekyllrb.com/2014/01/03/moving-to-jekyll.md\">Click here if you are not redirected.</a>")
     end
   end
 

data/spec/spec_helper.rb

@@ -12,7 +12,7 @@ RSpec.configure do |config|
   end
 
   config.before(:all) do
-    Jekyll.logger.log_level = Jekyll::Stevenson::ERROR
+    Jekyll.logger.log_level = :error
 
     @fixtures_path = Pathname.new(__FILE__).parent.join("fixtures")
     @dest = @fixtures_path.join("_site")

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-redirect-from
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Parker Moore
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-22 00:00:00.000000000 Z
+date: 2014-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Seamlessly specify multiple redirection URLs for your pages and posts
@@ -73,9 +73,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - History.markdown
 - LICENSE.txt
@@ -106,17 +106,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Seamlessly specify multiple redirection URLs for your pages and posts