govuk_content_item_loader 1.2.0 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9f2c50ebc136f3c6f3303d1bff102d8f8cb603a2df8fa0d4fa23710ed4c0b6d
-  data.tar.gz: 5d86e91dded77543c5b30d6310245d230ed60cca32a3367406147952427640c4
+  metadata.gz: 704a8afd75af58674109ebefcb22e9855c481d7b5280330e6f1d25eac2fcbec2
+  data.tar.gz: 7415244c1e4abd90dfd25e1499bb083839e1dc0bc37d6ae6c9937c9c256a9c26
 SHA512:
-  metadata.gz: be560a01f12d317253875eeb418a1c3f4962bd31d3c0a63ca2cacb8e74505a3860a1c64080d48374fe8ecf70e66eeb514c88613a3bc1c3cf23921677d8be0188
-  data.tar.gz: 9173b6bf38e6eb65341ec4b7b77c96c65be812d4548a8795822a015ae6cae24bcd2be1656ce4ccabc1e9a82ddfbdf182318dc00e46c5f276b3d51b4c86941528
+  metadata.gz: 20823b0e5c2a93ede2bb195995393aa692dbb07e4b5d0cafe02b6d241ecac06c072bb8f009419dd66424b44a91237e813d6e226a282c300a46eb12fc7c52a13a
+  data.tar.gz: b9a349fb86b3232ae009d77c60672c0c8cdea9c5850f2d639e17ca09ea3d6724999314cfdbc540d933353aa4d333abc18716eb17607b1272b2f1a73a29430037

data/.github/workflows/ci.yml

@@ -38,7 +38,7 @@ jobs:
     - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
       with:
         ref: ${{ inputs.ref || github.ref }}
-    - uses: ruby/setup-ruby@319994f95fa847cf3fb3cd3dbe89f6dcde9f178f # v1.295.0
+    - uses: ruby/setup-ruby@3ff19f5e2baf30647122352b96108b1fbe250c64 # v1.299.0
       with:
         ruby-version: ${{ matrix.ruby }}
         bundler-cache: true

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 1.2.2
+
+* Update dependencies
+
+## 1.2.1
+
+* Stub the requests in test helpers and add Plek as dependency 
+
 ## 1.2.0
 
 * Add test helpers which provide stubs

data/govuk_content_item_loader.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = %w[lib]
 
   spec.add_dependency "gds-api-adapters", ">= 99.3"
+  spec.add_dependency "plek", ">= 1.9.0"
   spec.add_dependency "railties", ">= 7.2"
 
   spec.add_development_dependency "climate_control"

data/lib/govuk_content_item_loader/test_helpers.rb

@@ -1,11 +1,8 @@
 require "json"
 
 module GovukConditionalContentItemLoaderTestHelpers
-  Response = Struct.new(:status, :body, :headers) do
-    def to_h
-      JSON.parse(body)
-    end
-  end
+  CONTENT_STORE_ENDPOINT = Plek.find("content-store")
+  PUBLISHING_API_ENDPOINT = Plek.find("publishing-api")
 
   # Stubs the loader returns a content item
   # The following options can be passed in:
@@ -14,22 +11,25 @@ module GovukConditionalContentItemLoaderTestHelpers
   #   :private  if true, the Cache-Control header will include the "private" directive. By default it
   #             will include "public"
   def stub_conditional_loader_returns_content_item(body, options = {})
-    body.to_json unless body.is_a?(String)
+    body = body.is_a?(String) ? body : body.to_json
     max_age = options.fetch(:max_age, 900)
     visibility = options[:private] ? "private" : "public"
 
-    response = Response.new(200, body, {
-      cache_control: "#{visibility}, max-age=#{max_age}",
-      date: Time.now.httpdate,
-    })
+    [CONTENT_STORE_ENDPOINT, PUBLISHING_API_ENDPOINT].each do |endpoint|
+      stub_request(:get, %r{#{Regexp.escape(endpoint)}}).to_return(
+        status: 200,
+        body: body,
+        headers: {
+          "Cache-Control" => "#{visibility}, max-age=#{max_age}",
+          "Date" => Time.now.httpdate,
+        },
+      )
+    end
 
-    loader = instance_double(GovukConditionalContentItemLoader, load: response)
+    loader = instance_double(GovukConditionalContentItemLoader, load: JSON.parse(body))
 
     allow(GovukConditionalContentItemLoader).to receive(:new).with(request: anything)
       .and_return(loader)
-    allow(loader).to receive(:load).and_return(body)
-
-    response
   end
 
   # Stubs the loader returns a error response

data/lib/govuk_content_item_loader/version.rb

@@ -1,3 +1,3 @@
 module GovukContentItemLoader
-  VERSION = "1.2.0".freeze
+  VERSION = "1.2.2".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: govuk_content_item_loader
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.2
 platform: ruby
 authors:
 - GOV.UK Dev
@@ -23,6 +23,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '99.3'
+- !ruby/object:Gem::Dependency
+  name: plek
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.9.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.9.0
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
@@ -182,7 +196,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.8
+rubygems_version: 4.0.9
 specification_version: 4
 summary: Provides a standardised content item loader for GOV.UK frontend apps with
   configurable GraphQL traffic routing and automatic fallback to the Content Store