Merge pull request #76 from jekyll/jekyll-3

Merge pull request 76

Author: parkr

.gitignore

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

lib/jekyll-redirect-from/redirector.rb

@@ -4,7 +4,7 @@ class Redirector < Jekyll::Generator
 
     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 @@ def generate_alt_urls(site, list)
     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)

spec/jekyll_redirect_from/redirector_spec.rb

@@ -11,7 +11,11 @@
   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