floodgate 0.0.3 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd92ed8bca5cd54cc2257216a08d972fb94fac97
-  data.tar.gz: ef4911f7b3b5157311858f53b3d467257aef4839
+  metadata.gz: dfa3da66938d40caf0237a7ea2c66e092948332c
+  data.tar.gz: 00a92131edb02b28a8ed0f6d2a6858f56bdc8320
 SHA512:
-  metadata.gz: 7fc5ed1de91f72b9fa1cc0f9d23d9ba1cf963d243749f8810120c0704c4c33d20be13b811e50741e9397202d1b362d1bfaff6fdc3bb40cc63d837975973b8b07
-  data.tar.gz: 2f43f2f36d0a0829900349c5ea2f36a1d9fdbab3d477afead0d2cb1b4ad329cee9999a0a46b8d3978a5eada4267ace8184e1974e4b8de232931456193504b908
+  metadata.gz: d0665c1e13d70a8ae8e253509d366ab835fdf143736d03a4ffabfc63c02f9c260470b42a4b7d63db958bacbe8091c0107764e389245bb2f36bf1463e394fb1a7
+  data.tar.gz: 5385f21d8fdeb1e9fc0c11333dbc9437e214a6c1576f42592b4f2cdf9871326f71de4ba91c3e584671471a6605d6517ba21894d508bc346998fc3b82bfdfabe6

data/lib/floodgate/version.rb

@@ -1,3 +1,3 @@
 module Floodgate
-  VERSION = "0.0.3"
+  VERSION = "0.0.7"
 end

data/lib/floodgate.rb

@@ -6,18 +6,27 @@ module Floodgate
       @app = app
     end
 
-    def filter_traffic?(env)
-      !env['FLOODGATE_FILTER_TRAFFIC'].nil?
-    end
-
     def call(env)
-      return @app.call(env) unless filter_traffic?(env)
+      return @app.call(env) unless filter_traffic?
 
-      if maintenance_url = env['MAINTENANCE_PAGE_URL']
-        [307, { 'Location' => maintenance_url }, []]
+      if redirect?
+        [307, { 'Location' => redirect_url }, []]
       else
         [503, {}, ['Application Unavailable']]
       end
     end
+
+    def filter_traffic?
+      !(ENV['FLOODGATE_FILTER_TRAFFIC'].nil? || ENV['FLOODGATE_FILTER_TRAFFIC'] == '')
+    end
+
+    def redirect?
+      !(redirect_url.nil? || redirect_url == '')
+    end
+
+    def redirect_url
+      ENV['MAINTENANCE_PAGE_URL']
+    end
+
   end
 end

data/spec/floodgate_spec.rb

@@ -6,6 +6,16 @@ module Floodgate
     let(:control) { described_class.new(app) }
     let(:env) { Hash.new }
 
+    before do
+      ENV['FLOODGATE_FILTER_TRAFFIC'] = ''
+      ENV['MAINTENANCE_PAGE_URL'] = ''
+    end
+
+    after do
+      ENV['FLOODGATE_FILTER_TRAFFIC'] = ''
+      ENV['MAINTENANCE_PAGE_URL'] = ''
+    end
+
     describe '#call' do
       it 'sends :call to the app with the specified environment' do
         expect(app).to receive(:call).with(env)
@@ -13,7 +23,7 @@ module Floodgate
       end
 
       context 'when the floodgate is closed' do
-        before { env['FLOODGATE_FILTER_TRAFFIC'] = 'closed' }
+        before { ENV['FLOODGATE_FILTER_TRAFFIC'] = 'closed' }
 
         let(:control) { described_class.new(app) }
 
@@ -22,8 +32,20 @@ module Floodgate
           control.call(env)
         end
 
+        context 'when no maintenance page is specified in the environment' do
+          before { ENV['MAINTENANCE_PAGE_URL'] = '' }
+
+          it 'responds with a status of service unavailable' do
+            expect(control.call(env)[0]).to eq(503)
+          end
+
+          it 'has an appropriate message in the response' do
+            expect(control.call(env)[2]).to eq(['Application Unavailable'])
+          end
+        end
+
         context 'when a maintenance page is specified in the environment' do
-          before { env['MAINTENANCE_PAGE_URL'] = 'someurl' }
+          before { ENV['MAINTENANCE_PAGE_URL'] = 'someurl' }
 
           it 'redirects with a temporary redirect status' do
             expect(control.call(env)[0]).to eq(307)
@@ -33,17 +55,57 @@ module Floodgate
             expect(control.call(env)[1]['Location']).to eq('someurl')
           end
         end
+      end
+    end
 
-        context 'when no maintenance page is specified in the environment' do
-          it 'responds with a status of service unavailable' do
-            expect(control.call(env)[0]).to eq(503)
-          end
+    describe '#filter_traffic?' do
+      it 'returns false by default' do
+        expect(control.filter_traffic?).to eq(false)
+      end
 
-          it 'has an appropriate message in the response' do
-            expect(control.call(env)[2]).to eq(['Application Unavailable'])
-          end
+      context 'when traffic filtering is enabled in the environment' do
+        before { ENV['FLOODGATE_FILTER_TRAFFIC'] = 'closed' }
+
+        it 'returns true' do
+          expect(control.filter_traffic?).to eq(true)
+        end
+
+        after { ENV['FLOODGATE_FILTER_TRAFFIC'] = nil }
+      end
+    end
+
+    describe '#redirect?' do
+      it 'is false by default' do
+        expect(control.redirect?).to eq(false)
+      end
+
+      context 'when the redirect url is an empty string' do
+        before { control.stub(:redirect_url).and_return '' }
+
+        it 'is false' do
+          expect(control.redirect?).to eq(false)
+        end
+      end
+
+      context 'when the redirect url is a string' do
+        before { control.stub(:redirect_url).and_return 'someurl' }
+
+        it 'is true' do
+          expect(control.redirect?).to eq(true)
         end
       end
     end
+
+    describe '#redirect_url' do
+      context 'when a maintenance page is specified in the environment' do
+        before { ENV['MAINTENANCE_PAGE_URL'] = 'someurl' }
+
+        it 'returns the maintenance page url' do
+          expect(control.redirect_url).to eq('someurl')
+        end
+
+        after { ENV['MAINTENANCE_PAGE_URL'] = '' }
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: floodgate
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.7
 platform: ruby
 authors:
 - Mark McEahern
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-14 00:00:00.000000000 Z
+date: 2014-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake