gds-api-adapters 17.2.0 → 17.3.0

data/lib/gds_api/router.rb

@@ -18,8 +18,11 @@ class GdsApi::Router < GdsApi::Base
 
   ### Routes
 
-  def get_route(path, type)
-    get_json("#{endpoint}/routes?incoming_path=#{CGI.escape(path)}&route_type=#{CGI.escape(type)}")
+  def get_route(path, type = nil)
+    if type
+      $stderr.puts "DEPRECATION WARNING: passing type to GdsApi::Router#get_route is deprecated and will be removed in a future version. Caller: #{caller[0]}"
+    end
+    get_json("#{endpoint}/routes?incoming_path=#{CGI.escape(path)}")
   end
 
   def add_route(path, type, backend_id, options = {})
@@ -41,8 +44,14 @@ class GdsApi::Router < GdsApi::Base
     response
   end
 
-  def delete_route(path, type, options = {})
-    response = delete_json!("#{endpoint}/routes?incoming_path=#{CGI.escape(path)}&route_type=#{CGI.escape(type)}")
+  def delete_route(path, options_or_deprecated_type = {}, deprecated_options = {})
+    if options_or_deprecated_type.is_a?(String)
+      $stderr.puts "DEPRECATION WARNING: passing type to GdsApi::Router#delete_route is deprecated and will be removed in a future version. Caller: #{caller[0]}"
+      options = deprecated_options
+    else
+      options = options_or_deprecated_type
+    end
+    response = delete_json!("#{endpoint}/routes?incoming_path=#{CGI.escape(path)}")
     commit_routes if options[:commit]
     response
   end

data/lib/gds_api/version.rb

@@ -1,3 +1,3 @@
 module GdsApi
-  VERSION = '17.2.0'
+  VERSION = '17.3.0'
 end

data/test/router_test.rb

@@ -149,10 +149,10 @@ describe GdsApi::Router do
       it "should return the route details" do
         route_data = {"incoming_path" => "/foo", "route_type" => "exact", "handler" => "backend", "backend_id" => "foo"}
         req = WebMock.stub_request(:get, "#{@base_api_url}/routes").
-          with(:query => {"incoming_path" => "/foo", "route_type" => "exact"}).
+          with(:query => {"incoming_path" => "/foo"}).
           to_return(:status => 200, :body => route_data.to_json, :headers => {"Content-type" => "application/json"})
 
-        response = @api.get_route("/foo", "exact")
+        response = @api.get_route("/foo")
         assert_equal 200, response.code
         assert_equal "foo", response.backend_id
 
@@ -162,10 +162,10 @@ describe GdsApi::Router do
 
       it "should return nil if nothing found" do
         req = WebMock.stub_request(:get, "#{@base_api_url}/routes").
-          with(:query => {"incoming_path" => "/foo", "route_type" => "exact"}).
+          with(:query => {"incoming_path" => "/foo"}).
           to_return(:status => 404)
 
-        response = @api.get_route("/foo", "exact")
+        response = @api.get_route("/foo")
         assert_nil response
 
         assert_requested(req)
@@ -176,10 +176,10 @@ describe GdsApi::Router do
         # The WebMock query matcher matches unescaped params.  The call blows up if they're not escaped
 
         req = WebMock.stub_request(:get, "#{@base_api_url}/routes").
-          with(:query => {"incoming_path" => "/foo bar", "route_type" => "exa ct"}).
+          with(:query => {"incoming_path" => "/foo bar"}).
           to_return(:status => 404)
 
-        response = @api.get_route("/foo bar", "exa ct")
+        response = @api.get_route("/foo bar")
         assert_nil response
 
         assert_requested(req)
@@ -352,10 +352,10 @@ describe GdsApi::Router do
       it "should allow deleting a route" do
         route_data = {"incoming_path" => "/foo", "route_type" => "exact", "handler" => "backend", "backend_id" => "foo"}
         req = WebMock.stub_request(:delete, "#{@base_api_url}/routes").
-          with(:query => {"incoming_path" => "/foo", "route_type" => "exact"}).
+          with(:query => {"incoming_path" => "/foo"}).
           to_return(:status => 200, :body => route_data.to_json, :headers => {"Content-type" => "application/json"})
 
-        response = @api.delete_route("/foo", "exact")
+        response = @api.delete_route("/foo")
         assert_equal 200, response.code
         assert_equal "foo", response.backend_id
 
@@ -365,10 +365,10 @@ describe GdsApi::Router do
 
       it "should commit the routes when asked to" do
         req = WebMock.stub_request(:delete, "#{@base_api_url}/routes").
-          with(:query => {"incoming_path" => "/foo", "route_type" => "exact"}).
+          with(:query => {"incoming_path" => "/foo"}).
           to_return(:status => 200, :body => {}.to_json, :headers => {"Content-type" => "application/json"})
 
-        @api.delete_route("/foo", "exact", :commit => true)
+        @api.delete_route("/foo", :commit => true)
 
         assert_requested(req)
         assert_requested(@commit_req)
@@ -376,12 +376,12 @@ describe GdsApi::Router do
 
       it "should raise HTTPNotFound if nothing found" do
         req = WebMock.stub_request(:delete, "#{@base_api_url}/routes").
-          with(:query => {"incoming_path" => "/foo", "route_type" => "exact"}).
+          with(:query => {"incoming_path" => "/foo"}).
           to_return(:status => 404)
 
         e = nil
         begin
-          @api.delete_route("/foo", "exact")
+          @api.delete_route("/foo")
         rescue GdsApi::HTTPNotFound => ex
           e = ex
         end
@@ -397,11 +397,11 @@ describe GdsApi::Router do
         # The WebMock query matcher matches unescaped params.  The call blows up if they're not escaped
 
         req = WebMock.stub_request(:delete, "#{@base_api_url}/routes").
-          with(:query => {"incoming_path" => "/foo bar", "route_type" => "exa ct"}).
+          with(:query => {"incoming_path" => "/foo bar"}).
           to_return(:status => 404)
 
         begin
-          @api.delete_route("/foo bar", "exa ct")
+          @api.delete_route("/foo bar")
         rescue GdsApi::HTTPNotFound
         end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gds-api-adapters
 version: !ruby/object:Gem::Version
-  version: 17.2.0
+  version: 17.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-10 00:00:00.000000000 Z
+date: 2015-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: plek
-  requirement: &19119560 !ruby/object:Gem::Requirement
+  requirement: &23375780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19119560
+  version_requirements: *23375780
 - !ruby/object:Gem::Dependency
   name: null_logger
-  requirement: &19117620 !ruby/object:Gem::Requirement
+  requirement: &23374840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19117620
+  version_requirements: *23374840
 - !ruby/object:Gem::Dependency
   name: link_header
-  requirement: &19116720 !ruby/object:Gem::Requirement
+  requirement: &23374260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19116720
+  version_requirements: *23374260
 - !ruby/object:Gem::Dependency
   name: lrucache
-  requirement: &19115240 !ruby/object:Gem::Requirement
+  requirement: &23373500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *19115240
+  version_requirements: *23373500
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &19113900 !ruby/object:Gem::Requirement
+  requirement: &23371640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.6.3
   type: :runtime
   prerelease: false
-  version_requirements: *19113900
+  version_requirements: *23371640
 - !ruby/object:Gem::Dependency
   name: rack-cache
-  requirement: &19144320 !ruby/object:Gem::Requirement
+  requirement: &23371040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19144320
+  version_requirements: *23371040
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &19142860 !ruby/object:Gem::Requirement
+  requirement: &23370060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -87,10 +87,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *19142860
+  version_requirements: *23370060
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &19140360 !ruby/object:Gem::Requirement
+  requirement: &23386780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 0.9.2.2
   type: :development
   prerelease: false
-  version_requirements: *19140360
+  version_requirements: *23386780
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &19138000 !ruby/object:Gem::Requirement
+  requirement: &23385800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: '1.19'
   type: :development
   prerelease: false
-  version_requirements: *19138000
+  version_requirements: *23385800
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &19149700 !ruby/object:Gem::Requirement
+  requirement: &23384720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: 0.12.4
   type: :development
   prerelease: false
-  version_requirements: *19149700
+  version_requirements: *23384720
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &19179160 !ruby/object:Gem::Requirement
+  requirement: &23381840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +131,10 @@ dependencies:
         version: 3.4.0
   type: :development
   prerelease: false
-  version_requirements: *19179160
+  version_requirements: *23381840
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &19174640 !ruby/object:Gem::Requirement
+  requirement: &23381420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19174640
+  version_requirements: *23381420
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &19200460 !ruby/object:Gem::Requirement
+  requirement: &23380880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19200460
+  version_requirements: *23380880
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &19198040 !ruby/object:Gem::Requirement
+  requirement: &23380340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -164,10 +164,10 @@ dependencies:
         version: 0.5.4
   type: :development
   prerelease: false
-  version_requirements: *19198040
+  version_requirements: *23380340
 - !ruby/object:Gem::Dependency
   name: simplecov-rcov
-  requirement: &19194340 !ruby/object:Gem::Requirement
+  requirement: &23379920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,10 +175,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19194340
+  version_requirements: *23379920
 - !ruby/object:Gem::Dependency
   name: gem_publisher
-  requirement: &19214500 !ruby/object:Gem::Requirement
+  requirement: &23379260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -186,10 +186,10 @@ dependencies:
         version: 1.1.1
   type: :development
   prerelease: false
-  version_requirements: *19214500
+  version_requirements: *23379260
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &19212700 !ruby/object:Gem::Requirement
+  requirement: &23471200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -197,10 +197,10 @@ dependencies:
         version: 0.5.1
   type: :development
   prerelease: false
-  version_requirements: *19212700
+  version_requirements: *23471200
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &19211220 !ruby/object:Gem::Requirement
+  requirement: &23469660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -208,7 +208,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19211220
+  version_requirements: *23469660
 description: A set of adapters providing easy access to the GDS GOV.UK APIs
 email:
 - jystewart@gmail.com
@@ -347,7 +347,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 879655839748434107
+      hash: -2078543241546642216
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -356,7 +356,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 879655839748434107
+      hash: -2078543241546642216
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11