govuk_content_item_loader 2.1.3 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0dcf5b2b565e52bd01cb1ab8edd4a697fe05ece140cb044a9118b5ea0273c5a2
-  data.tar.gz: 01070d8d27ae6541a211bdb939c54e0489db96900e4cb5c23a7234e2dd1a5288
+  metadata.gz: b3ceca83242496f8f8c801c30b74ff9e1a7e2614f9b596b9df3d793bb54f3f2e
+  data.tar.gz: f24ec6c54b15b1eeb5c3c793946c94ad44fe25aa173aceebabeec2b8000842b5
 SHA512:
-  metadata.gz: d8e0abf9f4d6e7088742f6a034231904d9f3ca01835f235497896139917ddc49ff21a6857a448098fbc7881a5ec5cf2ea74150667ca83aa5fe826ebc983b220d
-  data.tar.gz: 3351a571beed7bcf55f0ea8f3881e806d8d2955d9a36237e0c1542494da137d0d554552510a3ea30c453c0799885e63eeae14224c1c1ecea04a09f561bca1311
+  metadata.gz: ab47e97e60c256f5abc8286644de7e1f00a10295519b1effa8c1525afb3c09ff045cf4bd850b1e14c1bf044ce23e5d3901cc2a64733192e2079de2e163a5b8dc
+  data.tar.gz: 6e26ba08c76fc6a7cdada9282f8a6e709c44f54afd8465512d0920f9d44b37ce2d813b8168fd0beecee989913d187363bed65d947c91c66669b0286ac10d4bb4

data/.github/dependabot.yml

@@ -1,10 +1,31 @@
 version: 2
 updates:
   - package-ecosystem: bundler
-    directory: "/"
+    directory: /
     schedule:
-      interval: daily
-  - package-ecosystem: "github-actions"
-    directory: "/"
+      interval: weekly
+      day: tuesday
+      time: "07:00"
+    allow:
+      - dependency-type: direct
+    cooldown:
+      default-days: 3
+    open-pull-requests-limit: 25
+    groups:
+      test:
+        patterns:
+        - "climate_control"
+        - "ostruct"
+        - "rspec"
+        - "simplecov"
+        - "webmock"
+
+  - package-ecosystem: github-actions
+    directory: /
     schedule:
-      interval: daily
+      interval: weekly
+      day: tuesday
+      time: "07:00"
+    cooldown:
+      default-days: 3
+    open-pull-requests-limit: 25

data/.github/pull_request_template.md

@@ -1 +1 @@
-This application is owned by the Publishing Platform team. Please let us know in [#govuk-publishing-platform](https://gds.slack.com/archives/C03D792LYJG) when you raise any PRs.
+This repo is owned by the Content APIs team. Please let us know in [#govuk-content-apis](https://gds.slack.com/archives/C03D792LYJG) when you raise any PRs.

data/.github/workflows/actionlint.yml

@@ -6,7 +6,7 @@ jobs:
   actionlint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           show-progress: false
       - uses: alphagov/govuk-infrastructure/.github/actions/actionlint@main

data/.github/workflows/ci.yml

@@ -35,10 +35,10 @@ jobs:
         ruby: [3.3, 3.4, 4.0]
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+    - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
       with:
         ref: ${{ inputs.ref || github.ref }}
-    - uses: ruby/setup-ruby@4c56a21280b36d862b5fc31348f463d60bdc55d5 # v1.301.0
+    - uses: ruby/setup-ruby@afeafc3d1ab54a631816aba4c914a0081c12ff2f # v1.310.0
       with:
         ruby-version: ${{ matrix.ruby }}
         bundler-cache: true

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 2.2.0
+
+* Don't initialise Publishing API client when the Publishing API connection is not configured
+
 ## 2.1.3
 
 * Update dependencies

data/lib/govuk_content_item_loader/govuk_conditional_content_item_loader.rb

@@ -1,9 +1,9 @@
 class GovukConditionalContentItemLoader
   attr_reader :content_store_client, :publishing_api_client, :request, :base_path
 
-  def initialize(request:, content_store_client: GdsApi.content_store, publishing_api_client: GdsApi.publishing_api, base_path: nil)
+  def initialize(request:, content_store_client: GdsApi.content_store, publishing_api_client: nil, base_path: nil)
     @content_store_client = content_store_client
-    @publishing_api_client = publishing_api_client
+    @publishing_api_client = publishing_api_client || default_publishing_api_client
     @request = request
     @base_path = base_path || request&.path
   end
@@ -15,6 +15,8 @@ class GovukConditionalContentItemLoader
   end
 
   def can_load_from_graphql?
+    return false unless publishing_api_client
+
     return false unless request
 
     return false if draft_host?
@@ -55,6 +57,14 @@ private
     request.env["govuk.prometheus_labels"] = prometheus_labels.merge(hash)
   end
 
+  def publishing_api_service_uri_configured?
+    !ENV["PLEK_SERVICE_PUBLISHING_API_URI"].nil?
+  end
+
+  def default_publishing_api_client
+    publishing_api_service_uri_configured? ? GdsApi.publishing_api : nil
+  end
+
   def draft_host?
     ENV["PLEK_HOSTNAME_PREFIX"] == "draft-"
   end

data/lib/govuk_content_item_loader/version.rb

@@ -1,3 +1,3 @@
 module GovukContentItemLoader
-  VERSION = "2.1.3".freeze
+  VERSION = "2.2.0".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: govuk_content_item_loader
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.2.0
 platform: ruby
 authors:
 - GOV.UK Dev
@@ -210,7 +210,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.10
+rubygems_version: 4.0.14
 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