gds-api-adapters 24.5.0 → 24.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1cdf38f1b222c05d8d81625b25b222de03f6f273
-  data.tar.gz: 41fb59bce925ffd63f782566ccb50beda983bf8f
+  metadata.gz: 212e116b422961283b637ba076848769be4c2eaa
+  data.tar.gz: c79059c7b2f7040590283f54ff51950db3b401cb
 SHA512:
-  metadata.gz: 2a57d45ce36edc708d49082e6fc47a66094e1d6717cfb71b24acd142cd7c996188cf1c2d3b7c109284720fd14fe459e405b54e48f5d0ccf8b4a61264642ef1ff
-  data.tar.gz: 82494aeda400c32f9bdf66541d52c9e9a78a552dcd3ac606621e02f957ef92b5cdc08e55932dc97622cc8b15030d52e542165fd8985c82238183b7bfe4019032
+  metadata.gz: 982d5e547eec900056a748469da51fe2be0f62c831eb90074f56dfb748d8aa8a624e7af3b30b0c7996c61d52cfbb1c9db68ce9e350c8e3bbc1f8696f988c3897
+  data.tar.gz: 88442f8971daf8150de2328246199d0f1ee89e020a97f4443cb180a0da95d2f94af65783468420f7f005c5921d10faaaa51a2945780fc254d4adaa9cbefd5fd9

data/lib/gds_api/imminence.rb

@@ -31,12 +31,6 @@ class GdsApi::Imminence < GdsApi::Base
     get_raw("#{@endpoint}/places/#{type}.kml").body
   end
 
-  def business_support_schemes(facets_hash)
-    query = facets_hash.keys.sort.map { |k| "#{k.to_s}=#{facets_hash[k]}" }.join("&")
-    query = "?#{query}" unless query.empty?
-    get_json!("#{@endpoint}/business_support_schemes.json#{query}")
-  end
-
   def areas_for_postcode(postcode)
     url = "#{@endpoint}/areas/#{URI.encode(postcode)}.json"
     get_json(url)
@@ -70,5 +64,4 @@ private
     {"address" => address_fields.map(&:strip).join(", ")}
   end
 
-
 end

data/lib/gds_api/router.rb

@@ -33,7 +33,7 @@ class GdsApi::Router < GdsApi::Base
 
   def add_redirect_route(path, type, destination, redirect_type = "permanent", options = {})
     response = put_json!("#{endpoint}/routes", :route => {:incoming_path => path, :route_type => type, :handler => "redirect",
-              :redirect_to => destination, :redirect_type => redirect_type})
+              :redirect_to => destination, :redirect_type => redirect_type, :segments_mode => options[:segments_mode]})
     commit_routes if options[:commit]
     response
   end

data/lib/gds_api/test_helpers/imminence.rb

@@ -15,33 +15,6 @@ module GdsApi
         to_return(:status => 200, :body => response, :headers => {})
       end
 
-      def imminence_has_business_support_schemes(facets_hash, schemes)
-        results = {
-          "_response_info" => {"status" => "ok"},
-          "description" => "Business Support Schemes!",
-          "total" => schemes.size, "startIndex" => 1, "pageSize" => schemes.size, "currentPage" => 1, "pages" => 1,
-          "results" => schemes
-        }
-
-        stub_request(:get, "#{IMMINENCE_API_ENDPOINT}/business_support_schemes.json").
-          with(query: facets_hash).
-          to_return(status: 200, body: results.to_json, headers: {})
-      end
-
-      # Stubs out all bussiness_support_schemes requests to return an ampty set of results.
-      # Requests stubbed with the above method will take precedence over this.
-      def stub_imminence_default_business_support_schemes
-        empty_results = {
-          "_response_info" => {"status" => "ok"},
-          "description" => "Business Support Schemes!",
-          "total" => 0, "startIndex" => 1, "pageSize" => 0, "currentPage" => 1, "pages" => 1,
-          "results" => []
-        }
-
-        stub_request(:get, %r{\A#{IMMINENCE_API_ENDPOINT}/business_support_schemes\.json}).
-          to_return(:body => empty_results.to_json)
-      end
-
       def imminence_has_areas_for_postcode(postcode, areas)
         results = {
           "_response_info" => {"status" => "ok"},

data/lib/gds_api/test_helpers/router.rb

@@ -31,13 +31,14 @@ module GdsApi
         [register_stub, commit_stub]
       end
 
-      def stub_redirect_registration(path, type, destination, redirect_type)
+      def stub_redirect_registration(path, type, destination, redirect_type, segments_mode = nil)
         redirect = { route: {
                       incoming_path: path,
                       route_type: type,
                       handler: 'redirect',
                       redirect_to: destination,
-                      redirect_type: redirect_type }
+                      redirect_type: redirect_type,
+                      segments_mode: segments_mode }
                   }
 
         register_stub = stub_route_put(redirect)

data/lib/gds_api/version.rb

@@ -1,3 +1,3 @@
 module GdsApi
-  VERSION = '24.5.0'
+  VERSION = '24.6.0'
 end

data/test/gds_api_base_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 require 'gds_api/base'
 require 'uri'
 
-class GdsApiBaseTest < MiniTest::Unit::TestCase
+class GdsApiBaseTest < Minitest::Test
 
   class ConcreteApi < GdsApi::Base
     def base_url

data/test/imminence_api_test.rb

@@ -1,7 +1,7 @@
 require "test_helper"
 require "gds_api/imminence"
 
-class ImminenceApiTest < MiniTest::Unit::TestCase
+class ImminenceApiTest < Minitest::Test
 
   ROOT = "https://imminence.test.alphagov.co.uk"
   LATITUDE = 52.1327584352089
@@ -118,25 +118,6 @@ class ImminenceApiTest < MiniTest::Unit::TestCase
     end
   end
 
-  def test_business_support_schemes
-    dummy_schemes = [
-      { "business_support_identifier" => "bar-business-award", "title" => "Bar business award." },
-      { "business_support_identifier" => "bar-small-business-loan", "title" => "Bar small business loan." },
-      { "business_support_identifier" => "foo-small-business-loan", "title" => "Foo small business loan." }
-    ]
-    c = api_client
-    url = "#{ROOT}/business_support_schemes.json?business_types=private-company&" +
-      "sectors=agriculture,healthcare,manufacturing&stages=grow-and-sustain&types=award,loan"
-    c.expects(:get_json!).with(url).returns(dummy_schemes)
-
-    schemes = c.business_support_schemes(sectors: "agriculture,healthcare,manufacturing",
-      business_types: "private-company", stages: "grow-and-sustain", types: "award,loan")
-
-    assert_equal 3, schemes.size
-    assert_equal "bar-business-award", schemes.first["business_support_identifier"]
-    assert_equal "Foo small business loan.", schemes.last["title"]
-  end
-
   def test_places_kml
     kml_body = <<-EOS
 <?xml version="1.0" encoding="UTF-8"?>

data/test/licence_application_api_test.rb

@@ -2,7 +2,7 @@ require "test_helper"
 require "gds_api/licence_application"
 require "gds_api/test_helpers/licence_application"
 
-class LicenceApplicationApiTest < MiniTest::Unit::TestCase
+class LicenceApplicationApiTest < Minitest::Test
   include GdsApi::TestHelpers::LicenceApplication
 
   def setup

data/test/router_test.rb

@@ -238,7 +238,8 @@ describe GdsApi::Router do
 
     describe "creating/updating a redirect route" do
       it "should allow creating/updating a redirect route" do
-        route_data = {"incoming_path" => "/foo", "route_type" => "exact", "handler" => "redirect", "redirect_to" => "/bar", "redirect_type" => "permanent"}
+        route_data = {"incoming_path" => "/foo", "route_type" => "exact", "handler" => "redirect",
+          "redirect_to" => "/bar", "redirect_type" => "permanent", "segments_mode" => nil}
         req = WebMock.stub_request(:put, "#{@base_api_url}/routes").
           with(:body => {"route" => route_data}.to_json).
           to_return(:status => 201, :body => route_data.to_json, :headers => {"Content-type" => "application/json"})
@@ -252,7 +253,8 @@ describe GdsApi::Router do
       end
 
       it "should allow creating/updating a temporary redirect route" do
-        route_data = {"incoming_path" => "/foo", "route_type" => "exact", "handler" => "redirect", "redirect_to" => "/bar", "redirect_type" => "temporary"}
+        route_data = {"incoming_path" => "/foo", "route_type" => "exact", "handler" => "redirect",
+          "redirect_to" => "/bar", "redirect_type" => "temporary", "segments_mode" => nil}
         req = WebMock.stub_request(:put, "#{@base_api_url}/routes").
           with(:body => {"route" => route_data}.to_json).
           to_return(:status => 201, :body => route_data.to_json, :headers => {"Content-type" => "application/json"})
@@ -265,6 +267,21 @@ describe GdsApi::Router do
         assert_not_requested(@commit_req)
       end
 
+      it "should allow creating/updating a redirect route which preserves segments" do
+        route_data = {"incoming_path" => "/foo", "route_type" => "exact", "handler" => "redirect",
+          "redirect_to" => "/bar", "redirect_type" => "temporary", "segments_mode" => "preserve"}
+        req = WebMock.stub_request(:put, "#{@base_api_url}/routes").
+          with(:body => {"route" => route_data}.to_json).
+          to_return(:status => 201, :body => route_data.to_json, :headers => {"Content-type" => "application/json"})
+
+        response = @api.add_redirect_route("/foo", "exact", "/bar", "temporary", :segments_mode => "preserve")
+        assert_equal 201, response.code
+        assert_equal "/bar", response.redirect_to
+
+        assert_requested(req)
+        assert_not_requested(@commit_req)
+      end
+
       it "should commit the routes when asked to" do
         req = WebMock.stub_request(:put, "#{@base_api_url}/routes").
           to_return(:status => 201, :body =>{}.to_json, :headers => {"Content-type" => "application/json"})
@@ -276,7 +293,8 @@ describe GdsApi::Router do
       end
 
       it "should raise an error if creating/updating the redirect route fails" do
-        route_data = {"incoming_path" => "/foo", "route_type" => "exact", "handler" => "redirect", "redirect_to" => "bar", "redirect_type" => "permanent"}
+        route_data = {"incoming_path" => "/foo", "route_type" => "exact", "handler" => "redirect",
+          "redirect_to" => "bar", "redirect_type" => "permanent", "segments_mode" => nil}
         response_data = route_data.merge("errors" => {"redirect_to" => "is not a valid URL path"})
 
         req = WebMock.stub_request(:put, "#{@base_api_url}/routes").

data/test/rummager_helpers_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 require 'gds_api/rummager'
 require 'gds_api/test_helpers/rummager'
 
-class RummagerHelpersTest < MiniTest::Unit::TestCase
+class RummagerHelpersTest < Minitest::Test
   include GdsApi::TestHelpers::Rummager
 
   def test_services_and_info_data_returns_an_adequate_response_object

data/test/test_helper.rb

@@ -20,7 +20,7 @@ SimpleCov.start do
   formatter SimpleCov::Formatter::RcovFormatter
 end
 
-class MiniTest::Unit::TestCase
+class Minitest::Test
   def teardown
     Timecop.return
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gds-api-adapters
 version: !ruby/object:Gem::Version
-  version: 24.5.0
+  version: 24.6.0
 platform: ruby
 authors:
 - James Stewart
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-13 00:00:00.000000000 Z
+date: 2015-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: plek