sitehub 0.5.0.alpha11 → 0.5.0.alpha12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 673473acf603cd4bb059ba39942acd23c298805a
-  data.tar.gz: d0ac444795bfd73878698d243f16718045b86e15
+  metadata.gz: 5960551a37d7e1dcc81e5c1f1e785874e93e98ed
+  data.tar.gz: fce52d9ba323bd271d8164fef30ff61736bd698e
 SHA512:
-  metadata.gz: 79508cdd923756cea548c2c62fd7f94ff27046d30961dfe81c30e0f401037939ab83539a8ac44e6720a5c6e31b767675426bf7292781b9d793867ee651bb4776
-  data.tar.gz: 768aef4bbde59e3378a98197f01e37ad901314375359dbeb324c60b53de91bf263414037f72027c909910f827856b89b116be3050efe0b3474cba4a69ef92625
+  metadata.gz: f61bbdaa2cb7bca2a6b4974cb0ea962b6076a7236c39b7e75e7f7959e98cbc463c18c97f06acf4216145aebeee7a139ccf0b730162fcc132654210f63ec8e816
+  data.tar.gz: e7d8c1ec72fae39c13fc47613d0558d478c74d7bb457bba43ca1c8ad70a4ed3cb3b811283d2f3eb4d5beada7b4ac7f2ee537f8a3329dfae97bbf0aa54f6d2e5e

data/Gemfile.lock

@@ -1,12 +1,12 @@
 PATH
   remote: .
   specs:
-    sitehub (0.5.0.alpha11)
+    sitehub (0.5.0.alpha12)
       activesupport
       em-http-request
       em-synchrony
       faraday
-      rack
+      rack (~> 1.6.8)
       rack-fiber_pool
       rack-ssl-enforcer
       thin
@@ -15,7 +15,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.0.0)
+    activesupport (5.1.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
       minitest (~> 5.1)
@@ -33,11 +33,11 @@ GEM
       simplecov (>= 0.7.1, < 1.0.0)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
-    concurrent-ruby (1.0.2)
+    concurrent-ruby (1.0.5)
     cookiejar (0.3.3)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
-    daemons (1.2.4)
+    daemons (1.2.6)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.2.5)
@@ -50,10 +50,10 @@ GEM
       http_parser.rb (>= 0.6.0)
     em-socksify (0.3.1)
       eventmachine (>= 1.0.0.beta.4)
-    em-synchrony (1.0.5)
+    em-synchrony (1.0.6)
       eventmachine (>= 1.0.0.beta.1)
     equalizer (0.0.11)
-    eventmachine (1.2.0.1)
+    eventmachine (1.2.5)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
     geminabox (0.13.1)
@@ -65,19 +65,20 @@ GEM
     hashdiff (0.3.0)
     http_parser.rb (0.6.0)
     httpclient (2.8.0)
-    i18n (0.7.0)
+    i18n (0.9.1)
+      concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
     json (1.8.3)
     macaddr (1.7.1)
       systemu (~> 2.6.2)
     memory_profiler (0.9.6)
-    minitest (5.9.0)
+    minitest (5.10.3)
     multipart-post (2.0.0)
     nesty (1.0.2)
     parser (2.3.1.2)
       ast (~> 2.2)
     powerpack (0.1.1)
-    rack (1.6.4)
+    rack (1.6.8)
     rack-fiber_pool (0.9.3)
     rack-protection (1.5.3)
       rack
@@ -122,14 +123,14 @@ GEM
       rack-protection (~> 1.4)
       tilt (>= 1.3, < 3)
     systemu (2.6.5)
-    thin (1.7.0)
+    thin (1.7.2)
       daemons (~> 1.0, >= 1.0.9)
       eventmachine (~> 1.0, >= 1.0.4)
       rack (>= 1, < 3)
     thread_safe (0.3.5)
     tilt (2.0.5)
     timecop (0.8.1)
-    tzinfo (1.2.2)
+    tzinfo (1.2.4)
       thread_safe (~> 0.1)
     unicode-display_width (1.0.5)
     uuid (2.3.8)

data/lib/sitehub/candidate_routes.rb

@@ -14,6 +14,13 @@ require_relative 'forward_proxy'
 require_relative 'downstream_client'
 
 class SiteHub
+  class TrackingCookieDefinition
+    attr_reader :name, :path
+    def initialize(name, path = nil)
+      @name = name
+      @path = path
+    end
+  end
   class CandidateRoutes
     class InvalidDefinitionError < StandardError
     end
@@ -55,11 +62,12 @@ class SiteHub
       self
     end
 
-    def candidates(collection = nil)
-      return @endpoints ||= Collection::RouteCollection.new unless collection
+    def candidates(clazz = nil)
+      return @endpoints ||= Collection::RouteCollection.new unless clazz
+      @endpoints ||= clazz.new
 
-      raise InvalidDefinitionError, ROUTES_WITH_SPLITS_MSG if @endpoints && !@endpoints.equal?(collection)
-      @endpoints = collection
+      raise InvalidDefinitionError, ROUTES_WITH_SPLITS_MSG unless @endpoints.is_a?(clazz)
+      @endpoints
     end
 
     def default(url:)
@@ -86,20 +94,18 @@ class SiteHub
     end
 
     # TODO: combine cookie name and path in to an : nobject
-    def initialize(id: nil, sitehub_cookie_name:, sitehub_cookie_path: nil, mapped_path:, rule: nil, &block)
+    def initialize(id: nil, version_cookie:, mapped_path:, rule: nil, &block)
       @id = Identifier.new(id)
 
       @mapped_path = sanitise_mapped_path(mapped_path)
-      @sitehub_cookie_name = sitehub_cookie_name
-      @sitehub_cookie_path = sitehub_cookie_path
+      sitehub_cookie_name(version_cookie.name)
+      sitehub_cookie_path(version_cookie.path)
 
       rule(rule)
 
       init(&block) if block_given?
     end
 
-
-
     def resolve(id: nil, env:)
       id = Identifier.new(id)
       if id.valid? && (route = candidates[id.root])
@@ -110,14 +116,12 @@ class SiteHub
     end
 
     def route(url: nil, label:, rule: nil, &block)
-      @routes ||= Collection::RouteCollection.new
-      candidates(@routes)
+      candidates(Collection::RouteCollection)
       add(label: label, rule: rule, url: url, &block)
     end
 
     def split(percentage:, url: nil, label:, &block)
-      @splits ||= Collection::SplitRouteCollection.new
-      candidates(@splits)
+      candidates(Collection::SplitRouteCollection)
       add(label: label, percentage: percentage, url: url, &block)
     end
 
@@ -175,8 +179,7 @@ class SiteHub
       inherited_middleware = middlewares
 
       self.class.new(id: id,
-                     sitehub_cookie_name: sitehub_cookie_name,
-                     sitehub_cookie_path: sitehub_cookie_path,
+                     version_cookie: TrackingCookieDefinition.new(sitehub_cookie_name, sitehub_cookie_path),
                      mapped_path: mapped_path,
                      rule: rule) do
         middlewares.concat(inherited_middleware)

data/lib/sitehub/candidate_routes/from_json.rb

@@ -1,10 +1,9 @@
 class SiteHub
   class CandidateRoutes
-
     module FromJson
       extend CollectionMethods
 
-      def self.extended clazz
+      def self.extended(clazz)
         clazz.class_eval do
           include InstanceMethods
         end
@@ -14,8 +13,7 @@ class SiteHub
       def from_hash(hash, sitehub_cookie_name, sitehub_cookie_path)
         cookie_path = hash[:sitehub_cookie_path] || sitehub_cookie_path
         cookie_name = hash[:sitehub_cookie_name] || sitehub_cookie_name
-        new(sitehub_cookie_name: cookie_name,
-            sitehub_cookie_path: cookie_path,
+        new(version_cookie: TrackingCookieDefinition.new(cookie_name, cookie_path),
             mapped_path: hash[:path]) do
           handle_routes(hash, self)
           default url: hash[:default] if hash[:default]
@@ -24,6 +22,7 @@ class SiteHub
 
       module InstanceMethods
         private
+
         def handle_routes(hash, routes)
           extract_splits(hash, routes)
           extract_routes(hash, routes)
@@ -42,13 +41,12 @@ class SiteHub
             cookie_name = split[:sitehub_cookie_name] || sitehub_cookie_name
 
             if split[:splits] || split[:routes]
-              routes.split(percentage: percentage, label: label)  { handle_routes(split, self) }
+              routes.split(percentage: percentage, label: label) { handle_routes(split, self) }
             else
               routes.split(percentage: percentage, label: label, url: split[:url])
             end
           end
         end
-
       end
     end
   end

data/lib/sitehub/constants.rb

@@ -7,7 +7,7 @@ class SiteHub
   RESPONSE = 'sitehub.response'.freeze
   ASYNC_CALLBACK = 'async.callback'.freeze
   RECORDED_ROUTES_COOKIE = 'sitehub.recorded_route'.freeze
-  RECORDED_ROUTE_COOKIE_PATH = '/'.freeze
+  RECORDED_ROUTES_COOKIE_PATH = '/'.freeze
   ERRORS = 'sitehub.errors'.freeze
   TIME_STAMP_FORMAT = '%d/%b/%Y:%H:%M:%S %z'.freeze
   EMPTY_STRING = ''.freeze

data/lib/sitehub/core.rb

@@ -19,7 +19,7 @@ class SiteHub
           sitehub_cookie_path config[:sitehub_cookie_path] if config[:sitehub_cookie_path]
 
           collection!(config, :proxies).each do |proxy|
-            mappings.add_route candidate_routes: CandidateRoutes.from_hash(proxy, sitehub_cookie_name, sitehub_cookie_path )
+            mappings.add_route candidate_routes: CandidateRoutes.from_hash(proxy, sitehub_cookie_name, sitehub_cookie_path)
           end
 
           collection(config, :reverse_proxies).each do |proxy|

data/lib/sitehub/middleware/candidate_route_mappings.rb

@@ -14,7 +14,7 @@ class SiteHub
       include Equality
 
       extend GetterSetterMethods
-      getter_setter :sitehub_cookie_path, RECORDED_ROUTE_COOKIE_PATH
+      getter_setter :sitehub_cookie_path, RECORDED_ROUTES_COOKIE_PATH
       getter_setter :sitehub_cookie_name, RECORDED_ROUTES_COOKIE
 
       def initialize
@@ -36,7 +36,7 @@ class SiteHub
 
       def add_route(url: nil, mapped_path: nil, candidate_routes: nil, &block)
         unless candidate_routes
-          candidate_routes = CandidateRoutes.new(sitehub_cookie_name: sitehub_cookie_name,
+          candidate_routes = CandidateRoutes.new(version_cookie: TrackingCookieDefinition.new(sitehub_cookie_name),
                                                  mapped_path: mapped_path,
                                                  &block).tap do |builder|
             builder.default(url: url) if url

data/lib/sitehub/version.rb

@@ -1,3 +1,3 @@
 class SiteHub
-  VERSION = '0.5.0.alpha11'.freeze
+  VERSION = '0.5.0.alpha12'.freeze
 end

data/sitehub.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(spec)/*.rb})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'rack'
+  spec.add_dependency 'rack', '~> 1.6.8'
   spec.add_dependency 'uuid'
   spec.add_dependency 'em-http-request'
   spec.add_dependency 'rack-ssl-enforcer'

data/spec/integration/config_server_spec.rb

@@ -4,14 +4,14 @@ describe 'config server' do
 
   let(:config) do
     {
-        proxies: [
-            {
-                sitehub_cookie_name: 'custom_name',
-                sitehub_cookie_path: '/custom/path',
-                path: '%r{/regex(.*)}',
-                default: DOWNSTREAM_URL
-            }
-        ]
+      proxies: [
+        {
+          sitehub_cookie_name: 'custom_name',
+          sitehub_cookie_path: '/custom/path',
+          path: '%r{/regex(.*)}',
+          default: DOWNSTREAM_URL
+        }
+      ]
     }
   end
 
@@ -24,7 +24,7 @@ describe 'config server' do
 
   let(:app) do
     sitehub = sitehub do
-      config_server(CONFIG_SERVER_URL, caching_options: {expires_in: 1})
+      config_server(CONFIG_SERVER_URL, caching_options: { expires_in: 1 })
     end
 
     Async::Middleware.new(sitehub)

data/spec/sitehub/candidate_routes/from_json_spec.rb

@@ -5,46 +5,42 @@ class SiteHub
         include_context :sitehub_json
 
         let(:described_class) { CandidateRoutes }
+        subject { described_class.from_hash(proxy_config, :top_level_cookie_name, :top_level_cookie_path) }
 
         context 'cookie configuration' do
-
-          subject do
-            described_class.from_hash(proxy_config_hash, :top_level_cookie_name, :top_level_cookie_path)
-          end
-
           let(:cookie_name) { 'custom_name' }
           let(:cookie_path) { 'custom_path' }
 
           context 'no config defined on proxy' do
-
-            let(:proxy_config_hash) do
+            let(:proxy_config) do
               {
-                  path: '/',
-                  default: 'url'
+                path: '/',
+                default: 'url'
               }
             end
 
             it 'uses the config passed in to the method' do
-                expect(subject.default_route.sitehub_cookie_name).to eq(:top_level_cookie_name)
-                expect(subject.default_route.sitehub_cookie_path).to eq(:top_level_cookie_path)
+              expect(subject.default_route.sitehub_cookie_name).to eq(:top_level_cookie_name)
+              expect(subject.default_route.sitehub_cookie_path).to eq(:top_level_cookie_path)
             end
           end
-          context 'defined on proxy' do
 
-            let(:proxy_config_hash) do
+          context 'defined on proxy' do
+            let(:proxy_config) do
               {
-                  path: '/',
-                  sitehub_cookie_name: cookie_name,
-                  sitehub_cookie_path: cookie_path,
-                  default: 'url'
+                path: '/',
+                sitehub_cookie_name: cookie_name,
+                sitehub_cookie_path: cookie_path,
+                default: 'url'
               }
             end
+
             it 'uses the configuration' do
               expect(subject.default_route.sitehub_cookie_name).to eq(cookie_name)
               expect(subject.default_route.sitehub_cookie_path).to eq(cookie_path)
             end
 
-            #TODO - support cookie config within split
+            # TODO: - support cookie config within split
             # context 'config defined on split' do
             #   let(:proxy_config_hash) do
             #     {
@@ -65,22 +61,19 @@ class SiteHub
             # end
           end
 
-          #TODO - support cookie config within split
+          # TODO: - support cookie config within split
           context 'defined on route' do
             it 'uses the configuration' do
-
             end
           end
         end
 
-
         context 'splits' do
-          subject do
-            described_class.from_hash(split_proxy, :expected, :top_level_cookie_path)
-          end
+          let(:proxy_config) { split_proxy }
+
           context 'sitehub_cookie_name' do
             it 'sets it' do
-              expect(subject.sitehub_cookie_name).to eq(:expected)
+              expect(subject.sitehub_cookie_name).to eq(:top_level_cookie_name)
             end
           end
 
@@ -93,8 +86,7 @@ class SiteHub
           it 'returns core with splits' do
             split_1 = split_1()
             split_2 = split_2()
-            expected = described_class.new(sitehub_cookie_name: :expected,
-                                           sitehub_cookie_path: subject.sitehub_cookie_path,
+            expected = described_class.new(version_cookie: TrackingCookieDefinition.new(:top_level_cookie_name, subject.sitehub_cookie_path),
                                            mapped_path: subject.mapped_path) do
               split percentage: split_1[:percentage], label: split_1[:label], url: split_1[:url]
               split percentage: split_2[:percentage], label: split_2[:label], url: split_2[:url]
@@ -110,12 +102,11 @@ class SiteHub
         end
 
         context 'routes' do
-          subject do
-            described_class.from_hash(routes_proxy, :expected, :top_level_cookie_path)
-          end
+          let(:proxy_config) { routes_proxy }
+
           context 'sitehub_cookie_name' do
             it 'sets it' do
-              expect(subject.sitehub_cookie_name).to eq(:expected)
+              expect(subject.sitehub_cookie_name).to eq(:top_level_cookie_name)
             end
           end
 
@@ -127,8 +118,7 @@ class SiteHub
 
           it 'returns core with routes' do
             route_1 = route_1()
-            expected = described_class.new(sitehub_cookie_name: :expected,
-                                           sitehub_cookie_path: subject.sitehub_cookie_path,
+            expected = described_class.new(version_cookie: TrackingCookieDefinition.new(:top_level_cookie_name, subject.sitehub_cookie_path),
                                            mapped_path: subject.mapped_path) do
               route label: route_1[:label], url: route_1[:url]
             end
@@ -144,16 +134,12 @@ class SiteHub
 
         context 'nested routes' do
           context 'routes inside a split' do
-            subject do
-              described_class.from_hash(nested_route_proxy, :expected, :top_level_cookie_path)
-            end
-
+            let(:proxy_config) { nested_route_proxy }
             it 'creates them' do
               route_1 = route_1()
               nested_route = nested_route()
 
-              expected = described_class.new(sitehub_cookie_name: :expected,
-                                             sitehub_cookie_path: subject.sitehub_cookie_path,
+              expected = described_class.new(version_cookie: TrackingCookieDefinition.new(:top_level_cookie_name, subject.sitehub_cookie_path),
                                              mapped_path: subject.mapped_path) do
                 split(percentage: nested_route[:percentage], label: nested_route[:label]) do
                   route label: route_1[:label], url: route_1[:url]
@@ -164,17 +150,14 @@ class SiteHub
           end
 
           context 'splits in a split' do
-            subject do
-              described_class.from_hash(nested_split_proxy, :expected, :top_level_cookie_path)
-            end
+            let(:proxy_config) { nested_split_proxy }
 
             it 'creates them' do
               split_1 = split_1()
               split_2 = split_2()
               nested_split = nested_split()
 
-              expected = described_class.new(sitehub_cookie_name: :expected,
-                                             sitehub_cookie_path: subject.sitehub_cookie_path,
+              expected = described_class.new(version_cookie: TrackingCookieDefinition.new(:top_level_cookie_name, subject.sitehub_cookie_path),
                                              mapped_path: subject.mapped_path) do
                 split(percentage: nested_split[:percentage], label: nested_split[:label]) do
                   split percentage: split_1[:percentage], label: split_1[:label], url: split_1[:url]
@@ -187,11 +170,23 @@ class SiteHub
         end
 
         context 'default' do
-          #TODO - implement me
-          it 'sets the default' do
+          let(:default_url) { 'url' }
+          let(:proxy_config_default) do
+            {
+              path: '/',
+              default: default_url
+            }
+          end
+
+          subject do
+            described_class.from_hash(proxy_config_default, :expected, :top_level_cookie_path)
+          end
+
+          it 'sets the default url' do
+            expect(subject.default_route.app.mapped_url).to eq(default_url)
           end
         end
       end
     end
   end
-end
+end

data/spec/sitehub/candidate_routes_spec.rb

@@ -5,9 +5,8 @@ class SiteHub
   describe CandidateRoutes do
     include_context :middleware_test
 
-
     subject do
-      described_class.new(sitehub_cookie_name: :cookie_name,
+      described_class.new(version_cookie: TrackingCookieDefinition.new(:cookie_name),
                           mapped_path: '/path')
     end
 
@@ -17,16 +16,15 @@ class SiteHub
       end
 
       it 'returns the same intance everytime' do
-        collection = Collection::SplitRouteCollection.new
-        subject.candidates(collection)
+        collection = subject.candidates(Collection::SplitRouteCollection)
         expect(subject.candidates).to be(collection)
       end
 
       context 'endpoints already set' do
         context 'different object supplied' do
           it 'raises an error' do
-            subject.candidates(Collection::SplitRouteCollection.new)
-            expect { subject.candidates(Collection::RouteCollection.new) }
+            subject.candidates(Collection::SplitRouteCollection)
+            expect { subject.candidates(Collection::RouteCollection) }
               .to raise_error(CandidateRoutes::InvalidDefinitionError)
           end
         end
@@ -48,7 +46,7 @@ class SiteHub
 
     describe '#initialize' do
       let(:named_parameters) do
-        { sitehub_cookie_name: :name,
+        { version_cookie: TrackingCookieDefinition.new(:name),
           mapped_path: '/path' }
       end
 
@@ -83,7 +81,7 @@ class SiteHub
               format(described_class::INVALID_PATH_MATCHER, '*', e.message)
             end
 
-            expect { described_class.new(sitehub_cookie_name: '', mapped_path: '%r{*}') }
+            expect { described_class.new(version_cookie: TrackingCookieDefinition.new(:cookie_name), mapped_path: '%r{*}') }
               .to raise_error(described_class::InvalidPathMatcherError, expected_message)
           end
         end
@@ -161,7 +159,7 @@ class SiteHub
       end
 
       it 'accepts a percentage' do
-        subject.candidates(Collection::SplitRouteCollection.new)
+        subject.candidates(Collection::SplitRouteCollection)
         endpoint = subject.add url: :url, label: :current, percentage: 50
         expect(endpoint.upper).to eq(50)
       end
@@ -182,7 +180,7 @@ class SiteHub
 
           expected_endpoints = CandidateRoutes.new(rule: rule,
                                                    id: :label1,
-                                                   sitehub_cookie_name: :cookie_name,
+                                                   version_cookie: TrackingCookieDefinition.new(:cookie_name),
                                                    mapped_path: '/path',
                                                    &block).build
 
@@ -194,7 +192,7 @@ class SiteHub
           context 'precentage and rule not supplied' do
             context 'split required' do
               it 'raise an error' do
-                subject.candidates(Collection::SplitRouteCollection.new)
+                subject.candidates(Collection::SplitRouteCollection)
                 expected_message = described_class::PERCENTAGE_NOT_SPECIFIED_MSG
                 expect { subject.add(label: :label) {} }
                   .to raise_exception described_class::InvalidDefinitionError, expected_message
@@ -203,7 +201,7 @@ class SiteHub
 
             context 'route required' do
               it 'raise an error' do
-                subject.candidates(Collection::RouteCollection.new)
+                subject.candidates(Collection::RouteCollection)
                 expected_message = described_class::RULE_NOT_SPECIFIED_MSG
                 expect { subject.add(label: :label) {} }
                   .to raise_exception described_class::InvalidDefinitionError, expected_message
@@ -224,7 +222,7 @@ class SiteHub
           subject.add(rule: rule, label: :label, &block)
 
           expected_endpoints = described_class.new(id: :label,
-                                                   sitehub_cookie_name: :cookie_name,
+                                                   version_cookie: TrackingCookieDefinition.new(:cookie_name),
                                                    rule: rule,
                                                    mapped_path: subject.mapped_path,
                                                    &block).tap do |builder|
@@ -354,23 +352,23 @@ class SiteHub
 
     context '#endpoints' do
       context 'called with a collection' do
-        it 'sets endpoints to be that collection' do
-          subject.candidates(:collection)
-          expect(subject.candidates).to eq(:collection)
+        it 'sets endpoints to a collection of that type' do
+          subject.candidates(Hash)
+          expect(subject.candidates).to be_a(Hash)
         end
       end
 
       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::InvalidDefinitionError
+          subject.candidates(Hash)
+          expect { subject.candidates(Array) }.to raise_exception described_class::InvalidDefinitionError
         end
       end
     end
 
     describe '#forward_proxy' do
       subject do
-        described_class.new(sitehub_cookie_name: :cookie_name,
+        described_class.new(version_cookie: TrackingCookieDefinition.new(:cookie_name),
                             mapped_path: '/path')
       end
 

data/spec/sitehub/core_spec.rb

@@ -45,7 +45,6 @@ class SiteHub
             expect(core.mappings['/route_1'].sitehub_cookie_path).to eq(sitehub_json[:sitehub_cookie_path])
           end
         end
-
       end
 
       context 'reverse_proxies' do
@@ -84,7 +83,7 @@ class SiteHub
 
     describe '#proxy' do
       let(:expected_route) do
-        CandidateRoutes.new(sitehub_cookie_name: RECORDED_ROUTES_COOKIE,
+        CandidateRoutes.new(version_cookie: TrackingCookieDefinition.new(RECORDED_ROUTES_COOKIE),
                             mapped_path: '/app')
       end
 

data/spec/sitehub/middleware/candidate_route_mappings_spec.rb

@@ -19,25 +19,28 @@ class SiteHub
         end.init
       end
 
-      # describe 'sitehub_cookie_path' do
-      #   pending 'defaults to CONSTANT' do
-      #
-      #   end
-      #
-      #   pending 'can be set' do
-      #
-      #   end
-      # end
-      #
-      # describe 'sitehub_cookie_name' do
-      #   pending 'defaults to CONSTANT' do
-      #
-      #   end
-      #
-      #   pending 'can be set' do
-      #
-      #   end
-      # end
+      shared_examples 'getter setter' do |default: nil|
+        let(:method_name) { self.class.parent_groups[1].description.delete('#') }
+        if default
+          it 'defaults' do
+            expect(subject.public_send(method_name)).to eq(default)
+          end
+        end
+
+        it 'can be set' do
+          custom_value = 'value'
+          subject.public_send(method_name, custom_value)
+          expect(subject.public_send(method_name)).to eq(custom_value)
+        end
+      end
+
+      describe '#sitehub_cookie_path' do
+        it_behaves_like 'getter setter', default: RECORDED_ROUTES_COOKIE_PATH
+      end
+
+      describe '#sitehub_cookie_name' do
+        it_behaves_like 'getter setter', default: RECORDED_ROUTES_COOKIE
+      end
 
       describe '#add_route' do
         def route(app, id:)
@@ -50,7 +53,7 @@ class SiteHub
         context 'candidate_routes as parameter' do
           it 'sets it' do
             another_mapping = '/mapping'
-            candidate_routes = CandidateRoutes.new(sitehub_cookie_name: :sitehub_cookie_name, mapped_path: another_mapping)
+            candidate_routes = CandidateRoutes.new(version_cookie: TrackingCookieDefinition.new(:sitehub_cookie_name), mapped_path: another_mapping)
             subject.add_route candidate_routes: candidate_routes
             expect(subject[another_mapping]).to be(candidate_routes)
           end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: sitehub
 version: !ruby/object:Gem::Version
-  version: 0.5.0.alpha11
+  version: 0.5.0.alpha12
 platform: ruby
 authors:
 - Ladtech
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-09 00:00:00.000000000 Z
+date: 2017-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.8
 - !ruby/object:Gem::Dependency
   name: uuid
   requirement: !ruby/object:Gem::Requirement
@@ -448,10 +448,10 @@ files:
 - spec/support/shared_contexts/module_spec_context.rb
 - spec/support/shared_contexts/rack_request_context.rb
 - spec/support/shared_contexts/rack_test_context.rb
+- spec/support/shared_contexts/sitehub_json_context.rb
 - spec/support/shared_examples.rb
 - spec/support/shared_examples/memoized_helpers.rb
 - spec/support/shared_examples/prohibited_http_header_filter.rb
-- spec/support/shared_examples/sitehub_json_context.rb
 - spec/support/silent_warnings.rb
 - tasks/code_quality.rake
 - tasks/gem_tasks.rake