From 2b2a6458411d85fa6cbd85e2d90f57d702236639 Mon Sep 17 00:00:00 2001 From: Jack McCracken Date: Thu, 4 May 2023 14:37:16 -0400 Subject: [PATCH 1/2] Add pusher_id to /api/v1/:gem/versions/:version --- app/models/version.rb | 1 + test/models/version_test.rb | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/models/version.rb b/app/models/version.rb index 2d3e6752f29..53ac50f950e 100644 --- a/app/models/version.rb +++ b/app/models/version.rb @@ -281,6 +281,7 @@ def downloads_count def payload { "authors" => authors, + "pusher_id" => pusher_id, "built_at" => built_at, "created_at" => created_at, "description" => description, diff --git a/test/models/version_test.rb b/test/models/version_test.rb index 48cb2a52d77..749fafc5a57 100644 --- a/test/models/version_test.rb +++ b/test/models/version_test.rb @@ -12,12 +12,13 @@ class VersionTest < ActiveSupport::TestCase should "only have relevant API fields" do json = @version.as_json - fields = %w[number built_at summary description authors platform + fields = %w[number built_at summary description authors pusher_id platform ruby_version rubygems_version prerelease downloads_count licenses requirements sha metadata created_at] assert_equal fields.map(&:to_s).sort, json.keys.sort assert_equal @version.authors, json["authors"] + assert_equal @version.pusher_id.to_s, json["pusher_id"] assert_equal @version.built_at, json["built_at"] assert_equal @version.created_at, json["created_at"] assert_equal @version.description, json["description"] @@ -41,13 +42,14 @@ class VersionTest < ActiveSupport::TestCase should "only have relevant API fields" do xml = Nokogiri.parse(@version.to_xml) - fields = %w[number built-at summary description authors platform + fields = %w[number built-at summary description authors pusher-id platform ruby-version rubygems-version prerelease downloads-count licenses requirements sha metadata created-at] assert_equal fields.map(&:to_s).sort, xml.root.children.map(&:name).reject { |t| t == "text" }.sort assert_equal @version.authors, xml.at_css("authors").content + assert_equal @version.pusher_id.to_s, xml.at_css("pusher-id").content assert_equal @version.built_at.iso8601, xml.at_css("built-at").content assert_equal @version.description, xml.at_css("description").content assert_equal @version.downloads_count, xml.at_css("downloads-count").content.to_i From 739cffee5f32fe7c5cbc6505883f8adb9b8ebc7e Mon Sep 17 00:00:00 2001 From: Jack McCracken Date: Wed, 10 May 2023 14:13:19 -0400 Subject: [PATCH 2/2] Fix test: we were calling to_s on pusher_id before asserting when we should not be --- test/models/version_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/models/version_test.rb b/test/models/version_test.rb index 749fafc5a57..617554d56aa 100644 --- a/test/models/version_test.rb +++ b/test/models/version_test.rb @@ -18,7 +18,7 @@ class VersionTest < ActiveSupport::TestCase assert_equal fields.map(&:to_s).sort, json.keys.sort assert_equal @version.authors, json["authors"] - assert_equal @version.pusher_id.to_s, json["pusher_id"] + assert_equal @version.pusher_id, json["pusher_id"] assert_equal @version.built_at, json["built_at"] assert_equal @version.created_at, json["created_at"] assert_equal @version.description, json["description"]