sitehub 0.4.10 → 0.5.0.alpha2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d94187ef893c9a2c4d268cb7742aec5af3a3dbe
-  data.tar.gz: 86265225147758c53c9be73618785d8a9dc83f3d
+  metadata.gz: f337700fc9aa4189ae5eca245175ce90215feb89
+  data.tar.gz: e13f12292d4dfd071025531ffa3a1e318f62e830
 SHA512:
-  metadata.gz: 9fb4f9c14ae859297789424346658c018978a0781d4db2a11353b8e6050d49b0624d43ff5e42fb16c72a9051af834a01854f148d9fe7077e86ba0c893affaa65
-  data.tar.gz: 0ca49b96ca7838ca6e0e384006261fa76c9a553f3cc818c559fcb413852a7541b212cd768670726915c8e6ca374ef7f183d1cb9c3ce077aeebb0d66a18a1fb7f
+  metadata.gz: e7d744f3fa8f2fa9170291eab863c4d1f6b79024b3811ec1a292409c188ace0ea62e4289575241b5af4c64d0359affaa25b9571e5c316e8ed2733552d3d587b5
+  data.tar.gz: f481d91e80a2e9de3681174c9ca0da813ee4e724395308ec2abbe5fd29e4220ddfa356c58b0f22a25d48424b7284c31799bb453a4929d28b576449ab7e536da7

data/Gemfile.lock

@@ -1,11 +1,12 @@
 PATH
   remote: .
   specs:
-    sitehub (0.4.10)
+    sitehub (0.5.0.alpha2)
+      activesupport
       em-http-request
       em-synchrony
       faraday
-      rack (~> 1.6.8)
+      rack
       rack-fiber_pool
       rack-ssl-enforcer
       thin
@@ -14,6 +15,11 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
+    activesupport (5.0.0)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
     addressable (2.4.0)
     ast (2.3.0)
     axiom-types (0.1.1)
@@ -27,10 +33,11 @@ GEM
       simplecov (>= 0.7.1, < 1.0.0)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
+    concurrent-ruby (1.0.2)
     cookiejar (0.3.3)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
-    daemons (1.2.6)
+    daemons (1.2.3)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.2.5)
@@ -43,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.6)
+    em-synchrony (1.0.5)
       eventmachine (>= 1.0.0.beta.1)
     equalizer (0.0.11)
-    eventmachine (1.2.5)
+    eventmachine (1.2.0.1)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
     geminabox (0.13.1)
@@ -58,17 +65,19 @@ GEM
     hashdiff (0.3.0)
     http_parser.rb (0.6.0)
     httpclient (2.8.0)
+    i18n (0.7.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)
     multipart-post (2.0.0)
     nesty (1.0.2)
     parser (2.3.1.2)
       ast (~> 2.2)
     powerpack (0.1.1)
-    rack (1.6.8)
+    rack (1.6.4)
     rack-fiber_pool (0.9.3)
     rack-protection (1.5.3)
       rack
@@ -113,13 +122,15 @@ GEM
       rack-protection (~> 1.4)
       tilt (>= 1.3, < 3)
     systemu (2.6.5)
-    thin (1.7.2)
+    thin (1.7.0)
       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)
+      thread_safe (~> 0.1)
     unicode-display_width (1.0.5)
     uuid (2.3.8)
       macaddr (~> 1.0)

data/lib/sitehub.rb

@@ -1,4 +1,5 @@
 require 'sitehub/constants'
+require 'sitehub/middleware'
 require 'sitehub/builder'
 class SiteHub
   class << self

data/lib/sitehub/builder.rb

@@ -1,20 +1,14 @@
-require 'sitehub/getter_setter_methods'
-require 'sitehub/forward_proxy_builder'
-require 'sitehub/middleware'
 require 'logger'
+require 'sitehub/core'
+require 'active_support/cache'
 
 class SiteHub
-  class InvalidProxyDefinitionException < Exception
-  end
-
   class Builder
-    attr_reader :sitehub, :forward_proxies, :reverse_proxies
-
     include Middleware
     extend GetterSetterMethods
 
-    getter_setters :access_logger, :error_logger
-    getter_setter :sitehub_cookie_name, RECORDED_ROUTES_COOKIE
+    attr_reader :core
+    getter_setters :access_logger, :error_logger, :config_server
 
     def force_ssl(except: [])
       @force_ssl = true
@@ -22,41 +16,33 @@ class SiteHub
     end
 
     def initialize(&block)
-      @reverse_proxies = {}
+      @core = Core.new
       instance_eval(&block) if block
     end
 
-    def forward_proxies
-      @forward_proxies ||= ForwardProxies.new(sitehub_cookie_name)
-    end
-
     def build
-      forward_proxies.init
       add_default_middleware
-      middlewares.reverse!
-      apply_middleware(forward_proxies)
+      use ConfigLoader, config_server if config_server
+      apply_middleware(core.build)
     end
 
     def add_default_middleware
-      use Middleware::ReverseProxy, reverse_proxies
-      use Middleware::TransactionId
-      use Middleware::ErrorHandling
-      use Middleware::Logging::AccessLogger, access_logger || ::Logger.new(STDOUT)
-      use Middleware::Logging::ErrorLogger, error_logger || ::Logger.new(STDERR)
-      use Rack::FiberPool
       use Rack::SslEnforcer, except: @ssl_exclusions if @force_ssl
+      use Rack::FiberPool
+      use Middleware::Logging::ErrorLogger, error_logger || ::Logger.new(STDERR)
+      use Middleware::Logging::AccessLogger, access_logger || ::Logger.new(STDOUT)
+      use Middleware::ErrorHandling
+      use Middleware::TransactionId
     end
 
-    def proxy(opts = {}, &block)
-      mapped_path, url = *(opts.respond_to?(:to_a) ? opts.to_a : [opts]).flatten
-
-      forward_proxies.add_proxy(url: url,
-                                mapped_path: mapped_path,
-                                &block)
+    def respond_to?(method)
+      super || core.respond_to?(method)
     end
 
-    def reverse_proxy(hash)
-      reverse_proxies.merge!(hash)
+    def method_missing(method, *args, &block)
+      core.send(method, *args, &block)
+    rescue NoMethodError
+      super
     end
   end
 end

data/lib/sitehub/collection/route_collection.rb

@@ -15,12 +15,6 @@ class SiteHub
         result = values.find { |route| route.applies?(env) }
         result && result.resolve(env: env)
       end
-
-      def transform
-        each do |id, value|
-          self[id] = yield(value)
-        end
-      end
     end
   end
 end

data/lib/sitehub/core.rb

@@ -0,0 +1,69 @@
+require 'sitehub/route_builder'
+require 'forwardable'
+
+class SiteHub
+  class InvalidProxyDefinitionException < Exception
+  end
+
+  class ConfigError < Exception
+  end
+
+  module CollectionMethods
+    def collection(hash, item)
+      hash[item] || []
+    end
+
+    def collection!(hash, item)
+      return hash[item] if hash[item]
+      raise ConfigError, "missing: #{item}"
+    end
+  end
+
+  class Core
+    class << self
+      # TODO: default action for missing key, throw exception?
+      def from_hash(config)
+        new do
+          extend CollectionMethods
+          sitehub_cookie_name config[:sitehub_cookie_name] if config[:sitehub_cookie_name]
+
+          collection!(config, :proxies).each do |proxy|
+            routes.add_route route_builder: RouteBuilder.from_hash(proxy, sitehub_cookie_name)
+          end
+
+          collection(config, :reverse_proxies).each do |proxy|
+            reverse_proxy proxy[:downstream_url] => proxy[:path]
+          end
+        end
+      end
+    end
+
+    include Equality
+    extend Forwardable
+
+    attr_reader :routes, :reverse_proxies
+    def_delegator :routes, :sitehub_cookie_name
+
+    def initialize(&block)
+      @reverse_proxies = {}
+      @routes = Middleware::Routes.new
+      instance_eval(&block) if block
+    end
+
+    def build
+      Middleware::ReverseProxy.new(routes.init, reverse_proxies)
+    end
+
+    def proxy(opts = {}, &block)
+      mapped_path, url = *(opts.respond_to?(:to_a) ? opts.to_a : [opts]).flatten
+
+      routes.add_route(url: url,
+                       mapped_path: mapped_path,
+                       &block)
+    end
+
+    def reverse_proxy(hash)
+      reverse_proxies.merge!(hash)
+    end
+  end
+end

data/lib/sitehub/equality.rb

@@ -14,7 +14,6 @@ class SiteHub
     end
 
     def ==(other)
-      return false unless other.is_a?(_clazz)
       fields = instance_variables.find_all { |field| !_clazz.transient_fields.include?(field) }
       fields.all? do |variable|
         instance_variable_get(variable) == other.instance_variable_get(variable)

data/lib/sitehub/forward_proxy.rb

@@ -1,18 +1,13 @@
-# rubocop:disable Metrics/ParameterLists
 class SiteHub
   class ForwardProxy
-    include Rules, Resolver, Equality
+    include Equality
 
-    attr_reader :downstream_client, :sitehub_cookie_name, :id, :sitehub_cookie_path, :mapped_path, :mapped_url
+    attr_reader :downstream_client, :mapped_path, :mapped_url
 
     transient :downstream_client
 
-    def initialize(sitehub_cookie_path: nil, sitehub_cookie_name:, id:, rule: nil, mapped_path:, mapped_url:)
+    def initialize(mapped_path:, mapped_url:)
       @downstream_client = DownstreamClient.new
-      @sitehub_cookie_path = sitehub_cookie_path
-      @sitehub_cookie_name = sitehub_cookie_name
-      @id = id
-      @rule = rule
       @mapped_path = mapped_path
       @mapped_url = mapped_url
     end
@@ -21,15 +16,7 @@ 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: resolve_sitehub_cookie_path(request),
-                            value: id)
-      end
-    end
-
-    def resolve_sitehub_cookie_path(request)
-      sitehub_cookie_path || request.path
+      downstream_client.call(request)
     end
   end
 end

data/lib/sitehub/location_rewriters.rb

@@ -4,6 +4,8 @@ class SiteHub
   class LocationRewriters < Array
     DEFAULT = NilLocationRewriter.new
 
+    include Equality
+
     def initialize(map = {})
       enriched = map.collect do |pattern, path_template|
         matcher = pattern.is_a?(Regexp) ? pattern : /#{pattern}/

data/lib/sitehub/middleware.rb

@@ -2,9 +2,11 @@ $LOAD_PATH.unshift(__dir__)
 require 'middleware/logging'
 require 'middleware/transaction_id'
 require 'middleware/error_handling'
-require 'middleware/forward_proxies'
+require 'middleware/routes'
 require 'middleware/reverse_proxy'
+require 'middleware/config_loader'
 require 'rack/ssl-enforcer'
+require 'middleware/route'
 require 'rack/fiber_pool'
 
 class SiteHub

data/lib/sitehub/middleware/config_loader.rb

@@ -0,0 +1,39 @@
+class SiteHub
+  class ConfigServer
+    attr_reader :server_url, :http_client
+    def initialize(url)
+      @server_url = url
+      @http_client = Faraday.new(ssl: { verify: false }) do |con|
+        con.adapter :em_synchrony
+      end
+    end
+
+    def get
+      JSON(http_client.get(server_url).body, symbolize_names: true)
+    end
+  end
+
+  module Middleware
+    class ConfigLoader
+      attr_reader :config_server, :app, :cache
+
+      def initialize(_app, config_server_url)
+        @config_server = ConfigServer.new(config_server_url)
+        @cache = ActiveSupport::Cache::MemoryStore.new(size: 1.megabytes)
+      end
+
+      def call(env)
+        load_config
+        @app.call env
+      end
+
+      def load_config
+        config = cache.fetch(:sitehub_config, expires_in: 30) do
+          config_server.get
+        end
+
+        @app = Core.from_hash(config).build
+      end
+    end
+  end
+end

data/lib/sitehub/middleware/reverse_proxy.rb

@@ -6,7 +6,7 @@ require 'sitehub/constants'
 class SiteHub
   module Middleware
     class ReverseProxy
-      include CookieRewriting, Constants::HttpHeaderKeys
+      include CookieRewriting, Constants::HttpHeaderKeys, Equality
 
       attr_reader :path_directives
 

data/lib/sitehub/middleware/route.rb

@@ -0,0 +1,35 @@
+require 'sitehub/middleware'
+require 'sitehub/rules'
+
+class SiteHub
+  class Route
+    include Middleware, Resolver, Rules, Equality
+
+    attr_reader :id, :sitehub_cookie_name, :sitehub_cookie_path, :app
+
+    def initialize(app, id:, sitehub_cookie_name:, sitehub_cookie_path: nil)
+      @app = app
+      @id = id
+      @sitehub_cookie_name = sitehub_cookie_name
+      @sitehub_cookie_path = sitehub_cookie_path
+    end
+
+    def call(env)
+      request = env[REQUEST]
+      @app.call(env).tap do |response|
+        response.set_cookie(sitehub_cookie_name,
+                            path: resolve_sitehub_cookie_path(request),
+                            value: id)
+      end
+    end
+
+    def resolve_sitehub_cookie_path(request)
+      sitehub_cookie_path || request.path
+    end
+
+    def init
+      @app = apply_middleware(@app)
+      self
+    end
+  end
+end

data/lib/sitehub/middleware/{forward_proxies.rb → routes.rb}

@@ -1,21 +1,23 @@
+require 'sitehub/getter_setter_methods'
 require 'sitehub/constants'
-require 'sitehub/nil_proxy'
+require 'sitehub/nil_route'
 require 'rack/request'
 require 'rack/response'
 require 'rack/utils'
 require 'em-http'
-require 'forwardable'
 
 class SiteHub
   module Middleware
-    class ForwardProxies < Hash
-      NIL_PROXY = NilProxy.new
+    class Routes < Hash
+      NIL_ROUTE = NilRoute.new
 
-      attr_reader :sitehub_cookie_name
+      include Equality
 
-      def initialize(sitehub_cookie_name)
-        @sitehub_cookie_name = sitehub_cookie_name
-        self.default = NIL_PROXY
+      extend GetterSetterMethods
+      getter_setter :sitehub_cookie_name, RECORDED_ROUTES_COOKIE
+
+      def initialize
+        self.default = NIL_ROUTE
       end
 
       def call(env)
@@ -31,11 +33,17 @@ class SiteHub
         self
       end
 
-      def add_proxy(url: nil, mapped_path:, &block)
-        self[mapped_path] = ForwardProxyBuilder.new(sitehub_cookie_name: sitehub_cookie_name,
-                                                    url: url,
-                                                    mapped_path: mapped_path,
-                                                    &block)
+      def add_route(url: nil, mapped_path: nil, route_builder: nil, &block)
+        if route_builder
+          self[route_builder.mapped_path] = route_builder
+          return
+        end
+
+        self[mapped_path] = RouteBuilder.new(sitehub_cookie_name: sitehub_cookie_name,
+                                             mapped_path: mapped_path,
+                                             &block).tap do |builder|
+          builder.default(url: url) if url
+        end
       end
 
       def mapped_proxy(path:, request:)