diff --git a/lib/jekyll-github-metadata/repository.rb b/lib/jekyll-github-metadata/repository.rb index 821d8f3..c8716f2 100644 --- a/lib/jekyll-github-metadata/repository.rb +++ b/lib/jekyll-github-metadata/repository.rb @@ -118,7 +118,11 @@ def owner_public_repositories :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).each { |r| r[:releases] = c.releases(r[:full_name]) } + 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 diff --git a/lib/jekyll-github-metadata/sanitizer.rb b/lib/jekyll-github-metadata/sanitizer.rb index edaf554..0a993d3 100644 --- a/lib/jekyll-github-metadata/sanitizer.rb +++ b/lib/jekyll-github-metadata/sanitizer.rb @@ -16,7 +16,7 @@ module Sanitizer # 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 @@ def sanitize(resource) nil when String resource + when Value + resource.render else if resource.respond_to?(:to_hash) sanitize_resource(resource) @@ -39,7 +41,7 @@ def sanitize(resource) 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. diff --git a/spec/integration_spec.rb b/spec/integration_spec.rb index 49cb6b5..c7dd85a 100644 --- a/spec/integration_spec.rb +++ b/spec/integration_spec.rb @@ -42,6 +42,13 @@ expect(subject["public_repositories"].first["releases"].first["target_commitish"]).to eql("master") end + it "contains the correct public_repositories.contributors" do + expect(subject).to have_key("public_repositories") + expect(subject["public_repositories"].first).to have_key("contributors") + expect(subject["public_repositories"].first["contributors"].size).to eql(1) + expect(subject["public_repositories"].first["contributors"].first["login"]).to eql("parkr") + end + it "calls all the stubs" do stubs.each do |stub| expect(stub).to have_been_requested diff --git a/spec/spec_helpers/stub_helper.rb b/spec/spec_helpers/stub_helper.rb index 04d14f3..c61c413 100644 --- a/spec/spec_helpers/stub_helper.rb +++ b/spec/spec_helpers/stub_helper.rb @@ -22,7 +22,10 @@ def stub_all_api_requests }.map { |path, file| stub_api(path, file) } owner_repos = JSON.parse(webmock_data("owner_repos")) - owner_repos.each { |r| stubs << stub_api("/repos/#{r["full_name"]}/releases?per_page=100", "repo_releases") } + owner_repos.each do |r| + stubs << stub_api("/repos/#{r["full_name"]}/releases?per_page=100", "repo_releases") + stubs << stub_api("/repos/#{r["full_name"]}/contributors?per_page=100", "repo_contributors") + end stubs end