routemaster-drain 1.1.0 → 2.0.0

data/gemfiles/rails_4.gemfile.lock

@@ -0,0 +1,224 @@
+PATH
+  remote: ../
+  specs:
+    routemaster-drain (1.1.0)
+      faraday (>= 0.9.0)
+      faraday_middleware
+      hashie
+      net-http-persistent (< 3)
+      rack (>= 1.4.5)
+      redis-namespace
+      thread
+      wisper (~> 1.6.1)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionmailer (4.0.0)
+      actionpack (= 4.0.0)
+      mail (~> 2.5.3)
+    actionpack (4.0.0)
+      activesupport (= 4.0.0)
+      builder (~> 3.1.0)
+      erubis (~> 2.7.0)
+      rack (~> 1.5.2)
+      rack-test (~> 0.6.2)
+    activemodel (4.0.0)
+      activesupport (= 4.0.0)
+      builder (~> 3.1.0)
+    activerecord (4.0.0)
+      activemodel (= 4.0.0)
+      activerecord-deprecated_finders (~> 1.0.2)
+      activesupport (= 4.0.0)
+      arel (~> 4.0.0)
+    activerecord-deprecated_finders (1.0.4)
+    activesupport (4.0.0)
+      i18n (~> 0.6, >= 0.6.4)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
+    addressable (2.5.0)
+      public_suffix (~> 2.0, >= 2.0.2)
+    appraisal (2.1.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    arel (4.0.2)
+    builder (3.1.4)
+    byebug (9.0.6)
+    codeclimate-test-reporter (1.0.3)
+      simplecov
+    coderay (1.1.1)
+    concurrent-ruby (1.0.2)
+    connection_pool (2.2.1)
+    crack (0.4.3)
+      safe_yaml (~> 1.0.0)
+    diff-lcs (1.2.5)
+    docile (1.1.5)
+    dotenv (2.1.1)
+    erubis (2.7.0)
+    faraday (0.10.0)
+      multipart-post (>= 1.2, < 3)
+    faraday_middleware (0.10.1)
+      faraday (>= 0.7.4, < 1.0)
+    ffi (1.9.14)
+    formatador (0.2.5)
+    guard (2.14.0)
+      formatador (>= 0.2.4)
+      listen (>= 2.7, < 4.0)
+      lumberjack (~> 1.0)
+      nenv (~> 0.1)
+      notiffany (~> 0.0)
+      pry (>= 0.9.12)
+      shellany (~> 0.0)
+      thor (>= 0.18.1)
+    guard-compat (1.2.1)
+    guard-rspec (4.7.3)
+      guard (~> 2.1)
+      guard-compat (~> 1.1)
+      rspec (>= 2.99.0, < 4.0)
+    hashdiff (0.3.1)
+    hashie (3.4.6)
+    hike (1.2.3)
+    i18n (0.7.0)
+    json (2.0.2)
+    listen (3.1.5)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+      ruby_dep (~> 1.2)
+    lumberjack (1.0.10)
+    mail (2.5.4)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    method_source (0.8.2)
+    mime-types (1.25.1)
+    minitest (4.7.5)
+    mono_logger (1.1.0)
+    multi_json (1.12.1)
+    multipart-post (2.0.0)
+    nenv (0.3.0)
+    net-http-persistent (2.9.4)
+    notiffany (0.1.1)
+      nenv (~> 0.1)
+      shellany (~> 0.0)
+    polyglot (0.3.5)
+    pry (0.10.4)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    pry-byebug (3.4.2)
+      byebug (~> 9.0)
+      pry (~> 0.10)
+    psych (2.2.1)
+    public_suffix (2.0.4)
+    rack (1.5.5)
+    rack-protection (1.5.3)
+      rack
+    rack-test (0.6.3)
+      rack (>= 1.0)
+    rails (4.0.0)
+      actionmailer (= 4.0.0)
+      actionpack (= 4.0.0)
+      activerecord (= 4.0.0)
+      activesupport (= 4.0.0)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.0.0)
+      sprockets-rails (~> 2.0.0)
+    railties (4.0.0)
+      actionpack (= 4.0.0)
+      activesupport (= 4.0.0)
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rake (12.0.0)
+    rb-fsevent (0.9.8)
+    rb-inotify (0.9.7)
+      ffi (>= 0.5.0)
+    redis (3.3.2)
+    redis-namespace (1.5.2)
+      redis (~> 3.0, >= 3.0.4)
+    resque (1.26.0)
+      mono_logger (~> 1.0)
+      multi_json (~> 1.0)
+      redis-namespace (~> 1.3)
+      sinatra (>= 0.9.2)
+      vegas (~> 0.1.2)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.4)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
+    ruby_dep (1.5.0)
+    safe_yaml (1.0.4)
+    shellany (0.0.1)
+    sidekiq (4.2.7)
+      concurrent-ruby (~> 1.0)
+      connection_pool (~> 2.2, >= 2.2.0)
+      rack-protection (>= 1.5.0)
+      redis (~> 3.2, >= 3.2.1)
+    simplecov (0.12.0)
+      docile (~> 1.1.0)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.0)
+    sinatra (1.4.7)
+      rack (~> 1.5)
+      rack-protection (~> 1.4)
+      tilt (>= 1.3, < 3)
+    slop (3.6.0)
+    sprockets (2.12.4)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sprockets-rails (2.0.1)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (~> 2.8)
+    thor (0.19.4)
+    thread (0.2.2)
+    thread_safe (0.3.5)
+    tilt (1.4.1)
+    treetop (1.4.15)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.52)
+    vegas (0.1.11)
+      rack (>= 1.0.0)
+    webmock (2.3.1)
+      addressable (>= 2.3.6)
+      crack (>= 0.3.2)
+      hashdiff
+    wisper (1.6.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  appraisal
+  bundler
+  codeclimate-test-reporter
+  dotenv
+  guard-rspec
+  pry-byebug
+  psych
+  rack-test
+  rails (= 4.0.0)
+  rake
+  resque
+  routemaster-drain!
+  rspec
+  sidekiq
+  simplecov
+  webmock
+
+BUNDLED WITH
+   1.13.6

data/gemfiles/rails_5.gemfile

@@ -0,0 +1,24 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "psych", :require => false
+gem "bundler", :require => false
+gem "rake", :require => false
+gem "webmock", :require => false
+gem "rack-test", :require => false
+gem "dotenv", :require => false
+gem "codeclimate-test-reporter", :require => false
+gem "simplecov"
+gem "resque"
+gem "sidekiq"
+gem "rails", "5.0.0"
+
+group :development, :test do
+  gem "guard-rspec", :require => false
+  gem "pry-byebug", :require => false
+  gem "rspec"
+  gem "appraisal"
+end
+
+gemspec :path => "../"

data/gemfiles/rails_5.gemfile.lock

@@ -0,0 +1,250 @@
+PATH
+  remote: ../
+  specs:
+    routemaster-drain (1.1.0)
+      faraday (>= 0.9.0)
+      faraday_middleware
+      hashie
+      net-http-persistent (< 3)
+      rack (>= 1.4.5)
+      redis-namespace
+      thread
+      wisper (~> 1.6.1)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actioncable (5.0.0)
+      actionpack (= 5.0.0)
+      nio4r (~> 1.2)
+      websocket-driver (~> 0.6.1)
+    actionmailer (5.0.0)
+      actionpack (= 5.0.0)
+      actionview (= 5.0.0)
+      activejob (= 5.0.0)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 2.0)
+    actionpack (5.0.0)
+      actionview (= 5.0.0)
+      activesupport (= 5.0.0)
+      rack (~> 2.0)
+      rack-test (~> 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (5.0.0)
+      activesupport (= 5.0.0)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    activejob (5.0.0)
+      activesupport (= 5.0.0)
+      globalid (>= 0.3.6)
+    activemodel (5.0.0)
+      activesupport (= 5.0.0)
+    activerecord (5.0.0)
+      activemodel (= 5.0.0)
+      activesupport (= 5.0.0)
+      arel (~> 7.0)
+    activesupport (5.0.0)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    addressable (2.5.0)
+      public_suffix (~> 2.0, >= 2.0.2)
+    appraisal (2.1.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    arel (7.1.4)
+    builder (3.2.2)
+    byebug (9.0.6)
+    codeclimate-test-reporter (1.0.3)
+      simplecov
+    coderay (1.1.1)
+    concurrent-ruby (1.0.2)
+    connection_pool (2.2.1)
+    crack (0.4.3)
+      safe_yaml (~> 1.0.0)
+    diff-lcs (1.2.5)
+    docile (1.1.5)
+    dotenv (2.1.1)
+    erubis (2.7.0)
+    faraday (0.10.0)
+      multipart-post (>= 1.2, < 3)
+    faraday_middleware (0.10.1)
+      faraday (>= 0.7.4, < 1.0)
+    ffi (1.9.14)
+    formatador (0.2.5)
+    globalid (0.3.7)
+      activesupport (>= 4.1.0)
+    guard (2.14.0)
+      formatador (>= 0.2.4)
+      listen (>= 2.7, < 4.0)
+      lumberjack (~> 1.0)
+      nenv (~> 0.1)
+      notiffany (~> 0.0)
+      pry (>= 0.9.12)
+      shellany (~> 0.0)
+      thor (>= 0.18.1)
+    guard-compat (1.2.1)
+    guard-rspec (4.7.3)
+      guard (~> 2.1)
+      guard-compat (~> 1.1)
+      rspec (>= 2.99.0, < 4.0)
+    hashdiff (0.3.1)
+    hashie (3.4.6)
+    i18n (0.7.0)
+    json (2.0.2)
+    listen (3.1.5)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+      ruby_dep (~> 1.2)
+    loofah (2.0.3)
+      nokogiri (>= 1.5.9)
+    lumberjack (1.0.10)
+    mail (2.6.4)
+      mime-types (>= 1.16, < 4)
+    method_source (0.8.2)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
+    mini_portile2 (2.1.0)
+    minitest (5.9.1)
+    mono_logger (1.1.0)
+    multi_json (1.12.1)
+    multipart-post (2.0.0)
+    nenv (0.3.0)
+    net-http-persistent (2.9.4)
+    nio4r (1.2.1)
+    nokogiri (1.6.8.1)
+      mini_portile2 (~> 2.1.0)
+    notiffany (0.1.1)
+      nenv (~> 0.1)
+      shellany (~> 0.0)
+    pry (0.10.4)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    pry-byebug (3.4.2)
+      byebug (~> 9.0)
+      pry (~> 0.10)
+    psych (2.2.1)
+    public_suffix (2.0.4)
+    rack (2.0.1)
+    rack-protection (1.5.3)
+      rack
+    rack-test (0.6.3)
+      rack (>= 1.0)
+    rails (5.0.0)
+      actioncable (= 5.0.0)
+      actionmailer (= 5.0.0)
+      actionpack (= 5.0.0)
+      actionview (= 5.0.0)
+      activejob (= 5.0.0)
+      activemodel (= 5.0.0)
+      activerecord (= 5.0.0)
+      activesupport (= 5.0.0)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 5.0.0)
+      sprockets-rails (>= 2.0.0)
+    rails-dom-testing (2.0.1)
+      activesupport (>= 4.2.0, < 6.0)
+      nokogiri (~> 1.6.0)
+    rails-html-sanitizer (1.0.3)
+      loofah (~> 2.0)
+    railties (5.0.0)
+      actionpack (= 5.0.0)
+      activesupport (= 5.0.0)
+      method_source
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rake (12.0.0)
+    rb-fsevent (0.9.8)
+    rb-inotify (0.9.7)
+      ffi (>= 0.5.0)
+    redis (3.3.2)
+    redis-namespace (1.5.2)
+      redis (~> 3.0, >= 3.0.4)
+    resque (1.26.0)
+      mono_logger (~> 1.0)
+      multi_json (~> 1.0)
+      redis-namespace (~> 1.3)
+      sinatra (>= 0.9.2)
+      vegas (~> 0.1.2)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.4)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
+    ruby_dep (1.5.0)
+    safe_yaml (1.0.4)
+    shellany (0.0.1)
+    sidekiq (4.2.7)
+      concurrent-ruby (~> 1.0)
+      connection_pool (~> 2.2, >= 2.2.0)
+      rack-protection (>= 1.5.0)
+      redis (~> 3.2, >= 3.2.1)
+    simplecov (0.12.0)
+      docile (~> 1.1.0)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.0)
+    sinatra (1.0)
+      rack (>= 1.0)
+    slop (3.6.0)
+    sprockets (3.7.0)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.2.0)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    thor (0.19.4)
+    thread (0.2.2)
+    thread_safe (0.3.5)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+    vegas (0.1.11)
+      rack (>= 1.0.0)
+    webmock (2.3.1)
+      addressable (>= 2.3.6)
+      crack (>= 0.3.2)
+      hashdiff
+    websocket-driver (0.6.4)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.2)
+    wisper (1.6.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  appraisal
+  bundler
+  codeclimate-test-reporter
+  dotenv
+  guard-rspec
+  pry-byebug
+  psych
+  rack-test
+  rails (= 5.0.0)
+  rake
+  resque
+  routemaster-drain!
+  rspec
+  sidekiq
+  simplecov
+  webmock
+
+BUNDLED WITH
+   1.13.6

data/lib/routemaster/{fetcher.rb → api_client.rb}

@@ -3,21 +3,15 @@ require 'faraday'
 require 'faraday_middleware'
 require 'hashie'
 require 'routemaster/config'
-require 'routemaster/middleware/caching'
+require 'routemaster/middleware/response_caching'
+require 'routemaster/middleware/error_handling'
 
 module Routemaster
-  class Fetcher
-    DEFAULT_MIDDLEWARE = Routemaster::Middleware::Caching
-
-    #
-    # Usage:
-    #
-    # You can extend Fetcher with custom middlewares like:
-    # Fetcher.new(middlewares: [[MyCustomMiddleWare, option1, option2]])
-    #
-    def initialize(middlewares: [], listener: nil)
+  class APIClient
+    def initialize(middlewares: [], listener: nil, response_class: nil)
       @listener = listener
-      @middlewares = generate_middlewares(middlewares)
+      @middlewares = middlewares
+      @response_class = response_class
     end
 
     # Performs a GET HTTP request for the `url`, with optional
@@ -28,30 +22,50 @@ module Routemaster
     # string otherwise.
     def get(url, params: {}, headers: {})
       host = URI.parse(url).host
-      connection.get(url, params, headers.merge(auth_header(host)))
+      response_wrapper do
+        connection.get(url, params, headers.merge(auth_header(host)))
+      end
+    end
+
+    def post(url, body: {}, headers: {})
+      host = URI.parse(url).host
+      response_wrapper do
+        connection.post do |req|
+          req.url url
+          req.headers = headers.merge(auth_header(host))
+          req.body = body.to_json
+        end
+      end
+    end
+
+    def discover(url)
+      get(url)
     end
 
     private
 
-    def generate_middlewares(middlewares)
-      default_middleware = [DEFAULT_MIDDLEWARE, listener: @listener]
-      middlewares.unshift(default_middleware)
+    def response_wrapper(&block)
+      response = block.call
+      @response_class ? @response_class.new(response, client: self) : response
     end
 
     def connection
       @connection ||= Faraday.new do |f|
+        f.request  :json
         f.request  :retry, max: 2, interval: 100e-3, backoff_factor: 2
         f.response :mashify
         f.response :json, content_type: /\bjson/
+        f.use Routemaster::Middleware::ResponseCaching, listener: @listener
         f.adapter  :net_http_persistent
-
-        f.options.timeout      = ENV.fetch('ROUTEMASTER_CACHE_TIMEOUT', 1).to_f
-        f.options.open_timeout = ENV.fetch('ROUTEMASTER_CACHE_TIMEOUT', 1).to_f
-        f.ssl.verify           = ENV.fetch('ROUTEMASTER_CACHE_VERIFY_SSL', 'false') == 'true'
+        f.use Routemaster::Middleware::ErrorHandling
 
         @middlewares.each do |middleware|
           f.use(*middleware)
         end
+
+        f.options.timeout      = ENV.fetch('ROUTEMASTER_CACHE_TIMEOUT', 1).to_f
+        f.options.open_timeout = ENV.fetch('ROUTEMASTER_CACHE_TIMEOUT', 1).to_f
+        f.ssl.verify           = ENV.fetch('ROUTEMASTER_CACHE_VERIFY_SSL', 'false') == 'true'
       end
     end
 

data/lib/routemaster/cache.rb

@@ -1,4 +1,4 @@
-require 'routemaster/fetcher'
+require 'routemaster/api_client'
 require 'thread/pool'
 require 'thread/future'
 require 'singleton'
@@ -11,7 +11,7 @@ module Routemaster
   #
   # Emits `cache_bust`, `cache_hit`, and `cache_miss` events.
   #
-  # The requests themselves are handled by {Fetcher}.
+  # The requests themselves are handled by {APIClient}.
   # Note that `Cache-Control` headers are intentionally ignored, as it is
   # assumed one will call {#bust} when the cache becomes stale.
   #
@@ -60,9 +60,9 @@ module Routemaster
       delegate %i(status headers body) => :value
     end
 
-    def initialize(redis:nil, fetcher:nil)
+    def initialize(redis:nil, client:nil)
       @redis   = redis || Config.cache_redis
-      @fetcher = fetcher || Fetcher.new(listener: self)
+      @client = client || APIClient.new(listener: self)
     end
 
     # Bust the cache for a given URL
@@ -93,7 +93,7 @@ module Routemaster
           "application/json"
       }
       headers['Accept-Language'] = locale if locale
-      @fetcher.get(url, headers: headers)
+      @client.get(url, headers: headers)
     end
 
     # Like {#get}, but schedules any request in the background using a thread

data/lib/routemaster/config.rb

@@ -24,6 +24,20 @@ module Routemaster
       RedisBroker.instance.get(ENV.fetch('ROUTEMASTER_CACHE_REDIS'))
     end
 
+    #
+    # Given an ENV format of service:service_root_url,other_service:other_service_root_url
+    # Generate a hash of { service => service_root_url, other_service => other_service_root_url }
+    #
+    def hosts
+      @hosts ||= begin
+                   hosts = ENV['ROUTEMASTER_DRAIN_HOSTS'].split(',')
+                   hosts.inject({}) do |res, host|
+                     key, val = host.split(':')
+                     res.merge(key => val)
+                   end
+                 end
+    end
+
     def cache_expiry
       Integer(ENV.fetch('ROUTEMASTER_CACHE_EXPIRY', 86_400 * 365))
     end

data/lib/routemaster/drain.rb

@@ -1,5 +1,5 @@
 module Routemaster
   module Drain
-    VERSION = '1.1.0'
+    VERSION = '2.0.0'
   end
 end