determinator 2.3.0 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64d1088dbb10e6ed41b2d1b03f381eb97ad45ffeeb44d44cbb4cd86c16f37eab
-  data.tar.gz: 051e42e160577f2d18bbe400ef65316a72e7208aa04fb7afdb56593ff675d347
+  metadata.gz: '08378908b45b61bc3c88232e1e480db1200acfe98d3b42dfd10e27420067b5e8'
+  data.tar.gz: ee822d9401d3c8a0019ae45ecdebd1f2becd56e7081764dd92ecbba9a30b6fa5
 SHA512:
-  metadata.gz: ad601db1e2572791c02d691407d7f70e8a7c089b80d81308cb3249b69f2d74e62821b0a3019115abca8468dd20de845005f3a65ef0a03718e3d8ef2497deb373
-  data.tar.gz: db770901187876e66202799c2672cb991e0856d26ff87ace117e2d33637421d4b6103833bec91ec1708c6376421727a27be20a0f116acfd9e94c9ab21fc8e309
+  metadata.gz: '0288df451ba45366adfb9ffb1f76147c0e565ee647d278f00b23877490cdbb7ebd4fd1b832e46f3812616894d576ee285f509df67e54a68a69415ce6370bfc65'
+  data.tar.gz: 93cc9692b60bc97bfcf629995bfd38afdbf00161864bec8b5b15568a0b409470d17b52ad1673270444afd7080ff857b10605cea4c0d733b41fbb633a8bf13dd5

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# v2.3.1 (2019-05-25)
+
+Feature:
+- Add a flag `cache_missing[true]` to the cache wrapper to control the cache behaviour on 404
+
+Bug fix:
+- Ensure errors are not cached by the cache wrapper
+
 # v2.3.0 (2019-09-06)
 
 Feature:

data/lib/determinator.rb

@@ -4,6 +4,9 @@ require 'determinator/feature'
 require 'determinator/target_group'
 require 'determinator/cache/fetch_wrapper'
 require 'determinator/serializers/json'
+require 'determinator/missing_response'
+require 'determinator/error_response'
+
 
 module Determinator
   class << self

data/lib/determinator/cache/fetch_wrapper.rb

@@ -4,7 +4,8 @@ module Determinator
       # @param *caches [ActiveSupport::Cache] If a list then the head of the the
       # list should will be checked before the  tail. If the head is empty but
       # the tail is not then the head will be filled with the value of the tail.
-      def initialize(*caches)
+      def initialize(*caches, cache_missing: true)
+        @cache_missing = cache_missing
         @caches = caches
       end
 
@@ -12,11 +13,15 @@ module Determinator
       # any cache, otherwise popularing each cache with the value of yield.
       def call(feature_name)
         value = read_and_upfill(feature_name)
-        # nil is an acceptable value in the case of a missing feature definition
-        return nil if value.nil?
-        return value if value != false
+
+        # if the value is missing and we cache it, return the missing response
+        return value if value.is_a?(MissingResponse) && @cache_missing
+
+        #otherwise only return the non nil/notice_missing_feature value
+        return value if !value.nil? && !(value.is_a?(MissingResponse) && !@cache_missing)
 
         value_to_write = yield
+        return value_to_write if value_to_write.is_a?(ErrorResponse)
         @caches.each do |cache|
           cache.write(key(feature_name), value_to_write)
         end
@@ -39,8 +44,7 @@ module Determinator
       # in that list will be backfilled.
       #
       # @param url [String] a feature name
-      # @return [false, nil, Feature] false when no value is found, otherwise
-      # the value stored in the cache (including nil)
+      # @return [Feature, MissingResponse] nil when no value is found
       def read_and_upfill(feature_name)
         @caches.each.with_index do |cache, index|
           if cache.exist?(key(feature_name))
@@ -51,7 +55,7 @@ module Determinator
             return value
           end
         end
-        return false
+        return nil
       end
     end
   end

data/lib/determinator/control.rb

@@ -62,7 +62,7 @@ module Determinator
     def determinate_and_notice(name, id:, guid:, properties:)
       feature = Determinator.with_retrieval_cache(name) { retrieval.retrieve(name) }
 
-      if feature.nil?
+      if feature.nil? || feature.is_a?(ErrorResponse) || feature.is_a?(MissingResponse)
         Determinator.notice_missing_feature(name)
         return false
       end

data/lib/determinator/error_response.rb

@@ -0,0 +1,3 @@
+module Determinator
+  class ErrorResponse; end
+end

data/lib/determinator/missing_response.rb

@@ -0,0 +1,3 @@
+module Determinator
+  class MissingResponse; end
+end

data/lib/determinator/retrieve/dynaconf.rb

@@ -17,10 +17,11 @@ module Determinator
 
       def retrieve(feature_id)
         response = get(feature_id)
-        Determinator::Serializers::JSON.load(response.body) if response.status == 200
+        return Determinator::Serializers::JSON.load(response.body) if response.status == 200
+        return MissingResponse.new if response.status == 404
       rescue => e
         Determinator.notice_error(e)
-        nil
+        ErrorResponse.new
       end
 
       private

data/lib/determinator/retrieve/file.rb

@@ -13,11 +13,11 @@ module Determinator
 
       def retrieve(feature_id)
         feature = @root.join(feature_id.to_s)
-        return unless feature.exist?
+        return MissingResponse.new unless feature.exist?
         @serializer.load(feature.read)
       rescue => e
         Determinator.notice_error(e)
-        nil
+        ErrorResponse.new
       end
     end
   end

data/lib/determinator/retrieve/http_retriever.rb

@@ -10,13 +10,12 @@ module Determinator
       end
 
       def retrieve(name)
-        begin
-          response = @connection.get("/features/#{name}")
-          return Determinator::Serializers::JSON.load(response.body) if response.status == 200
-        rescue => e
-          Determinator.notice_error(e)
-        end
-        nil
+        response = @connection.get("/features/#{name}")
+        return Determinator::Serializers::JSON.load(response.body) if response.status == 200
+        return MissingResponse.new if response.status == 404
+      rescue => e
+        Determinator.notice_error(e)
+        ErrorResponse.new
       end
 
       # Returns a feature name given a actor-tracking url. Used so we are able

data/lib/determinator/version.rb

@@ -1,3 +1,3 @@
 module Determinator
-  VERSION = '2.3.0'
+  VERSION = '2.3.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: determinator
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.1
 platform: ruby
 authors:
 - JP Hastings-Spital
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-12 00:00:00.000000000 Z
+date: 2019-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -194,7 +194,9 @@ files:
 - lib/determinator/actor_control.rb
 - lib/determinator/cache/fetch_wrapper.rb
 - lib/determinator/control.rb
+- lib/determinator/error_response.rb
 - lib/determinator/feature.rb
+- lib/determinator/missing_response.rb
 - lib/determinator/retrieve/dynaconf.rb
 - lib/determinator/retrieve/file.rb
 - lib/determinator/retrieve/http_retriever.rb
@@ -223,7 +225,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.7.9
 signing_key: 
 specification_version: 4
 summary: Determine which experiments and features a specific actor should see.