gds-api-adapters 10.17.1 → 11.0.0

data/lib/gds_api/router.rb

@@ -1,5 +1,4 @@
 require_relative 'base'
-#require_relative 'exceptions'
 
 class GdsApi::Router < GdsApi::Base
 
@@ -25,20 +24,20 @@ class GdsApi::Router < GdsApi::Base
 
   def add_route(path, type, backend_id, options = {})
     response = put_json!("#{endpoint}/routes", :route => {:incoming_path => path, :route_type => type, :handler => "backend", :backend_id => backend_id})
-    commit_routes unless options[:skip_commit]
+    commit_routes if options[:commit]
     response
   end
 
   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})
-    commit_routes unless options[:skip_commit]
+    commit_routes if options[:commit]
     response
   end
 
   def delete_route(path, type, options = {})
     response = delete_json!("#{endpoint}/routes?incoming_path=#{CGI.escape(path)}&route_type=#{CGI.escape(type)}")
-    commit_routes unless options[:skip_commit]
+    commit_routes if options[:commit]
     response
   end
 

data/lib/gds_api/test_helpers/router.rb

@@ -5,6 +5,19 @@ module GdsApi
     module Router
       ROUTER_API_ENDPOINT = Plek.current.find('router-api')
 
+      def stub_all_router_registration
+        stub_request(:put, %r{\A#{ROUTER_API_ENDPOINT}/backends/[a-z0-9-]+\z})
+        stub_request(:put, "#{ROUTER_API_ENDPOINT}/routes")
+        stub_request(:post, "#{ROUTER_API_ENDPOINT}/routes/commit")
+      end
+
+      def stub_router_backend_registration(backend_id, backend_url)
+        backend = { "backend" => { "backend_url" => backend_url }}
+        stub_http_request(:put, "#{ROUTER_API_ENDPOINT}/backends/#{backend_id}")
+            .with(:body => backend.to_json)
+            .to_return(:status => 201)
+      end
+
       def stub_route_registration(path, type, backend_id)
         route = { route: {
                     incoming_path: path,
@@ -13,8 +26,9 @@ module GdsApi
                     backend_id: backend_id }
                 }
 
-        stub_router_put(route)
-        stub_http_request(:post, "#{ROUTER_API_ENDPOINT}/routes/commit")
+        register_stub = stub_route_put(route)
+        commit_stub = stub_router_commit
+        [register_stub, commit_stub]
       end
 
       def stub_redirect_registration(path, type, destination, redirect_type)
@@ -26,13 +40,18 @@ module GdsApi
                       redirect_type: redirect_type }
                   }
 
-        stub_router_put(redirect)
+        register_stub = stub_route_put(redirect)
+        commit_stub = stub_router_commit
+        [register_stub, commit_stub]
+      end
+
+      def stub_router_commit
         stub_http_request(:post, "#{ROUTER_API_ENDPOINT}/routes/commit")
       end
 
     private
 
-      def stub_router_put(route)
+      def stub_route_put(route)
         stub_http_request(:put, "#{ROUTER_API_ENDPOINT}/routes")
             .with(:body => route.to_json)
             .to_return(:status => 201)

data/lib/gds_api/version.rb

@@ -1,3 +1,3 @@
 module GdsApi
-  VERSION = '10.17.1'
+  VERSION = '11.0.0'
 end

data/test/router_test.rb

@@ -199,17 +199,17 @@ describe GdsApi::Router do
         assert_equal "foo", response.backend_id
 
         assert_requested(req)
-        assert_requested(@commit_req)
+        assert_not_requested(@commit_req)
       end
 
-      it "should not commit the routes when asked not to" do
+      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"})
 
-        @api.add_route("/foo", "exact", "foo", :skip_commit => true)
+        @api.add_route("/foo", "exact", "foo", :commit => true)
 
         assert_requested(req)
-        assert_not_requested(@commit_req)
+        assert_requested(@commit_req)
       end
 
       it "should raise an error if creating/updating the route fails" do
@@ -248,7 +248,7 @@ describe GdsApi::Router do
         assert_equal "/bar", response.redirect_to
 
         assert_requested(req)
-        assert_requested(@commit_req)
+        assert_not_requested(@commit_req)
       end
 
       it "should allow creating/updating a temporary redirect route" do
@@ -262,17 +262,17 @@ describe GdsApi::Router do
         assert_equal "/bar", response.redirect_to
 
         assert_requested(req)
-        assert_requested(@commit_req)
+        assert_not_requested(@commit_req)
       end
 
-      it "should not commit the routes when asked not to" do
+      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"})
 
-        @api.add_redirect_route("/foo", "exact", "/bar", "temporary", :skip_commit => true)
+        @api.add_redirect_route("/foo", "exact", "/bar", "temporary", :commit => true)
 
         assert_requested(req)
-        assert_not_requested(@commit_req)
+        assert_requested(@commit_req)
       end
 
       it "should raise an error if creating/updating the redirect route fails" do
@@ -311,18 +311,18 @@ describe GdsApi::Router do
         assert_equal "foo", response.backend_id
 
         assert_requested(req)
-        assert_requested(@commit_req)
+        assert_not_requested(@commit_req)
       end
 
-      it "should not commit the routes when asked not to" 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"}).
           to_return(:status => 200, :body => {}.to_json, :headers => {"Content-type" => "application/json"})
 
-        @api.delete_route("/foo", "exact", :skip_commit => true)
+        @api.delete_route("/foo", "exact", :commit => true)
 
         assert_requested(req)
-        assert_not_requested(@commit_req)
+        assert_requested(@commit_req)
       end
 
       it "should raise HTTPNotFound if nothing found" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gds-api-adapters
 version: !ruby/object:Gem::Version
-  version: 10.17.1
+  version: 11.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -382,7 +382,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -186651956250723834
+      hash: -1694392773198955183
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -391,7 +391,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -186651956250723834
+      hash: -1694392773198955183
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23