determinator 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 31a5345bdfccd96ab6365abbf4252b404f04dcad
-  data.tar.gz: 8ad32254bb12c3ec42c231a004cebc766b81c638
+  metadata.gz: d000e613ee7aeaf88c08bf5588ad6e076722e9da
+  data.tar.gz: b133723daaea81147a3abb6ca2300717669dced2
 SHA512:
-  metadata.gz: 72d958a7aa3f1e4760d786d903e6b26d262d709156dfdeba0969637fd91ccc034db6e716eafba467d687ed9ecccbb0b33ae4bb66ae138f9f16f04fcf6d4506b1
-  data.tar.gz: 97e2fbf318765d3982afad0a0f8e4766784e3360be8779e1389f8b1515ad16d679429d165f39c92ed232d5963500f6b0c645005bfa8bba2479b4005b3fc9e26e
+  metadata.gz: 59a22af903dd9f0cce9a714617efb5b7a38a6933245d2299a50e1d999784fd328361b5ba3f50751f55d8c57e49fac6c76059a9d8900dcfa93d405f0fa4b76917
+  data.tar.gz: 7da1374c9d8588b25d3b9dddfb7b407a0a80a614b9c3eb383d9f11f837526d27339364025aa0240c434d8b59f5194f167380e020c5fdeae9816924d65fceeb3f

data/determinator.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "routemaster-drain", "~> 2.4"
+  spec.add_runtime_dependency "routemaster-drain", "~> 2.5"
 
   spec.add_development_dependency "bundler", "~> 1.13"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/determinator/retrieve/routemaster.rb

@@ -1,7 +1,7 @@
 require 'uri'
 require 'routemaster/drain/caching'
 require 'routemaster/responses/hateoas_response'
-require 'determinator/retrieve/routemaster_indexing_middleware'
+require 'determinator/retrieve/routemaster_feature_id_cache_warmer'
 
 module Determinator
   module Retrieve
@@ -24,11 +24,12 @@ module Determinator
       # @param :discovery_url [String] The bootstrap URL of the instance of Florence which defines Features.
       def initialize(discovery_url:)
         client = ::Routemaster::APIClient.new(
-          response_class: ::Routemaster::Responses::HateoasResponse,
-          middlewares: [RoutemasterIndexingMiddleware]
+          response_class: ::Routemaster::Responses::HateoasResponse
         )
         @routemaster = client.discover(discovery_url)
-        @routemaster_app = ::Routemaster::Drain::Caching.new
+        @routemaster_app = ::Routemaster::Drain::Caching.new(
+          siphon_events: { 'features' => RoutemasterFeatureIdCacheWarmer }
+        )
       end
 
       def retrieve(feature_name)
@@ -45,11 +46,11 @@ module Determinator
           target_groups: obj.body.target_groups.map { |tg|
             TargetGroup.new(
               rollout: tg.rollout,
-              constraints: tg.constraints.to_hash
+              constraints: tg.constraints.to_h
             )
           },
-          variants:      obj.body.variants.to_hash,
-          overrides:     obj.body.overrides.to_hash
+          variants:      obj.body.variants.to_h,
+          overrides:     obj.body.overrides.to_h
         )
       rescue ::Routemaster::Errors::ResourceNotFound
         nil

data/lib/determinator/retrieve/routemaster_feature_id_cache_warmer.rb

@@ -0,0 +1,29 @@
+module Determinator
+  module Retrieve
+    class RoutemasterFeatureIdCacheWarmer
+      def initialize(payload)
+        @payload = payload
+      end
+
+      def call
+        response = client.get(@payload['url']).body
+        if valid_feature_response?(response)
+          key = Routemaster.index_cache_key(response['name'])
+          ::Routemaster::Config.cache_redis.set(key, response['id'])
+        end
+      end
+
+      private
+
+      def client
+        @client ||= ::Routemaster::APIClient.new(
+          response_class: ::Routemaster::Responses::HateoasResponse
+        )
+      end
+
+      def valid_feature_response?(response)
+        response['id'] && response['name'] && response['bucket_type']
+      end
+    end
+  end
+end

data/lib/determinator/version.rb

@@ -1,3 +1,3 @@
 module Determinator
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: determinator
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - JP Hastings-Spital
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-21 00:00:00.000000000 Z
+date: 2017-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: routemaster-drain
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '2.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '2.5'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -178,7 +178,7 @@ files:
 - lib/determinator/control.rb
 - lib/determinator/feature.rb
 - lib/determinator/retrieve/routemaster.rb
-- lib/determinator/retrieve/routemaster_indexing_middleware.rb
+- lib/determinator/retrieve/routemaster_feature_id_cache_warmer.rb
 - lib/determinator/target_group.rb
 - lib/determinator/version.rb
 homepage: https://github.com/deliveroo/determinator
@@ -201,7 +201,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Determine which experiments and features a specific actor should see.

data/lib/determinator/retrieve/routemaster_indexing_middleware.rb

@@ -1,28 +0,0 @@
-module Determinator
-  module Retrieve
-    # Middleware which indexes features by their name, so we can look up a feature by name
-    # and find the details (which are only accessible by ID)
-    class RoutemasterIndexingMiddleware
-      def initialize(app)
-        @app = app
-      end
-
-      def call(env)
-        content = JSON.parse(env.body)
-
-        if content_describes_feature?(content)
-          key = Routemaster.index_cache_key(content['name'])
-          ::Routemaster::Config.cache_redis.set(key, content['id'])
-        end
-
-        @app.call(env)
-      end
-
-      private
-
-      def content_describes_feature?(content)
-        content['id'] && content['name'] && content['bucket_type']
-      end
-    end
-  end
-end