alllll the compatibility b/w jekyll 3 and jekyll 2

Author: parkr

lib/jekyll-redirect-from.rb

@@ -1,4 +1,11 @@
 require "jekyll"
+
+module JekyllRedirectFrom
+  def self.jekyll_3?
+    @jekyll_3 ||= (Jekyll::VERSION >= '3.0.0')
+  end
+end
+
 require "jekyll-redirect-from/version"
 require "jekyll-redirect-from/redirect_page"
 require "jekyll-redirect-from/redirector"

lib/jekyll-redirect-from/redirect_page.rb

@@ -21,7 +21,7 @@ def initialize(site, base, dir, name)
         site.frontmatter_defaults.find(File.join(dir, name), type, key)
       end
 
-      Jekyll::Hooks.trigger :pages, :post_init, self if defined?(Jekyll::Hooks)
+      Jekyll::Hooks.trigger :pages, :post_init, self if JekyllRedirectFrom.jekyll_3?
     end
 
     def generate_redirect_content(item_url)

spec/integrations_spec.rb

@@ -3,7 +3,7 @@
 describe("Integration Tests") do
   it "writes the redirect pages for collection items which are outputted" do
     expect(dest_dir("articles", "redirect-me-plz.html")).to exist
-    expect(dest_dir("articles", "23128432159832", "mary-had-a-little-lamb.html")).to exist
+    expect(dest_dir("articles", "23128432159832", "mary-had-a-little-lamb#{forced_output_ext}")).to exist
   end
 
   it "doesn't write redirect pages for collection items which are not outputted" do

spec/jekyll_redirect_from/redirect_page_spec.rb

@@ -36,15 +36,19 @@
       let(:redirect_page) { new_redirect_page(permalink_dir) }
 
       it "knows to add the index.html if it's a folder" do
-        dest = dest_dir("posts", "1914798137981389", "larry-had-a-little-lamb", "index.html").to_s
-        expect(redirect_page.destination("/")).to eql(dest)
+        expected = dest_dir("posts", "1914798137981389", "larry-had-a-little-lamb", "index.html").to_s
+        dest = redirect_page.destination("/")
+        dest = "#{@site.dest}#{dest}" unless dest.start_with? @site.dest
+        expect(dest).to eql(expected)
       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
-        dest = dest_dir("posts", "12435151125", "larry-had-a-little-lamb.html").to_s
-        expect(redirect_page.destination("/")).to eql(dest)
+        expected = dest_dir("posts", "12435151125", "larry-had-a-little-lamb#{forced_output_ext}").to_s
+        dest = redirect_page.destination("/")
+        dest = "#{@site.dest}#{dest}" unless dest.start_with? @site.dest
+        expect(dest).to eql(expected)
       end
     end
   end
@@ -58,7 +62,7 @@
     end
 
     it "fetches the path properly" do
-      expect(redirect_page_full_path).to match /\/spec\/fixtures\/\_site\/posts\/12435151125\/larry-had-a-little-lamb.html$/
+      expect(redirect_page_full_path).to match /\/spec\/fixtures\/\_site\/posts\/12435151125\/larry-had-a-little-lamb#{forced_output_ext}$/
     end
 
     it "is written to the proper location" do

spec/jekyll_redirect_from/redirector_spec.rb

@@ -11,10 +11,10 @@
   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
-    if Jekyll::VERSION < '3.0.0'
-      expect(redirector.has_alt_urls?(post_to_redirect)).to be_truthy
-    else
+    if JekyllRedirectFrom.jekyll_3?
       skip "Don't need to test posts in Jekyll 3"
+    else
+      expect(redirector.has_alt_urls?(post_to_redirect)).to be_truthy
     end
   end
 
@@ -52,7 +52,7 @@
     end
 
     it "generates the refresh page for the post properly" do
-      expect(dest_dir("posts/23128432159832/mary-had-a-little-lamb.html")).to exist
+      expect(dest_dir("posts/23128432159832/mary-had-a-little-lamb#{forced_output_ext}")).to exist
     end
 
     it "generates the refresh pages for the page with multiple redirect_from urls" do
@@ -63,7 +63,7 @@
     end
 
     it "generates the refresh page for the page with one redirect_from url" do
-      expect(dest_dir("mencius/was/my/father.html")).to exist
+      expect(dest_dir("mencius/was/my/father#{forced_output_ext}")).to exist
     end
 
     it "generates the refresh page for the collection with one redirect_to url" do

spec/spec_helper.rb

@@ -67,6 +67,10 @@ def new_redirect_page(permalink)
   def destination_sitemap
     @dest.join("sitemap.xml").read
   end
+
+  def forced_output_ext
+    JekyllRedirectFrom.jekyll_3? ? ".html" : ""
+  end
 end
 
 class TestStringContainer