sitehub 0.4.2 → 0.4.3

data/spec/sitehub/logging/error_logger_spec.rb

@@ -3,8 +3,7 @@ require 'sitehub/logging/error_logger'
 class SiteHub
   module Logging
     describe ErrorLogger do
-
-      let(:app){ proc{[200, {}, []]}}
+      let(:app) { proc { [200, {}, []] } }
       subject { described_class.new(app) }
 
       describe '#initialize' do
@@ -44,7 +43,7 @@ class SiteHub
         context 'errors have occurred' do
           it 'logs errors' do
             log_message = subject.log_message(error: error_message, transaction_id: :transaction_id)
-            subject.call({ERRORS => errors, Constants::RackHttpHeaderKeys::TRANSACTION_ID => :transaction_id})
+            subject.call(ERRORS => errors, Constants::RackHttpHeaderKeys::TRANSACTION_ID => :transaction_id)
             expect(output.string).to eq(log_message)
           end
         end
@@ -52,7 +51,7 @@ class SiteHub
         context 'no errors have occured' do
           it 'does not log anything' do
             expect(logger).to_not receive(:write)
-            subject.call({ERRORS => []})
+            subject.call(ERRORS => [])
           end
         end
       end
@@ -62,17 +61,16 @@ class SiteHub
         it 'contains the time and date' do
           now = Time.now
           expect(Time).to receive(:now).and_return(now)
-          expected_time = now.strftime("%d/%b/%Y:%H:%M:%S %z")
+          expected_time = now.strftime('%d/%b/%Y:%H:%M:%S %z')
           expect(subject.log_message(error: error, transaction_id: :transaction_id)).to start_with("[#{expected_time}]")
         end
 
         it 'logs statements made against blah' do
-
           expect(subject.log_message(error: error, transaction_id: :transaction_id)).to match(/ERROR: .* -  ?#{error}$/)
         end
 
         it 'contains the transation id of the request' do
-          expect(subject.log_message(error: error, transaction_id: :transaction_id)).to include("ERROR: #{:transaction_id}")
+          expect(subject.log_message(error: error, transaction_id: :transaction_id)).to include('ERROR: transaction_id')
         end
       end
     end

data/spec/sitehub/logging/log_entry_spec.rb

@@ -3,8 +3,7 @@ class SiteHub
   module Logging
     describe LogEntry do
       describe '#initialize' do
-
-        let(:time){Time.now}
+        let(:time) { Time.now }
         subject do
           described_class.new(:message, time)
         end
@@ -26,9 +25,7 @@ class SiteHub
             expect(subject.time).to be(:current_time)
           end
         end
-
-
       end
     end
   end
-end
+end

data/spec/sitehub/logging/log_stash_spec.rb

@@ -3,13 +3,11 @@ require 'sitehub/logging/log_stash'
 class SiteHub
   module Logging
     describe LogStash do
-
       it 'inherits Array' do
         expect(subject).to be_a_kind_of(Array)
       end
 
       describe '#<<' do
-
         it 'adds a LogEntry' do
           allow(Time).to receive(:now).and_return(:current_time)
           subject << :message
@@ -18,4 +16,4 @@ class SiteHub
       end
     end
   end
-end
+end

data/spec/sitehub/logging/log_wrapper_spec.rb

@@ -1,9 +1,7 @@
 require 'sitehub/logging/log_wrapper'
 class SiteHub
   module Logging
-
     describe LogWrapper do
-
       describe '#write' do
         let(:logger) { double('logger') }
         subject do
@@ -19,14 +17,12 @@ class SiteHub
         end
 
         context 'logger responds to write' do
-
           it 'calls << when writing out the log' do
             message = 'message'
             expect(logger).to receive(:write).with(message)
             subject.write(message)
           end
         end
-
       end
     end
   end

data/spec/sitehub/middleware_spec.rb

@@ -19,9 +19,7 @@ class SiteHub
     end
 
     describe '#apply_middleware' do
-
       context 'middleware defined' do
-
         it 'wraps the supplied app in the middleware' do
           subject.use middleware
           result = subject.apply_middleware(:app)
@@ -61,9 +59,7 @@ class SiteHub
             expect(block_passed).to be(true)
           end
         end
-
       end
-
     end
   end
-end
+end

data/spec/sitehub/path_directive_spec.rb

@@ -1,13 +1,11 @@
 require 'sitehub/path_directive'
 class SiteHub
   describe PathDirective do
-
     subject do
       described_class.new(%r{/match}, '/path_template')
     end
 
     describe '#match?' do
-
       context 'matcher applies' do
         it 'returns true' do
           expect(subject.match?('/match')).to eq(true)
@@ -26,7 +24,7 @@ class SiteHub
         described_class.new(Regexp.new('http://www.upstream.com/orders/(.*)'), '/$1')
       end
 
-      let(:url){'http://www.upstream.com/orders/123'}
+      let(:url) { 'http://www.upstream.com/orders/123' }
 
       it 'uses the url to populate the path template' do
         expect(subject.apply(url)).to eq('/123')
@@ -39,12 +37,11 @@ class SiteHub
 
     describe '#path_template' do
       it 'returns a duplicate of the path_template every time' do
-        version1, version2 = subject.path_template, subject.path_template
+        version1 = subject.path_template
+        version2 = subject.path_template
         expect(version1).to eq(version2)
         expect(version1).to_not be(version2)
       end
     end
-
   end
-
-end
+end

data/spec/sitehub/path_directives_spec.rb

@@ -10,7 +10,7 @@ class SiteHub
         it 'leaves the key has a regexp' do
           key = %r{/.*/}
           value = '/'
-          expect(described_class.new(key => value)).to eq([PathDirective.new(key,value)])
+          expect(described_class.new(key => value)).to eq([PathDirective.new(key, value)])
         end
       end
 
@@ -18,20 +18,20 @@ class SiteHub
         it 'converts the key to a regexp' do
           key = 'string'
           value = '/'
-          expect(described_class.new(key => value)).to eq([PathDirective.new(Regexp.new(key),value)])
+          expect(described_class.new(key => value)).to eq([PathDirective.new(Regexp.new(key), value)])
         end
       end
     end
 
     describe '#find' do
-      let(:matcher){Regexp.new('/orders/(.*)')}
-      let(:path_template){'/orders/$1'}
+      let(:matcher) { Regexp.new('/orders/(.*)') }
+      let(:path_template) { '/orders/$1' }
       subject do
         described_class.new(matcher => path_template)
       end
       context 'url matches matcher' do
         it 'returns the path directive' do
-          expect(subject.find('http://url.com/orders/123')).to eq(PathDirective.new(matcher,path_template))
+          expect(subject.find('http://url.com/orders/123')).to eq(PathDirective.new(matcher, path_template))
         end
       end
       context 'url does not matches matcher' do
@@ -39,7 +39,6 @@ class SiteHub
           expect(subject.find('http://url.com/mismatch')).to eq(nil)
         end
       end
-
     end
   end
-end
+end

data/spec/sitehub/request_mapping_spec.rb

@@ -2,9 +2,8 @@ require 'sitehub/request_mapping'
 
 class SiteHub
   describe RequestMapping do
-
     describe '#initialize' do
-      let(:mapped_url){'http://downstream_url'}
+      let(:mapped_url) { 'http://downstream_url' }
       subject do
         described_class.new(source_url: 'http://upstream.com/articles/123',
                             mapped_url: mapped_url,
@@ -64,8 +63,6 @@ class SiteHub
           expect(subject.computed_uri).to eq('http://downstream_url/articles?param=value')
         end
       end
-
-
     end
   end
-end
+end

data/spec/sitehub/resolver_spec.rb

@@ -12,4 +12,4 @@ class SiteHub
       end
     end
   end
-end
+end

data/spec/sitehub/reverse_proxy_spec.rb

@@ -1,36 +1,31 @@
 class SiteHub
-
   describe ReverseProxy do
-
     include_context :middleware_test
 
+    let(:mapped_path) { '/orders' }
+    let(:user_facing_app_url) { "http://example.org#{mapped_path}" }
 
-    let(:mapped_path){'/orders'}
-    let(:user_facing_app_url){"http://example.org#{mapped_path}"}
+    let(:downstream_mapping) { 'https://downstream.com/app1/orders' }
+    let(:downstream_location) { "#{downstream_mapping}/123/confirmation" }
 
+    let(:request_mapping) do
+      RequestMapping.new source_url: "#{user_facing_app_url}/123/payment",
+                         mapped_url: downstream_mapping,
+                         mapped_path: mapped_path
+    end
 
-    let(:downstream_mapping){'https://downstream.com/app1/orders'}
-    let(:downstream_location){"#{downstream_mapping}/123/confirmation"}
-    let(:request_mapping){RequestMapping.new source_url: "#{user_facing_app_url}/123/payment", mapped_url: downstream_mapping, mapped_path: mapped_path}
     let(:app) do
-      proc{downstream_response}
+      proc { downstream_response }
     end
-    let(:downstream_response){Rack::Response.new('downstream', 200, {'header1' => 'header1'} )}
+    let(:downstream_response) { Rack::Response.new('downstream', 200, 'header1' => 'header1') }
 
-    #subject do
-    #  described_class.new(inner_app, [])
-    #end
-
-    subject(:reverse_proxy){described_class.new(app, [])}
-    let(:env){{REQUEST_MAPPING => request_mapping}}
+    subject(:reverse_proxy) { described_class.new(app, []) }
+    let(:env) { { REQUEST_MAPPING => request_mapping } }
 
     describe '#call' do
-
-
-
       subject(:response) do
         status, headers, body = reverse_proxy.call(env).to_a
-        Rack::Response.new(body,status, headers)
+        Rack::Response.new(body, status, headers)
       end
 
       it 'copies the downstream body in to the response' do
@@ -49,7 +44,11 @@ class SiteHub
         context 'downstream response contains a cookie' do
           it 'rewrites it to use the upstream domain' do
             downstream_response.set_cookie('downstream.cookie', domain: '.downstream.com', value: 'value')
-            expect(reverse_proxy).to receive(:rewrite_cookies).with(downstream_response.headers, substitute_domain: URI(request_mapping.source_url).host)
+
+            expect(reverse_proxy)
+              .to receive(:rewrite_cookies)
+              .with(downstream_response.headers, substitute_domain: URI(request_mapping.source_url).host)
+
             reverse_proxy.call(env)
           end
         end
@@ -64,42 +63,49 @@ class SiteHub
         end
       end
 
-      #Location, Content-Location and URI
+      # Location, Content-Location and URI
       it 'rewrites the Location header' do
         downstream_response.headers[HttpHeaders::LOCATION_HEADER] = downstream_location
-        expect(reverse_proxy).to receive(:interpolate_location).with(downstream_location, request_mapping.source_url).and_return(:interpolated_location)
+
+        expect(reverse_proxy)
+          .to receive(:interpolate_location)
+          .with(downstream_location, request_mapping.source_url)
+          .and_return(:interpolated_location)
+
         reverse_proxy.call(env)
         expect(downstream_response.headers[HttpHeaders::LOCATION_HEADER]).to eq(:interpolated_location)
       end
-
     end
 
     describe '#interpolate_location' do
       it 'changes the domain' do
-        expect(reverse_proxy.interpolate_location(downstream_location, request_mapping.source_url)).to eq("http://example.org/app1/orders/123/confirmation")
+        expect(reverse_proxy.interpolate_location(downstream_location, request_mapping.source_url)).to eq('http://example.org/app1/orders/123/confirmation')
       end
 
       context 'there is a directive that applies' do
         context 'matcher is a regexp' do
           subject do
-            directive = {%r{#{downstream_mapping}/(.*)/confirmation} => '/confirmation/$1'}
-            described_class.new(inner_app,directive)
+            directive = { %r{#{downstream_mapping}/(.*)/confirmation} => '/confirmation/$1' }
+            described_class.new(inner_app, directive)
           end
           it 'changes the path' do
-            expect(subject.interpolate_location(downstream_location, request_mapping.source_url)).to eq("http://example.org/confirmation/123")
+            expect(subject.interpolate_location(downstream_location, request_mapping.source_url)).to eq('http://example.org/confirmation/123')
           end
         end
 
         context 'matcher is a string' do
+          let(:downstream_url) { 'http://downstream.com/confirmation' }
           subject do
-            directive = {"http://downstream.com/confirmation" => '/congratulations'}
-            described_class.new(inner_app,directive)
+            directive = { downstream_url => '/congratulations' }
+            described_class.new(inner_app, directive)
           end
           it 'changes the path' do
-            expect(subject.interpolate_location('http://downstream.com/confirmation', request_mapping.source_url)).to eq("http://example.org/congratulations")
+            actual = subject.interpolate_location(downstream_url, request_mapping.source_url)
+            expected = 'http://example.org/congratulations'
+            expect(actual).to eq(expected)
           end
         end
       end
     end
   end
-end
+end

data/spec/sitehub/transaction_id_spec.rb

@@ -2,9 +2,9 @@ require 'sitehub/transaction_id'
 
 class SiteHub
   describe TransactionId do
-    let(:transaction_id){Constants::RackHttpHeaderKeys::TRANSACTION_ID}
+    let(:transaction_id) { Constants::RackHttpHeaderKeys::TRANSACTION_ID }
     subject do
-      described_class.new(Proc.new{})
+      described_class.new(proc {})
     end
     it 'adds a unique identifier to the request' do
       uuid = UUID.generate(:compact)
@@ -18,7 +18,7 @@ class SiteHub
     context 'transaction id header already exists' do
       it 'leaves it intact' do
         expect(UUID).to_not receive(:generate)
-        env = {transaction_id => :exiting_id}
+        env = { transaction_id => :exiting_id }
         subject.call(env)
 
         expect(env[transaction_id]).to eq(:exiting_id)

data/spec/sitehub_spec.rb

@@ -1,5 +1,4 @@
 describe SiteHub do
-
   describe '::build' do
     it 'gives you a configure sitehub to run in your config.ru' do
       allow_any_instance_of(SiteHub::Builder).to receive(:build).and_return(:sitehub)
@@ -7,13 +6,12 @@ describe SiteHub do
     end
     it 'passes your block on a sitehub builder' do
       block_called = false
-      block = Proc.new do
+      block = proc do
         block_called = true
       end
 
       described_class.build(&block)
       expect(block_called).to eq(true)
     end
-
   end
-end
+end

data/spec/support/async/callback.rb

@@ -0,0 +1,11 @@
+module Async
+  class Callback
+    attr_reader :response
+
+    def call(*args)
+      status, headers, body = *args.flatten.to_a
+      @response = Rack::Response.new(body, status, headers)
+      EventMachine.stop if EventMachine.reactor_running?
+    end
+  end
+end

data/spec/support/async/middleware.rb

@@ -0,0 +1,25 @@
+module Async
+  class Middleware
+    def initialize(app)
+      @app = app
+    end
+
+    def last_response
+      callback.response
+    end
+
+    def callback
+      @callback ||= Callback.new
+    end
+
+    def call(env)
+      env['async.callback'] = callback
+
+      catch(:async) do
+        @app.call env
+      end
+
+      [200, {}, []]
+    end
+  end
+end

data/spec/support/async/response_handler.rb

@@ -0,0 +1,16 @@
+module Async
+  class ResponseHandler < EM::DefaultDeferrable
+    attr_reader :last_response, :callback_args
+
+    alias arg callback_args
+
+    def succeed(arg)
+      sitehub_response = arg[:downstream_response]
+      instance_variable_set(:@arg, arg)
+      status, headers, body = *sitehub_response.to_a
+      rack_response = Rack::Response.new(body, status, headers)
+      instance_variable_set(:@last_response, rack_response)
+      EM.stop
+    end
+  end
+end

data/spec/support/async.rb

@@ -0,0 +1,4 @@
+$LOAD_PATH.unshift("#{__dir__}/async")
+require 'middleware'
+require 'response_handler'
+require 'callback'

data/spec/support/patch/rack/response.rb

@@ -1,25 +1,17 @@
-class Rack::Response
-  def cookies
-    cookies = {}
-    header['Set-Cookie'].lines.collect { |line| line.scan(/([\.\w]+)=([\.\w\/]+)/) }.each do |cookie_definition_array|
-      name_value_array = cookie_definition_array.delete_at(0)
-      name = name_value_array.first
-      value = name_value_array.last
-      data = cookie_definition_array.collect { |pair| [pair[0].to_sym, pair[1]] }.to_h
-      cookies[name] = {value: value}.merge(data)
+module Rack
+  class Response
+    def cookies
+      cookie_key_value_array.each_with_object({}) do |cookie_key_value, cookies|
+        name_value_array = cookie_key_value.delete_at(0)
+        name, value = *name_value_array
+        data = cookie_key_value.collect { |pair| [pair[0].to_sym, pair[1]] }.to_h
+        cookies[name] = { value: value }.merge(data)
+        cookies
+      end
     end
-    cookies
-  end
 
-  def cookies_as_hash
-    cookies = {}
-    header['Set-Cookie'].lines.collect { |line| line.scan(/([\.\w]+)=([\.\w]+)/) }.each do |cookie_definition_array|
-      name_value_array = cookie_definition_array.delete_at(0)
-      name = name_value_array.first
-      value = name_value_array.last
-      data = cookie_definition_array.collect { |pair| [pair[0].to_sym, pair[1]] }.to_h
-      cookies[name] = {value: value}.merge(data)
+    def cookie_key_value_array
+      header['Set-Cookie'].lines.collect { |line| line.scan(%r{([\.\w]+)=([\.\w/]+)}) }
     end
-    cookies
   end
-end
+end

data/spec/support/shared_contexts/async_context.rb

@@ -1,69 +1,14 @@
+require_relative '../async'
 shared_context :async do
-  class Callback
-    attr_reader :response
-
-    def call *args
-      status, headers, body = *args.flatten.to_a
-      @response = Rack::Response.new(body, status, headers)
-      EventMachine.stop if EventMachine.reactor_running?
-    end
-  end
-
   def callback
-    @callback ||= Callback.new
+    @callback ||= Async::Callback.new
   end
 
   def async_response_handler
-    @async_response_handler ||= begin
-      instance_double(EM::DefaultDeferrable).tap do |handler|
-        allow(handler).to receive(:succeed) do |arg|
-          sitehub_response = arg[:downstream_response]
-          handler.instance_variable_set(:@arg, arg)
-          sitehub_response = sitehub_response.to_a
-          handler.instance_variable_set(:@last_response, Rack::Response.new(sitehub_response[2], sitehub_response[0], sitehub_response[1]))
-          EM.stop
-        end
-
-        def handler.last_response
-          @last_response
-        end
-
-        def handler.callback_args
-          @arg
-        end
-      end
-    end
+    @async_response_handler = Async::ResponseHandler.new
   end
 
   def last_response
     app.last_response
   end
-
-  def async_middleware
-    Class.new do
-      def initialize app
-        @app = app
-      end
-
-      def last_response
-        callback.response
-      end
-
-      def callback
-        @callback ||= Callback.new
-      end
-
-
-      def call env
-
-        env['async.callback'] = callback
-
-        catch(:async) do
-          @app.call env
-        end
-
-        [200, {}, []]
-      end
-    end
-  end
 end

data/spec/support/shared_contexts/middleware_context.rb

@@ -1,51 +1,49 @@
 shared_context :middleware_test do
-
   include_context :rack_test
 
-  let(:inner_app){
-    proc{[200, {}, []]}
-  }
+  let(:inner_app) do
+    proc { [200, {}, []] }
+  end
 
   subject(:app) do
     described_class.new(inner_app)
   end
 
-  def collect_middleware rack_app
+  def collect_middleware(rack_app)
     middleware = [rack_app]
-    while rack_app = rack_app.instance_variable_get(:@app)
+    while (rack_app = rack_app.instance_variable_get(:@app))
       middleware << rack_app
     end
     middleware
   end
 
-
-  def find_middleware rack_app, clazz
+  def find_middleware(rack_app, clazz)
     return rack_app if rack_app.is_a?(clazz)
-    collect_middleware(rack_app).find{|middleware| middleware.is_a?(clazz)}
+    collect_middleware(rack_app).find { |middleware| middleware.is_a?(clazz) }
   end
 
-  RSpec::Matchers.define :be_using do |expected, *args|
+  RSpec::Matchers.define :be_using do |expected, *_args|
     match do |actual|
-      !!find_middleware(actual, expected)
+      !find_middleware(actual, expected).nil?
     end
   end
 
   def create_middleware
     Class.new do
       attr_reader :app, :arg
-      def initialize app, arg=nil, &block
-        @app, @arg = app, arg
-        block.call if block
+      def initialize(app, arg = nil, &block)
+        @app = app
+        @arg = arg
+        yield if block
       end
 
-      def call env
+      def call(env)
         @app.call env
       end
     end
-
   end
 
   let(:middleware) do
     create_middleware
   end
-end
+end

data/spec/support/shared_contexts/rack_test_context.rb

@@ -3,10 +3,10 @@ shared_context :rack_test do
   include Rack::Test::Methods
 
   def env
-    @env||={}
+    @env ||= {}
   end
 
   before :each do |example|
-    @env = {'async.callback' => callback} if example.metadata[:async]
+    @env = { 'async.callback' => callback } if example.metadata[:async]
   end
-end
+end