floodgate 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dfa3da66938d40caf0237a7ea2c66e092948332c
-  data.tar.gz: 00a92131edb02b28a8ed0f6d2a6858f56bdc8320
+  metadata.gz: 77b129e9d0e4ead27720019cd03c5b97a20270d2
+  data.tar.gz: af2b0d06583f2747a038ccbe4640c2ff708d884a
 SHA512:
-  metadata.gz: d0665c1e13d70a8ae8e253509d366ab835fdf143736d03a4ffabfc63c02f9c260470b42a4b7d63db958bacbe8091c0107764e389245bb2f36bf1463e394fb1a7
-  data.tar.gz: 5385f21d8fdeb1e9fc0c11333dbc9437e214a6c1576f42592b4f2cdf9871326f71de4ba91c3e584671471a6605d6517ba21894d508bc346998fc3b82bfdfabe6
+  metadata.gz: 37ef2355c6421b1e6e8cad329ce01be0e54215631dafe761081e3784d6813e3e75bc0a0da21eecd9ef1746a88141aea1a59990e227d7db5f8d0a9042c0dae2eb
+  data.tar.gz: 0b19d251bff0fb95b28f35766f798180e7fe087889a015ebcddaec78a8a76f5785ba32c4886691df36b48f57bf214401a5ec1d19d80a0ed0cc230de65c2c39fa

data/lib/floodgate/client.rb

@@ -0,0 +1,11 @@
+require 'json'
+require 'open-uri'
+
+module Floodgate
+  class Client
+    def self.status(app_id, api_token)
+      # TODO: Handle errors, timeouts, proxies, environments, etc.
+      JSON.parse(open("http://floodgate-api-staging.herokuapp.com/api/v1/apps/#{app_id}/status?token=#{api_token}").read)
+    end
+  end
+end

data/lib/floodgate/config.rb

@@ -0,0 +1,29 @@
+# TODO: Use a real client real soon now, but not now
+require 'open-uri'
+require 'json'
+
+module Floodgate
+  class Config
+    attr_accessor :app_id, :api_token, :filter_traffic, :redirect_url
+
+    def initialize(app_id, api_token)
+      @app_id = app_id
+      @api_token = api_token
+
+      json = Client.status(app_id, api_token)
+
+      @filter_traffic = json['filter_traffic']
+      @redirect_url = json['redirect_url']
+    end
+
+    def redirect?
+      !redirect_url.nil? && !redirect_url.empty?
+    end
+
+    def filter_traffic?(env)
+      filter_traffic
+
+      # TODO: Use env
+    end
+  end
+end

data/lib/floodgate/control.rb

@@ -0,0 +1,33 @@
+module Floodgate
+  class Control
+    attr_accessor :app, :config
+
+    def initialize(app, app_id, api_token)
+      @app = app
+      @config = Config.new(app_id, api_token)
+    end
+
+    def call(env)
+      return app.call(env) unless filter_traffic?(env)
+
+      if redirect?
+        [307, { 'Location' => redirect_url }, []]
+      else
+        [503, {}, ['Application Unavailable']]
+      end
+    end
+
+    def filter_traffic?(env)
+      config.filter_traffic?(env)
+    end
+
+    def redirect?
+      config.redirect?
+    end
+
+    def redirect_url
+      config.redirect_url
+    end
+  end
+end
+

data/lib/floodgate/version.rb

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

data/lib/floodgate.rb

@@ -1,32 +1,5 @@
+require 'floodgate/client'
+require 'floodgate/config'
+require 'floodgate/control'
 require 'floodgate/version'
 
-module Floodgate
-  class Control
-    def initialize(app)
-      @app = app
-    end
-
-    def call(env)
-      return @app.call(env) unless filter_traffic?
-
-      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/lib/floodgate/client_spec.rb

@@ -0,0 +1,38 @@
+require 'spec_helper'
+
+module Floodgate
+  describe Client do
+    let(:json) { Client.status(app_id, api_token) }
+
+    describe '.status' do
+      context 'when the credentials are not valid' do
+        let(:app_id) { 'foo' }
+        let(:api_token) { 'bar' }
+
+        it 'is an error' do
+          expect { json }.to raise_error(OpenURI::HTTPError)
+        end
+      end
+
+      context 'when the credentials are valid' do
+        context 'and traffic filtering is enabled' do
+          let(:app_id) { 'fa5d63bcf3d6b557eee782c9e61e4002' }
+          let(:api_token) { 'da2f2d06c102eea0f1971c2c90936ee3' }
+
+          it 'filter_traffic is true' do
+            expect(json['filter_traffic']).to be_true
+          end
+        end
+
+        context 'and traffic filtering is not enabled' do
+          let(:app_id) { 'cbaeb13b7f63956ef70c382a7a67407d' }
+          let(:api_token) { '349d2b1ee8ec56eb04b909b1eb9993b0' }
+
+          it 'filter_traffic is false' do
+            expect(json['filter_traffic']).to be_false
+          end
+        end
+      end
+    end
+  end
+end

data/spec/lib/floodgate/config_spec.rb

@@ -0,0 +1,43 @@
+require 'spec_helper'
+
+module Floodgate
+  describe Config do
+    before { Client.stub(:status).and_return json }
+
+    let(:json) do
+      {
+        'filter_traffic' => filter_traffic,
+        'redirect_url' => redirect_url
+      }
+    end
+
+    let(:filter_traffic) { false }
+    let(:redirect_url) { nil }
+    let(:app_id) { 'abc123' }
+    let(:api_token) { 'def456' }
+    let(:config) { Config.new(app_id, api_token) }
+
+    context 'when redirect_url is an empty string' do
+      let(:filter_traffic) { false }
+      let(:redirect_url) { '' }
+
+      describe '#redirect?' do
+        it 'is false' do
+          expect(config.redirect?).to be_false
+        end
+      end
+    end
+
+    context 'when a redirect_url is specified' do
+      let(:filter_traffic) { false }
+      let(:redirect_url) { 'someurl' }
+
+      describe '#redirect?' do
+        it 'is true' do
+          expect(config.redirect?).to be_true
+        end
+      end
+    end
+  end
+end
+

data/spec/lib/floodgate/control_spec.rb

@@ -0,0 +1,82 @@
+require 'spec_helper'
+
+module Floodgate
+  describe Control do
+    let(:app) { double().as_null_object }
+    let(:control) { Control.new(app, app_id, api_token) }
+    let(:env) { Hash.new }
+    let(:app_id) { 'abc123' }
+    let(:api_token) { 'def456' }
+    let(:filter_traffic) { false }
+    let(:redirect_url) { 'something' }
+    let(:json) do
+      {
+        'filter_traffic' => filter_traffic,
+        'redirect_url' => redirect_url
+      }
+    end
+
+    before { Client.stub(:status).and_return json }
+
+    describe '#call' do
+      it 'sends :call to the app with the specified environment' do
+        expect(app).to receive(:call).with(env)
+        control.call(env)
+      end
+
+      context 'when the filter_traffic is true' do
+        let(:filter_traffic) { true }
+
+        it 'does not send :call to the app' do
+          expect(app).not_to receive(:call).with(env)
+          control.call(env)
+        end
+
+        context 'when no redirect url is specified' do
+          let(:redirect_url) { nil }
+
+          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 redirect url is specified' do
+          let(:redirect_url) { 'someurl' }
+
+          it 'redirects with a temporary redirect status' do
+            expect(control.call(env)[0]).to eq(307)
+          end
+
+          it 'has a location set to the maintenance page' do
+            expect(control.call(env)[1]['Location']).to eq('someurl')
+          end
+        end
+      end
+    end
+
+    describe '#filter_traffic?' do
+      it 'delegates to config' do
+        expect(control.config).to receive(:filter_traffic?).with(env).and_return 'some boolean value'
+        expect(control.filter_traffic?(env)).to eq 'some boolean value'
+      end
+    end
+
+    describe '#redirect?' do
+      it 'delegates to config' do
+        expect(control.config).to receive(:redirect?).and_return 'some boolean value'
+        expect(control.redirect?).to eq 'some boolean value'
+      end
+    end
+
+    describe '#redirect_url' do
+      it 'delegates to config' do
+        expect(control.config).to receive(:redirect_url).and_return 'someurl'
+        expect(control.redirect_url).to eq 'someurl'
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: floodgate
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Mark McEahern
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-17 00:00:00.000000000 Z
+date: 2014-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -70,8 +70,13 @@ files:
 - Rakefile
 - floodgate.gemspec
 - lib/floodgate.rb
+- lib/floodgate/client.rb
+- lib/floodgate/config.rb
+- lib/floodgate/control.rb
 - lib/floodgate/version.rb
-- spec/floodgate_spec.rb
+- spec/lib/floodgate/client_spec.rb
+- spec/lib/floodgate/config_spec.rb
+- spec/lib/floodgate/control_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/adorableio/floodgate
 licenses:
@@ -98,5 +103,7 @@ signing_key:
 specification_version: 4
 summary: floodgate helps you control access to your app
 test_files:
-- spec/floodgate_spec.rb
+- spec/lib/floodgate/client_spec.rb
+- spec/lib/floodgate/config_spec.rb
+- spec/lib/floodgate/control_spec.rb
 - spec/spec_helper.rb

data/spec/floodgate_spec.rb

@@ -1,111 +0,0 @@
-require 'spec_helper'
-
-module Floodgate
-  describe Control do
-    let(:app) { double().as_null_object }
-    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)
-        control.call(env)
-      end
-
-      context 'when the floodgate is closed' do
-        before { ENV['FLOODGATE_FILTER_TRAFFIC'] = 'closed' }
-
-        let(:control) { described_class.new(app) }
-
-        it 'does not send :call to the app' do
-          expect(app).not_to receive(:call).with(env)
-          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' }
-
-          it 'redirects with a temporary redirect status' do
-            expect(control.call(env)[0]).to eq(307)
-          end
-
-          it 'has a location set to the maintenance page' do
-            expect(control.call(env)[1]['Location']).to eq('someurl')
-          end
-        end
-      end
-    end
-
-    describe '#filter_traffic?' do
-      it 'returns false by default' do
-        expect(control.filter_traffic?).to eq(false)
-      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