jekyll-github-metadata 2.12.0 → 2.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db796ded361fa761e1733d72440324b1d87ca74026fff300dd8b7322735e6529
-  data.tar.gz: fa94f023f861ce9daf7af80b60d78c25f2aa14ef488694d1f53ebf0dcdd487c5
+  metadata.gz: 0aa9b80b06e98d57d4a18a9952b633e26bdd18743300b2a060fdf49ab9fd76a5
+  data.tar.gz: 750dc7e1fd1da0527ffe369bc6abd3b12170900ae3a7db30e041b35712ebe163
 SHA512:
-  metadata.gz: 1982de628a9bf0c1282ab53fec061bfbd9b32e234cddec0b4029a0c968b0a5b3becf9023e5e649be747e6fe6d6bc89ef081720dfd89797146116676ed6784c7d
-  data.tar.gz: 30038f99fd37bb5cbccf2ec6b64faababba9d8695c6bbf1f11a3e573fc488adc90275ea6d07d336477e1f376e81b81c3244d9be3eb099767e08710603c64d379
+  metadata.gz: 3768bf00efd6d4455c739cc84fe0e553c5569eb2548f1608845dd3cf8ca203bb83d47be001987152acd64d63962587c8d4748fa4bae9006b5a2a98963210c092
+  data.tar.gz: 62bfca12e088100b09b0343391cf2750778415062a9b2ef1da7cc4390ef56fa8b13ac60347bc37a891d504738ac6bce6a160b5ba5f680bd09bb792ce5dbe92bf

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
@@ -48,6 +48,7 @@ module Jekyll
       def_delegator :repository, :tagline,                     :project_tagline
       def_delegator :repository, :owner_metadata,              :owner
       def_delegator :repository, :owner,                       :owner_name
+      def_delegator :repository, :owner_display_name,          :owner_display_name
       def_delegator :repository, :owner_url,                   :owner_url
       def_delegator :repository, :owner_gravatar_url,          :owner_gravatar_url
       def_delegator :repository, :repository_url,              :repository_url
@@ -69,6 +70,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 +98,10 @@ module Jekyll
       def fallback_data
         @fallback_data ||= {}
       end
+
+      def mutations
+        @mutations ||= {}
+      end
     end
   end
 end

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

@@ -68,6 +68,7 @@ module Jekyll
       end
       alias_method :to_hash, :to_h
       def_delegator :to_h, :to_json, :to_json
+      def_delegator :to_h, :to_liquid, :to_liquid
 
       def_delegator :to_h, :to_s, :to_s
       alias_method :to_str, :to_s

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
 
@@ -62,6 +64,10 @@ module Jekyll
         end
       end
 
+      def owner_display_name
+        owner_metadata.name
+      end
+
       def owner_metadata
         @owner_metadata ||= Jekyll::GitHubMetadata::Owner.new(owner)
       end
@@ -107,7 +113,17 @@ 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 do |c|
+          c.list_repos(owner, options).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
+          end
+        end)
       end
 
       def organization_public_members

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

@@ -16,7 +16,7 @@ module Jekyll
       # resource - an Object
       #
       # Returns the sanitized resource.
-      # rubocop:disable Metrics/CyclomaticComplexity
+      # rubocop:disable Metrics/CyclomaticComplexity, Metrics/MethodLength
       def sanitize(resource)
         case resource
         when Array
@@ -31,6 +31,8 @@ module Jekyll
           nil
         when String
           resource
+        when Value
+          resource.render
         else
           if resource.respond_to?(:to_hash)
             sanitize_resource(resource)
@@ -39,7 +41,7 @@ module Jekyll
           end
         end
       end
-      # rubocop:enable Metrics/CyclomaticComplexity
+      # rubocop:enable Metrics/CyclomaticComplexity, Metrics/MethodLength
 
       # Sanitize the Sawyer Resource or Hash
       # Note: the object must respond to :to_hash for this to work.

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

@@ -55,7 +55,13 @@ module Jekyll
           msg << "Jekyll GitHub Metadata will not set site.title to the repository's name."
           Jekyll::GitHubMetadata.log :warn, msg
         else
-          site.config["title"] ||= Value.new("title", proc { |_c, r| r.name })
+          site.config["title"] ||= Value.new("title", proc { |_context, repository|
+            if repository.project_page?
+              repository.name
+            else
+              repository.owner_display_name || repository.owner
+            end
+          })
         end
         site.config["description"] ||= Value.new("description", proc { |_c, r| r.tagline })
       end

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

@@ -2,6 +2,6 @@
 
 module Jekyll
   module GitHubMetadata
-    VERSION = "2.12.0"
+    VERSION = "2.14.0"
   end
 end

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-github-metadata
 version: !ruby/object:Gem::Version
-  version: 2.12.0
+  version: 2.14.0
 platform: ruby
 authors:
 - Parker Moore
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-11 00:00:00.000000000 Z
+date: 2022-05-05 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,30 +110,30 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.11.0
 - !ruby/object:Gem::Dependency
   name: rubocop-jekyll
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.12.0
 description: 
 email:
 - parkrmoore@gmail.com
@@ -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.1.6
 signing_key: 
 specification_version: 4
 summary: The site.github namespace