sitehub 0.5.0.alpha8 → 0.5.0.alpha10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2389132d290dc9bcff1fca5999cc75802e31af1a
-  data.tar.gz: dfca66250eac7e57b5ec53002d2c662ede650688
+  metadata.gz: b127101beee3301abb96d447bcc5a89079edbc61
+  data.tar.gz: bdb07a1212a2ddc317e90bb0f357aa710707b3d9
 SHA512:
-  metadata.gz: 27a39c2ac4aea35dcf4ae1b73a7ad8fd77c23f3f0fc1e22c4829a0052eec38cec2d1d4eaac32e84906e442297855eefa7afce5e6eccf1a33605a04ca84fcd001
-  data.tar.gz: fb3e3f8a9d9eb65ef2ad3b714bec96a716cbaf5d8b0fde70dd5e5418a887901e7f07403f4e63249e4f736ce4e10a7f723afe90d21b2312803e0c22de771c4341
+  metadata.gz: 56bdcc1643bc86eb0a1f16aa06d6e0da5b21cfe7fc8edaab4801b96ae16fc859ffb986f4286c3e05e01c57ae4c608b94a1f94d8627d53de897516e5d7ded34ab
+  data.tar.gz: a9e5fbe7fc778646af3de85e2061df64e2704292f7b7dd15f7ad43fe3bde2adf59cd4a8fc75d2bd10132e7ad4cc872fb3c48c21b9a4bae72280653589bfb68f1

data/Gemfile.lock

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

data/lib/sitehub/candidate_routes.rb

@@ -18,6 +18,10 @@ class SiteHub
     class InvalidDefinitionError < StandardError
     end
 
+    INVALID_PATH_MATCHER = 'Matcher for path (%s) was not a valid regexp: %s'.freeze
+    class InvalidPathMatcherError < StandardError
+    end
+
     ROUTES_WITH_SPLITS_MSG = 'you cant register routes and splits at the same level'.freeze
     INVALID_SPLIT_MSG = 'url must be defined if not supplying a block'.freeze
     RULE_NOT_SPECIFIED_MSG = 'rule must be supplied'.freeze
@@ -29,7 +33,8 @@ class SiteHub
     include Rules, Equality, Middleware
 
     getter_setters :sitehub_cookie_path, :sitehub_cookie_name
-    attr_reader :mapped_path, :id, :calling_scope
+    attr_reader :id, :calling_scope
+    attr_accessor :mapped_path
 
     transient :calling_scope
 
@@ -86,6 +91,8 @@ class SiteHub
     def initialize(id: nil, sitehub_cookie_name:, sitehub_cookie_path: nil, mapped_path:, rule: nil, calling_scope: nil, &block)
       @id = Identifier.new(id)
       @calling_scope = calling_scope
+
+      mapped_path = string_to_regexp(mapped_path) if string_containing_regexp?(mapped_path)
       @mapped_path = mapped_path
       @sitehub_cookie_name = sitehub_cookie_name
       @sitehub_cookie_path = sitehub_cookie_path
@@ -138,6 +145,18 @@ class SiteHub
       candidates[Identifier.new(key)]
     end
 
+    def string_containing_regexp?(obj)
+      return false unless obj.is_a?(String)
+      obj.start_with?('%r{') && obj.end_with?('}')
+    end
+
+    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
+
     private
 
     def add_middleware_to_proxy(proxy)

data/lib/sitehub/middleware/candidate_route_mappings.rb

@@ -9,10 +9,6 @@ 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
@@ -38,18 +34,15 @@ class SiteHub
       end
 
       def add_route(url: nil, mapped_path: nil, route_builder: nil, &block)
-        if route_builder
-          self[route_builder.mapped_path] = route_builder
-          return
+        unless route_builder
+          route_builder = CandidateRoutes.new(sitehub_cookie_name: sitehub_cookie_name,
+                                              mapped_path: mapped_path,
+                                              &block).tap do |builder|
+            builder.default(url: url) if url
+          end
         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|
-          builder.default(url: url) if url
-        end
+        self[route_builder.mapped_path] = route_builder
       end
 
       def mapped_route(path:, request:)
@@ -66,20 +59,6 @@ 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

@@ -27,11 +27,10 @@ class SiteHub
 
       # TODO: handle errors connecting to the config server
       def load_config
-        config = cache.fetch(:sitehub_config, caching_options) do
-          config_server.get
+        unless cache.exist?(:sitehub_config)
+          cache.write(:sitehub_config, :retrieved, caching_options)
+          @app = Core.from_hash(config_server.get).build
         end
-
-        @app = Core.from_hash(config).build
       end
     end
   end

data/lib/sitehub/version.rb

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

data/spec/integration/config_server_spec.rb

@@ -0,0 +1,34 @@
+describe 'config server' do
+  include_context :integration
+  include_context :sitehub_json
+
+  let(:config) do
+    { proxies: [
+      {
+        path: '%r{/regex(.*)}',
+        default: DOWNSTREAM_URL
+      }
+    ] }
+  end
+
+  let(:downstream_response) { 'downstream response' }
+
+  before do
+    stub_request(:get, CONFIG_SERVER_URL).and_return(body: config.to_json)
+    stub_request(:get, DOWNSTREAM_URL).and_return(body: downstream_response)
+  end
+
+  let(:app) do
+    sitehub = sitehub do
+      config_server(CONFIG_SERVER_URL, caching_options: { expires_in: 1 })
+    end
+
+    Async::Middleware.new(sitehub)
+  end
+
+  it 'path as regex' do
+    get('/regex123')
+
+    expect(app.last_response.body).to eq([downstream_response])
+  end
+end

data/spec/integration/error_handling_spec.rb

@@ -1,11 +1,7 @@
 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 :integration
     include_context :sitehub_json
 
     let(:config) do
@@ -23,10 +19,8 @@ describe 'error handling' 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
+      sitehub = sitehub do
+        config_server(CONFIG_SERVER_URL, caching_options: { expires_in: 1 })
       end
       Async::Middleware.new(sitehub)
     end
@@ -63,7 +57,9 @@ describe 'error handling' do
         end
 
         it 'uses the old config' do
+          Timecop.travel(1)
           get('/')
+
           expect(app.last_response.body).to eq([downstream_response])
         end
 

data/spec/sitehub/candidate_routes_spec.rb

@@ -47,7 +47,6 @@ class SiteHub
         subject do
           described_class.from_hash(routes_proxy, :expected)
         end
-
         context 'sitehub_cookie_name' do
           it 'sets it' do
             expect(subject.sitehub_cookie_name).to eq(:expected)
@@ -192,6 +191,23 @@ class SiteHub
           end
         end
       end
+
+      context 'mapped_path' do
+        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 { described_class.new(sitehub_cookie_name: '', mapped_path: '%r{*}') }
+              .to raise_error(described_class::InvalidPathMatcherError, expected_message)
+          end
+        end
+      end
     end
 
     describe 'valid?' do
@@ -491,6 +507,28 @@ class SiteHub
       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
+
     describe '#method_missing' do
       context 'calling scope set' do
         subject do

data/spec/sitehub/middleware/candidate_route_mappings_spec.rb

@@ -70,20 +70,6 @@ class SiteHub
               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
@@ -190,28 +176,6 @@ 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

@@ -1,3 +1,4 @@
+require 'timecop'
 class SiteHub
   module Middleware
     describe ConfigLoader do
@@ -26,15 +27,14 @@ class SiteHub
         stub_request(:get, server_url).to_return(body: config.to_json)
       end
 
-      let(:no_caching) { { force: true } }
+      let(:cache_settings) { { expires_in: 1 } }
       subject do
-        described_class.new(:app, server_url, caching_options: no_caching)
+        described_class.new(:app, server_url, caching_options: cache_settings)
       end
 
       describe '#load_config' do
         subject do
-          caching_enabled = { expires_in: 30 }
-          described_class.new(:app, server_url, caching_options: caching_enabled)
+          described_class.new(:app, server_url, caching_options: cache_settings)
         end
 
         let(:expected_core) do
@@ -101,7 +101,7 @@ class SiteHub
 
           context 'config previously loaded' do
             subject do
-              described_class.new(:app, server_url, caching_options: no_caching)
+              described_class.new(:app, server_url, caching_options: cache_settings)
             end
 
             let(:response) { [200, {}, []] }
@@ -113,6 +113,7 @@ class SiteHub
               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)
+              Timecop.travel(2)
             end
 
             it 'retains the original config' do

data/spec/spec_helper.rb

@@ -22,11 +22,16 @@ require 'lib/sitehub'
 
 RSpec.configure do |config|
   include Rack::Test::Methods
+
   config.before do
     Timecop.freeze
     WebMock.enable!
   end
 
+  config.after do
+    Timecop.return
+  end
+
   config.after(:suite) do
     WebMock.disable!
   end

data/spec/support/shared_contexts/integration_context.rb

@@ -0,0 +1,19 @@
+
+
+shared_context :integration do
+  unless const_defined?(:CONFIG_SERVER_URL)
+    CONFIG_SERVER_URL = 'http://the.config.server'.freeze
+    DOWNSTREAM_URL = 'http://downstream.url'.freeze
+    ERROR_LOGGER = StringIO.new
+    ACCESS_LOGGER = StringIO.new
+  end
+
+  def sitehub(&block)
+    builder_block = proc do
+      access_logger ACCESS_LOGGER
+      error_logger ERROR_LOGGER
+      instance_eval(&block)
+    end
+    SiteHub.build(&builder_block)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sitehub
 version: !ruby/object:Gem::Version
-  version: 0.5.0.alpha8
+  version: 0.5.0.alpha10
 platform: ruby
 authors:
 - Ladtech
@@ -391,6 +391,7 @@ files:
 - sitehub.gemspec
 - spec/equality_spec.rb
 - spec/integration/access_logs_spec.rb
+- spec/integration/config_server_spec.rb
 - spec/integration/error_handling_spec.rb
 - spec/integration/middleware_spec.rb
 - spec/integration/version_affinity_spec.rb
@@ -441,6 +442,7 @@ files:
 - spec/support/patch/rack/response.rb
 - spec/support/shared_contexts.rb
 - spec/support/shared_contexts/http_proxy_rules_context.rb
+- spec/support/shared_contexts/integration_context.rb
 - spec/support/shared_contexts/middleware_context.rb
 - spec/support/shared_contexts/module_spec_context.rb
 - spec/support/shared_contexts/rack_request_context.rb