geo_redirect 0.4 → 0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc53d6e770a29fb9a25ad601803bc220e9de5595
-  data.tar.gz: ce7e9473fb1a032807256e361c72811ef06856c8
+  metadata.gz: 82d54b2c77fe8c90bc209fd0adcb1b01815a1cad
+  data.tar.gz: 3928b90c6060facb3365babf3b9222da9e31fec3
 SHA512:
-  metadata.gz: 4b82b53e72d1ac2f59562433e6f4f30033115692484049253991507aa3871c4030751f382020976fda8b945425c9df93d7957a58534fa1f065b5e7f13b9b998e
-  data.tar.gz: 467773cacba033e14b1f0ee811fc420095e9f650d7239db8caf10a6bc0ebf4948fb967a5fde8e6096b8d8223624d08d4c732047e2194efa5198ab85dbf8c5326
+  metadata.gz: 7571edc045457947731740163892ea1ce6b4ce957167d87f564eb605154aadb3823a03fc44d1e665491a843ed8c7c3ddc5d8d8c7732a4e22f230927b1f85e931
+  data.tar.gz: 5b802714a2b3b312ec50b43bf37052717083ab45b3f8fb373f2db979a19ce2dff39ef8fb54e57e534887d4ed432c62103d5b3c1fa83fa74e2aec75194e685003

data/.gitignore

@@ -15,3 +15,6 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.idea
+.ruby-gemset
+.ruby-version

data/.rubocop.yml

@@ -7,10 +7,29 @@ Metrics/MethodLength:
   Max: 15
 
 Metrics/ClassLength:
-  Max: 154
+  Max: 170
 
 Style/RescueModifier:
   Enabled: false
 
 Style/RegexpLiteral:
   Enabled: false
+
+RSpec/InstanceVariable:
+  Enabled: false
+
+Style/BlockDelimiters:
+  Exclude:
+    - 'spec/**/*'
+
+Style/BlockEndNewline:
+  Exclude:
+    - 'spec/**/*'
+
+Style/MultilineBlockLayout:
+  Exclude:
+    - 'spec/**/*'
+
+RSpec/DescribeClass:
+  Exclude:
+    - 'spec/lib/tasks/*'

data/.travis.yml

@@ -1,4 +1,13 @@
+sudo: false
+cache: bundler
 language: ruby
 rvm:
-  - 2.0.0
   - 1.9.3
+  - 2.0.0
+  - 2.1
+  - 2.2
+  - jruby-19mode
+  - jruby-9.0.0.0
+before_install: gem update --remote bundler
+script:
+  - bundle exec rake ci

data/README.md

@@ -90,6 +90,22 @@ and unzip it into `db/` in your project, **or** you could use the following
 It'd be a good idea to use this task on your (Capistrano or whatever) deployment
 scripts.
 
+### Excluding certain URLs from redirection
+
+You may want certain URLs in your app to be ignored by GeoRedirect and to 
+respond normally to *all* incoming requests. You can configure this with the 
+`:exclude` option. 
+
+    Rails.application.middleware.use GeoRedirect::Middleware, exclude: '/excluded_path'
+    
+The value of the option can be a string or an array of strings which represent 
+the path(s) to be excluded. Note that each string must be an exact match of the 
+path portion of the URL, including the leading slash.
+
+    Rails.application.middleware.use GeoRedirect::Middleware, exclude: '/exclude'
+    
+will match `www.myapp.com/exclude` but not `www.myapp.com/other/path/exclude`
+
 ### Custom paths
 
 The default paths for these files are:

data/Rakefile

@@ -1,6 +1,9 @@
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
+require 'rubocop/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
+RuboCop::RakeTask.new(:style)
 
-task default: [:spec]
+task ci: [:spec, :style]
+task default: [:ci]

data/geo_redirect.gemspec

@@ -4,21 +4,24 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'geo_redirect/version'
 
 Gem::Specification.new do |gem|
-  gem.name          = 'geo_redirect'
-  gem.version       = GeoRedirect::VERSION
-  gem.authors       = ['Sagie Maoz']
-  gem.email         = ['sagie@waze.com']
-  gem.description   = 'Geo-location based redirector'
-  gem.summary       = 'Rack middleware to redirect clients to hostnames based on geo-location'
-  gem.homepage      = ''
+  gem.name        = 'geo_redirect'
+  gem.version     = GeoRedirect::VERSION
+  gem.authors     = ['Sagie Maoz']
+  gem.email       = ['sagie@waze.com']
+  gem.description = 'Geo-location based redirector'
+  gem.summary =
+    'Rack middleware to redirect clients to hostnames based on geo-location'
+  gem.homepage = ''
 
   gem.add_dependency 'rake'
   gem.add_dependency 'geoip'
 
-  gem.add_development_dependency 'rspec',     '~> 3.1.0'
-  gem.add_development_dependency 'rack',      '~> 1.6.0'
-  gem.add_development_dependency 'rack-test', '~> 0.6.3'
-  gem.add_development_dependency 'simplecov', '~> 0.9.1'
+  gem.add_development_dependency 'rspec',           '~> 3.1.0'
+  gem.add_development_dependency 'rack',            '~> 1.6.0'
+  gem.add_development_dependency 'rack-test',       '~> 0.6.3'
+  gem.add_development_dependency 'simplecov',       '~> 0.9.1'
+  gem.add_development_dependency 'rubocop',         '~> 0.33.0'
+  gem.add_development_dependency 'rubocop-rspec',   '~> 1.3.0'
 
   gem.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   gem.executables   = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }

data/lib/geo_redirect/middleware.rb

@@ -7,14 +7,15 @@ module GeoRedirect
 
     def initialize(app, options = {})
       # Some defaults
-      options[:db]     ||= DEFAULT_DB_PATH
+      options[:db] ||= DEFAULT_DB_PATH
       options[:config] ||= DEFAULT_CONFIG_PATH
 
       @app = app
 
-      @logger = init_logger(options[:logfile]) if options[:logfile]
-      @db     = init_db(options[:db])
-      @config = init_config(options[:config])
+      @logger   = init_logger(options[:logfile]) if options[:logfile]
+      @db       = init_db(options[:db])
+      @config   = init_config(options[:config])
+      @excludes = Array(options[:exclude])
 
       log 'Initialized middleware'
     end
@@ -60,9 +61,17 @@ module GeoRedirect
 
     def skip_redirect?
       url = URI.parse(@request.url)
+      query_includes_skip_geo?(url) || path_excluded?(url)
+    end
+
+    def query_includes_skip_geo?(url)
       Rack::Utils.parse_query(url.query).key? 'skip_geo'
     end
 
+    def path_excluded?(url)
+      @excludes.any? { |exclude| url.path == exclude }
+    end
+
     def handle_force
       url = URI.parse(@request.url)
       host = host_by_hostname(url.host)
@@ -173,10 +182,10 @@ module GeoRedirect
       ip = request_ip
       log "Handling GeoIP lookup: IP #{ip}"
 
-      res  = @db.country(ip)
-      code = res[:country_code]
+      country = @db.country(ip)
+      code = country[:country_code]
 
-      res[:country_code2] unless code.nil? || code.zero?
+      country[:country_code2] unless code.nil? || code.zero?
     end
 
     def redirect_url(hostname)
@@ -199,7 +208,7 @@ module GeoRedirect
     def should_redirect?(hostname, same_host)
       return true if hostname.nil? || same_host
 
-      hostname_ends_with = %r{#{hostname.gsub(".", "\.")}$}
+      hostname_ends_with = %r{#{hostname.tr('.', '\.')}$}
       (@request.host =~ hostname_ends_with).nil?
     end
   end

data/lib/geo_redirect/version.rb

@@ -1,3 +1,3 @@
 module GeoRedirect
-  VERSION = '0.4'
+  VERSION = '0.5'
 end

data/spec/lib/geo_redirect/middleware_spec.rb

@@ -0,0 +1,267 @@
+require 'spec_helper'
+require 'tempfile'
+require 'logger'
+
+describe GeoRedirect::Middleware do
+  include GeoRedirect::Support
+  include Rack::Test::Methods
+
+  let(:config) { YAML.load_file(fixture_path('config.yml')) }
+
+  describe '#load_config' do
+    it 'reads a config file' do
+      mock_app
+      expect(@app.config).to eq(config)
+    end
+
+    it 'errors on not-found config file' do
+      mock_app config: nonexisting_file_path
+      log_should_include('ERROR')
+      log_should_include('Could not load GeoRedirect config YML file')
+    end
+
+    it 'errors on a mal-formatted config file' do
+      mock_app config: fixture_path('config.bad.yml')
+      log_should_include('ERROR')
+      log_should_include('Could not load GeoRedirect config YML file')
+    end
+  end
+
+  describe '#load_db' do
+    it 'reads a db file' do
+      mock_app
+      expect(@app.db).to be_a(GeoIP)
+    end
+
+    it 'errors on not-found db file' do
+      mock_app db: nonexisting_file_path
+      log_should_include('ERROR')
+      log_should_include('Could not load GeoIP database file.')
+    end
+
+    # this example is disabled, as it seems that
+    # GeoIP does not let me know if a db file is proper.
+    #     it "errors on mal-formatted db file" do
+    #       pending "GeoIP does not raise on bad files"
+    #       mock_app :db => fixture_path("config.yml")
+    #       log_should_include("ERROR")
+    #       log_should_include("Could not load GeoIP database file.")
+    #     end
+  end
+
+  describe '#log' do
+    describe 'with valid logfile path' do
+      before { mock_app }
+
+      it 'initiates a log file' do
+        expect(@app.instance_variable_get(:"@logger")).to be_kind_of Logger
+      end
+
+      it 'prints to log file' do
+        message = 'Testing GeoRedirect logger'
+        @app.send(:log, [message])
+        log_should_include(message)
+      end
+    end
+
+    it 'ignores invalid logfile path' do
+      mock_app logfile: '/no_such_file'
+      expect(@app.instance_variable_get(:"@logger")).to be_nil
+    end
+  end
+
+  describe '#host_by_country' do
+    before { mock_app }
+    subject { @app.host_by_country(country) }
+
+    context 'when country is valid' do
+      let(:country) { 'US' }
+      it { is_expected.to eq(:us) }
+    end
+
+    context 'when country is invalid' do
+      let(:country) { 'WHATEVER' }
+      it { is_expected.to eq(:default) }
+    end
+  end
+
+  describe 'host_by_hostname' do
+    before { mock_app }
+    subject { @app.host_by_hostname(hostname) }
+
+    context 'when hostname is valid' do
+      let(:hostname) { 'biz.waze.co.il' }
+      it { is_expected.to eq(:il) }
+    end
+
+    context 'when hostname is invalid' do
+      let(:hostname) { 'something.else.org' }
+      it { is_expected.to eq(:default) }
+    end
+  end
+
+  describe 'redirect logic' do
+    let(:app_options) { {} }
+    let(:request_ip) { '5.5.5.5' }
+    let(:request_path) { '/' }
+    let(:request_args) { {} }
+    let(:request_session) { nil }
+    let(:country) { { country_code: 5, country_code2: country_code } }
+    let(:env) do
+      {
+        'REMOTE_ADDR' => request_ip,
+        'HTTP_HOST' => 'biz.waze.co.il',
+        'rack.session' => {
+          'geo_redirect' => request_session,
+          'geo_redirect.country' => (country_code if request_session)
+        }
+      }
+    end
+
+    before do
+      mock_app(app_options)
+      allow(@app.db).to receive(:country).with(request_ip).and_return(country)
+      get request_path, request_args, env
+    end
+
+    subject(:session) { last_request.env['rack.session'] }
+    subject { last_response }
+
+    matcher :redirect_to do |expected|
+      match do |response|
+        url_scheme = last_request.env['rack.url_scheme']
+        url = "#{url_scheme}://#{config[expected][:host]}"
+
+        response.body.include?('Moved Permanently') &&
+          response.status == 301 &&
+          response.headers['Location'].start_with?(url)
+      end
+    end
+
+    matcher :not_redirect do
+      match do |response|
+        response.body.include?('Hello world!') &&
+          response.ok?
+      end
+    end
+
+    matcher :remember do |host|
+      match do
+        session && session['geo_redirect'] == host
+      end
+    end
+
+    matcher :remember_country do |country|
+      match do
+        session && session['geo_redirect.country'] == country
+      end
+    end
+
+    describe 'without session memory' do
+      describe 'for a foreign source' do
+        let(:country_code) { 'US' }
+        it { is_expected.to redirect_to :us }
+        it { is_expected.to remember :us }
+        it { is_expected.to remember_country 'US' }
+      end
+
+      describe 'for a local source' do
+        let(:country_code) { 'IL' }
+        it { is_expected.to not_redirect }
+        it { is_expected.to remember :il }
+        it { is_expected.to remember_country 'IL' }
+      end
+
+      describe 'for an unknown source' do
+        let(:country_code) { 'SOMEWHERE OVER THE RAINBOW' }
+        it { is_expected.to redirect_to :default }
+        it { is_expected.to remember :default }
+        it { is_expected.to remember_country 'SOMEWHERE OVER THE RAINBOW' }
+      end
+    end
+
+    describe 'with valid session memory' do
+      let(:request_session) { :default }
+      let(:country_code) { 'US' }
+      it { is_expected.to redirect_to :default }
+      it { is_expected.to remember :default }
+      it { is_expected.to remember_country 'US' }
+    end
+
+    describe 'with invalid session memory' do
+      let(:request_session) { 'foo' }
+      let(:country_code) { 'US' }
+
+      it 'removes invalid session data' do
+        expect(session['geo_redirect']).not_to eq('foo')
+      end
+
+      it { is_expected.to redirect_to :us }
+      it { is_expected.to remember :us }
+      it { is_expected.to remember_country 'US' }
+    end
+
+    describe 'with forced redirect flag' do
+      let(:country_code) { 'US' }
+      let(:request_args) { { redirect: 1 } }
+
+      it { is_expected.to redirect_to :il }
+      it 'rewrites the flag out' do
+        expect(subject.headers['Location']).not_to include('redirect=1')
+      end
+
+      it { is_expected.to remember :il }
+      it { is_expected.to remember_country nil }
+    end
+
+    describe 'with skip flag' do
+      let(:country_code) { 'US' }
+      let(:request_args) { { skip_geo: true } }
+      it { is_expected.to not_redirect }
+      it { is_expected.to remember nil }
+      it { is_expected.to remember_country nil }
+    end
+
+    describe 'with no recognizable IP' do
+      let(:country_code) { nil }
+      it { is_expected.to not_redirect }
+      it { is_expected.to remember nil }
+      it { is_expected.to remember_country nil }
+    end
+
+    describe 'with an exclude option set' do
+      let(:app_options) { { exclude: ['/exclude_me', '/exclude_me/too'] } }
+
+      context 'when the request URL matches one of the excluded paths' do
+        let(:country_code) { 'US' }
+        let(:request_path) { '/exclude_me?query_param=value' }
+
+        it { is_expected.to not_redirect }
+        it { is_expected.to remember nil }
+        it { is_expected.to remember_country nil }
+      end
+
+      context 'when the request URL does not match one of the excluded paths' do
+        let(:country_code) { 'US' }
+        let(:request_path) { '/dont_exclude_me?query_param=value' }
+
+        it { is_expected.to redirect_to :us }
+        it { is_expected.to remember :us }
+        it { is_expected.to remember_country 'US' }
+      end
+    end
+
+    describe 'with a single excluded path' do
+      let(:app_options) { { exclude: '/exclude_me' } }
+
+      context 'when the request URL matches one of the excluded paths' do
+        let(:country_code) { 'US' }
+        let(:request_path) { '/exclude_me?query_param=value' }
+
+        it { is_expected.to not_redirect }
+        it { is_expected.to remember nil }
+        it { is_expected.to remember_country nil }
+      end
+    end
+  end
+end

data/spec/lib/tasks/geo_redirect_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+describe 'geo_redirect:fetch_db' do
+  include_context 'rake'
+
+  it 'downloads a GeoIP db to a location' do
+    dbfile = Tempfile.new('db')
+    subject.invoke(dbfile.path)
+    expect(dbfile.size).to be > 0
+  end
+end

data/spec/spec_helper.rb

@@ -14,7 +14,6 @@ Dir[File.join(current_dir, 'support/**/*.rb')].each { |f| require f }
 
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
 

data/spec/support/geo_redirect.rb

@@ -34,7 +34,7 @@ module GeoRedirect
 
     def log_should_include(message)
       @logfile.rewind
-      @logfile.read.should include(message)
+      expect(@logfile.read).to include(message)
     end
   end
 end

metadata

@@ -1,99 +1,127 @@
 --- !ruby/object:Gem::Specification
 name: geo_redirect
 version: !ruby/object:Gem::Version
-  version: '0.4'
+  version: '0.5'
 platform: ruby
 authors:
 - Sagie Maoz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-12 00:00:00.000000000 Z
+date: 2015-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: geoip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.3
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.1
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.33.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.33.0
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.0
 description: Geo-location based redirector
 email:
 - sagie@waze.com
@@ -101,10 +129,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .rubocop.yml
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".rubocop.yml"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -118,7 +146,8 @@ files:
 - spec/fixtures/GeoIP.dat
 - spec/fixtures/config.bad.yml
 - spec/fixtures/config.yml
-- spec/geo_redirect_spec.rb
+- spec/lib/geo_redirect/middleware_spec.rb
+- spec/lib/tasks/geo_redirect_spec.rb
 - spec/spec_helper.rb
 - spec/support/geo_redirect.rb
 - spec/support/rake.rb
@@ -131,17 +160,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Rack middleware to redirect clients to hostnames based on geo-location
@@ -149,7 +178,9 @@ test_files:
 - spec/fixtures/GeoIP.dat
 - spec/fixtures/config.bad.yml
 - spec/fixtures/config.yml
-- spec/geo_redirect_spec.rb
+- spec/lib/geo_redirect/middleware_spec.rb
+- spec/lib/tasks/geo_redirect_spec.rb
 - spec/spec_helper.rb
 - spec/support/geo_redirect.rb
 - spec/support/rake.rb
+has_rdoc: 

data/spec/geo_redirect_spec.rb

@@ -1,241 +0,0 @@
-require 'spec_helper'
-require 'tempfile'
-require 'logger'
-
-describe 'geo_redirect' do
-  include GeoRedirect::Support
-  include Rack::Test::Methods
-
-  def session
-    last_request.env['rack.session'] || {}
-  end
-
-  def url_scheme
-    last_request.env['rack.url_scheme']
-  end
-
-  let(:config) { YAML.load_file(fixture_path('config.yml')) }
-
-  describe '#load_config' do
-    it 'reads a config file' do
-      mock_app
-      expect(@app.config).to eq(config)
-    end
-
-    it 'errors on not-found config file' do
-      mock_app config: nonexisting_file_path
-      log_should_include('ERROR')
-      log_should_include('Could not load GeoRedirect config YML file')
-    end
-
-    it 'errors on a mal-formatted config file' do
-      mock_app config: fixture_path('config.bad.yml')
-      log_should_include('ERROR')
-      log_should_include('Could not load GeoRedirect config YML file')
-    end
-  end
-
-  describe '#load_db' do
-    it 'reads a db file' do
-      mock_app
-      expect(@app.db).to be_a(GeoIP)
-    end
-
-    it 'errors on not-found db file' do
-      mock_app db: nonexisting_file_path
-      log_should_include('ERROR')
-      log_should_include('Could not load GeoIP database file.')
-    end
-
-    # this example is disabled, as it seems that
-    # GeoIP does not let me know if a db file is proper.
-    #     it "errors on mal-formatted db file" do
-    #       pending "GeoIP does not raise on bad files"
-    #       mock_app :db => fixture_path("config.yml")
-    #       log_should_include("ERROR")
-    #       log_should_include("Could not load GeoIP database file.")
-    #     end
-  end
-
-  describe '#log' do
-    describe 'with valid logfile path' do
-      before { mock_app }
-
-      it 'initiates a log file' do
-        @app.instance_variable_get(:"@logger").should be_kind_of Logger
-      end
-
-      it 'prints to log file' do
-        message = 'Testing GeoRedirect logger'
-        @app.send(:log, [message])
-        log_should_include(message)
-      end
-    end
-
-    it 'ignores invalid logfile path' do
-      mock_app logfile: '/no_such_file'
-      expect(@app.instance_variable_get(:"@logger")).to be_nil
-    end
-  end
-
-  describe '#host_by_country' do
-    before { mock_app }
-    subject { @app.host_by_country(country) }
-
-    context 'when country is valid' do
-      let(:country) { 'US' }
-      it { is_expected.to eq(:us) }
-    end
-
-    context 'when country is invalid' do
-      let(:country) { 'WHATEVER' }
-      it { is_expected.to eq(:default) }
-    end
-  end
-
-  describe 'host_by_hostname' do
-    before { mock_app }
-    subject { @app.host_by_hostname(hostname) }
-
-    context 'when hostname is valid' do
-      let(:hostname) { 'biz.waze.co.il' }
-      it { is_expected.to eq(:il) }
-    end
-
-    context 'when hostname is invalid' do
-      let(:hostname) { 'something.else.org' }
-      it { is_expected.to eq(:default) }
-    end
-  end
-
-  describe 'redirect logic' do
-    before :each do
-      mock_app
-    end
-
-    def mock_request_from(code, options = {})
-      ip = '5.5.5.5'
-
-      if code.nil?
-        country = nil
-      else
-        country = GeoIP::Country.stub(country_code2: code,
-                                      country_code: 5)
-      end
-      @app.db.stub(:country).with(ip).and_return(country)
-
-      env = { 'REMOTE_ADDR' => ip, 'HTTP_HOST' => 'biz.waze.co.il' }
-
-      if options[:session]
-        env['rack.session'] ||= {}
-        env['rack.session']['geo_redirect'] = options[:session]
-        env['rack.session']['geo_redirect.country'] = code
-      end
-
-      args = {}
-      args[:redirect] = 1 if options[:force]
-      args[:skip_geo] = true if options[:skip]
-
-      get '/', args, env
-    end
-
-    def should_redirect_to(host)
-      last_response.body.should include('Moved Permanently')
-      last_response.status.should eq(301)
-      last_response.headers.should have_key('Location')
-      url = "#{url_scheme}://#{config[host][:host]}"
-      last_response.headers['Location'].should start_with(url)
-    end
-
-    def should_not_redirect
-      last_response.body.should include('Hello world!')
-      last_response.should be_ok
-    end
-
-    def should_remember(host)
-      session['geo_redirect'].should eq(host)
-    end
-
-    def should_remember_country(country)
-      session['geo_redirect.country'].should eq(country)
-    end
-
-    describe 'without session memory' do
-      describe 'for a foreign source' do
-        before { mock_request_from 'US' }
-        it { should_redirect_to :us }
-        it { should_remember :us }
-        it { should_remember_country 'US' }
-      end
-
-      describe 'for a local source' do
-        before { mock_request_from 'IL' }
-        it { should_not_redirect }
-        it { should_remember :il }
-        it { should_remember_country 'IL' }
-      end
-
-      describe 'for an unknown source' do
-        before { mock_request_from 'SOMEWHERE OVER THE RAINBOW' }
-        it { should_redirect_to :default }
-        it { should_remember :default }
-        it { should_remember_country 'SOMEWHERE OVER THE RAINBOW' }
-      end
-    end
-
-    describe 'with valid session memory' do
-      before { mock_request_from 'US', session: :default }
-      it { should_redirect_to :default }
-      it { should_remember :default }
-      it { should_remember_country 'US' }
-    end
-
-    describe 'with invalid session memory' do
-      before { mock_request_from 'US', session: 'foo' }
-
-      it 'removes invalid session data' do
-        expect(session['geo_redirect']).not_to eq('foo')
-      end
-
-      it { should_redirect_to :us }
-      it { should_remember :us }
-      it { should_remember_country 'US' }
-    end
-
-    describe 'with forced redirect flag' do
-      before { mock_request_from 'US', force: true }
-
-      it { should_redirect_to :il }
-      it 'rewrites the flag out' do
-        expect(last_response.headers['Location']).not_to include('redirect=1')
-      end
-
-      it { should_remember :il }
-      it { should_remember_country nil }
-    end
-
-    describe 'with skip flag' do
-      before { mock_request_from 'US', skip: true }
-      it { should_not_redirect }
-      it { should_remember nil }
-      it { should_remember_country nil }
-    end
-
-    describe 'with no recognizable IP' do
-      before { mock_request_from nil }
-      it { should_not_redirect }
-      it { should_remember nil }
-      it { should_remember_country nil }
-    end
-  end
-end
-
-describe 'geo_redirect:fetch_db' do
-  include_context 'rake'
-
-  it 'downloads a GeoIP db to a location' do
-    dbfile = Tempfile.new('db')
-    subject.invoke(dbfile.path)
-    expect(dbfile.size).to be > 0
-  end
-end