sitehub 0.5.0.alpha7 → 0.5.0.alpha8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da2a5c038108c8668145aa88a4c0a828b6b922a9
-  data.tar.gz: 54aa60369801ce0c17e5cf63534476b89982ed7b
+  metadata.gz: 2389132d290dc9bcff1fca5999cc75802e31af1a
+  data.tar.gz: dfca66250eac7e57b5ec53002d2c662ede650688
 SHA512:
-  metadata.gz: 41ecea0098d4388ca85887cf8c5bdbab22f29d10f05c16559378aa89a893fcc6149e66eb538ee8b54ce0635ca2e168f4e23b03004e94d5f0765b5a991028fdd1
-  data.tar.gz: 1e0da0d04f15a22558b26140884f4f5f7ba20f13515d35d8ee7b67bf60836fd6698ec97110ef53c683043761a336f12ca19824ecafd5ef8cfd0eec6396596d87
+  metadata.gz: 27a39c2ac4aea35dcf4ae1b73a7ad8fd77c23f3f0fc1e22c4829a0052eec38cec2d1d4eaac32e84906e442297855eefa7afce5e6eccf1a33605a04ca84fcd001
+  data.tar.gz: fb3e3f8a9d9eb65ef2ad3b714bec96a716cbaf5d8b0fde70dd5e5418a887901e7f07403f4e63249e4f736ce4e10a7f723afe90d21b2312803e0c22de771c4341

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sitehub (0.5.0.alpha7)
+    sitehub (0.5.0.alpha8)
       activesupport
       em-http-request
       em-synchrony

data/lib/sitehub/builder.rb

@@ -7,8 +7,15 @@ class SiteHub
     include Middleware
     extend GetterSetterMethods
 
-    attr_reader :core
-    getter_setters :access_logger, :error_logger, :config_server
+    DEFAULT_CACHING_OPTIONS = { expires_in: 30 }.freeze
+
+    attr_reader :core, :config_server_url, :config_server_caching_options
+    getter_setters :access_logger, :error_logger
+
+    def config_server(url, caching_options: DEFAULT_CACHING_OPTIONS)
+      @config_server_url = url
+      @config_server_caching_options = caching_options
+    end
 
     def force_ssl(except: [])
       @force_ssl = true
@@ -22,7 +29,7 @@ class SiteHub
 
     def build
       add_default_middleware
-      use ConfigLoader, config_server if config_server
+      use ConfigLoader, config_server_url, caching_options: config_server_caching_options if config_server_url
       apply_middleware(core.build)
     end
 

data/lib/sitehub/candidate_routes.rb

@@ -15,7 +15,7 @@ require_relative 'downstream_client'
 
 class SiteHub
   class CandidateRoutes
-    class InvalidDefinitionException < Exception
+    class InvalidDefinitionError < StandardError
     end
 
     ROUTES_WITH_SPLITS_MSG = 'you cant register routes and splits at the same level'.freeze
@@ -37,11 +37,11 @@ class SiteHub
       child_label = id.child_label(label)
 
       route = if block
-                raise InvalidDefinitionException, candidate_definition_msg unless percentage || rule
+                raise InvalidDefinitionError, candidate_definition_msg unless percentage || rule
                 warn(IGNORING_URL_MSG) if url
                 new(rule: rule, id: child_label, &block).build
               else
-                raise InvalidDefinitionException, URL_REQUIRED_MSG unless url
+                raise InvalidDefinitionError, URL_REQUIRED_MSG unless url
                 forward_proxy(url: url, label: child_label, rule: rule)
               end
 
@@ -56,7 +56,7 @@ class SiteHub
     def candidates(collection = nil)
       return @endpoints ||= Collection::RouteCollection.new unless collection
 
-      raise InvalidDefinitionException, ROUTES_WITH_SPLITS_MSG if @endpoints && !@endpoints.equal?(collection)
+      raise InvalidDefinitionError, ROUTES_WITH_SPLITS_MSG if @endpoints && !@endpoints.equal?(collection)
       @endpoints = collection
     end
 
@@ -96,7 +96,7 @@ class SiteHub
       return unless block_given?
 
       instance_eval(&block)
-      raise InvalidDefinitionException unless valid?
+      raise InvalidDefinitionError unless valid?
     end
 
     def method_missing(method, *args, &block)

data/lib/sitehub/collection.rb

@@ -1,6 +1,6 @@
 class SiteHub
   class Collection < Hash
-    class DuplicateVersionException < Exception
+    class DuplicateVersionError < StandardError
     end
 
     module ClassMethods
@@ -16,7 +16,7 @@ class SiteHub
           alias_method :add_backup, :add
 
           send(:define_method, :add) do |id, value, *args|
-            raise DuplicateVersionException, UNIQUE_LABELS_MSG if key?(id)
+            raise DuplicateVersionError, UNIQUE_LABELS_MSG if key?(id)
             add_backup id, value, *args
           end
         end

data/lib/sitehub/collection/route_collection.rb

@@ -1,4 +1,7 @@
 require_relative '../collection'
+# rubocop:disable Lint/UnusedMethodArgument -
+# this is because #resolve is supporting a duck typed interface and needs the env parameter
+
 class SiteHub
   class Collection < Hash
     class RouteCollection < Collection

data/lib/sitehub/collection/split_route_collection.rb

@@ -3,7 +3,7 @@ require_relative 'split_route_collection/split'
 class SiteHub
   class Collection < Hash
     class SplitRouteCollection < Collection
-      class InvalidSplitException < Exception
+      class InvalidSplitException < StandardError
       end
 
       FIXNUM_ERR_MSG = 'splits must be a Fixnum'.freeze

data/lib/sitehub/config_server.rb

@@ -0,0 +1,32 @@
+class SiteHub
+  class ConfigServer
+    BAD_JSON_MSG = 'Illegal JSON returned from config server: %s'.freeze
+    UNABLE_TO_CONTACT_SERVER_MSG = 'Unabled to contact server: %s'.freeze
+    NON_200_RESPONSE_MSG = 'Config server did not respond with a 200, got %s'.freeze
+
+    class Error < StandardError
+    end
+
+    attr_reader :server_url, :http_client
+    def initialize(url)
+      @server_url = url
+      @http_client = Faraday.new(ssl: { verify: false }) do |con|
+        con.adapter :em_synchrony
+      end
+    end
+
+    def get
+      response = http_client.get(server_url)
+      raise Error, NON_200_RESPONSE_MSG % response.status unless response.status == 200
+      parse_response(response.body)
+    rescue Faraday::Error => e
+      raise Error, UNABLE_TO_CONTACT_SERVER_MSG % e.message
+    end
+
+    def parse_response(response_body)
+      JSON(response_body, symbolize_names: true)
+    rescue JSON::ParserError
+      raise Error, BAD_JSON_MSG % response_body
+    end
+  end
+end

data/lib/sitehub/core.rb

@@ -3,10 +3,10 @@ require 'sitehub/candidate_routes'
 require 'forwardable'
 
 class SiteHub
-  class InvalidProxyDefinitionException < Exception
+  class InvalidProxyDefinitionException < StandardError
   end
 
-  class ConfigError < Exception
+  class ConfigError < StandardError
   end
 
   class Core

data/lib/sitehub/middleware/candidate_route_mappings.rb

@@ -9,6 +9,10 @@ require 'em-http'
 class SiteHub
   module Middleware
     class CandidateRouteMappings < Hash
+      INVALID_PATH_MATCHER = 'Matcher for path (%s) was not a valid regexp: %s'.freeze
+      class InvalidPathMatcherError < StandardError
+      end
+
       NIL_ROUTE = NilRoute.new
 
       include Equality
@@ -39,6 +43,8 @@ class SiteHub
           return
         end
 
+        mapped_path = string_to_regexp(mapped_path) if string_containing_regexp?(mapped_path)
+
         self[mapped_path] = CandidateRoutes.new(sitehub_cookie_name: sitehub_cookie_name,
                                                 mapped_path: mapped_path,
                                                 &block).tap do |builder|
@@ -60,6 +66,20 @@ class SiteHub
           end
         end
       end
+
+      def string_containing_regexp?(obj)
+        return false unless obj.is_a?(String)
+        obj.start_with?('%r{') && obj.end_with?('}')
+      end
+
+      private
+
+      def string_to_regexp(mapped_path)
+        regexp_string = mapped_path.to_s.sub(/^%r{/, '').sub(/}$/, '')
+        Regexp.compile(regexp_string)
+      rescue RegexpError => e
+        raise InvalidPathMatcherError, format(INVALID_PATH_MATCHER, regexp_string, e.message)
+      end
     end
   end
 end

data/lib/sitehub/middleware/config_loader.rb

@@ -1,36 +1,33 @@
 require 'active_support'
+require 'sitehub/config_server'
 class SiteHub
-  class ConfigServer
-    attr_reader :server_url, :http_client
-    def initialize(url)
-      @server_url = url
-      @http_client = Faraday.new(ssl: { verify: false }) do |con|
-        con.adapter :em_synchrony
-      end
-    end
-
-    def get
-      JSON(http_client.get(server_url).body, symbolize_names: true)
-    end
-  end
-
   module Middleware
     class ConfigLoader
-      attr_reader :config_server, :app, :cache
+      attr_reader :config_server, :app, :cache, :caching_options
 
-      def initialize(_app, config_server_url)
+      def initialize(_app, config_server_url, caching_options:)
         @config_server = ConfigServer.new(config_server_url)
         @cache = ActiveSupport::Cache::MemoryStore.new(size: 1.megabytes)
+        @caching_options = caching_options
       end
 
       def call(env)
-        load_config
+        begin
+          load_config
+        rescue ConfigServer::Error => e
+          if @app
+            env[ERRORS] << e.message
+          else
+            raise e unless @app
+          end
+        end
+
         @app.call env
       end
 
       # TODO: handle errors connecting to the config server
       def load_config
-        config = cache.fetch(:sitehub_config, expires_in: 30) do
+        config = cache.fetch(:sitehub_config, caching_options) do
           config_server.get
         end
 

data/lib/sitehub/version.rb

@@ -1,3 +1,3 @@
 class SiteHub
-  VERSION = '0.5.0.alpha7'.freeze
+  VERSION = '0.5.0.alpha8'.freeze
 end

data/spec/integration/access_logs_spec.rb

@@ -1,4 +1,5 @@
 require 'cgi'
+
 describe 'access_logs' do
   let(:downstream_url) { 'http://localhost:12345/experiment1' }
 
@@ -30,10 +31,13 @@ describe 'access_logs' do
   let(:query_string) { '' }
   let(:request_url) { "/endpoint#{query_string.empty? ? '' : "?#{query_string}"}" }
 
-  subject do
+  before do
     query_string_hash = CGI.parse(query_string).collect { |key, value| [key, value.first] }.to_h
     stub_request(:get, downstream_url).with(query: query_string_hash)
     get(request_url)
+  end
+
+  subject do
     access_logger.string
   end
 
@@ -41,20 +45,28 @@ describe 'access_logs' do
     context 'present' do
       let(:query_string) { 'key=value' }
       it 'logs it' do
-        expect(subject).to include(query_string)
+        expect(subject).to include("GET #{request_url} => #{downstream_url}")
       end
     end
 
     context 'not present' do
       let(:query_string) { '' }
       it 'is not logged' do
+        expect(subject).to match(/"GET\s#{request_url}\s=>\s#{downstream_url}\s/)
         expect(subject).to include(query_string)
       end
     end
   end
 
+  module WebMock
+    def self.last_request
+      WebMock::RequestRegistry.instance.requested_signatures.hash.keys.first
+    end
+  end
+
   it 'logs the transaction id' do
-    expect(subject).to match(/transaction_id:.*?\s/)
+    expected_id = WebMock.last_request.headers['Sitehub-Transaction-Id']
+    expect(subject).to match(/transaction_id:#{expected_id}/)
   end
 
   it 'logs the response status' do
@@ -69,7 +81,6 @@ describe 'access_logs' do
     processing_time_matcher = '\d{1}\.\d{4}'
     transaction_id_matcher = '[a-z\d]+'
     expected_response_status = 200
-    puts subject
     expect(subject).to match(/transaction_id:#{transaction_id_matcher}:\s"GET\s#{request_url}\s=>\s#{downstream_url}\s"\s#{expected_response_status}\s-\s#{processing_time_matcher}/)
   end
 end

data/spec/integration/error_handling_spec.rb

@@ -0,0 +1,77 @@
+require 'stringio'
+describe 'error handling' do
+  context 'using config server' do
+    CONFIG_SERVER_URL = 'http://the.config.server'.freeze
+    DOWNSTREAM_URL = 'http://downstream.url'.freeze
+    ERROR_LOGGER = StringIO.new
+    ACCESS_LOGGER = StringIO.new
+
+    include_context :sitehub_json
+
+    let(:config) do
+      { proxies: [
+        {
+          path: '/',
+          default: DOWNSTREAM_URL
+        }
+      ] }
+    end
+
+    let(:downstream_response) { 'downstream response' }
+
+    before do
+      stub_request(:get, DOWNSTREAM_URL).and_return(body: downstream_response)
+    end
+    let(:app) do
+      sitehub = SiteHub.build do
+        config_server(CONFIG_SERVER_URL, caching_options: { force: true })
+        error_logger ERROR_LOGGER
+        access_logger ACCESS_LOGGER
+      end
+      Async::Middleware.new(sitehub)
+    end
+
+    it 'reads the config for routing' do
+      stub_request(:get, CONFIG_SERVER_URL).and_return(body: config.to_json)
+      get('/')
+      expect(app.last_response.body).to eq([downstream_response])
+    end
+
+    context 'config server is broken' do
+      let(:bad_status) { 500 }
+      context 'config has not been loaded' do
+        it 'returns an error' do
+          stub_request(:get, CONFIG_SERVER_URL).and_return(status: 500)
+          get('/')
+          expect(app.last_response.status).to eq(500)
+        end
+
+        it 'logs an error' do
+          bad_status = 500
+          stub_request(:get, CONFIG_SERVER_URL).and_return(status: bad_status)
+          get('/')
+          expect(ERROR_LOGGER.string).to include(SiteHub::ConfigServer::NON_200_RESPONSE_MSG % bad_status)
+        end
+      end
+
+      context 'config has been correctly loaded once' do
+        before do
+          stub_request(:get, CONFIG_SERVER_URL).and_return(body: config.to_json)
+          get('/')
+
+          stub_request(:get, CONFIG_SERVER_URL).and_return(status: bad_status)
+        end
+
+        it 'uses the old config' do
+          get('/')
+          expect(app.last_response.body).to eq([downstream_response])
+        end
+
+        it 'logs the failure to read config' do
+          get('/')
+          expect(ERROR_LOGGER.string).to include(SiteHub::ConfigServer::NON_200_RESPONSE_MSG % bad_status)
+        end
+      end
+    end
+  end
+end

data/spec/sitehub/builder_spec.rb

@@ -163,6 +163,27 @@ class SiteHub
 
             expect(middleware_stack).to eq(expected_middleware)
           end
+
+          it 'defaults caching policy' do
+            subject.config_server(:server_url)
+
+            sitehub = subject.build
+
+            config_loader = find_middleware(sitehub, Middleware::ConfigLoader)
+            expect(config_loader.caching_options).to eq(described_class::DEFAULT_CACHING_OPTIONS)
+          end
+
+          context 'caching options specified' do
+            it 'uses them' do
+              caching_options = { force: true }
+              subject.config_server(:server_url, caching_options: caching_options)
+
+              sitehub = subject.build
+
+              config_loader = find_middleware(sitehub, Middleware::ConfigLoader)
+              expect(config_loader.caching_options).to eq(caching_options)
+            end
+          end
         end
 
         it 'adds them in the right order' do

data/spec/sitehub/candidate_routes_spec.rb

@@ -148,7 +148,7 @@ class SiteHub
           it 'raises an error' do
             subject.candidates(Collection::SplitRouteCollection.new)
             expect { subject.candidates(Collection::RouteCollection.new) }
-              .to raise_error(CandidateRoutes::InvalidDefinitionException)
+              .to raise_error(CandidateRoutes::InvalidDefinitionError)
           end
         end
       end
@@ -301,7 +301,7 @@ class SiteHub
                 subject.candidates(Collection::SplitRouteCollection.new)
                 expected_message = described_class::PERCENTAGE_NOT_SPECIFIED_MSG
                 expect { subject.add(label: :label) {} }
-                  .to raise_exception described_class::InvalidDefinitionException, expected_message
+                  .to raise_exception described_class::InvalidDefinitionError, expected_message
               end
             end
 
@@ -310,7 +310,7 @@ class SiteHub
                 subject.candidates(Collection::RouteCollection.new)
                 expected_message = described_class::RULE_NOT_SPECIFIED_MSG
                 expect { subject.add(label: :label) {} }
-                  .to raise_exception described_class::InvalidDefinitionException, expected_message
+                  .to raise_exception described_class::InvalidDefinitionError, expected_message
               end
             end
           end
@@ -327,8 +327,11 @@ class SiteHub
           rule = proc { true }
           subject.add(rule: rule, label: :label, &block)
 
-          expected_endpoints = described_class.new(id: :label, sitehub_cookie_name: :cookie_name,
-                                                   rule: rule, mapped_path: subject.mapped_path, &block).tap do |builder|
+          expected_endpoints = described_class.new(id: :label,
+                                                   sitehub_cookie_name: :cookie_name,
+                                                   rule: rule,
+                                                   mapped_path: subject.mapped_path,
+                                                   &block).tap do |builder|
             builder.sitehub_cookie_name subject.sitehub_cookie_name
           end.build
 
@@ -342,7 +345,7 @@ class SiteHub
               subject.add rule: rule, label: :label do
                 split percentage: 20, url: :url, label: :label1
               end
-            end.to raise_exception described_class::InvalidDefinitionException
+            end.to raise_exception described_class::InvalidDefinitionError
           end
         end
       end
@@ -464,7 +467,7 @@ class SiteHub
       context 'already set with a different collection' do
         it 'raise an error' do
           subject.candidates(:collection1)
-          expect { subject.candidates(:collection2) }.to raise_exception described_class::InvalidDefinitionException
+          expect { subject.candidates(:collection2) }.to raise_exception described_class::InvalidDefinitionError
         end
       end
     end

data/spec/sitehub/collection_spec.rb

@@ -32,7 +32,7 @@ class SiteHub
             subject.add(duplicate.id, duplicate)
             expected_message = described_class::ClassMethods::UNIQUE_LABELS_MSG
             expect { subject.add(duplicate.id, duplicate) }
-              .to raise_exception described_class::DuplicateVersionException, expected_message
+              .to raise_exception described_class::DuplicateVersionError, expected_message
           end
         end
       end

data/spec/sitehub/config_server_spec.rb

@@ -0,0 +1,48 @@
+require 'sitehub/config_server'
+
+class SiteHub
+  describe ConfigServer do
+    include_context :sitehub_json
+
+    let(:server_url) { 'http://www.server.url' }
+    let(:config) { { config: 'value' } }
+
+    subject do
+      described_class.new(server_url)
+    end
+
+    describe '#get' do
+      context 'non 200 returned' do
+        it 'raises an error' do
+          bad_response_code = 500
+          stub_request(:get, server_url).to_return(body: config.to_json, status: bad_response_code)
+          expected_message = described_class::NON_200_RESPONSE_MSG % bad_response_code
+          expect { subject.get }.to raise_error(described_class::Error, expected_message)
+        end
+      end
+
+      context 'exception thrown in client' do
+        it 'raises an error' do
+          error_msg = 'error from library'
+          expect_any_instance_of(Faraday::Connection).to receive(:get).and_raise(Faraday::ConnectionFailed, error_msg)
+          expected_message = described_class::UNABLE_TO_CONTACT_SERVER_MSG % error_msg
+          expect { subject.get }.to raise_error(described_class::Error, expected_message)
+        end
+      end
+
+      context 'malformed json returned' do
+        it 'returns an error' do
+          bad_json = 'bad json'
+          stub_request(:get, server_url).to_return(body: bad_json)
+          expected_message = described_class::BAD_JSON_MSG % bad_json
+          expect { subject.get }.to raise_error(described_class::Error, expected_message)
+        end
+      end
+
+      it 'returns config as a hash' do
+        stub_request(:get, server_url).to_return(body: config.to_json)
+        expect(subject.get).to eq(config)
+      end
+    end
+  end
+end

data/spec/sitehub/downstream_client_spec.rb

@@ -45,6 +45,15 @@ class SiteHub
           end
         end
 
+        context 'query string' do
+          let(:params) { { 'key' => 'value' } }
+          let(:env) { env_for(path: mapped_path, params_or_body: params) }
+          it 'preserves the query string when forwarding the request' do
+            stub_request(http_method, current_version_url).with(query: params)
+            subject.call(request)
+          end
+        end
+
         it 'preserves the headers when forwarding request' do
           http_headers['HTTP_HEADER'] = 'value'
           subject.call(request)

data/spec/sitehub/middleware/candidate_route_mappings_spec.rb

@@ -21,10 +21,10 @@ class SiteHub
       end
 
       before do
-        subject.init
+        # subject.init
       end
 
-      describe '#add_proxy' do
+      describe '#add_route' do
         def route(app, id:)
           Route.new(app,
                     id: id,
@@ -41,6 +41,51 @@ class SiteHub
           end
         end
 
+        context 'mapped_path' do
+          let(:expected_route) do
+            proxy = ForwardProxy.new(mapped_path: expected_mapping, mapped_url: base_url)
+            route(proxy, id: :current)
+          end
+
+          context 'mapped_path is a string' do
+            let(:mapped_path) { 'string' }
+            let(:expected_mapping) { mapped_path }
+            it 'stores the route against that strubg' do
+              expect(subject[mapped_path][:current]).to eq(expected_route)
+            end
+          end
+
+          context 'mapped_path is a valid regex' do
+            let(:mapped_path) { /regular_expression/ }
+            let(:expected_mapping) { mapped_path }
+            it 'stores the route against that regexp' do
+              expect(subject[mapped_path][:current]).to eq(expected_route)
+            end
+          end
+
+          context 'is a string containing a valid regexp' do
+            let(:expected_mapping) { /regexp/ }
+            let(:mapped_path) { '%r{regexp}' }
+            it 'stores the route against the string coverted to a regexp' do
+              expect(subject[expected_mapping][:current]).to eq(expected_route)
+            end
+          end
+
+          context 'is a string containing malformed regexp' do
+            let(:mapped_path) { '%r{*}' }
+
+            it 'raises an error' do
+              expected_message = begin
+                Regexp.compile('*')
+              rescue RegexpError => e
+                format(described_class::INVALID_PATH_MATCHER, '*', e.message)
+              end
+
+              expect { subject }.to raise_error(described_class::InvalidPathMatcherError, expected_message)
+            end
+          end
+        end
+
         context 'url specified' do
           let(:expected_route) do
             proxy = ForwardProxy.new(mapped_path: mapped_path, mapped_url: :url)
@@ -145,6 +190,28 @@ class SiteHub
           end
         end
       end
+
+      describe '#string_containing_regexp?' do
+        context 'parameter is not a string' do
+          it 'it returns false' do
+            expect(subject.string_containing_regexp?(//)).to eq(false)
+          end
+        end
+
+        context 'parameter is a string' do
+          context 'contains a regexp' do
+            it 'it returns true' do
+              expect(subject.string_containing_regexp?('%r{}')).to be(true)
+            end
+          end
+
+          context 'does not contain a regexp' do
+            it 'returns false' do
+              expect(subject.string_containing_regexp?('')).to eq(false)
+            end
+          end
+        end
+      end
     end
   end
 end

data/spec/sitehub/middleware/config_loader_spec.rb

@@ -26,24 +26,40 @@ class SiteHub
         stub_request(:get, server_url).to_return(body: config.to_json)
       end
 
+      let(:no_caching) { { force: true } }
       subject do
-        described_class.new(:app, server_url)
+        described_class.new(:app, server_url, caching_options: no_caching)
       end
 
       describe '#load_config' do
-        it 'loads config' do
-          expect(subject.app).to be_nil
-          subject.load_config
+        subject do
+          caching_enabled = { expires_in: 30 }
+          described_class.new(:app, server_url, caching_options: caching_enabled)
+        end
 
-          expected_core = Core.new do
+        let(:expected_core) do
+          Core.new do
             sitehub_cookie_name 'sitehub.recorded_route'
             proxy '/route_1' do
               route label: :label_1, url: 'http://lvl-up.uk/'
             end
           end.build
+        end
+
+        it 'loads config' do
+          expect(subject.app).to be_nil
+          subject.load_config
 
           expect(subject.app).to eq(expected_core)
         end
+
+        it 'loads it from cache' do
+          different_config = { proxies: [] }
+          subject.load_config
+          stub_request(:get, server_url).to_return(body: different_config.to_json)
+          subject.load_config
+          expect(subject.app).to eq(expected_core)
+        end
       end
 
       describe '#call' do
@@ -58,6 +74,61 @@ class SiteHub
 
           expect(subject.call(:env)).to eq(response)
         end
+
+        context 'config not retrievable' do
+          let(:config_server) do
+            instance_double(ConfigServer).tap do |config_server|
+              expect(ConfigServer).to receive(:new).and_return(config_server)
+            end
+          end
+
+          let(:env) { { ERRORS => [] } }
+
+          context 'first call ever received' do
+            it 'raises an error' do
+              expected_message = 'error message'
+              expect(config_server).to receive(:get).and_raise(ConfigServer::Error, expected_message)
+              expect { subject.call(env) }.to raise_error(ConfigServer::Error, expected_message)
+            end
+
+            it 'does not write anything to errors' do
+              expect(config_server).to receive(:get).and_raise(ConfigServer::Error)
+
+              expect { subject.call(env) }.to raise_error(ConfigServer::Error)
+              expect(env[ERRORS]).to be_empty
+            end
+          end
+
+          context 'config previously loaded' do
+            subject do
+              described_class.new(:app, server_url, caching_options: no_caching)
+            end
+
+            let(:response) { [200, {}, []] }
+            before do
+              app = proc do |_env|
+                response
+              end
+
+              expect(config_server).to receive(:get).and_return(config)
+              expect(Core).to receive(:from_hash).with(config).and_return(double(build: app))
+              subject.call(env)
+            end
+
+            it 'retains the original config' do
+              expect(config_server).to receive(:get).and_raise(ConfigServer::Error)
+              expect(subject.call(env)).to eq(response)
+            end
+
+            it 'writes an error to the error log' do
+              expected_error_message = 'error message'
+              expect(config_server).to receive(:get).and_raise(ConfigServer::Error, expected_error_message)
+
+              subject.call(env)
+              expect(env[ERRORS]).to include(expected_error_message)
+            end
+          end
+        end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sitehub
 version: !ruby/object:Gem::Version
-  version: 0.5.0.alpha7
+  version: 0.5.0.alpha8
 platform: ruby
 authors:
 - Ladtech
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-03 00:00:00.000000000 Z
+date: 2016-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -346,6 +346,7 @@ files:
 - lib/sitehub/collection/split_route_collection.rb
 - lib/sitehub/collection/split_route_collection/split.rb
 - lib/sitehub/collection_methods.rb
+- lib/sitehub/config_server.rb
 - lib/sitehub/constants.rb
 - lib/sitehub/constants/http_header_keys.rb
 - lib/sitehub/constants/rack_http_header_keys.rb
@@ -390,6 +391,7 @@ files:
 - sitehub.gemspec
 - spec/equality_spec.rb
 - spec/integration/access_logs_spec.rb
+- spec/integration/error_handling_spec.rb
 - spec/integration/middleware_spec.rb
 - spec/integration/version_affinity_spec.rb
 - spec/sitehub/builder_spec.rb
@@ -398,6 +400,7 @@ files:
 - spec/sitehub/collection/split_route_collection/split_spec.rb
 - spec/sitehub/collection/split_route_collection_spec.rb
 - spec/sitehub/collection_spec.rb
+- spec/sitehub/config_server_spec.rb
 - spec/sitehub/cookie/attribute_spec.rb
 - spec/sitehub/cookie/flag_spec.rb
 - spec/sitehub/cookie/rewriting_spec.rb