Merge pull request #37 from jekyll/smarter-url-scheme

Properly calculate the url scheme

Author: parkr

lib/jekyll-github-metadata/pages.rb

@@ -12,6 +12,10 @@ class << self
           'SUBDOMAIN_ISOLATION'   => 'false'.freeze
         }.freeze
 
+        # Whether the GitHub instance supports HTTPS
+        # Note: this will be the same as how sites are served in Enterprise,
+        # but may be different from how sites are served on GitHub.com.
+        # See Repository#url_scheme
         def ssl?
           env_var('SSL') == 'true' || test?
         end

lib/jekyll-github-metadata/repository.rb

@@ -106,13 +106,17 @@ def primary?
         end
       end
 
+      # In enterprise, the site's scheme will be the same as the instance's
+      # In dotcom, this will be `https` for GitHub-owned sites that end with
+      # `.github.com` and will be `http` for all other sites.
+      # Note: This is not the same as *instance*'s scheme, which may differ
       def url_scheme
-        if domain.end_with?(".github.com".freeze)
-          "https".freeze
-        elsif cname
-          "http"
-        else
+        if Pages.enterprise?
           Pages.scheme
+        elsif owner == 'github' && domain.end_with?('.github.com')
+          'https'
+        else
+          'http'
         end
       end
 

spec/repository_spec.rb

@@ -46,11 +46,34 @@
     end
 
     it "returns Pages.scheme for the scheme" do
-      expect(repo.url_scheme).to eql(Jekyll::GitHubMetadata::Pages.scheme)
+      expect(repo.url_scheme).to eql("http")
     end
 
     it "uses Pages.scheme to determine scheme for domain" do
-      expect(repo.pages_url).to eql("#{Jekyll::GitHubMetadata::Pages.scheme}://parkr.github.io")
+      expect(repo.pages_url).to eql("http://parkr.github.io")
+    end
+    
+    context "on enterprise" do
+      it "uses Pages.scheme to determine scheme for pages URL" do
+        # With SSL=true
+        with_env({
+          "PAGES_ENV" => "enterprise",
+          "SSL"       => "true"
+        }) do
+          expect(Jekyll::GitHubMetadata::Pages.ssl?).to be(true)
+          expect(Jekyll::GitHubMetadata::Pages.scheme).to eql("https")
+          expect(repo.url_scheme).to eql("https")
+        end
+        
+        # With no SSL
+        with_env({
+          "PAGES_ENV" => "enterprise"
+        }) do
+          expect(Jekyll::GitHubMetadata::Pages.ssl?).to be(false)
+          expect(Jekyll::GitHubMetadata::Pages.scheme).to eql("http")
+          expect(repo.url_scheme).to eql("http")
+        end
+      end
     end
   end
 end