jekyll-github-metadata 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e2f07193bb80feccf89ea426bcd93d8188e3c0b
-  data.tar.gz: 9fa02218e3108a017a03337b8923b1357f8f3a50
+  metadata.gz: b7d6a9d7c3a9fd754220e85041847e91bbb2e76c
+  data.tar.gz: c9a791c58406dd4a0d27ea000cef9fae610dd1d5
 SHA512:
-  metadata.gz: 58e40f5163d6f3e359f02c1aff7b5e87ee7ec87dfc8e94d59f004700bffe1092dcf4462e39ad6011ca56db4d6a9c0090b86c8e3351641e3295af465b061c2b86
-  data.tar.gz: cb6d03ce523c88e3ae3fac2bac8aa66b4b97e69e67ed89dca4715dc8c4c8431da3f42573ad4d86e79dd2fc8d1628447cf76c7c205c6bead14a27050dac99f22e
+  metadata.gz: 1f146d6c25bc4c245615e11021c8eef409d1f03d561a1c9aa8efc0dbf66f4d31e2c974f8cd69383e550d4a63fe0b7ec566b5b33135b7a93436def4f8cf1f34fd
+  data.tar.gz: 0069d3c00e5f1dbc64b0fcb07a060c29d3b0c3ff9516831bfd822036da8031574739ca548839914e58600bc3ad1e25f053ab93fa78147395241967332895821e

data/lib/jekyll-github-metadata/ghp_metadata_generator.rb

@@ -1,4 +1,5 @@
 require "jekyll"
+require "uri"
 
 module Jekyll
   module GitHubMetadata
@@ -11,13 +12,7 @@ module Jekyll
         Jekyll::GitHubMetadata.log :debug, "Initializing..."
         @site = site
         site.config["github"] = github_namespace
-
-        # Set `site.url` and `site.baseurl` if unset and in production mode.
-        if Jekyll.env == "production"
-          site.config["url"] ||= drop.url
-          site.config["baseurl"] = drop.baseurl if site.config["baseurl"].to_s.empty?
-        end
-
+        set_url_and_baseurl_fallbacks!
         @site = nil
       end
 
@@ -37,6 +32,17 @@ module Jekyll
       def drop
         @drop ||= MetadataDrop.new(site)
       end
+
+      # Set `site.url` and `site.baseurl` if unset and in production mode.
+      def set_url_and_baseurl_fallbacks!
+        return unless Jekyll.env == "production"
+
+        repo = drop.send(:repository)
+        site.config["url"] ||= repo.url_without_path
+        if site.config["baseurl"].to_s.empty? && !["", "/"].include?(repo.baseurl)
+          site.config["baseurl"] = repo.baseurl
+        end
+      end
     end
   end
 end

data/lib/jekyll-github-metadata/repository.rb

@@ -151,6 +151,10 @@ module Jekyll
         @uri ||= URI(html_url)
       end
 
+      def url_without_path
+        uri.dup.tap { |u| u.path = "" }.to_s
+      end
+
       def domain
         uri.host
       end

data/lib/jekyll-github-metadata/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module GitHubMetadata
-    VERSION = "2.1.0".freeze
+    VERSION = "2.1.1".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-github-metadata
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Parker Moore
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-05 00:00:00.000000000 Z
+date: 2016-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit
@@ -145,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.7
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: The site.github namespace