sitehub 0.4.7 → 0.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 04363e00e3336d8455b4cb2c9d4eb4fc9740b8b5
-  data.tar.gz: 6016da732dd7cdb35e7dbe0a1d74697f98dc9557
+  metadata.gz: 0d9f33c7bd5d70f6b2b82af2a323ad52001ab72a
+  data.tar.gz: 1b7e24903e21456c9ce94f2c6ae4b9e15574e257
 SHA512:
-  metadata.gz: 96eaea637b18d9e272b526d664a9d5c748d910a8c59de339b2f091df2a3e693f3cbf5363cdf0f62f1c8831f5449fb01c1f647c66b0ecd63bd9b181db0b025ab4
-  data.tar.gz: 5165e6d91e40ac2945fd881efe73d69f4addd303bed5d35c87bee949343fd05f3231065f2f88a2bc25cef0154a0af548705b5665e39b9d38500a5cc5a15e66b4
+  metadata.gz: ac6d54ab0e88de48ecd18ccd84adbe946eff83bfdcb5a4e4b0ed5ebe64ace38c53f3ce022a6baab46f63dd6b145d40c6388b64ef917b3e50b6cfee32d86d369b
+  data.tar.gz: 4fd1f12ee1c746b9539bbfbd704d8b83b31805ce1483d0e1508595278a28264fe23de9dabba020f81f9932d1236d6a20b2c6d1876be24ee038309a5e65678e3b

data/.reek

@@ -16,6 +16,7 @@ TooManyStatements:
   exclude:
   - "Builder#add_default_middleware"
   - "ForwardProxy#initialize"
+  - "ForwardProxy#call"
   - "SiteHub::ForwardProxyBuilder#initialize"
 
 FeatureEnvy:

data/Gemfile.lock

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

data/lib/sitehub/forward_proxy.rb

@@ -19,9 +19,14 @@ class SiteHub
       request = env[REQUEST]
       request.map(mapped_path, mapped_url)
 
-      downstream_client.call(request).tap do |response|
-        response.set_cookie(sitehub_cookie_name, path: (sitehub_cookie_path || request.path), value: id)
-      end
+      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
+    end
+
+    def resolve_sitehub_cookie_path(request)
+      sitehub_cookie_path || request.path
     end
 
     def ==(other)

data/lib/sitehub/request.rb

@@ -13,6 +13,7 @@ class SiteHub
     def_delegator :@rack_request, :url
     def_delegator :@rack_request, :path
     def_delegator :@rack_request, :query_string
+    def_delegator :@rack_request, :cookies
 
     attr_reader :env, :rack_request, :mapped_path, :mapped_url, :time
 

data/lib/sitehub/version.rb

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

data/spec/sitehub/forward_proxy_spec.rb

@@ -26,7 +26,8 @@ class SiteHub
     end
 
     describe '#call' do
-      let(:request) { Request.new(env: env_for(path: mapped_path)) }
+      let(:rack_headers) { {} }
+      let(:request) { Request.new(env: env_for(path: mapped_path, env: rack_headers)) }
 
       before do
         get(mapped_path, {}, REQUEST => request)
@@ -47,6 +48,14 @@ class SiteHub
           expect(last_response.cookies[:cookie_name.to_s]).to eq(value: :id.to_s, path: mapped_path)
         end
 
+        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)
+          end
+        end
+
         context 'recorded_routes_cookie_path not set' do
           it 'sets the path to be the request path' do
             expect(last_response.cookies[:cookie_name.to_s][:path]).to eq(mapped_path)

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

@@ -13,7 +13,8 @@ module Rack
     end
 
     def cookie_key_value_array
-      header['Set-Cookie'].lines.collect { |line| line.scan(%r{([\.\w]+)=([\.\w/]+)}) }
+      value = header['Set-Cookie'] || ''
+      value.lines.collect { |line| line.scan(%r{([\.\w]+)=([\.\w/]+)}) }
     end
   end
 end

metadata

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