sitehub 0.5.0.alpha10 → 0.5.0.alpha11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b127101beee3301abb96d447bcc5a89079edbc61
-  data.tar.gz: bdb07a1212a2ddc317e90bb0f357aa710707b3d9
+  metadata.gz: 673473acf603cd4bb059ba39942acd23c298805a
+  data.tar.gz: d0ac444795bfd73878698d243f16718045b86e15
 SHA512:
-  metadata.gz: 56bdcc1643bc86eb0a1f16aa06d6e0da5b21cfe7fc8edaab4801b96ae16fc859ffb986f4286c3e05e01c57ae4c608b94a1f94d8627d53de897516e5d7ded34ab
-  data.tar.gz: a9e5fbe7fc778646af3de85e2061df64e2704292f7b7dd15f7ad43fe3bde2adf59cd4a8fc75d2bd10132e7ad4cc872fb3c48c21b9a4bae72280653589bfb68f1
+  metadata.gz: 79508cdd923756cea548c2c62fd7f94ff27046d30961dfe81c30e0f401037939ab83539a8ac44e6720a5c6e31b767675426bf7292781b9d793867ee651bb4776
+  data.tar.gz: 768aef4bbde59e3378a98197f01e37ad901314375359dbeb324c60b53de91bf263414037f72027c909910f827856b89b116be3050efe0b3474cba4a69ef92625

data/Gemfile.lock

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

data/circle.yml

@@ -1,6 +1,6 @@
 machine:
   ruby:
-    version: '2.2'
+    version: '2.3.0'
 test:
   override:
     - bundle exec rake

data/lib/sitehub/candidate_routes.rb

@@ -3,7 +3,7 @@ require 'sitehub/equality'
 require 'sitehub/nil_route'
 require 'sitehub/identifier'
 require 'sitehub/getter_setter_methods'
-require 'sitehub/candidate_routes/class_methods'
+require 'sitehub/candidate_routes/from_json'
 
 require_relative 'collection/split_route_collection'
 require_relative 'rules'
@@ -29,14 +29,11 @@ class SiteHub
     IGNORING_URL_MSG = 'Block supplied, ignoring URL parameter'.freeze
     URL_REQUIRED_MSG = 'URL must be supplied for splits and routes'.freeze
 
-    extend CollectionMethods, ClassMethods, GetterSetterMethods
-    include Rules, Equality, Middleware
+    extend CollectionMethods, FromJson, GetterSetterMethods
+    include Rules, Equality, Middleware, CollectionMethods
 
     getter_setters :sitehub_cookie_path, :sitehub_cookie_name
-    attr_reader :id, :calling_scope
-    attr_accessor :mapped_path
-
-    transient :calling_scope
+    attr_reader :id, :mapped_path
 
     def add(label:, rule: nil, percentage: nil, url: nil, &block)
       child_label = id.child_label(label)
@@ -88,30 +85,20 @@ class SiteHub
       end
     end
 
-    def initialize(id: nil, sitehub_cookie_name:, sitehub_cookie_path: nil, mapped_path:, rule: nil, calling_scope: nil, &block)
+    # 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)
       @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
+      @mapped_path = sanitise_mapped_path(mapped_path)
       @sitehub_cookie_name = sitehub_cookie_name
       @sitehub_cookie_path = sitehub_cookie_path
-      @splits = Collection::SplitRouteCollection.new
-      @routes = Collection::RouteCollection.new
-      rule(rule)
 
-      return unless block_given?
+      rule(rule)
 
-      instance_eval(&block)
-      raise InvalidDefinitionError unless valid?
+      init(&block) if block_given?
     end
 
-    def method_missing(method, *args, &block)
-      super unless calling_scope
-      calling_scope.send(method, *args, &block)
-    rescue NoMethodError
-      super
-    end
+
 
     def resolve(id: nil, env:)
       id = Identifier.new(id)
@@ -123,19 +110,17 @@ class SiteHub
     end
 
     def route(url: nil, label:, rule: nil, &block)
+      @routes ||= Collection::RouteCollection.new
       candidates(@routes)
       add(label: label, rule: rule, url: url, &block)
     end
 
     def split(percentage:, url: nil, label:, &block)
+      @splits ||= Collection::SplitRouteCollection.new
       candidates(@splits)
       add(label: label, percentage: percentage, url: url, &block)
     end
 
-    def splits?
-      candidates.is_a?(Collection::SplitRouteCollection)
-    end
-
     def valid?
       return true if default_route?
       candidates.valid?
@@ -181,6 +166,11 @@ class SiteHub
       splits? ? PERCENTAGE_NOT_SPECIFIED_MSG : RULE_NOT_SPECIFIED_MSG
     end
 
+    def init(&block)
+      instance_eval(&block)
+      raise InvalidDefinitionError unless valid?
+    end
+
     def new(id:, rule: nil, &block)
       inherited_middleware = middlewares
 
@@ -188,11 +178,18 @@ class SiteHub
                      sitehub_cookie_name: sitehub_cookie_name,
                      sitehub_cookie_path: sitehub_cookie_path,
                      mapped_path: mapped_path,
-                     rule: rule,
-                     calling_scope: calling_scope) do
+                     rule: rule) do
         middlewares.concat(inherited_middleware)
         instance_eval(&block)
       end
     end
+
+    def sanitise_mapped_path(mapped_path)
+      string_containing_regexp?(mapped_path) ? string_to_regexp(mapped_path) : mapped_path
+    end
+
+    def splits?
+      candidates.is_a?(Collection::SplitRouteCollection)
+    end
   end
 end

data/lib/sitehub/candidate_routes/from_json.rb

@@ -0,0 +1,55 @@
+class SiteHub
+  class CandidateRoutes
+
+    module FromJson
+      extend CollectionMethods
+
+      def self.extended clazz
+        clazz.class_eval do
+          include InstanceMethods
+        end
+      end
+
+      # TODO: support nested routes, i.e. support rule name being passed in
+      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,
+            mapped_path: hash[:path]) do
+          handle_routes(hash, self)
+          default url: hash[:default] if hash[:default]
+        end
+      end
+
+      module InstanceMethods
+        private
+        def handle_routes(hash, routes)
+          extract_splits(hash, routes)
+          extract_routes(hash, routes)
+        end
+
+        def extract_routes(hash, routes)
+          collection(hash, :routes).each do |route|
+            routes.route(url: route[:url], label: route[:label])
+          end
+        end
+
+        def extract_splits(hash, routes)
+          collection(hash, :splits).each do |split|
+            label = split[:label]
+            percentage = split[:percentage]
+            cookie_name = split[:sitehub_cookie_name] || sitehub_cookie_name
+
+            if split[:splits] || split[:routes]
+              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
+end

data/lib/sitehub/config_server.rb

@@ -1,3 +1,4 @@
+require 'json'
 class SiteHub
   class ConfigServer
     BAD_JSON_MSG = 'Illegal JSON returned from config server: %s'.freeze

data/lib/sitehub/constants.rb

@@ -7,6 +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
   ERRORS = 'sitehub.errors'.freeze
   TIME_STAMP_FORMAT = '%d/%b/%Y:%H:%M:%S %z'.freeze
   EMPTY_STRING = ''.freeze

data/lib/sitehub/core.rb

@@ -16,9 +16,10 @@ class SiteHub
         new do
           extend CollectionMethods
           sitehub_cookie_name config[:sitehub_cookie_name] if config[:sitehub_cookie_name]
+          sitehub_cookie_path config[:sitehub_cookie_path] if config[:sitehub_cookie_path]
 
           collection!(config, :proxies).each do |proxy|
-            mappings.add_route route_builder: CandidateRoutes.from_hash(proxy, sitehub_cookie_name)
+            mappings.add_route candidate_routes: CandidateRoutes.from_hash(proxy, sitehub_cookie_name, sitehub_cookie_path )
           end
 
           collection(config, :reverse_proxies).each do |proxy|
@@ -33,6 +34,7 @@ class SiteHub
 
     attr_reader :mappings, :reverse_proxies
     def_delegator :mappings, :sitehub_cookie_name
+    def_delegator :mappings, :sitehub_cookie_path
 
     def initialize(&block)
       @reverse_proxies = {}

data/lib/sitehub/middleware/candidate_route_mappings.rb

@@ -14,6 +14,7 @@ class SiteHub
       include Equality
 
       extend GetterSetterMethods
+      getter_setter :sitehub_cookie_path, RECORDED_ROUTE_COOKIE_PATH
       getter_setter :sitehub_cookie_name, RECORDED_ROUTES_COOKIE
 
       def initialize
@@ -33,16 +34,16 @@ class SiteHub
         self
       end
 
-      def add_route(url: nil, mapped_path: nil, route_builder: nil, &block)
-        unless route_builder
-          route_builder = CandidateRoutes.new(sitehub_cookie_name: sitehub_cookie_name,
-                                              mapped_path: mapped_path,
-                                              &block).tap do |builder|
+      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,
+                                                 mapped_path: mapped_path,
+                                                 &block).tap do |builder|
             builder.default(url: url) if url
           end
         end
 
-        self[route_builder.mapped_path] = route_builder
+        self[candidate_routes.mapped_path] = candidate_routes
       end
 
       def mapped_route(path:, request:)

data/lib/sitehub/version.rb

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

data/spec/integration/config_server_spec.rb

@@ -3,12 +3,16 @@ describe 'config server' do
   include_context :sitehub_json
 
   let(:config) do
-    { proxies: [
-      {
-        path: '%r{/regex(.*)}',
-        default: DOWNSTREAM_URL
-      }
-    ] }
+    {
+        proxies: [
+            {
+                sitehub_cookie_name: 'custom_name',
+                sitehub_cookie_path: '/custom/path',
+                path: '%r{/regex(.*)}',
+                default: DOWNSTREAM_URL
+            }
+        ]
+    }
   end
 
   let(:downstream_response) { 'downstream response' }
@@ -20,12 +24,20 @@ 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)
   end
 
+  context 'from_json' do
+    it 'reads cookie path from config' do
+      get('/regex123')
+
+      expect(app.last_response.cookies['custom_name'][:path]).to eq('/custom/path')
+    end
+  end
+
   it 'path as regex' do
     get('/regex123')
 

data/spec/sitehub/candidate_routes/from_json_spec.rb

@@ -0,0 +1,197 @@
+class SiteHub
+  class CandidateRoutes
+    describe FromJson do
+      describe '::from_hash' do
+        include_context :sitehub_json
+
+        let(:described_class) { CandidateRoutes }
+
+        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
+              {
+                  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)
+            end
+          end
+          context 'defined on proxy' do
+
+            let(:proxy_config_hash) do
+              {
+                  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
+            # context 'config defined on split' do
+            #   let(:proxy_config_hash) do
+            #     {
+            #         path: '/',
+            #         splits: [
+            #             {sitehub_cookie_path: cookie_path,
+            #              sitehub_cookie_name: cookie_name,
+            #              percentage: 100,
+            #              url: 'url',
+            #              label: 'route_label'}
+            #         ]
+            #     }
+            #   end
+            #   it 'is overidden by the config on the route' do
+            #     expect(subject.sitehub_cookie_name).to eq(cookie_name)
+            #     expect(subject.sitehub_cookie_path).to eq(cookie_path)
+            #   end
+            # end
+          end
+
+          #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
+          context 'sitehub_cookie_name' do
+            it 'sets it' do
+              expect(subject.sitehub_cookie_name).to eq(:expected)
+            end
+          end
+
+          context 'sitehub_cookie_path' do
+            it 'sets it' do
+              expect(subject.sitehub_cookie_path).to eq(split_proxy[:sitehub_cookie_path])
+            end
+          end
+
+          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,
+                                           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]
+            end
+            expect(subject.candidates).to eq(expected.candidates)
+          end
+
+          context 'default' do
+            it 'sets it' do
+              expect(subject.default_route.app.mapped_url).to eq(split_proxy[:default])
+            end
+          end
+        end
+
+        context 'routes' do
+          subject do
+            described_class.from_hash(routes_proxy, :expected, :top_level_cookie_path)
+          end
+          context 'sitehub_cookie_name' do
+            it 'sets it' do
+              expect(subject.sitehub_cookie_name).to eq(:expected)
+            end
+          end
+
+          context 'sitehub_cookie_path' do
+            it 'sets it' do
+              expect(subject.sitehub_cookie_path).to eq(routes_proxy[:sitehub_cookie_path])
+            end
+          end
+
+          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,
+                                           mapped_path: subject.mapped_path) do
+              route label: route_1[:label], url: route_1[:url]
+            end
+            expect(subject.candidates).to eq(expected.candidates)
+          end
+
+          context 'default' do
+            it 'sets it' do
+              expect(subject.default_route.app.mapped_url).to eq(routes_proxy[:default])
+            end
+          end
+        end
+
+        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
+
+            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,
+                                             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]
+                end
+              end
+              expect(subject).to eq(expected)
+            end
+          end
+
+          context 'splits in a split' do
+            subject do
+              described_class.from_hash(nested_split_proxy, :expected, :top_level_cookie_path)
+            end
+
+            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,
+                                             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]
+                  split percentage: split_2[:percentage], label: split_2[:label], url: split_2[:url]
+                end
+              end
+              expect(subject).to eq(expected)
+            end
+          end
+        end
+
+        context 'default' do
+          #TODO - implement me
+          it 'sets the default' do
+          end
+        end
+      end
+    end
+  end
+end

data/spec/sitehub/candidate_routes_spec.rb

@@ -5,126 +5,6 @@ class SiteHub
   describe CandidateRoutes do
     include_context :middleware_test
 
-    describe '::from_hash' do
-      include_context :sitehub_json
-
-      context 'splits' do
-        subject do
-          described_class.from_hash(split_proxy, :expected)
-        end
-        context 'sitehub_cookie_name' do
-          it 'sets it' do
-            expect(subject.sitehub_cookie_name).to eq(:expected)
-          end
-        end
-
-        context 'sitehub_cookie_path' do
-          it 'sets it' do
-            expect(subject.sitehub_cookie_path).to eq(split_proxy[:sitehub_cookie_path])
-          end
-        end
-
-        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,
-                                         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]
-          end
-          expect(subject.candidates).to eq(expected.candidates)
-        end
-
-        context 'default' do
-          it 'sets it' do
-            expect(subject.default_route.app.mapped_url).to eq(split_proxy[:default])
-          end
-        end
-      end
-
-      context 'routes' do
-        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)
-          end
-        end
-
-        context 'sitehub_cookie_path' do
-          it 'sets it' do
-            expect(subject.sitehub_cookie_path).to eq(routes_proxy[:sitehub_cookie_path])
-          end
-        end
-
-        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,
-                                         mapped_path: subject.mapped_path) do
-            route label: route_1[:label], url: route_1[:url]
-          end
-          expect(subject.candidates).to eq(expected.candidates)
-        end
-
-        context 'default' do
-          it 'sets it' do
-            expect(subject.default_route.app.mapped_url).to eq(routes_proxy[:default])
-          end
-        end
-      end
-
-      context 'nested routes' do
-        context 'routes inside a split' do
-          subject do
-            described_class.from_hash(nested_route_proxy, :expected)
-          end
-
-          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,
-                                           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]
-              end
-            end
-            expect(subject).to eq(expected)
-          end
-        end
-
-        context 'splits in a split' do
-          subject do
-            described_class.from_hash(nested_split_proxy, :expected)
-          end
-
-          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,
-                                           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]
-                split percentage: split_2[:percentage], label: split_2[:label], url: split_2[:url]
-              end
-            end
-            expect(subject).to eq(expected)
-          end
-        end
-      end
-
-      context 'default' do
-        it 'sets the default' do
-        end
-      end
-    end
 
     subject do
       described_class.new(sitehub_cookie_name: :cookie_name,
@@ -528,33 +408,5 @@ class SiteHub
         end
       end
     end
-
-    describe '#method_missing' do
-      context 'calling scope set' do
-        subject do
-          calling_scope = double(:calling_scope, parent_method: :called)
-          described_class.new(sitehub_cookie_name: :cookie_name,
-                              mapped_path: '/path',
-                              calling_scope: calling_scope)
-        end
-        context 'method on calling_context' do
-          it 'delegates to it' do
-            expect(subject.parent_method).to eq(:called)
-          end
-        end
-
-        context 'method on calling_context' do
-          it 'delegates to it' do
-            expect(subject.parent_method).to eq(:called)
-          end
-        end
-      end
-
-      context 'calling scope not set' do
-        it 'raises an error' do
-          expect { subject.parent_method }.to raise_error(NoMethodError)
-        end
-      end
-    end
   end
 end

data/spec/sitehub/core_spec.rb

@@ -33,13 +33,19 @@ class SiteHub
         end
       end
 
-      context 'sitehub_cookie_name' do
-        it 'sets it' do
-          sitehub_json[:sitehub_cookie_name] = 'custom_name'
-
-          expect(core.sitehub_cookie_name).to eq(expected.sitehub_cookie_name)
-          expect(core.mappings['/route_1'].sitehub_cookie_name).to eq(expected.sitehub_cookie_name)
+      context 'cookie configuration' do
+        context 'defined at top level' do
+          it 'sets it' do
+            sitehub_json[:sitehub_cookie_name] = 'custom_name'
+            sitehub_json[:sitehub_cookie_path] = 'custom_path'
+            sitehub_json[:proxies].first.delete(:sitehub_cookie_path)
+
+            expect(core.sitehub_cookie_name).to eq(expected.sitehub_cookie_name)
+            expect(core.mappings['/route_1'].sitehub_cookie_name).to eq(sitehub_json[:sitehub_cookie_name])
+            expect(core.mappings['/route_1'].sitehub_cookie_path).to eq(sitehub_json[:sitehub_cookie_path])
+          end
         end
+
       end
 
       context 'reverse_proxies' do

data/spec/sitehub/middleware/candidate_route_mappings_spec.rb

@@ -4,7 +4,6 @@ class SiteHub
   module Middleware
     describe CandidateRouteMappings do
       let(:base_url) { 'http://google.com' }
-      let(:mapped_path) { '/app' }
       let(:mapped_path) { '/application_url' }
 
       let(:forward_proxy_builder) do
@@ -20,9 +19,25 @@ class SiteHub
         end.init
       end
 
-      before do
-        # subject.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
 
       describe '#add_route' do
         def route(app, id:)
@@ -32,12 +47,12 @@ class SiteHub
                     sitehub_cookie_path: nil)
         end
 
-        context 'RouteBuilder as parameter' do
+        context 'candidate_routes as parameter' do
           it 'sets it' do
             another_mapping = '/mapping'
-            route = CandidateRoutes.new(sitehub_cookie_name: :sitehub_cookie_name, mapped_path: another_mapping)
-            subject.add_route route_builder: route
-            expect(subject[another_mapping]).to be(route)
+            candidate_routes = CandidateRoutes.new(sitehub_cookie_name: :sitehub_cookie_name, mapped_path: another_mapping)
+            subject.add_route candidate_routes: candidate_routes
+            expect(subject[another_mapping]).to be(candidate_routes)
           end
         end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sitehub
 version: !ruby/object:Gem::Version
-  version: 0.5.0.alpha10
+  version: 0.5.0.alpha11
 platform: ruby
 authors:
 - Ladtech
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-08 00:00:00.000000000 Z
+date: 2016-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -340,7 +340,7 @@ files:
 - lib/sitehub.rb
 - lib/sitehub/builder.rb
 - lib/sitehub/candidate_routes.rb
-- lib/sitehub/candidate_routes/class_methods.rb
+- lib/sitehub/candidate_routes/from_json.rb
 - lib/sitehub/collection.rb
 - lib/sitehub/collection/route_collection.rb
 - lib/sitehub/collection/split_route_collection.rb
@@ -396,6 +396,7 @@ files:
 - spec/integration/middleware_spec.rb
 - spec/integration/version_affinity_spec.rb
 - spec/sitehub/builder_spec.rb
+- spec/sitehub/candidate_routes/from_json_spec.rb
 - spec/sitehub/candidate_routes_spec.rb
 - spec/sitehub/collection/route_collection_spec.rb
 - spec/sitehub/collection/split_route_collection/split_spec.rb

data/lib/sitehub/candidate_routes/class_methods.rb

@@ -1,42 +0,0 @@
-class SiteHub
-  class CandidateRoutes
-    module ClassMethods
-      extend CollectionMethods
-
-      # TODO: support nested routes, i.e. support rule name being passed in
-      def from_hash(hash, sitehub_cookie_name)
-        new(sitehub_cookie_name: sitehub_cookie_name,
-            sitehub_cookie_path: hash[:sitehub_cookie_path],
-            mapped_path: hash[:path], calling_scope: self) do
-          handle_routes(hash, self)
-          default url: hash[:default] if hash[:default]
-        end
-      end
-
-      private
-
-      def handle_routes(hash, routes)
-        extract_splits(hash, routes)
-        extract_routes(hash, routes)
-      end
-
-      def extract_routes(hash, routes)
-        collection(hash, :routes).each do |route|
-          routes.route(url: route[:url], label: route[:label])
-        end
-      end
-
-      def extract_splits(hash, routes)
-        collection(hash, :splits).each do |split|
-          if split[:splits] || split[:routes]
-            routes.split(percentage: split[:percentage], label: split[:label]) do
-              handle_routes(split, self)
-            end
-          else
-            routes.split(percentage: split[:percentage], label: split[:label], url: split[:url])
-          end
-        end
-      end
-    end
-  end
-end