sitehub 0.5.0.alpha4 → 0.5.0.alpha5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ede66ca937a51aa4de571db5f3080113198429c
-  data.tar.gz: 91540d0d051530439cd2979ba054e5478cb215b6
+  metadata.gz: d7189b64635170892f88906d52c53a757bdffd12
+  data.tar.gz: c928e7fb8bcb65d9375b6ac448298de8f6d6449f
 SHA512:
-  metadata.gz: 8d1c08d30bcf5f0c95b20a7a49433ee214c65afa6d917eb04c5ca869d29fe3bff2bd8afce684b77f9920de2ee2f7f633797ba49b202cf6809fc3a2c25d8b4596
-  data.tar.gz: 9f2ce2edfb124e6b09b835986dd96a224bc7e403afbb20a808f19a0c5b0be83a5b044272b72680db17522b841ac3bbfbe03d982578d2666fd93db1b4f125a6e9
+  metadata.gz: 9c57e15219c0a8f28e450b294b143db8b6d9b7851cbca600618c174533020116eda0dbbfb989c7179f827b8c4e3f95fe7b47bc129b3a4a7be05f339b34148640
+  data.tar.gz: d87d4cab4c1d81cea2cd40d269a579e916d89e023d598e44fe2210500981a317237508b3bbca11ed467b28d8da337c80afa0ed4a84dec655ccb5aacdfb33c20a

data/Gemfile.lock

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

data/lib/sitehub/identifier.rb

@@ -11,7 +11,7 @@ class SiteHub
     end
 
     def root
-      components.first
+      Identifier.new(components.first)
     end
 
     def sub_id
@@ -33,5 +33,11 @@ class SiteHub
     def ==(other)
       other.respond_to?(:to_sym) && to_sym == other.to_sym
     end
+
+    def hash
+      components.hash
+    end
+
+    alias eql? ==
   end
 end

data/lib/sitehub/route_builder.rb

@@ -67,17 +67,18 @@ class SiteHub
     end
 
     def add_route(label:, rule: nil, percentage: nil, url: nil, &block)
-      label = id.child_label(label)
+      child_label = id.child_label(label)
+
       route = if block
                 raise InvalidDefinitionException, RULE_NOT_SPECIFIED_MSG unless percentage || rule
                 warn(IGNORING_URL_MSG) if url
-                new(rule: rule, id: label, &block).build
+                new(rule: rule, id: child_label, &block).build
               else
                 raise InvalidDefinitionException, RULE_NOT_SPECIFIED_MSG unless url
-                forward_proxy(url: url, label: label, rule: rule)
+                forward_proxy(url: url, label: child_label, rule: rule)
               end
 
-      routes.add(label, route, percentage)
+      routes.add(Identifier.new(label), route, percentage)
     end
 
     def default_route

data/lib/sitehub/version.rb

@@ -1,3 +1,3 @@
 class SiteHub
-  VERSION = '0.5.0.alpha4'.freeze
+  VERSION = '0.5.0.alpha5'.freeze
 end

data/spec/sitehub/identifier_spec.rb

@@ -8,6 +8,18 @@ class SiteHub
       described_class.new(nil)
     end
 
+    describe '#hash' do
+      it 'returns the hash off the components' do
+        expect(subject.hash).to be(subject.components.hash)
+      end
+    end
+
+    describe '#eql?' do
+      it 'is an alias of the #== method' do
+        expect(subject.method(:eql?)).to eq(subject.method(:==))
+      end
+    end
+
     describe '#initialize' do
       context 'id supplied' do
         it 'it returns a concatenated id' do

data/spec/sitehub/integration_spec.rb

@@ -7,8 +7,8 @@ shared_context :site_hub do
 
   before do
     WebMock.enable!
-    stub_request(:get, experiment1_url).to_return(body: 'hello')
-    stub_request(:get, experiment2_url).to_return(body: 'experiment1_body')
+    stub_request(:get, experiment1_url).to_return(body: 'experiment1_body')
+    stub_request(:get, experiment2_url).to_return(body: 'experiment2_body')
   end
 
   let(:builder) do
@@ -24,7 +24,8 @@ shared_context :site_hub do
         end
 
         split(label: :experiment2, percentage: 0) do
-          split percentage: 100, label: 'variant1', url: experiment2_url
+          split percentage: 0, label: 'variant1', url: experiment2_url
+          split percentage: 100, label: 'variant2', url: experiment2_url
         end
       end
     end
@@ -52,7 +53,6 @@ describe 'proxying calls' do
   describe 'route affinity' do
     context 'requested route cookie not present' do
       it 'drops a cookie to keep you on the same path' do
-        stub_request(:get, downstream_url).to_return(body: 'hello')
         get('/endpoint')
         expect(app.last_response.cookies[SiteHub::RECORDED_ROUTES_COOKIE][:value]).to eq('experiment1|variant1')
       end
@@ -61,7 +61,7 @@ describe 'proxying calls' do
     context 'requested route cookie present' do
       it 'proxies to the preselected route' do
         get('/endpoint', {}, 'HTTP_COOKIE' => "#{SiteHub::RECORDED_ROUTES_COOKIE}=experiment2|variant1")
-        expect(app.last_response.body).to eq(['experiment1_body'])
+        expect(app.last_response.body).to eq(['experiment2_body'])
 
         expect(app.last_response.cookies[SiteHub::RECORDED_ROUTES_COOKIE][:value]).to eq('experiment2|variant1')
       end
@@ -78,13 +78,12 @@ describe 'proxying calls' do
   #     create_middleware.tap do |clazz|
   #       clazz.class_eval do
   #         define_method :call do |env|
+  #
   #           callback = env['async.callback'] || env['async.orig_callback']
   #           env['async.orig_callback'] = env['async.callback'] = proc do |status, headers, body|
-  #             if body.is_a?(Rack::BodyProxy)
-  #               body = "#{name}, #{body.body.join}"
-  #             end
+  #             body = body.body.join if body.is_a?(Rack::BodyProxy)
   #
-  #             callback.call(status, headers, body)
+  #             callback.call(status, headers, "#{name}, #{body}")
   #           end
   #           @app.call(env)
   #         end
@@ -153,13 +152,13 @@ describe 'proxying calls' do
   #           use middleware2
   #           route label: :with_middleware, url: downstream_url
   #         end
-  #         # proxy '/2' => downstream_url
+  #         proxy '/2' => downstream_url
   #       end
   #     end
   #
   #     it 'adds it to that route only' do
   #       get('/1')
-  #       expect(app.last_response.body.join).to eq('middleware1, middleware2,  hello')
+  #       expect(app.last_response.body.join).to eq('middleware1, middleware2, hello')
   #       get('/2')
   #       expect(app.last_response.body.join).to eq('middleware1, hello')
   #     end
@@ -177,7 +176,7 @@ describe 'proxying calls' do
   #         proxy '/1' do
   #           split percentage: 100, label: :experiment1 do
   #             use middleware1
-  #             split percentage: 100, label: :with_middleware  do
+  #             split percentage: 100, label: :with_middleware do
   #               use middleware2
   #               split percentage: 100, label: :with_nested_middleware, url: downstream_url
   #             end

data/spec/sitehub/middleware/routes_spec.rb

@@ -69,7 +69,7 @@ class SiteHub
         context 'mapped_route found' do
           it 'uses the forward proxy' do
             subject
-            expect(forward_proxy_builder.routes[:current]).to receive(:call) do
+            expect(forward_proxy_builder.routes[Identifier.new(:current)]).to receive(:call) do
               [200, {}, []]
             end
             expect(get(mapped_path).status).to eq(200)

data/spec/sitehub/route_builder_spec.rb

@@ -9,7 +9,7 @@ class SiteHub
       include_context :sitehub_json
 
       subject do
-        described_class.from_hash(proxy_1, :expected).routes[route_1[:label]]
+        described_class.from_hash(proxy_1, :expected).routes[Identifier.new(route_1[:label])]
       end
 
       context 'splits' do
@@ -164,7 +164,7 @@ class SiteHub
                                    sitehub_cookie_name: :cookie_name,
                                    sitehub_cookie_path: nil)
 
-        expect(subject.routes[:current]).to eq(expected_route)
+        expect(subject.routes[Identifier.new(:current)]).to eq(expected_route)
       end
 
       it 'accepts a rule' do
@@ -198,7 +198,7 @@ class SiteHub
                                                 mapped_path: '/path',
                                                 &block).build
 
-          expect(subject.routes[:label1]).to eq(expected_endpoints)
+          expect(subject.routes[Identifier.new(:label1)]).to eq(expected_endpoints)
           subject.build
         end
 
@@ -250,9 +250,9 @@ class SiteHub
       context 'middleware not specified' do
         it 'leaves it the proxies alone' do
           subject.route url: :url, label: :current
-          expect(subject.routes[:current]).to be_using_rack_stack(ForwardProxy)
+          expect(subject.routes[Identifier.new(:current)]).to be_using_rack_stack(ForwardProxy)
           subject.build
-          expect(subject.routes[:current]).to be_using_rack_stack(ForwardProxy)
+          expect(subject.routes[Identifier.new(:current)]).to be_using_rack_stack(ForwardProxy)
         end
       end
 
@@ -264,7 +264,7 @@ class SiteHub
         it 'wraps the forward proxies in the middleware' do
           subject.route url: :url, label: :current
           subject.build
-          expect(subject.routes[:current]).to be_using_rack_stack(middleware, ForwardProxy)
+          expect(subject.routes[Identifier.new(:current)]).to be_using_rack_stack(middleware, ForwardProxy)
         end
 
         it 'wraps the default in the middleware' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sitehub
 version: !ruby/object:Gem::Version
-  version: 0.5.0.alpha4
+  version: 0.5.0.alpha5
 platform: ruby
 authors:
 - Ladtech