Move DEFAULT_THRESHOLD into the data store

lib/stoplight.rb

@@ -17,9 +17,6 @@ module Stoplight
   # @return [Gem::Version]
   VERSION = Gem::Version.new('0.2.1')
 
-  # @return [Integer]
-  DEFAULT_THRESHOLD = 3
-
   @data_store = DataStore::Memory.new
   @notifiers = [Notifier::StandardError.new]
 
@@ -47,11 +44,5 @@ def red?(name)
     def yellow?(name)
       data_store.color(name) == DataStore::COLOR_YELLOW
     end
-
-    # @param name [String]
-    # @return [Integer]
-    def threshold(name)
-      data_store.threshold(name) || DEFAULT_THRESHOLD
-    end
   end
 end

lib/stoplight/data_store.rb

@@ -23,5 +23,8 @@ module DataStore
 
     # @return [Integer]
     DEFAULT_TIMEOUT = 5 * 60
+
+    # @return [Integer]
+    DEFAULT_THRESHOLD = 3
   end
 end

lib/stoplight/data_store/base.rb

@@ -106,7 +106,7 @@ def _color(failures, state, threshold, timeout)
         return COLOR_GREEN if state == STATE_LOCKED_GREEN
         return COLOR_RED if state == STATE_LOCKED_RED
 
-        threshold = threshold ? threshold.to_i : Stoplight::DEFAULT_THRESHOLD
+        threshold = threshold ? threshold.to_i : DEFAULT_THRESHOLD
         return COLOR_GREEN if failures.size < threshold
 
         # If the threshold is 0, the light is always red.

lib/stoplight/data_store/memory.rb

@@ -71,7 +71,7 @@ def set_state(name, state)
       # @group Threshold
 
       def threshold(name)
-        all_thresholds[name]
+        all_thresholds[name] || DEFAULT_THRESHOLD
       end
 
       def set_threshold(name, threshold)

lib/stoplight/data_store/redis.rb

@@ -84,8 +84,8 @@ def set_state(name, state)
       # @group Threshold
 
       def threshold(name)
-        value = @redis.hget(thresholds_key, name)
-        Integer(value) if value
+        threshold = @redis.hget(thresholds_key, name)
+        threshold ? threshold.to_i : DEFAULT_THRESHOLD
       end
 
       def set_threshold(name, threshold)

lib/stoplight/light.rb

@@ -85,7 +85,7 @@ def red?
     end
 
     def threshold
-      Stoplight.threshold(name)
+      Stoplight.data_store.threshold(name)
     end
 
     def timeout

spec/stoplight/light_spec.rb

@@ -27,7 +27,8 @@
     subject(:result) { light.run }
 
     it 'syncs settings' do
-      expect(Stoplight.data_store.threshold(name)).to be nil
+      expect(Stoplight.data_store.threshold(name)).to eql(
+         Stoplight::DataStore::DEFAULT_THRESHOLD)
       result
       expect(Stoplight.data_store.threshold(name)).to eql(
         light.threshold)
@@ -249,7 +250,7 @@
     subject(:result) { light.threshold }
 
     it 'uses the default threshold' do
-      expect(result).to eql(Stoplight::DEFAULT_THRESHOLD)
+      expect(result).to eql(Stoplight::DataStore::DEFAULT_THRESHOLD)
     end
   end
 end

spec/stoplight_spec.rb

@@ -101,7 +101,7 @@
 
     context 'with failures' do
       before do
-        described_class.threshold(name).times do
+        described_class.data_store.threshold(name).times do
           described_class.data_store.record_failure(name, nil)
         end
       end
@@ -137,22 +137,4 @@
       end
     end
   end
-
-  describe '.threshold' do
-    subject(:result) { described_class.threshold(name) }
-
-    it 'uses the default threshold' do
-      expect(result).to eql(Stoplight::DEFAULT_THRESHOLD)
-    end
-
-    context 'with a custom threshold' do
-      let(:threshold) { rand(10) }
-
-      before { described_class.data_store.set_threshold(name, threshold) }
-
-      it 'uses the threshold' do
-        expect(result).to eql(threshold)
-      end
-    end
-  end
 end

spec/support/data_store.rb

@@ -163,7 +163,7 @@
       subject(:result) { data_store.threshold(name) }
 
       it 'returns nil' do
-        expect(result).to eql(nil)
+        expect(result).to eql(Stoplight::DataStore::DEFAULT_THRESHOLD)
       end
 
       context 'with a threshold' do