determinator 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 066363028ac1046f4d723b50c600c4f32482573e
-  data.tar.gz: 9335a928b7c7ff5bc090fea102eaee6de44b335a
+  metadata.gz: b61e11a6498a8925acd9afe2f044ee454a0b155d
+  data.tar.gz: 033893ae1248afd025503413daebc2a0dd953a66
 SHA512:
-  metadata.gz: b2160f41cf9f742948933bfae8fca2f64e6c051e7bfc4320f04148e47fbc78f1bf9b55a258fb8cd16e640a05197fc8c866881597a682041e97e0d9d526c0ccee
-  data.tar.gz: fb1501b19164f5a70260930c32828a45ba31f39c6610c2cc4c792e309e53ed6e735dd776fbcd7b8bfbd74b34410d83c55d061a6a08fd75721d9e7f7aa43892e5
+  metadata.gz: 3f1abc324ad0a963d67d82fabdc35a49ea8149bd6a8718e2ece520a5b07ae7d101a4234455ae82e1ede5c76f1db8b5d96760440330c6be3dbe41836a5253759e
+  data.tar.gz: 500c7ec60e1dd4e08764dc3d0d30dc60cd0be635e4b42b8188b5363a0f37690a3984a6a0c109ee3ada8976931c5551678f48f4e2dabc52d82c97dfac65d2f56d

data/examples/determinator-rails/config/initializers/determinator.rb

@@ -3,5 +3,6 @@ require 'determinator/retrieve/routemaster'
 Determinator.configure(
   retrieval: Determinator::Retrieve::Routemaster.new(
     discovery_url: 'https://florence.dev/'
+    retrieval_cache: ActiveSupport::Cache::MemoryStore.new(expires_in: 1.minute)
   )
 )

data/lib/determinator/retrieve/null_cache.rb

@@ -0,0 +1,5 @@
+class NullCache
+  def fetch(name)
+    yield
+  end
+end

data/lib/determinator/retrieve/routemaster.rb

@@ -2,6 +2,7 @@ require 'uri'
 require 'routemaster/drain/caching'
 require 'routemaster/responses/hateoas_response'
 require 'determinator/retrieve/routemaster_feature_id_cache_warmer'
+require 'determinator/retrieve/null_cache'
 
 module Determinator
   module Retrieve
@@ -22,23 +23,52 @@ module Determinator
       CALLBACK_PATH = (URI.parse(ENV['ROUTEMASTER_CALLBACK_URL']).path rescue '/events').freeze
 
       # @param :discovery_url [String] The bootstrap URL of the instance of Florence which defines Features.
-      def initialize(discovery_url:)
+      def initialize(discovery_url:, retrieval_cache: NullCache.new)
         client = ::Routemaster::APIClient.new(
           response_class: ::Routemaster::Responses::HateoasResponse
         )
-        @routemaster = client.discover(discovery_url)
+        @retrieval_cache = retrieval_cache
+        @actor_service = client.discover(discovery_url)
         @routemaster_app = ::Routemaster::Drain::Caching.new(
           siphon_events: { 'features' => RoutemasterFeatureIdCacheWarmer }
         )
       end
 
       def retrieve(feature_name)
-        key = self.class.index_cache_key(feature_name)
-        feature_id = ::Routemaster::Config.cache_redis.get(key)
-        return unless feature_id
+        cached_feature_lookup(feature_name) do
+          key = self.class.index_cache_key(feature_name)
+          feature_id = ::Routemaster::Config.cache_redis.get(key)
+          return unless feature_id
+          @actor_service.feature.show(feature_id)
+        end
+      rescue ::Routemaster::Errors::ResourceNotFound
+        nil
+      end
+
+      # Automatically configures the rails router to listen for Features with routemaster
+      #
+      # @param route_mapper [ActionDispatch::Routing::Mapper] The rails mapper, 'self' within the `routes.draw` block
+      def configure_rails_router(route_mapper)
+        route_mapper.mount routemaster_app, at: CALLBACK_PATH
+      end
+
+      def self.index_cache_key(feature_name)
+        "determinator_index:#{feature_name}"
+      end
+
+      def self.lookup_cache_key(feature_name)
+        "determinator_cache:#{feature_name}"
+      end
 
-        obj = @routemaster.feature.show(feature_id)
+      private
 
+      def cached_feature_lookup(feature_name)
+        build_feature_from_api_response(
+          @retrieval_cache.fetch(self.class.lookup_cache_key(feature_name)){ yield }
+        )
+      end
+
+      def build_feature_from_api_response(obj)
         Feature.new(
           name:          obj.body.name,
           identifier:    obj.body.identifier,
@@ -56,19 +86,6 @@ module Determinator
           },
           winning_variant: obj.body.winning_variant,
         )
-      rescue ::Routemaster::Errors::ResourceNotFound
-        nil
-      end
-
-      # Automatically configures the rails router to listen for Features with routemaster
-      #
-      # @param route_mapper [ActionDispatch::Routing::Mapper] The rails mapper, 'self' within the `routes.draw` block
-      def configure_rails_router(route_mapper)
-        route_mapper.mount routemaster_app, at: CALLBACK_PATH
-      end
-
-      def self.index_cache_key(feature_name)
-        "determinator_index:#{feature_name}"
       end
     end
   end

data/lib/determinator/version.rb

@@ -1,3 +1,3 @@
 module Determinator
-  VERSION = "0.7.0"
+  VERSION = "0.8.0"
 end

data/lib/rspec/determinator.rb

@@ -0,0 +1,48 @@
+module RSpec
+  module Determinator
+    def self.included(by)
+      by.extend(DSL)
+
+      by.let(:fake_determinator) { FakeControl.new }
+      by.before do
+        allow(Determinator::Control).to receive(:new).and_return(fake_determinator)
+      end
+    end
+
+    module DSL
+      def forced_determination(name, result, only_for: nil)
+        before do
+          fake_determinator.mock_result(
+            name,
+            result,
+            only_for: only_for
+          )
+        end
+      end
+    end
+
+    class FakeControl
+      def initialize
+        @mocked_results = {}
+      end
+
+      def mock_result(name, result, only_for: nil)
+        @mocked_results[name.to_s][only_for || {}] = result
+      end
+
+      def fake_determinate(name, id: nil, guid: nil, constraints: {})
+        constraints[:id] = id if id
+        constraints[:guid] = guid if guid
+
+        return false unless @mocked_results[name.to_s].has_key?(constraints)
+        @mocked_results[name.to_s][constraints]
+      end
+      alias_method :feature_flag_on?, :fake_determinate
+      alias_method :which_variant, :fake_determinate
+    end
+  end
+end
+
+RSpec.configure do |conf|
+  conf.include RSpec::Determinator, :determinator_support
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: determinator
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - JP Hastings-Spital
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-11 00:00:00.000000000 Z
+date: 2017-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: routemaster-drain
@@ -177,11 +177,13 @@ files:
 - lib/determinator/actor_control.rb
 - lib/determinator/control.rb
 - lib/determinator/feature.rb
+- lib/determinator/retrieve/null_cache.rb
 - lib/determinator/retrieve/null_retriever.rb
 - lib/determinator/retrieve/routemaster.rb
 - lib/determinator/retrieve/routemaster_feature_id_cache_warmer.rb
 - lib/determinator/target_group.rb
 - lib/determinator/version.rb
+- lib/rspec/determinator.rb
 homepage: https://github.com/deliveroo/determinator
 licenses:
 - MIT
@@ -207,4 +209,3 @@ signing_key:
 specification_version: 4
 summary: Determine which experiments and features a specific actor should see.
 test_files: []
-has_rdoc: