govuk-client-url_arbiter 0.0.1 → 0.0.2

data/lib/govuk/client/test_helpers/url_arbiter.rb

@@ -36,7 +36,7 @@ module GOVUK
         def url_arbiter_has_registration_for(path, publishing_app)
           data = url_arbiter_data_for(path, "publishing_app" => publishing_app)
           error_data = data.merge({
-            "errors" => {"base" => ["is already reserved by the #{publishing_app} application"]},
+            "errors" => {"path" => ["is already reserved by the #{publishing_app} application"]},
           })
 
           stub_request(:get, "#{URL_ARBITER_ENDPOINT}/paths#{path}").
@@ -50,6 +50,21 @@ module GOVUK
             to_return(:status => 200, :body => data.to_json, :headers => {:content_type => "application/json"})
         end
 
+        # Stub out call to simulate url-arbiter returning a validation error
+        # for a given path.
+        #
+        # @param path [String] The path being reserved
+        # @param error_details [Hash{String => Array<String>}] Error details to be
+        #   returned in the stubbed response.  If unspecified, a generic error
+        #   message will be added.
+        def url_arbiter_returns_validation_error_for(path, error_details = nil)
+          error_details ||= {"base" => ["computer says no"]}
+          error_data = url_arbiter_data_for(path).merge("errors" => error_details)
+
+          stub_request(:put, "#{URL_ARBITER_ENDPOINT}/paths#{path}").
+            to_return(:status => 422, :body => error_data.to_json, :headers => {:content_type => "application/json"})
+        end
+
         # Generate sample url-arbiter data for a given path.
         #
         # @param path [String] The path being requested

data/lib/govuk/client/url_arbiter/version.rb

@@ -1,7 +1,7 @@
 module GOVUK
   module Client
     class URLArbiter
-      VERSION = "0.0.1"
+      VERSION = "0.0.2"
     end
   end
 end

data/lib/govuk/client/url_arbiter.rb

@@ -23,6 +23,7 @@ module GOVUK
       # @param path [String] the path to fetch
       # @return [Response, nil] Details of the reserved path, or +nil+ if the path wasn't found.
       def path(path)
+        check_path(path)
         get_json("/paths#{path}")
       end
 
@@ -34,11 +35,18 @@ module GOVUK
       # @raise [Errors::Conflict] if the path is already reserved by another app.
       # @raise [Errors::UnprocessableEntity] for any validation errors.
       def reserve_path(path, details)
+        check_path(path)
         put_json!("/paths#{path}", details)
       end
 
       private
 
+      def check_path(path)
+        unless path && path.start_with?("/")
+          raise ArgumentError, "Path must start with a '/'"
+        end
+      end
+
       def get_json(path)
         response = RestClient.get(@base_url.merge(path).to_s)
         Response.new(response.code, response.body)

data/spec/url_arbiter_spec.rb

@@ -19,6 +19,24 @@ describe GOVUK::Client::URLArbiter do
       expect(response).to eq(data)
     end
 
+    it "should raise an error if the path is nil" do
+      expect {
+        response = client.path(nil)
+      }.to raise_error(ArgumentError)
+    end
+
+    it "should raise an error if the path is empty" do
+      expect {
+        response = client.path("")
+      }.to raise_error(ArgumentError)
+    end
+
+    it "should raise an error if the path doesn't start with a slash" do
+      expect {
+        response = client.path("bacon")
+      }.to raise_error(ArgumentError)
+    end
+
     it "should return nil on 404" do
       stub_request(:get, "#{base_url}/paths/foo/bar").
         to_return(:status => 404)
@@ -67,6 +85,24 @@ describe GOVUK::Client::URLArbiter do
       expect(response).to eq(data)
     end
 
+    it "should raise an error if the path is nil" do
+      expect {
+        response = client.reserve_path(nil, {})
+      }.to raise_error(ArgumentError)
+    end
+
+    it "should raise an error if the path is empty" do
+      expect {
+        response = client.reserve_path("", {})
+      }.to raise_error(ArgumentError)
+    end
+
+    it "should raise an error if the path doesn't start with a slash" do
+      expect {
+        response = client.reserve_path("bacon", {})
+      }.to raise_error(ArgumentError)
+    end
+
     it "should raise a conflict error if the path is already reserved" do
       data = url_arbiter_data_for("/foo/bar").merge({
         "errors" => {"base" => ["is already reserved by the 'bar_publisher' app"]},

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: govuk-client-url_arbiter
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-03 00:00:00.000000000 Z
+date: 2014-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -162,7 +162,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1429177817123946626
+      hash: 3700616753026108825
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -171,7 +171,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1429177817123946626
+      hash: 3700616753026108825
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23.2