sitehub 0.4.8 → 0.4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d9f33c7bd5d70f6b2b82af2a323ad52001ab72a
-  data.tar.gz: 1b7e24903e21456c9ce94f2c6ae4b9e15574e257
+  metadata.gz: dc1b1f945c39176d1b996c7e1d874132686b2d11
+  data.tar.gz: 65e4926ceab0628a35a257a31c8a6f320501623c
 SHA512:
-  metadata.gz: ac6d54ab0e88de48ecd18ccd84adbe946eff83bfdcb5a4e4b0ed5ebe64ace38c53f3ce022a6baab46f63dd6b145d40c6388b64ef917b3e50b6cfee32d86d369b
-  data.tar.gz: 4fd1f12ee1c746b9539bbfbd704d8b83b31805ce1483d0e1508595278a28264fe23de9dabba020f81f9932d1236d6a20b2c6d1876be24ee038309a5e65678e3b
+  metadata.gz: 87eb4057e4afb5766c060f8b976700d1764f6230412da1fcb0ef022deeefa816e4af4bf434c73ee82c232ae7fa0ef7f93975d965cc7dc7e727ec0c537353114e
+  data.tar.gz: e548bc84ed6d7f341f0909978bcc7d1e694115c421d24c8bff74fa5cdd254d83caab55c1d295eb389b4befaf02423e97f4b152bd05d7172b39fc4410a6be27fd

data/.reek

@@ -23,6 +23,7 @@ FeatureEnvy:
   exclude:
   - "SiteHub::DownstreamClient#call"
   - "SiteHub::LocationRewriters"
+  - "SiteHub::Builder#proxy"
   - 'Rack::Response#cookies'
   - 'format_http_to_rack_headers'
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sitehub (0.4.8)
+    sitehub (0.4.9)
       em-http-request
       em-synchrony
       faraday

data/lib/sitehub/builder.rb

@@ -22,11 +22,14 @@ class SiteHub
     end
 
     def initialize(&block)
-      @forward_proxies = ForwardProxies.new
       @reverse_proxies = {}
       instance_eval(&block) if block
     end
 
+    def forward_proxies
+      @forward_proxies ||= ForwardProxies.new(sitehub_cookie_name)
+    end
+
     def build
       forward_proxies.init
       add_default_middleware
@@ -45,17 +48,11 @@ class SiteHub
     end
 
     def proxy(opts = {}, &block)
-      if opts.is_a?(Hash)
-        mapped_path, url = *opts.to_a.flatten
-      else
-        mapped_path = opts
-        url = nil
-      end
+      mapped_path, url = *(opts.respond_to?(:to_a) ? opts.to_a : [opts]).flatten
 
-      forward_proxies << ForwardProxyBuilder.new(sitehub_cookie_name: sitehub_cookie_name,
-                                                 url: url,
-                                                 mapped_path: mapped_path,
-                                                 &block)
+      forward_proxies.add_proxy(url: url,
+                                mapped_path: mapped_path,
+                                &block)
     end
 
     def reverse_proxy(hash)

data/lib/sitehub/forward_proxy.rb

@@ -1,9 +1,11 @@
 # rubocop:disable Metrics/ParameterLists
 class SiteHub
   class ForwardProxy
-    include Rules, Resolver
+    include Rules, Resolver, Equality
 
-    attr_reader :downstream_client, :sitehub_cookie_name, :sitehub_cookie_path, :id, :mapped_path, :mapped_url
+    attr_reader :downstream_client, :sitehub_cookie_name, :id, :sitehub_cookie_path, :mapped_path, :mapped_url
+
+    transient :downstream_client
 
     def initialize(sitehub_cookie_path: nil, sitehub_cookie_name:, id:, rule: nil, mapped_path:, mapped_url:)
       @downstream_client = DownstreamClient.new
@@ -19,25 +21,15 @@ class SiteHub
       request = env[REQUEST]
       request.map(mapped_path, mapped_url)
 
-      response = downstream_client.call(request)
-      value = request.cookies[sitehub_cookie_name.to_s] || id
-      response.set_cookie(sitehub_cookie_name, path: resolve_sitehub_cookie_path(request), value: value)
-      response
+      downstream_client.call(request).tap do |response|
+        response.set_cookie(sitehub_cookie_name,
+                            path: resolve_sitehub_cookie_path(request),
+                            value: id)
+      end
     end
 
     def resolve_sitehub_cookie_path(request)
       sitehub_cookie_path || request.path
     end
-
-    def ==(other)
-      expected = [other.mapped_path,
-                  other.mapped_url,
-                  other.rule,
-                  other.id,
-                  other.sitehub_cookie_name,
-                  other.sitehub_cookie_path]
-
-      expected == [mapped_path, mapped_url, rule, id, sitehub_cookie_name, sitehub_cookie_path]
-    end
   end
 end

data/lib/sitehub/middleware/forward_proxies.rb

@@ -4,12 +4,20 @@ require 'rack/request'
 require 'rack/response'
 require 'rack/utils'
 require 'em-http'
+require 'forwardable'
 
 class SiteHub
   module Middleware
-    class ForwardProxies
+    class ForwardProxies < Hash
       NIL_PROXY = NilProxy.new
 
+      attr_reader :sitehub_cookie_name
+
+      def initialize(sitehub_cookie_name)
+        @sitehub_cookie_name = sitehub_cookie_name
+        self.default = NIL_PROXY
+      end
+
       def call(env)
         source_request = Rack::Request.new(env)
 
@@ -19,20 +27,23 @@ class SiteHub
       end
 
       def init
-        forward_proxies.values.each(&:build)
+        values.each(&:build)
         self
       end
 
-      def <<(route)
-        forward_proxies[route.mapped_path] = route
+      def add_proxy(url: nil, mapped_path:, &block)
+        self[mapped_path] = ForwardProxyBuilder.new(sitehub_cookie_name: sitehub_cookie_name,
+                                                    url: url,
+                                                    mapped_path: mapped_path,
+                                                    &block)
       end
 
       def mapped_proxy(path:, request:)
-        forward_proxies[mapping(path)].resolve(id: request.cookies[RECORDED_ROUTES_COOKIE], env: request.env)
+        self[mapping(path)].resolve(id: request.cookies[sitehub_cookie_name], env: request.env)
       end
 
       def mapping(path)
-        forward_proxies.keys.find do |key|
+        keys.find do |key|
           case key
           when Regexp
             key.match(path)
@@ -41,14 +52,6 @@ class SiteHub
           end
         end
       end
-
-      def forward_proxies
-        @forward_proxies ||= begin
-          {}.tap do |hash|
-            hash.default = NIL_PROXY
-          end
-        end
-      end
     end
   end
 end

data/lib/sitehub/version.rb

@@ -1,3 +1,3 @@
 class SiteHub
-  VERSION = '0.4.8'.freeze
+  VERSION = '0.4.9'.freeze
 end

data/spec/sitehub/builder_spec.rb

@@ -28,7 +28,7 @@ class SiteHub
                                                    sitehub_cookie_name: RECORDED_ROUTES_COOKIE).tap do |route|
             route.default(url: :endpoint)
           end
-          expect(subject.forward_proxies.forward_proxies['/app1']).to eq(expected_proxy)
+          expect(subject.forward_proxies['/app1']).to eq(expected_proxy)
         end
       end
 
@@ -47,7 +47,7 @@ class SiteHub
             route.split url: :endpoint, percentage: 100, label: :label
           end
 
-          expect(subject.forward_proxies.forward_proxies['/app'].endpoints).to eq(expected_route.endpoints)
+          expect(subject.forward_proxies['/app'].endpoints).to eq(expected_route.endpoints)
         end
       end
     end
@@ -81,10 +81,18 @@ class SiteHub
         expect(subject.sitehub_cookie_name).to eq(RECORDED_ROUTES_COOKIE)
       end
 
-      it 'is passed to forward_proxy_builders' do
-        subject.sitehub_cookie_name :expected_cookie_name
-        proxy = subject.proxy '/app1' => :endpoint
-        expect(proxy.sitehub_cookie_name).to eq(:expected_cookie_name)
+      context 'forward_proxies' do
+        subject do
+          described_class.new do
+            sitehub_cookie_name :expected_cookie_name
+            proxy '/app1' => :endpoint
+          end
+        end
+
+        it 'forwards it' do
+          proxy = subject.proxy '/app1' => :endpoint
+          expect(proxy.sitehub_cookie_name).to eq(:expected_cookie_name)
+        end
       end
     end
 
@@ -116,8 +124,22 @@ class SiteHub
           expect(subject.build).to be_using(Middleware::TransactionId)
         end
 
-        it 'adds a forward proxies' do
-          expect(subject.build).to be_using(Middleware::ForwardProxies)
+        context 'forward proxies' do
+          subject do
+            described_class.new do
+              sitehub_cookie_name :custom_cookie_name
+              proxy '/app1' => :endpoint
+            end
+          end
+
+          it 'adds a forward proxies' do
+            expect(subject.build).to be_using(Middleware::ForwardProxies)
+          end
+
+          it 'configures it with the sitehub_cookie_name' do
+            forward_proxies = find_middleware(subject.build, Middleware::ForwardProxies)
+            expect(forward_proxies.sitehub_cookie_name).to eq(:custom_cookie_name)
+          end
         end
 
         it 'adds a AccessLogger' do

data/spec/sitehub/forward_proxy_spec.rb

@@ -51,8 +51,8 @@ class SiteHub
         context 'cookie already set' do
           let(:rack_headers) { { 'HTTP_COOKIE' => 'cookie_name=existing_value' } }
 
-          it 'leaves it alone' do
-            expect(last_response.cookies[:cookie_name.to_s]).to eq(value: :existing_value.to_s, path: mapped_path)
+          it 'replaces the value as this is the proxy it should stick with' do
+            expect(last_response.cookies[:cookie_name.to_s]).to eq(value: :id.to_s, path: mapped_path)
           end
         end
 

data/spec/sitehub/middleware/forward_proxies_spec.rb

@@ -5,15 +5,17 @@ class SiteHub
     describe ForwardProxies do
       let(:base_url) { 'http://google.com' }
       let(:application_root) { '/application_url' }
+
       let(:forward_proxy_builder) do
-        ForwardProxyBuilder.new(mapped_path: application_root).tap do |builder|
-          builder.split url: base_url, label: :current, percentage: 100
-        end
+        subject.values.first
       end
 
       subject do
-        described_class.new.tap do |route_set|
-          route_set << forward_proxy_builder
+        base_url = base_url()
+        described_class.new(:cookie_name).tap do |route_set|
+          route_set.add_proxy(mapped_path: application_root) do |builder|
+            builder.split url: base_url, label: :current, percentage: 100
+          end
         end
       end
 
@@ -23,24 +25,28 @@ class SiteHub
 
       describe '#init' do
         it 'builds all of the forward_proxies' do
-          expect(subject.forward_proxies[application_root]).to receive(:build).and_call_original
+          expect(subject[application_root]).to receive(:build).and_call_original
           subject.init
         end
       end
 
       describe '#mapped_route' do
         let(:request) { Rack::Request.new({}) }
-        let(:more_specific_proxy_builder) do
-          ForwardProxyBuilder.new(url: "#{base_url}/sub_url", mapped_path: "#{application_root}/sub_url")
+
+        it 'uses the id in the sitehub_cookie to resolve the correct route' do
+          request.cookies[:cookie_name] = :preset_id
+          expect(forward_proxy_builder).to receive(:resolve).with(id: :preset_id, env: request.env).and_call_original
+          subject.mapped_proxy(path: application_root, request: request)
         end
 
         context 'regex match on path' do
           let(:fuzzy_matcher) do
-            ForwardProxyBuilder.new(url: "#{base_url}/$1/view", mapped_path: %r{#{application_root}/(.*)/view})
+            subject.values.first
           end
+
           subject do
-            described_class.new.tap do |route_set|
-              route_set << fuzzy_matcher
+            described_class.new(:cookie_name).tap do |route_set|
+              route_set.add_proxy url: "#{base_url}/$1/view", mapped_path: %r{#{application_root}/(.*)/view}
             end
           end
 
@@ -60,10 +66,14 @@ class SiteHub
         end
 
         context 'when more specific route is configured first' do
+          let(:more_specific_proxy_builder) do
+            subject.values.first
+          end
+
           subject do
-            described_class.new.tap do |route_set|
-              route_set << more_specific_proxy_builder
-              route_set << forward_proxy_builder
+            described_class.new(:cookie_name).tap do |route_set|
+              route_set.add_proxy(url: "#{base_url}/sub_url", mapped_path: "#{application_root}/sub_url")
+              route_set.add_proxy(mapped_path: application_root, url: base_url)
             end
           end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sitehub
 version: !ruby/object:Gem::Version
-  version: 0.4.8
+  version: 0.4.9
 platform: ruby
 authors:
 - Ladtech
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-22 00:00:00.000000000 Z
+date: 2016-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack