jekyll-github-metadata 2.3.1 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 830071ee9a66ef5338b02ddd4ae31f46a6f2aa4b
-  data.tar.gz: b83c56cd709c8712f771bcd6862a8a5ae24db5ee
+  metadata.gz: 7347cc8b75350a9f119bb515764484beadbf3b58
+  data.tar.gz: 356deee3da8394780051ac14bb82dbc5bf49a779
 SHA512:
-  metadata.gz: 8471a7b1c99806e85dc7519b66bba105ecee56ebb1b48f86f15dccc9173bf94fd821979b23dd8522ec13da816638a8dac03df86a855a6deb085f9ba96d58e464
-  data.tar.gz: 71ea515b6d692b376697488619778c3831ff343d6fa63f7a1dfb8408415fca6a158eb5ec38688756eb47301c507a31d4f768ac044817bcfdb41e28b1717f9fec
+  metadata.gz: 06d307897672e83283576796321325ceeb3f7ce524205bc11974c01c7b8422bc7d346640a765c3a1f4f2c0b8ea38f162784581c1a4b6a95576cc8e05664bd0ea
+  data.tar.gz: 39484711ab95934eb2de95fde1408e9c79ab7b83ead4ded42d4016910cf3d80ad9eb674cfec4243eec092f5c3fc6b7392ade498a879e35677c00d9bc6ad27b6b

data/lib/jekyll-github-metadata.rb

@@ -30,7 +30,7 @@ module Jekyll
     autoload :VERSION,          "jekyll-github-metadata/version"
 
     if Jekyll.const_defined? :Site
-      require_relative "jekyll-github-metadata/ghp_metadata_generator"
+      require_relative "jekyll-github-metadata/site_github_munger"
     end
 
     class << self

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

@@ -99,7 +99,7 @@ module Jekyll
       end
 
       def nwo_from_git_origin_remote
-        return unless Jekyll.env == "development"
+        return unless Jekyll.env == "development" || Jekyll.env == "test"
         matches = git_remote_url.chomp(".git").match %r!github.com(:|/)([\w-]+)/([\w\.-]+)!
         matches[2..3].join("/") if matches
       end

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

@@ -10,7 +10,8 @@ module Jekyll
           "PAGES_PAGES_HOSTNAME"   => "github.io".freeze,
           "SSL"                    => "false".freeze,
           "SUBDOMAIN_ISOLATION"    => "false".freeze,
-          "PAGES_PREVIEW_HTML_URL" => nil
+          "PAGES_PREVIEW_HTML_URL" => nil,
+          "PAGE_BUILD_ID"          => nil,
         }.freeze
 
         # Whether the GitHub instance supports HTTPS
@@ -75,6 +76,16 @@ module Jekyll
           trim_last_slash env_var("PAGES_PAGES_HOSTNAME", intermediate_default)
         end
 
+        def page_build?
+          !env_var("PAGE_BUILD_ID").to_s.empty?
+        end
+
+        def configuration
+          (methods - Object.methods - [:configuration]).sort.each_with_object({}) do |meth, memo|
+            memo[meth.to_s] = public_send(meth)
+          end
+        end
+
         private
         def env_var(key, intermediate_default = nil)
           !ENV[key].to_s.empty? ? ENV[key] : (intermediate_default || DEFAULTS[key])

data/lib/jekyll-github-metadata/{ghp_metadata_generator.rb → site_github_munger.rb}

@@ -3,17 +3,19 @@ require "uri"
 
 module Jekyll
   module GitHubMetadata
-    class GHPMetadataGenerator < Jekyll::Generator
-      safe true
-
+    class SiteGitHubMunger
       attr_reader :site
 
-      def generate(site)
-        Jekyll::GitHubMetadata.log :debug, "Initializing..."
+      def initialize(site)
         @site = site
+      end
+
+      def munge!
+        Jekyll::GitHubMetadata.log :debug, "Initializing..."
+
+        # This is the good stuff.
         site.config["github"] = github_namespace
-        set_url_and_baseurl_fallbacks!
-        @site = nil
+        add_url_and_baseurl_fallbacks!
       end
 
       private
@@ -22,8 +24,8 @@ module Jekyll
         case site.config["github"]
         when nil
           drop
-        when Hash, Liquid::Drop
-          Jekyll::Utils.deep_merge_hashes(drop, site.config["github"])
+        when Hash
+          Jekyll::Utils.deep_merge_hashes(site.config["github"], drop)
         else
           site.config["github"]
         end
@@ -33,9 +35,9 @@ module Jekyll
         @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"
+      # Set `site.url` and `site.baseurl` if unset.
+      def add_url_and_baseurl_fallbacks!
+        return unless Jekyll.env == "production" || Pages.page_build?
 
         repo = drop.send(:repository)
         site.config["url"] ||= repo.url_without_path
@@ -46,3 +48,7 @@ module Jekyll
     end
   end
 end
+
+Jekyll::Hooks.register :site, :after_init do |site|
+  Jekyll::GitHubMetadata::SiteGitHubMunger.new(site).munge! unless Jekyll.env == "test"
+end

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

@@ -1,5 +1,5 @@
 module Jekyll
   module GitHubMetadata
-    VERSION = "2.3.1".freeze
+    VERSION = "2.4.0".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-github-metadata
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.4.0
 platform: ruby
 authors:
 - Parker Moore
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-18 00:00:00.000000000 Z
+date: 2017-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit
@@ -123,12 +123,12 @@ extra_rdoc_files: []
 files:
 - lib/jekyll-github-metadata.rb
 - lib/jekyll-github-metadata/client.rb
-- lib/jekyll-github-metadata/ghp_metadata_generator.rb
 - lib/jekyll-github-metadata/metadata_drop.rb
 - lib/jekyll-github-metadata/pages.rb
 - lib/jekyll-github-metadata/repository.rb
 - lib/jekyll-github-metadata/repository_compat.rb
 - lib/jekyll-github-metadata/sanitizer.rb
+- lib/jekyll-github-metadata/site_github_munger.rb
 - lib/jekyll-github-metadata/value.rb
 - lib/jekyll-github-metadata/version.rb
 homepage: https://github.com/parkr/github-metadata
@@ -151,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: The site.github namespace