Set site.url

Author: jayvdb

lib/jekyll/netlify/generator.rb

@@ -12,6 +12,11 @@ def generate(site)
           site.config['environment'] = env.jekyll_env
           site.config['netlify'] = load_netlify_env
           site.config['netlify']['environment'] = env.prefixed_env
+          if production?
+            site.config['url'] = site.config['netlify']['url']
+          else
+            site.config['url'] = site.config['netlify']['deploy_url']
+          end
         else
           site.config['netlify'] = false
         end

test/test_netlify.rb

@@ -9,6 +9,10 @@ def jekyll_test_site
   File.join(File.dirname(__FILE__), 'test_site')
 end
 
+def get_about_page(site)
+  return site.pages[0]
+end
+
 class Jekyll::NetlifyTest < Minitest::Test
   context 'normal build' do
     setup do
@@ -26,6 +30,8 @@ class Jekyll::NetlifyTest < Minitest::Test
       @site = Jekyll::Site.new(config)
       @site.read
       @site.generate
+      @site.render
+      @about_page = get_about_page(@site)
     end
 
     context 'netlify info' do
@@ -37,6 +43,13 @@ class Jekyll::NetlifyTest < Minitest::Test
         assert_equal false, @netlify
       end
     end
+
+    context 'site.url' do
+      should 'be from _config.yml' do
+        assert_equal 'http://fake.com', @site.config['url']
+        assert_operator @about_page.output, :include?, 'http://fake.com'
+      end
+    end
   end
 
   context 'netlify production context' do
@@ -61,6 +74,8 @@ class Jekyll::NetlifyTest < Minitest::Test
       @site = Jekyll::Site.new(config)
       @site.read
       @site.generate
+      @site.render
+      @about_page = get_about_page(@site)
     end
 
     context 'info' do
@@ -92,14 +107,25 @@ class Jekyll::NetlifyTest < Minitest::Test
         assert_equal false, @netlify['webhook']
       end
     end
+
+    context 'site.url' do
+      should 'be netlify production url' do
+        assert_equal 'https://example.com', @site.config['url']
+      end
+      should 'be expanded in about.md' do
+        assert_operator @about_page.output, :include?, 'https://example.com'
+      end
+    end
   end
+
   context 'netlify deploy-preview context' do
     setup do
       Jekyll.instance_variable_set(
         :@logger, Jekyll::LogAdapter.new(Jekyll::Stevenson.new, :error)
       )
 
       ENV.clear
+      ENV['URL'] = 'https://example.com'
       ENV['CONTEXT'] = 'deploy-preview'
       ENV['JEKYLL_ENV'] = 'staging'
 
@@ -114,6 +140,8 @@ class Jekyll::NetlifyTest < Minitest::Test
       @site = Jekyll::Site.new(config)
       @site.read
       @site.generate
+      @site.render
+      @about_page = get_about_page(@site)
     end
 
     context 'info' do
@@ -125,6 +153,15 @@ class Jekyll::NetlifyTest < Minitest::Test
         assert_equal 'staging-deploy-preview', @netlify['environment']
       end
     end
+
+    context 'site.url' do
+      should 'be netlify deploy-preview url' do
+        assert_equal ENV['DEPLOY_URL'], @site.config['url']
+      end
+      should 'be expanded in about.md' do
+        assert_operator @about_page.output, :include?, ENV['DEPLOY_URL']
+      end
+    end
   end
 
   context 'netlify unrecognised pull request' do

test/test_site/_config.yml

@@ -2,4 +2,4 @@
 title: Jekyll Test Site for Jekyll::Netlify
 description: "This is a test jekyll site with git contents to properly test the Jekyll::Netlify generator"
 baseurl: ""
-url: "http://example.com"
+url: "http://fake.com"

test/test_site/about.md

@@ -8,4 +8,4 @@ This is a test Jekyll site for Jekyll::Netlify. You can view the plugin at [Gith
 
 You are welcome to submit pull requests or suggest ideas!
 
-Adding some content
+Site: [site.url]({{ site.url }})