gds-api-adapters 37.5.1 → 38.0.0

data/test/helpers_test.rb

@@ -13,7 +13,6 @@ describe GdsApi::Helpers do
     refute_nil test_with_helpers.business_support_api
     refute_nil test_with_helpers.content_api
     refute_nil test_with_helpers.content_store
-    refute_nil test_with_helpers.publisher_api
     refute_nil test_with_helpers.imminence_api
     refute_nil test_with_helpers.licence_application_api
     refute_nil test_with_helpers.need_api

data/test/json_client_test.rb

@@ -28,21 +28,6 @@ class JsonClientTest < MiniTest::Spec
     {}
   end
 
-  # TODO: When we remove `GdsApi.config.hash_response_for_requests`, this helper
-  # method no longer makes sense and it should be deleted.
-  def with_hash_response_for_requests_disabled
-    @old_hash_response_for_requests = GdsApi.config.hash_response_for_requests
-    GdsApi.configure do |config|
-      config.hash_response_for_requests = false
-    end
-
-    yield
-
-    GdsApi.configure do |config|
-      config.hash_response_for_requests = @old_hash_response_for_requests
-    end
-  end
-
   def test_long_get_requests_timeout
     url = "http://www.example.com/timeout.json"
     stub_request(:get, url).to_timeout
@@ -399,39 +384,6 @@ class JsonClientTest < MiniTest::Spec
     end
   end
 
-  # TODO: always_raise_for_not_found will be gone by December 1st, 2016. We will
-  # need to remove it from this test.
-  def test_get_should_be_nil_if_404_returned_from_endpoint_and_always_raise_for_not_found_is_disabled
-    @old_always_raise = GdsApi.config.always_raise_for_not_found
-    GdsApi.configure do |config|
-      config.always_raise_for_not_found = false
-    end
-    url = "http://some.endpoint/some.json"
-    stub_request(:get, url).to_return(body: "{}", status: 404)
-
-    assert_nil @client.get_json(url)
-  ensure
-    GdsApi.configure do |config|
-      config.always_raise_for_not_found = @old_always_raise
-    end
-  end
-
-  # TODO: always_raise_for_not_found will be gone by December 1st, 2016. We will
-  # need to remove it from this test.
-  def test_get_should_be_nil_if_410_returned_from_endpoint_and_always_raise_for_not_found_is_disabled
-    @old_always_raise = GdsApi.config.always_raise_for_not_found
-    GdsApi.configure do |config|
-      config.always_raise_for_not_found = false
-    end
-    url = "http://some.endpoint/some.json"
-    stub_request(:get, url).to_return(body: "{}", status: 410)
-    assert_nil @client.get_json(url)
-  ensure
-    GdsApi.configure do |config|
-      config.always_raise_for_not_found = @old_always_raise
-    end
-  end
-
   def test_get_should_raise_if_404_returned_from_endpoint
     url = "http://some.endpoint/some.json"
     stub_request(:get, url).to_return(body: "{}", status: 404)
@@ -448,38 +400,6 @@ class JsonClientTest < MiniTest::Spec
     end
   end
 
-  # TODO: always_raise_for_not_found will be gone by December 1st, 2016. We will
-  # need to remove it from this test.
-  def test_get_raw_should_be_nil_if_404_returned_from_endpoint_and_always_raise_for_not_found_is_disabled
-    @old_always_raise = GdsApi.config.always_raise_for_not_found
-    GdsApi.configure do |config|
-      config.always_raise_for_not_found = false
-    end
-    url = "http://some.endpoint/some.json"
-    stub_request(:get, url).to_return(body: "{}", status: 404)
-    assert_nil @client.get_raw(url)
-  ensure
-    GdsApi.configure do |config|
-      config.always_raise_for_not_found = @old_always_raise
-    end
-  end
-
-  # TODO: always_raise_for_not_found will be gone by December 1st, 2016. We will
-  # need to remove it from this test.
-  def test_get_raw_should_be_nil_if_410_returned_from_endpoint_and_always_raise_for_not_found_is_disabled
-    @old_always_raise = GdsApi.config.always_raise_for_not_found
-    GdsApi.configure do |config|
-      config.always_raise_for_not_found = false
-    end
-    url = "http://some.endpoint/some.json"
-    stub_request(:get, url).to_return(body: "{}", status: 410)
-    assert_nil @client.get_raw(url)
-  ensure
-    GdsApi.configure do |config|
-      config.always_raise_for_not_found = @old_always_raise
-    end
-  end
-
   def test_get_raw_should_raise_if_404_returned_from_endpoint
     url = "http://some.endpoint/some.json"
     stub_request(:get, url).to_return(body: "{}", status: 404)
@@ -700,18 +620,6 @@ class JsonClientTest < MiniTest::Spec
     assert_equal "Hello there!", response
   end
 
-  # TODO: When we remove `GdsApi.config.hash_response_for_requests`, this test
-  # no longer makes sense and it should be deleted.
-  def test_can_convert_response_to_ostruct
-    with_hash_response_for_requests_disabled do
-      url = "http://some.endpoint/some.json"
-      payload = { a: 1 }
-      stub_request(:put, url).with(body: payload.to_json).to_return(body: '{"a":1}', status: 200)
-      response = @client.put_json(url, payload)
-      assert_equal(OpenStruct.new(a: 1), response.to_ostruct)
-    end
-  end
-
   def test_can_access_attributes_of_response_directly
     url = "http://some.endpoint/some.json"
     payload = { a: 1 }
@@ -720,49 +628,6 @@ class JsonClientTest < MiniTest::Spec
     assert_equal 2, response['a']['b']
   end
 
-  def test_cant_access_attributes_of_response_directly_if_hash_only
-    url = "http://some.endpoint/some.json"
-    payload = { a: 1 }
-    stub_request(:put, url).with(body: payload.to_json).to_return(body: '{"a":{"b":2}}', status: 200)
-    response = @client.put_json(url, payload)
-
-    @old_hash_response_for_requests = GdsApi.config.hash_response_for_requests
-    GdsApi.configure do |config|
-      config.hash_response_for_requests = true
-    end
-
-    assert_raises NoMethodError do
-      response.a.b
-    end
-
-    GdsApi.configure do |config|
-      config.hash_response_for_requests = @old_hash_response_for_requests
-    end
-  end
-
-  # TODO: When we remove `GdsApi.config.hash_response_for_requests`, this test
-  # no longer makes sense and it should be deleted.
-  def test_accessing_non_existent_attribute_of_response_returns_nil
-    with_hash_response_for_requests_disabled do
-      url = "http://some.endpoint/some.json"
-      stub_request(:put, url).to_return(body: '{"a":1}', status: 200)
-      response = @client.put_json(url, {})
-      assert_equal nil, response.does_not_exist
-    end
-  end
-
-  # TODO: When we remove `GdsApi.config.hash_response_for_requests`, this test
-  # no longer makes sense and it should be deleted.
-  def test_response_does_not_claim_to_respond_to_methods_corresponding_to_non_existent_attributes
-    with_hash_response_for_requests_disabled do
-      # This mimics the behaviour of OpenStruct
-      url = "http://some.endpoint/some.json"
-      stub_request(:put, url).to_return(body: '{"a":1}', status: 200)
-      response = @client.put_json(url, {})
-      assert ! response.respond_to?(:does_not_exist)
-    end
-  end
-
   def test_a_response_is_always_considered_present_and_not_blank
     url = "http://some.endpoint/some.json"
     stub_request(:put, url).to_return(body: '{"a":1}', status: 200)

data/test/need_api_test.rb

@@ -219,6 +219,22 @@ describe GdsApi::NeedApi do
     end
   end
 
+  describe "viewing content_ids for needs" do
+    it "should return the content_id for a need_id" do
+      need = {
+        id: 100700,
+        content_id: "abcdef-12345",
+        role: "need",
+        goal: "needy",
+        benefit: "needless"
+      }
+      need_api_has_content_id_for_need(need)
+
+      need_response = @api.content_id(100700)
+      assert_equal 'abcdef-12345', need_response.body
+    end
+  end
+
   describe "updating needs" do
     it "should send a PUT request" do
       updated_fields = {

data/test/publishing_api_test.rb

@@ -11,64 +11,6 @@ describe GdsApi::PublishingApi do
     @api_client = GdsApi::PublishingApi.new(publishing_api_host)
   end
 
-  describe "#put_content_item" do
-    it "responds with 200 OK if the entry is valid" do
-      base_path = "/test-content-item"
-      content_item = content_item_for_publishing_api(base_path).merge("update_type" => "major")
-
-      publishing_api
-        .given("no content exists")
-        .upon_receiving("a request to create a content item")
-        .with(
-          method: :put,
-          path: "/content#{base_path}",
-          body: content_item,
-          headers: {
-            "Content-Type" => "application/json"
-          },
-        )
-        .will_respond_with(
-          status: 200,
-          body: content_item,
-          headers: {
-            "Content-Type" => "application/json; charset=utf-8"
-          },
-        )
-
-      response = @api_client.put_content_item(base_path, content_item)
-      assert_equal 200, response.code
-    end
-  end
-
-  describe "#put_draft_content_item" do
-    it "responds with 200 OK if the entry is valid" do
-      base_path = "/test-draft-content-item"
-      content_item = content_item_for_publishing_api(base_path).merge("update_type" => "major")
-
-      publishing_api
-        .given("no content exists")
-        .upon_receiving("a request to create a draft content item")
-        .with(
-          method: :put,
-          path: "/draft-content#{base_path}",
-          body: content_item,
-          headers: {
-            "Content-Type" => "application/json"
-          },
-        )
-        .will_respond_with(
-          status: 200,
-          body: content_item,
-          headers: {
-            "Content-Type" => "application/json; charset=utf-8"
-          },
-        )
-
-      response = @api_client.put_draft_content_item(base_path, content_item)
-      assert_equal 200, response.code
-    end
-  end
-
   describe "#put_intent" do
     it "responds with 200 OK if publish intent is valid" do
       base_path = "/test-intent"

data/test/response_test.rb

@@ -242,68 +242,5 @@ describe GdsApi::Response do
         assert_equal "1870", @response.dig("details", "need_id")
       end
     end
-
-    # TODO: When we remove `GdsApi.config.hash_response_for_requests`, this
-    # describe block no longer makes sense and it should be removed.
-    describe "behaving like a read-only openstruct" do
-      def with_hash_response_for_requests_disabled
-        @old_hash_response_for_requests = GdsApi.config.hash_response_for_requests
-        GdsApi.configure do |config|
-          config.hash_response_for_requests = false
-        end
-
-        yield
-
-        GdsApi.configure do |config|
-          config.hash_response_for_requests = @old_hash_response_for_requests
-        end
-      end
-
-      it "should allow accessing members using methods" do
-        with_hash_response_for_requests_disabled do
-          assert_equal "VAT rates", @response.title
-        end
-      end
-
-      it "should allow accessing nested values" do
-        with_hash_response_for_requests_disabled do
-          assert_equal "1870", @response.details.need_id
-        end
-      end
-
-      it "should allow accessing values nested within arrays" do
-        with_hash_response_for_requests_disabled do
-          assert_equal "bar", @response.tags[1].slug
-        end
-      end
-
-      it "should return nil for a non-existent key" do
-        with_hash_response_for_requests_disabled do
-          assert_equal nil, @response.foo
-        end
-      end
-
-      it "should memoize the generated openstruct" do
-        with_hash_response_for_requests_disabled do
-          @response.id
-          GdsApi::Response.expects(:build_ostruct_recursively).never
-          assert_equal "VAT rates", @response.title
-        end
-      end
-
-      describe "handling respond_to?" do
-        it "should respond_to methods for keys that exist" do
-          with_hash_response_for_requests_disabled do
-            assert @response.respond_to?(:title)
-          end
-        end
-
-        it "should not respond_to keys that don't exist" do
-          with_hash_response_for_requests_disabled do
-            assert ! @response.respond_to?(:foo)
-          end
-        end
-      end
-    end
   end
 end

data/test/rummager_test.rb

@@ -135,7 +135,7 @@ describe GdsApi::Rummager do
   it "#delete_content removes a document" do
     request = stub_request(:delete, "http://example.com/content?link=/foo/bar")
 
-    GdsApi::Rummager.new("http://example.com").delete_content!("/foo/bar")
+    GdsApi::Rummager.new("http://example.com").delete_content("/foo/bar")
 
     assert_requested(request)
   end
@@ -143,7 +143,7 @@ describe GdsApi::Rummager do
   it "#get_content Retrieves a document" do
     request = stub_request(:get, "http://example.com/content?link=/foo/bar")
 
-    GdsApi::Rummager.new("http://example.com").get_content!("/foo/bar")
+    GdsApi::Rummager.new("http://example.com").get_content("/foo/bar")
 
     assert_requested(request)
   end

data/test/test_helpers/publishing_api_test.rb

@@ -7,35 +7,6 @@ describe GdsApi::TestHelpers::PublishingApi do
   let(:base_api_url) { Plek.current.find("publishing-api") }
   let(:publishing_api) { GdsApi::PublishingApi.new(base_api_url) }
 
-  describe "#assert_publishing_api_put_item" do
-    before { stub_default_publishing_api_put }
-    let(:base_path) { "/example" }
-
-    it "matches a put request with any empty attributes by default" do
-      publishing_api.put_content_item(base_path, {})
-      assert_publishing_api_put_item(base_path)
-    end
-
-    it "matches a put request with any arbitrary attributes by default" do
-      random_attributes = Hash[10.times.map {|n| [Random.rand * 1_000_000_000_000, Random.rand * 1_000_000_000_000]}]
-      publishing_api.put_content_item(base_path, random_attributes)
-      assert_publishing_api_put_item(base_path)
-    end
-
-    it "if attributes are specified, matches a request with at least those attributes" do
-      publishing_api.put_content_item(base_path, {"required_attribute" => 1, "extra_attrbibute" => 1})
-      assert_publishing_api_put_item(base_path, {"required_attribute" => 1})
-    end
-
-    it "matches using a custom request matcher" do
-      publishing_api.put_content_item(base_path, {})
-      matcher_was_called = false
-      matcher = ->(request) { matcher_was_called = true; true }
-      assert_publishing_api_put_item(base_path, matcher)
-      assert matcher_was_called, "matcher should have been called"
-    end
-  end
-
   describe '#request_json_matching predicate' do
     describe "nested required attribute" do
       let(:matcher) { request_json_matching({"a" => {"b" => 1}}) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gds-api-adapters
 version: !ruby/object:Gem::Version
-  version: 37.5.1
+  version: 38.0.0
 platform: ruby
 authors:
 - James Stewart
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-28 00:00:00.000000000 Z
+date: 2016-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: plek
@@ -345,13 +345,11 @@ files:
 - lib/gds_api/asset_manager.rb
 - lib/gds_api/base.rb
 - lib/gds_api/business_support_api.rb
-- lib/gds_api/config.rb
 - lib/gds_api/content_api.rb
 - lib/gds_api/content_store.rb
 - lib/gds_api/core-ext/openstruct.rb
 - lib/gds_api/email_alert_api.rb
 - lib/gds_api/exceptions.rb
-- lib/gds_api/external_link_tracker.rb
 - lib/gds_api/gov_uk_delivery.rb
 - lib/gds_api/govuk_headers.rb
 - lib/gds_api/helpers.rb
@@ -364,15 +362,12 @@ files:
 - lib/gds_api/maslow.rb
 - lib/gds_api/middleware/govuk_header_sniffer.rb
 - lib/gds_api/need_api.rb
-- lib/gds_api/needotron.rb
 - lib/gds_api/null_cache.rb
 - lib/gds_api/organisations.rb
 - lib/gds_api/panopticon.rb
 - lib/gds_api/panopticon/registerer.rb
-- lib/gds_api/part_methods.rb
 - lib/gds_api/performance_platform/data_in.rb
 - lib/gds_api/performance_platform/data_out.rb
-- lib/gds_api/publisher.rb
 - lib/gds_api/publishing_api.rb
 - lib/gds_api/publishing_api/special_route_publisher.rb
 - lib/gds_api/publishing_api_v2.rb
@@ -403,7 +398,6 @@ files:
 - lib/gds_api/test_helpers/panopticon.rb
 - lib/gds_api/test_helpers/performance_platform/data_in.rb
 - lib/gds_api/test_helpers/performance_platform/data_out.rb
-- lib/gds_api/test_helpers/publisher.rb
 - lib/gds_api/test_helpers/publishing_api.rb
 - lib/gds_api/test_helpers/publishing_api_v2.rb
 - lib/gds_api/test_helpers/router.rb
@@ -419,7 +413,6 @@ files:
 - test/content_api_test.rb
 - test/content_store_test.rb
 - test/email_alert_api_test.rb
-- test/external_link_tracker_test.rb
 - test/fixtures/finder_api/cma-case-schema.json
 - test/fixtures/hello.txt
 - test/fixtures/new_policies_for_dwp.json
@@ -446,7 +439,6 @@ files:
 - test/panopticon_test.rb
 - test/pp_data_in_test.rb
 - test/pp_data_out_test.rb
-- test/publisher_api_test.rb
 - test/publishing_api/special_route_publisher_test.rb
 - test/publishing_api_test.rb
 - test/publishing_api_v2/get_expanded_links_test.rb
@@ -507,7 +499,6 @@ test_files:
 - test/licence_application_api_test.rb
 - test/test_helper.rb
 - test/govuk_headers_test.rb
-- test/publisher_api_test.rb
 - test/mapit_test.rb
 - test/rummager_helpers_test.rb
 - test/publishing_api_v2_test.rb
@@ -519,7 +510,6 @@ test_files:
 - test/gds_api_base_test.rb
 - test/router_test.rb
 - test/publishing_api/special_route_publisher_test.rb
-- test/external_link_tracker_test.rb
 - test/need_api_test.rb
 - test/panopticon_test.rb
 - test/pp_data_in_test.rb