jekyll-github-metadata 2.12.1 → 2.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3affb844ff34ffda3dd8a636cc09e79ffafcbd4bb856877773683142feb06f3
-  data.tar.gz: 58c18e6353383b324bc2cf19a9c0e7482253dce414f36145bf51138ecd1a54aa
+  metadata.gz: 60dcc741766ebde9c73e6f2d2d65a07a23d60e6eb1b7f5b88f2da4505c548a92
+  data.tar.gz: b3b67b1a6be141ce3558f431e44053c7f0c74c7b03079486601390204c03a0ee
 SHA512:
-  metadata.gz: d535514e12c247ddae4c3df837d5f9107ef8b89565a702e403dc013dc3f9cdab8bbda7eb20cce02f9ccd3be7f2003491fd3de70fcfc065d20a00850d294ad054
-  data.tar.gz: 8f0d0b44b843808598e4ed230a0f5702f0b8fd94c5443a690f46f7d4ad28d621d6cf8b706b2656b472dfe6cb7f62461681d822dd920721244eccb3f41c5b616f
+  metadata.gz: 3e8806b3cd7cf27ae282de1dd54d0055eef93d1dffcaf3644478440b729501125f8da1d655c33a503f5dd9215b09c850c0bc28e9ff4553f63e0e2044f5e41268
+  data.tar.gz: fa82e7d311dd2f720007e2d242211ee17831c34181b20dbf781859cee7241c0bdf469b1d3de18757317010c8649f815d240825b8ec4f5ef564a5a7b0ee80cc51

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

@@ -68,6 +68,15 @@ 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.
+      FARADAY_FAILED_CONNECTION =
+        begin
+          Faraday::Error::ConnectionFailed
+        rescue NameError
+          Faraday::ConnectionFailed
+        end
+
       def save_from_errors(default = false)
         unless internet_connected?
           GitHubMetadata.log :warn, "No internet connection. GitHub metadata may be missing or incorrect."
@@ -77,7 +86,7 @@ module Jekyll
         yield @client
       rescue Octokit::Unauthorized
         raise BadCredentialsError, "The GitHub API credentials you provided aren't valid."
-      rescue Faraday::Error::ConnectionFailed, Octokit::TooManyRequests => e
+      rescue FARADAY_FAILED_CONNECTION, Octokit::TooManyRequests => e
         GitHubMetadata.log :warn, e.message
         default
       rescue Octokit::NotFound

data/lib/jekyll-github-metadata/edit-link-tag.rb

@@ -69,19 +69,40 @@ module Jekyll
       end
 
       def parts
-        @parts ||= [repository_url, "edit/", branch, source_path, page_path]
+        memoize_conditionally { [repository_url, "edit/", branch, source_path, page_path] }
       end
 
       def parts_normalized
-        @parts_normalized ||= parts.map.with_index do |part, index|
-          part = remove_leading_slash(part.to_s)
-          part = ensure_trailing_slash(part) unless index == parts.length - 1
-          ensure_not_just_a_slash(part)
+        memoize_conditionally do
+          parts.map.with_index do |part, index|
+            part = remove_leading_slash(part.to_s)
+            part = ensure_trailing_slash(part) unless index == parts.length - 1
+            ensure_not_just_a_slash(part)
+          end
         end
       end
 
       def page
-        @page ||= context.registers[:page]
+        memoize_conditionally { context.registers[:page] }
+      end
+
+      # Utility function for compatibility with Jekyll 4.0
+      def memoize_conditionally
+        if renderer_cached?
+          yield
+        else
+          dispatcher = "@#{caller_locations(1..1).first.label}".to_sym
+          if instance_variable_defined?(dispatcher)
+            instance_variable_get(dispatcher)
+          else
+            instance_variable_set(dispatcher, yield)
+          end
+        end
+      end
+
+      # Utility function to detect Jekyll 4.0
+      def renderer_cached?
+        @renderer_cached ||= context.registers[:site].liquid_renderer.respond_to?(:cache)
       end
 
       def site

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

@@ -14,7 +14,7 @@ module Jekyll
       alias_method :invoke_drop, :[]
       def key?(key)
         return false if key.nil?
-        return true if self.class.mutable? && @mutations.key?(key)
+        return true if self.class.mutable? && mutations.key?(key)
 
         respond_to?(key) || fallback_data.key?(key)
       end
@@ -69,6 +69,8 @@ module Jekyll
       def_delegator :repository, :releases,                    :releases
       def_delegator :repository, :latest_release,              :latest_release
       def_delegator :repository, :private?,                    :private
+      def_delegator :repository, :archived?,                   :archived
+      def_delegator :repository, :disabled?,                   :disabled
       def_delegator :repository, :license,                     :license
       def_delegator :repository, :source,                      :source
 
@@ -95,6 +97,10 @@ module Jekyll
       def fallback_data
         @fallback_data ||= {}
       end
+
+      def mutations
+        @mutations ||= {}
+      end
     end
   end
 end

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

@@ -26,6 +26,8 @@ module Jekyll
       def_hash_delegator :repo_info,      :description,   :tagline
       def_hash_delegator :repo_info,      :has_downloads, :show_downloads?
       def_hash_delegator :repo_info,      :private,       :private?
+      def_hash_delegator :repo_info,      :archived,      :archived?
+      def_hash_delegator :repo_info,      :disabled,      :disabled?
       def_hash_delegator :latest_release, :url,           :latest_release_url
       def_hash_delegator :source,         :branch,        :git_ref
 
@@ -107,7 +109,11 @@ module Jekyll
       end
 
       def owner_public_repositories
-        memoize_value :@owner_public_repositories, Value.new("owner_public_repositories", proc { |c| c.list_repos(owner, "type" => "public") })
+        options = {
+          :type   => "public",
+          :accept => "application/vnd.github.mercy-preview+json",
+        }
+        memoize_value :@owner_public_repositories, Value.new("owner_public_repositories", proc { |c| c.list_repos(owner, options) })
       end
 
       def organization_public_members

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

@@ -2,6 +2,6 @@
 
 module Jekyll
   module GitHubMetadata
-    VERSION = "2.12.1"
+    VERSION = "2.13.0"
   end
 end

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-github-metadata
 version: !ruby/object:Gem::Version
-  version: 2.12.1
+  version: 2.13.0
 platform: ruby
 authors:
 - Parker Moore
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-12 00:00:00.000000000 Z
+date: 2020-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.4'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.4'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: octokit
   requirement: !ruby/object:Gem::Requirement
@@ -104,16 +110,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.8.0
 - !ruby/object:Gem::Dependency
   name: rubocop-jekyll
   requirement: !ruby/object:Gem::Requirement
@@ -148,7 +154,7 @@ files:
 - 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
+homepage: https://github.com/jekyll/github-metadata
 licenses:
 - MIT
 metadata: {}
@@ -167,7 +173,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: The site.github namespace