jekyll-github-metadata 2.15.0 → 2.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8029d104bab61f3fc0eb41d52c6e053b6cc67dbe00666ca304095d4207494f5
-  data.tar.gz: a84feb95d94df55a426c4f1f0c9dd7b4d9bda046faea401aa2bf661435e3f555
+  metadata.gz: 5621fa7f8d170317298114bbbe8b1f811f5af88e0eaa5a0a0bd2575bb9b5421a
+  data.tar.gz: a59e9cd62f6417d8d475de1d3b50e539fb8bbf4d5843c02ea54de060bac74c2c
 SHA512:
-  metadata.gz: a58ac4957b6c1bde8f898dfb32661fe3f5238d9d4d8316e3175fd2f87ac1fff8698e664adc374a6c8284617f6ac069e583b64331cc43428123bde447485dc7a2
-  data.tar.gz: df7ea4df4b7bc1fd84615287d94803e1d8e7f39c7d488710370eda06d96a451e767a6ba91f437b2a89379f4f5de52e4b99972b2c20ce021bcdbfec74bbec0ba8
+  metadata.gz: 289180a1ea9d3abd94ddee2dc6967b223e393e15c0894efe895ac278294de1f2bf19bc185ada379e6721cbcdaac9af762c9a9a66d5fb83c5ee8bfec15755b8ba
+  data.tar.gz: f07cbf68c0ad1a4330a837fd700e3b160090ac0f3c65caac940c96c77cfdde693fcab8ce8e1631f0901bed9e112f93f985568261bbd758b2fcdac140e8648daa

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

@@ -68,14 +68,20 @@ module Jekyll
         end
       end
 
-      # NOTE: Faraday's error classes has been promoted to under Faraday module from v1.0.0.
-      # This patch aims to prevent on locking specific version of Faraday.
+      # NOTE: Faraday's error classes have been simplified from v1.0.0.
+      #
+      # In older versions, both `Faraday::Error::ConnectionFailed` and `Faraday::ConnectionFailed`
+      # were valid and equivalent to each other.
+      # From v1.0.0 onwards, `Faraday::Error::ConnectionFailed` no longer exists.
+      #
+      # TODO: Remove in v2.0 of this plugin.
       FARADAY_FAILED_CONNECTION =
         begin
           Faraday::Error::ConnectionFailed
         rescue NameError
           Faraday::ConnectionFailed
         end
+      deprecate_constant :FARADAY_FAILED_CONNECTION
 
       def save_from_errors(default = false)
         unless internet_connected?
@@ -86,7 +92,7 @@ module Jekyll
         yield @client
       rescue Octokit::Unauthorized
         raise BadCredentialsError, "The GitHub API credentials you provided aren't valid."
-      rescue FARADAY_FAILED_CONNECTION, Octokit::TooManyRequests => e
+      rescue Faraday::ConnectionFailed, Octokit::TooManyRequests => e
         GitHubMetadata.log :warn, e.message
         default
       rescue Octokit::NotFound
@@ -130,11 +136,11 @@ module Jekyll
       def pluck_auth_method
         if ENV["JEKYLL_GITHUB_TOKEN"] || Octokit.access_token
           { :access_token => ENV["JEKYLL_GITHUB_TOKEN"] || Octokit.access_token }
-        elsif !ENV["NO_NETRC"] && File.exist?(File.join(ENV["HOME"], ".netrc")) && safe_require("netrc")
+        elsif !ENV["NO_NETRC"] && File.exist?(File.join(Dir.home, ".netrc")) && safe_require("netrc")
           { :netrc => true }
         else
-          GitHubMetadata.log :warn, "No GitHub API authentication could be found." \
-            " Some fields may be missing or have incorrect data."
+          GitHubMetadata.log :warn, "No GitHub API authentication could be found. " \
+                                    "Some fields may be missing or have incorrect data."
           {}.freeze
         end
       end

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

@@ -118,7 +118,8 @@ module Jekyll
           :accept => "application/vnd.github.mercy-preview+json",
         }
         memoize_value :@owner_public_repositories, Value.new("owner_public_repositories", proc do |c|
-          c.list_repos(owner, options).map do |r|
+          repos = c.list_repos(owner, options) || []
+          repos.map do |r|
             r[:releases] = Value.new("owner_public_repositories_releases", proc { c.releases(r[:full_name]) })
             r[:contributors] = Value.new("owner_public_repositories_contributors", proc { c.contributors(r[:full_name]) })
             r

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

@@ -27,9 +27,9 @@ module Jekyll
             nwo_from_git_origin_remote || \
             proc do
               raise NoRepositoryError, "No repo name found. " \
-                "Specify using PAGES_REPO_NWO environment variables, " \
-                "'repository' in your configuration, or set up an 'origin' " \
-                "git remote pointing to your github.com repository."
+                                       "Specify using PAGES_REPO_NWO environment variables, " \
+                                       "'repository' in your configuration, or set up an 'origin' " \
+                                       "git remote pointing to your github.com repository."
             end.call
         end
       end

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

@@ -15,6 +15,7 @@ module Jekyll
 
       def initialize(site)
         Jekyll::GitHubMetadata.site = site
+        @original_config = site.config["github"]
       end
 
       def munge!
@@ -28,16 +29,20 @@ module Jekyll
         payload.site["github"] = github_namespace
       end
 
+      def uninject_metadata!(payload)
+        payload.site["github"] = @original_config
+      end
+
       private
 
       def github_namespace
-        case site.config["github"]
+        case @original_config
         when nil
           drop
         when Hash
-          Jekyll::Utils.deep_merge_hashes(drop, site.config["github"])
+          drop.merge(@original_config)
         else
-          site.config["github"]
+          @original_config
         end
       end
 
@@ -94,5 +99,9 @@ module Jekyll
     Jekyll::Hooks.register :site, :pre_render do |_site, payload|
       SiteGitHubMunger.global_munger.inject_metadata!(payload)
     end
+
+    Jekyll::Hooks.register :site, :post_render do |_site, payload|
+      SiteGitHubMunger.global_munger.uninject_metadata!(payload)
+    end
   end
 end

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

@@ -2,6 +2,6 @@
 
 module Jekyll
   module GitHubMetadata
-    VERSION = "2.15.0"
+    VERSION = "2.16.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-github-metadata
 version: !ruby/object:Gem::Version
-  version: 2.15.0
+  version: 2.16.0
 platform: ruby
 authors:
 - Parker Moore
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-20 00:00:00.000000000 Z
+date: 2023-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -34,22 +34,28 @@ dependencies:
   name: octokit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4'
     - - "!="
       - !ruby/object:Gem::Version
         version: 4.4.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4'
     - - "!="
       - !ruby/object:Gem::Version
         version: 4.4.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -112,28 +118,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.11.0
+        version: 3.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.11.0
+        version: 3.12.0
 - !ruby/object:Gem::Dependency
   name: rubocop-jekyll
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.13.0
 description: 
 email:
 - parkrmoore@gmail.com