floodgate 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 57d84b07c086519871b5bc1fc9d9c91bf9345b7e
-  data.tar.gz: 02ef6c3e9fafe9e509be2ba120d7407eb9e33b8d
+  metadata.gz: b9db86194f10be4b4ce921bb9964d0c3600e4b2d
+  data.tar.gz: c9b0fafb0e2455a4db2d5c3629798ce7e5edcb45
 SHA512:
-  metadata.gz: 9e5ce474d5eb2d25ecc39001573cb155d996049a435da1e65b726b0b7d1de93bf76b2b0e20f296a24ec8d20591c583d4a8c61ba094b24221ba105bf8e85158da
-  data.tar.gz: 51649d87130c0bba9e9a0d7f6b9207ad5ef80b9b9389b0dde09da1cbfb04cafab7ed1e371a3d6889b322b893dfffd31261e497438aa39290d9ea92105998abfb
+  metadata.gz: fbd81c3f94ca145f550f6d5e8986e3d19bc6f14f1420b9a6028e2109d0ba51cd03770a8dbdf824616ebd1ca1fb87b1a04f59fc4e36601dd63dbb14006af497b1
+  data.tar.gz: 98ce680b053a23e15d2e5c49faeeb0e1f700c323443491491b879633045611600c0368ef016c79dcc2c18274816b662933f011a93088d3f0d81e8e6b0bcdbb33

data/floodgate.gemspec

@@ -18,6 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
+  spec.add_development_dependency 'pry'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec', '~> 2.14'
   spec.add_development_dependency 'simplecov', '~> 0.8'

data/lib/floodgate/config.rb

@@ -1,10 +1,11 @@
-# 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
+    attr_accessor \
+      :allowed_ip_addresses,
+      :api_token,
+      :app_id,
+      :filter_traffic,
+      :redirect_url
 
     def initialize(app_id, api_token)
       @app_id = app_id
@@ -14,16 +15,19 @@ module Floodgate
 
       @filter_traffic = json['filter_traffic']
       @redirect_url = json['redirect_url']
+      @allowed_ip_addresses = json['allowed_ip_addresses'] || []
     end
 
-    def redirect?
-      !redirect_url.nil? && !redirect_url.empty?
+    def ip_address_allowed?(ip_address)
+      allowed_ip_addresses.include?(ip_address)
     end
 
     def filter_traffic?(env)
-      filter_traffic
+      filter_traffic && !ip_address_allowed?(env['REMOTE_ADDR'])
+    end
 
-      # TODO: Use env
+    def redirect?
+      !redirect_url.nil? && !redirect_url.empty?
     end
   end
 end

data/lib/floodgate/version.rb

@@ -1,3 +1,3 @@
 module Floodgate
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

data/spec/lib/floodgate/config_spec.rb

@@ -6,33 +6,126 @@ module Floodgate
 
     let(:json) do
       {
+        'allowed_ip_addresses' => allowed_ip_addresses,
         'filter_traffic' => filter_traffic,
-        'redirect_url' => redirect_url
+        'redirect_url' => redirect_url,
       }
     end
 
+    let(:allowed_ip_addresses) { [] }
     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 '#ip_address_allowed?' do
+      context 'when the allowed ip address list is nil' do
+        let(:allowed_ip_addresses) { nil }
+        let(:ip_address) { '127.0.0.1' }
 
-      describe '#redirect?' do
         it 'is false' do
-          expect(config.redirect?).to be_false
+          expect(config.ip_address_allowed?(ip_address)).to be_false
+        end
+      end
+
+      context 'when the allowed ip address list is empty' do
+        let(:allowed_ip_addresses) { [] }
+        let(:ip_address) { '127.0.0.1' }
+
+        it 'is false' do
+          expect(config.ip_address_allowed?(ip_address)).to be_false
+        end
+      end
+
+      context 'when there are allowed ip addresses' do
+        let(:allowed_ip_addresses) { %w(198.81.129.107) }
+
+        context 'and the specified ip address is in the list' do
+          let(:ip_address) { '198.81.129.107' }
+
+          it 'is true' do
+            expect(config.ip_address_allowed?(ip_address)).to be_true
+          end
+        end
+
+        context 'but the specified ip address is not in the list' do
+          let(:ip_address) { '198.81.129.108' }
+
+          it 'is false' do
+            expect(config.ip_address_allowed?(ip_address)).to be_false
+          end
         end
       end
     end
 
-    context 'when a redirect_url is specified' do
-      let(:filter_traffic) { false }
-      let(:redirect_url) { 'someurl' }
+    describe '#filter_traffic?' do
+      context 'when filter_traffic is false' do
+        let(:filter_traffic) { false }
+        let(:env) { Hash.new }
+
+        it 'is false' do
+          expect(config.filter_traffic?(env)).to be_false
+        end
+      end
+
+      context 'when filter_traffic is true' do
+        let(:filter_traffic) { true }
+
+        context 'and the ip address is not allowed' do
+          let(:env) do
+            {
+              'REMOTE_ADDR' => '192.168.0.1'
+            }
+          end
+
+          let(:allowed_ip_addresses) { %w(127.0.0.1) }
+
+          it 'is true' do
+            expect(config.filter_traffic?(env)).to be_true
+          end
+        end
+
+        context 'and the ip address is allowed' do
+          let(:env) do
+            {
+              'REMOTE_ADDR' => '127.0.0.1'
+            }
+          end
+
+          let(:allowed_ip_addresses) { %w(127.0.0.1) }
+
+          it 'is false' do
+            expect(config.filter_traffic?(env)).to be_false
+          end
+        end
+      end
+    end
+
+    describe '#redirect?' do
+      context 'when redirect_url is nil' do
+        let(:filter_traffic) { false }
+        let(:redirect_url) { nil }
+
+        it 'is false' do
+          expect(config.redirect?).to be_false
+        end
+      end
+
+      context 'when redirect_url is an empty string' do
+        let(:filter_traffic) { false }
+        let(:redirect_url) { '' }
+
+        it 'is false' do
+          expect(config.redirect?).to be_false
+        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

data/spec/lib/floodgate/control_spec.rb

@@ -5,12 +5,17 @@ module Floodgate
     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(:allowed_ip_addresses) { nil }
     let(:filter_traffic) { false }
     let(:redirect_url) { 'something' }
+
     let(:json) do
       {
+        'allowed_ip_addresses' => allowed_ip_addresses,
         'filter_traffic' => filter_traffic,
         'redirect_url' => redirect_url
       }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: floodgate
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Mark McEahern
@@ -11,6 +11,20 @@ bindir: bin
 cert_chain: []
 date: 2014-02-26 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement