sitehub 0.5.0.alpha2 → 0.5.0.alpha3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f337700fc9aa4189ae5eca245175ce90215feb89
-  data.tar.gz: e13f12292d4dfd071025531ffa3a1e318f62e830
+  metadata.gz: 843f0e759d80716e875a4e9c10d7430fa3d3070a
+  data.tar.gz: efb553e0b1090e8ec3fa9fe9a20c3474500dc28e
 SHA512:
-  metadata.gz: e7d744f3fa8f2fa9170291eab863c4d1f6b79024b3811ec1a292409c188ace0ea62e4289575241b5af4c64d0359affaa25b9571e5c316e8ed2733552d3d587b5
-  data.tar.gz: f481d91e80a2e9de3681174c9ca0da813ee4e724395308ec2abbe5fd29e4220ddfa356c58b0f22a25d48424b7284c31799bb453a4929d28b576449ab7e536da7
+  metadata.gz: 81a3c977deca7ea18f198539f7d458ffb024dec97475be0d3928e9e3de519c58942c81614558fb02251ae2f457b39b8638050ec015505f45a877a834f20ac5ae
+  data.tar.gz: 92576a7ed7130e047cd34ad2aaee32175d71b0fcbca6d9cb2fbf9f54554feb036c64c82dd9561bed5c23cc6acdc754c3dfd0ba8b898b5c6ab88b151d0d9f358b

data/Gemfile.lock

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

data/lib/sitehub/collection/route_collection.rb

@@ -10,7 +10,7 @@ class SiteHub
         !empty?
       end
 
-      def resolve(env: nil)
+      def resolve(id: nil, env: nil)
         return values.first unless values.find(&:rule)
         result = values.find { |route| route.applies?(env) }
         result && result.resolve(env: env)

data/lib/sitehub/middleware/config_loader.rb

@@ -1,3 +1,4 @@
+require 'active_support'
 class SiteHub
   class ConfigServer
     attr_reader :server_url, :http_client

data/lib/sitehub/route_builder.rb

@@ -96,7 +96,7 @@ class SiteHub
 
     def resolve(id: nil, env:)
       id = id.to_s.to_sym
-      endpoints[id] || endpoints.resolve(env: env) || default_proxy
+      endpoints[id] || endpoints.resolve(id: id, env: env) || default_proxy
     end
 
     def route(url: nil, label: nil, rule: nil, &block)

data/lib/sitehub/version.rb

@@ -1,3 +1,3 @@
 class SiteHub
-  VERSION = '0.5.0.alpha2'.freeze
+  VERSION = '0.5.0.alpha3'.freeze
 end

data/spec/sitehub/route_builder_spec.rb

@@ -297,9 +297,14 @@ class SiteHub
         end
 
         it 'passes the env to the when resolving the correct route' do
-          expect_any_instance_of(subject.endpoints.class).to receive(:resolve).with(env: :env).and_call_original
+          expect_any_instance_of(subject.endpoints.class).to receive(:resolve).with(id: :'', env: :env).and_call_original
           subject.resolve(env: :env)
         end
+
+        it 'passes the requested route id when resolving the correct route' do
+          expect_any_instance_of(subject.endpoints.class).to receive(:resolve).with(id: :required_route_id, env: :env).and_call_original
+          subject.resolve(id: :required_route_id, env: :env)
+        end
       end
 
       context 'splits defined' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sitehub
 version: !ruby/object:Gem::Version
-  version: 0.5.0.alpha2
+  version: 0.5.0.alpha3
 platform: ruby
 authors:
 - Ladtech
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-04 00:00:00.000000000 Z
+date: 2016-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack