jekyll-redirect-from 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e29fdfc5ac1b72c7be5187053ee376a95962914
-  data.tar.gz: b310df2a84a1580f82e96c6e70d0de9ed25c94b4
+  metadata.gz: 7943ee5168973d4f3fb0dfce3ab6cf477b56957a
+  data.tar.gz: 45499228a22ab06aab61f89f2dc8f33c880987b6
 SHA512:
-  metadata.gz: 4e68b428d29435e1b3f6005870bdc094f4f7a2b9b2d48800374a948d202a7fe86bc0745236647c78cc5c7eacdba23232b8c5d994dd15ac4fa8e3a876f61782f9
-  data.tar.gz: fec31c22903b47943f2e16f8bd4d91977a9fbbf65f2955e823e7cb6a8d36ee095bd8105d7ab1783ce68c370095213747ebfc43de7003ef1a80d130cf94ebfc8b
+  metadata.gz: f2adce00c4d8a716ab5304c76fe146571537afea2e4950fb99bf6c67b7adb514997b52f540198c9fe7bb9aab6935d7e44906ef23f8250a7d99af838d49f84927
+  data.tar.gz: b2c337d536492b2a6b5935aadf9b95ef1893f872fe260d68bdffbf7d0b14d6a31e45d2a896c879f8f4ad7466e697d2a1e48c39f2ade0de1077a1c558aea54f2d

data/.gitignore

@@ -12,6 +12,7 @@ lib/bundler/man
 pkg
 rdoc
 spec/reports
+spec/fixtures/.jekyll-metadata
 test/tmp
 test/version_tmp
 tmp

data/.travis.yml

@@ -1,9 +1,26 @@
 language: ruby
+before_script: bundle update
+script: "script/cibuild"
 sudo: false
 cache: bundler
+
+matrix:
+  include:
+    - # GitHub Pages
+      rvm: 2.1.1
+      env: GH_PAGES=true
+    - # Ruby 1.9
+      rvm: 1.9
+      env: JEKYLL_VERSION=2.0
+  allow_failures:
+    - env: GH_PAGES=true # Jekyll 2.4 will fail tests
+  fast_finish: true
+
 rvm:
+  - 2.2
   - 2.1
   - 2.0
-  - 1.9.3
-before_script: bundle update
-script: "script/cibuild"
+env:
+  - ""
+  - JEKYLL_VERSION=3.0
+  - JEKYLL_VERSION=2.0

data/Gemfile

@@ -1,4 +1,8 @@
 source 'https://rubygems.org'
-
-# Specify your gem's dependencies in jekyll-alt-urls.gemspec
 gemspec
+
+if ENV["GH_PAGES"]
+  gem "github-pages"
+elsif ENV["JEKYLL_VERSION"]
+  gem "jekyll", "~> #{ENV["JEKYLL_VERSION"]}"
+end

data/History.markdown

@@ -1,3 +1,8 @@
+## 0.9.0 / 2015-10-28
+
+  * Support Jekyll 3 stable (#76)
+  * Test against Jekyll 3, 2, and GitHub Pages (#72)
+
 ## 0.8.0 / 2015-05-20
 
   * Exclude redirect pages from sitemap (#69)

data/README.md

@@ -11,6 +11,12 @@ Instead of dealing with maintaining those pages for redirection, let
 
 [![Build Status](https://travis-ci.org/jekyll/jekyll-redirect-from.svg?branch=master)](https://travis-ci.org/jekyll/jekyll-redirect-from)
 
+## How it Works
+
+Redirects are performed by serving an HTML file with an HTTP-REFRESH meta
+tag which points to your destination. No `.htaccess` file, nginx conf, xml
+file, or anything else will be generated. It simply creates HTML files.
+
 ## Installation
 
 Add this line to your application's Gemfile:

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

@@ -4,7 +4,7 @@ module JekyllRedirectFrom
 
     def generate(site)
       original_pages = site.pages.dup
-      generate_alt_urls(site, site.posts)
+      generate_alt_urls(site, site.posts) if Jekyll::VERSION < '3.0.0'
       generate_alt_urls(site, original_pages)
       generate_alt_urls(site, site.docs_to_write)
     end
@@ -38,9 +38,10 @@ module JekyllRedirectFrom
     end
 
     def is_dynamic_document?(page_or_post)
-      page_or_post.is_a?(Jekyll::Post) ||
-        page_or_post.is_a?(Jekyll::Page) ||
-        page_or_post.is_a?(Jekyll::Document)
+      page_or_post.is_a?(Jekyll::Page) ||
+        page_or_post.is_a?(Jekyll::Document) ||
+        (Jekyll::VERSION < '3.0.0' &&
+          page_or_post.is_a?(Jekyll::Post))
     end
 
     def has_alt_urls?(page_or_post)

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

@@ -1,3 +1,3 @@
 module JekyllRedirectFrom
-  VERSION = "0.8.0"
+  VERSION = "0.9.0"
 end

data/script/cibuild

@@ -1,2 +1,4 @@
 #! /bin/bash
-script/test $@
+set -e
+
+bundle exec rake spec

data/spec/jekyll_redirect_from/redirector_spec.rb

@@ -11,7 +11,11 @@ describe JekyllRedirectFrom::Redirector do
   let(:page_with_many_redirect_to)  { setup_page("multiple_redirect_tos.md") }
 
   it "knows if a page or post is requesting a redirect page" do
-    expect(redirector.has_alt_urls?(post_to_redirect)).to be_truthy
+    if Jekyll::VERSION < '3.0.0'
+      expect(redirector.has_alt_urls?(post_to_redirect)).to be_truthy
+    else
+      skip "Don't need to test posts in Jekyll 3"
+    end
   end
 
   it "knows if a document is requesting a redirect page" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-redirect-from
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Parker Moore
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-20 00:00:00.000000000 Z
+date: 2015-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -103,7 +103,6 @@ files:
 - script/bootstrap
 - script/cibuild
 - script/release
-- script/test
 - spec/fixtures/_articles/redirect-me-plz.md
 - spec/fixtures/_articles/redirect-somewhere-else-plz.html
 - spec/fixtures/_authors/kansaichris.md

data/script/test

@@ -1,2 +0,0 @@
-#!/bin/bash
-bundle exec rake spec