routemaster-drain 3.6.2 → 3.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3767d797098f45ef97ab1109e2adc72e02db4fc8
-  data.tar.gz: 9efed3541d15645fabc5ec362eea53ff25509237
+  metadata.gz: 68cd91502559ade561ad65e6440cd1609134a380
+  data.tar.gz: d9c8c31b7d24f5d56f831b49a42bcf1e09c86a43
 SHA512:
-  metadata.gz: 858c27a01bf3d3d0117d40956be50e63535fa07df173d8c43047e6feb3caf214c88b057c888e3bf61a794076db7d740020137faeef7b8425e9469e8361b29c3e
-  data.tar.gz: 9c261c1b13f3a0629efe44a04ae2896a30480d3552b82f9df226e87bb5c94649d00e1b893d0952f30a04787e89e24b6946992e4e1f945161ff026bc7b15422c4
+  metadata.gz: 9250edbe5107293bab6a4b5ec81eaa61b6e35483223c2af4548b1dce04afc7948c010092fb3dd831b11947ce463700702a1586228f3c110d2c7407bdbb535b4f
+  data.tar.gz: 8ed05bfc0b1cc2d39353612f18a3f123c13298c222cf77c25ba9873e43eb9f8002091e5eb5a0e8e4f25f4286947b56fa6e36182418fa4e8ad3f9c67a4087126a

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 _A description of your awesome changes here!_
 
+### 3.6.3 (2018-10-17)
+
+Bug fix:
+
+- Allow all middleware classes to be initialised in the same format
+
 ### 3.6.2 (2018-10-11)
 
 Features:

data/lib/routemaster/drain.rb

@@ -1,5 +1,5 @@
 module Routemaster
   module Drain
-    VERSION = '3.6.2'.freeze
+    VERSION = '3.6.3'.freeze
   end
 end

data/lib/routemaster/middleware/authenticate.rb

@@ -16,10 +16,10 @@ module Routemaster
     class Authenticate
       include Wisper::Publisher
 
-      # @param uuid [Enumerable] a set of accepted authentication tokens
-      def initialize(app, uuid: nil, **_)
+      # options[:uuid] [Enumerable] a set of accepted authentication tokens
+      def initialize(app, options = {})
         @app  = app
-        @uuid = uuid || Config.drain_tokens
+        @uuid = options.fetch(:uuid) { Config.drain_tokens }
 
         unless @uuid.kind_of?(String) || @uuid.kind_of?(Enumerable)
           raise ArgumentError, ':uuid must be a String or Enumerable'

data/lib/routemaster/middleware/cache.rb

@@ -7,11 +7,11 @@ require 'routemaster/event_index'
 module Routemaster
   module Middleware
     class Cache
-      def initialize(app, cache:nil, client:nil, queue:nil, **_)
+      def initialize(app, options = {})
         @app    = app
-        @cache  = cache || Routemaster::Cache.new
-        @client = client || Routemaster::Jobs::Client.new
-        @queue  = queue || Config.queue_name
+        @cache  = options.fetch(:cache) { Routemaster::Cache.new }
+        @client = options.fetch(:client) { Routemaster::Jobs::Client.new }
+        @queue  = options.fetch(:queue) { Config.queue_name }
       end
 
       def call(env)

data/lib/routemaster/middleware/dirty.rb

@@ -11,9 +11,9 @@ module Routemaster
     # The dirty map is passed as `:map` to the constructor and must respond to
     # `#mark` (like `Routemaster::Dirty::Map`).
     class Dirty
-      def initialize(app, dirty_map: nil, **_)
+      def initialize(app, options = {})
         @app = app
-        @map = dirty_map || Routemaster::Dirty::Map.new
+        @map = options.fetch(:dirty_map) { Routemaster::Dirty::Map.new }
       end
 
       def call(env)

data/lib/routemaster/middleware/expire_cache.rb

@@ -3,9 +3,9 @@ require 'routemaster/cache'
 module Routemaster
   module Middleware
     class ExpireCache
-      def initialize(app, cache:nil, **_)
+      def initialize(app, options = {})
         @app    = app
-        @cache  = cache || Routemaster::Cache.new
+        @cache  = options.fetch(:cache) { Routemaster::Cache.new }
       end
 
       def call(env)

data/lib/routemaster/middleware/filter.rb

@@ -7,11 +7,11 @@ module Routemaster
     #
     # Will use `Routemaster::Dirty::Filter` by default.
     class Filter
-      # @param filter [Routemaster::Dirty::Filter] an event filter (optional;
+      # options[:filter] [Routemaster::Dirty::Filter] an event filter (optional;
       # will be created using the `redis` and `expiry` options if not provided)
-      def initialize(app, filter:nil, **_)
+      def initialize(app, options = {})
         @app    = app
-        @filter = filter || Routemaster::Dirty::Filter.new
+        @filter = options.fetch(:filter) { Routemaster::Dirty::Filter.new }
       end
 
       def call(env)

data/lib/routemaster/middleware/metrics.rb

@@ -3,10 +3,10 @@ module Routemaster
     class Metrics
       INTERACTION_KEY = 'api_client'.freeze
 
-      def initialize(app, client: nil, source_peer: nil)
+      def initialize(app, options = {})
         @app    = app
-        @client = client
-        @source_peer = source_peer
+        @client = options[:client]
+        @source_peer = options[:source_peer]
       end
 
       def call(request_env)

data/lib/routemaster/middleware/parse.rb

@@ -10,7 +10,7 @@ module Routemaster
     # Lower middlewares (or the app) can access the parsed payload as a hash
     # in +env['routemaster.payload']+
     class Parse
-      def initialize(app)
+      def initialize(app, _options = {})
         @app  = app
       end
 

data/lib/routemaster/middleware/response_caching.rb

@@ -10,11 +10,11 @@ module Routemaster
       VERSION_REGEX = /application\/json;v=(?<version>\S*)/
       RESPONSE_CACHING_OPT_HEADER = 'X-routemaster_drain.opt_cache'.freeze
 
-      def initialize(app, cache: Config.cache_redis, listener: nil)
+      def initialize(app, options = {})
         @app = app
-        @cache = cache
+        @cache = options.fetch(:cache) { Config.cache_redis }
         @expiry = Config.cache_expiry
-        @listener = listener
+        @listener = options[:listener]
       end
 
       def call(env)

data/lib/routemaster/middleware/root_post_only.rb

@@ -2,7 +2,7 @@ module Routemaster
   module Middleware
     # Rejects all requests but POST to the root path
     class RootPostOnly
-      def initialize(app)
+      def initialize(app, _options = {})
         @app  = app
       end
 

data/lib/routemaster/middleware/siphon.rb

@@ -6,9 +6,9 @@ module Routemaster
     #
     #  Topic handlers are initialized with the full event payload and must respond to `#call`
     class Siphon
-      def initialize(app, siphon_events: nil)
+      def initialize(app, options = {})
         @app = app
-        @processors = siphon_events || {}
+        @processors = options.fetch(:siphon_events) { {} }
       end
 
       def call(env)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: routemaster-drain
 version: !ruby/object:Gem::Version
-  version: 3.6.2
+  version: 3.6.3
 platform: ruby
 authors:
 - Julien Letessier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-11 00:00:00.000000000 Z
+date: 2018-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable