gds-api-adapters 61.0.0 → 61.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 03633d3f73a43534c9a5bf7f4dd962440da1e00413b8cb68eb26ccabf9a852fd
-  data.tar.gz: 601382725376e9209d8e03898edffdf5d1cafe3e1afd7a7c42609c6a480d08fd
+  metadata.gz: d5f65962436358074fac776cc44bb46b9eb6f6468d5535cee98f3d74eb6d023f
+  data.tar.gz: d1db9044e8d30b6f9663c538c3899f6e91f89784976944a47fc1eedff628a864
 SHA512:
-  metadata.gz: ce83aa7cc12f0fa50c45e082c1085dfb125eb20cc0060f7e4b3412c7f016d776aed2bb499def860d4d34d955bca43528c96d0a4fbd56017d92647c61577a6415
-  data.tar.gz: 33690cb1426e6d63b5faa7f52b3521f80d046a1cc72a0c308ae8054e4b32f691c607770366ae4586042bf7aa808dc7cb91b2e8c8e5f5ad9bd0b8a43e92d1a751
+  metadata.gz: 8e13eabfbe27a41b911d00c2d8e3476ef76785a1879e0356aec501d397343a7c25fe7c2b76f9806a12060d0279b76b0bc6dc39b286aef216975edae592a90af5
+  data.tar.gz: c79eda01413dab578ab7eed8edaf2f468fc7702ef8ae280407431d1d6026373c078a4b98114ba80b8448b77f13e6c64a58bde11a024a1e2bbd3db688db550eac

data/README.md

@@ -5,16 +5,16 @@ A set of API adapters to work with the GDS APIs.
 Example usage:
 
 ```ruby
-require 'gds_api/rummager'
-rummager = GdsApi::Rummager.new(Plek.new.find('search))
-results = rummager.search(q: "taxes")
+require 'gds_api/search'
+search = GdsApi::Search.new(Plek.new.find('search))
+results = search.search(q: "taxes")
 ```
 
 Example adapters for frequently used applications:
 
 - [Publishing API](lib/gds_api/publishing_api_v2.rb) ([docs](http://www.rubydoc.info/gems/gds-api-adapters/GdsApi/PublishingApiV2), [test helper code](https://github.com/alphagov/gds-api-adapters/blob/master/lib/gds_api/test_helpers/publishing_api_v2.rb), [test helper docs](http://www.rubydoc.info/gems/gds-api-adapters/GdsApi/TestHelpers/PublishingApiV2))
 - [Content Store](lib/gds_api/content_store.rb) ([docs](http://www.rubydoc.info/gems/gds-api-adapters/GdsApi/ContentStore), [test helper code](https://github.com/alphagov/gds-api-adapters/blob/master/lib/gds_api/test_helpers/content_store.rb), [test helper docs](http://www.rubydoc.info/gems/gds-api-adapters/GdsApi/TestHelpers/ContentStore))
-- [Rummager](lib/gds_api/rummager.rb) ([docs](http://www.rubydoc.info/gems/gds-api-adapters/GdsApi/Rummager), [test helper code](https://github.com/alphagov/gds-api-adapters/blob/master/lib/gds_api/test_helpers/rummager.rb), [test helper docs](http://www.rubydoc.info/gems/gds-api-adapters/GdsApi/TestHelpers/Rummager))
+- [Search API](lib/gds_api/search.rb) ([docs](http://www.rubydoc.info/gems/gds-api-adapters/GdsApi/Search), [test helper code](https://github.com/alphagov/gds-api-adapters/blob/master/lib/gds_api/test_helpers/search.rb), [test helper docs](http://www.rubydoc.info/gems/gds-api-adapters/GdsApi/TestHelpers/Search))
 
 ## Logging
 

data/Rakefile

@@ -31,5 +31,5 @@ end
 
 desc "Run the linter against changed files"
 task :lint do
-  sh "bundle exec govuk-lint-ruby --format clang lib test"
+  sh "bundle exec rubocop --format clang lib test"
 end

data/lib/gds_api/test_helpers/email_alert_api.rb

@@ -19,6 +19,11 @@ module GdsApi
           .to_return(status: 404)
       end
 
+      def stub_email_alert_api_invalid_update_subscriber(id)
+        stub_request(:patch, "#{EMAIL_ALERT_API_ENDPOINT}/subscribers/#{id}")
+          .to_return(status: 422)
+      end
+
       def stub_email_alert_api_has_updated_subscription(subscription_id, frequency)
         stub_request(:patch, "#{EMAIL_ALERT_API_ENDPOINT}/subscriptions/#{subscription_id}")
           .to_return(
@@ -32,11 +37,13 @@ module GdsApi
           .to_return(status: 404)
       end
 
-      def stub_email_alert_api_has_subscriber_subscriptions(id, address, order)
-        stub_request(:get, "#{EMAIL_ALERT_API_ENDPOINT}/subscribers/#{id}/subscriptions?order=#{order}")
+      def stub_email_alert_api_has_subscriber_subscriptions(id, address, order = nil, subscriptions: nil)
+        params = order ? "?order=#{order}" : ""
+
+        stub_request(:get, "#{EMAIL_ALERT_API_ENDPOINT}/subscribers/#{id}/subscriptions#{params}")
           .to_return(
             status: 200,
-            body: get_subscriber_subscriptions_response(id, address).to_json,
+            body: get_subscriber_subscriptions_response(id, address, subscriptions: subscriptions).to_json,
           )
       end
 
@@ -240,6 +247,16 @@ module GdsApi
           )
       end
 
+      def stub_email_alert_api_invalid_auth_token
+        stub_request(:post, "#{EMAIL_ALERT_API_ENDPOINT}/subscribers/auth-token")
+          .to_return(status: 422)
+      end
+
+      def stub_email_alert_api_auth_token_no_subscriber
+        stub_request(:post, "#{EMAIL_ALERT_API_ENDPOINT}/subscribers/auth-token")
+          .to_return(status: 404)
+      end
+
       def assert_unsubscribed(uuid)
         assert_requested(:post, "#{EMAIL_ALERT_API_ENDPOINT}/unsubscribe/#{uuid}", times: 1)
       end
@@ -333,13 +350,13 @@ module GdsApi
         }
       end
 
-      def get_subscriber_subscriptions_response(id, address)
+      def get_subscriber_subscriptions_response(id, address, subscriptions:)
         {
           "subscriber" => {
             "id" => id,
             "address" => address,
           },
-          "subscriptions" => [
+          "subscriptions" => subscriptions || [
             {
               "subscriber_id" => 1,
               "subscriber_list_id" => 1000,

data/lib/gds_api/version.rb

@@ -1,3 +1,3 @@
 module GdsApi
-  VERSION = "61.0.0".freeze
+  VERSION = "61.1.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gds-api-adapters
 version: !ruby/object:Gem::Version
-  version: 61.0.0
+  version: 61.1.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-07 00:00:00.000000000 Z
+date: 2019-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -122,20 +122,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
-- !ruby/object:Gem::Dependency
-  name: govuk-lint
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -290,6 +276,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '12.3'
+- !ruby/object:Gem::Dependency
+  name: rubocop-govuk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement