hostrich 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa4e3e96a9692ca3bb53ce5408f139c9ed51f1a1
-  data.tar.gz: 170021e024e461c62dd02cf61039dfa3d73af6a7
+  metadata.gz: 87645430ed5a8510784bfb5faf7ec6d484eefeee
+  data.tar.gz: 491fba7c08cd85e0dca1c853b9beeff24ff28e70
 SHA512:
-  metadata.gz: a95b457cdde2b09f7bef015fd933e6751b23fcc787bcb53c22520b40f6ce7335b41ac70a2e7e8b2c172c50aa2e075e72e54ded9465722a7992a2dd5f2960b83d
-  data.tar.gz: 86ce4fc2137a9869261c939db61e6c81656f59f15a7a8c2f268a9135666463155ec95c5a6c4d4c54def716797fd191508586e961bcd7dff35fdc88548fd2ea96
+  metadata.gz: 1e28112181156877df78b420a3a6da154c6112863b5b2bba6f9845815eb7a9abf09b07ae4955d4e15ebeb9db86e1f1b0db8e61ea4fa6550a4e39cb4fd519ebac
+  data.tar.gz: 795a8bd7a1d1bf2f25a4010ca1ebe7421fc609cb0bfb3533650c26c402d551415a2047cdca64d6666969a7f2d2c4378c60993961d1ea9702dc75f628a4db0d44

data/lib/hostrich/version.rb

@@ -1,3 +1,3 @@
 class Hostrich
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

data/lib/hostrich.rb

@@ -23,7 +23,11 @@ class Hostrich
 
     # Extract suffix from current request host.
     match = nil
-    @@hosts.detect { |host| match = env['HTTP_HOST'].match(/#{host}(\.[\.\w-]+)?/) }
+    @@hosts.detect { |host|
+      if http_host = env['HTTP_HOST']
+        match = http_host.match(/#{host}(\.[\.\w-]+)?/)
+      end
+    }
     return @app.call(env) if match.nil?
 
     suffix = match[1]

data/spec/hostrich_spec.rb

@@ -10,53 +10,65 @@ describe Hostrich do
       when '/redirect'
         [302, { 'Location' => 'http://foo.com/index.html' }, []]
       when '/cookie'
-        [200, { 'Set-Cookie' => 'some_param=foo.com/index.html; Path=/; Domain=.foo.com' }, ['Cookie!']]
+        [200, { 'Set-Cookie' => 'some_param=foo.com/index.html; Path=/; Domain=.foo.bar.io' }, ['Cookie!']]
       when '/version.rb'
         Rack::File.new('lib/hostrich').call(env)
       else
-        [200, {}, ['Welcome to foo.com or foo.com.dev, not foo.comzle, not ffoo.com and not bar.io']]
+        [200, {}, ['Welcome to foo.com, foo.com.dev or foo.bar.io, not foo.comzle, not ffoo.com and not bar.io']]
       end
     }
   }
   let(:request) { Rack::MockRequest.new(stack) }
 
-  shared_examples 'the whole deal' do
-    it 'adds host suffix in response body' do
-      response = request.get('/', 'HTTP_HOST' => 'foo.com.dev')
-      expect(response.body).to eq 'Welcome to foo.com.dev or foo.com.dev, not foo.comzle, not ffoo.com and not bar.io'
-    end
-
+  shared_examples 'adds suffix to single host' do
     it 'adds host suffix in response headers' do
       response = request.get('/redirect', 'HTTP_HOST' => 'foo.com.dev')
       expect(response.headers['Location']).to eq 'http://foo.com.dev/index.html'
 
       response = request.get('/cookie', 'HTTP_HOST' => 'foo.com.dev')
-      expect(response.headers['Set-Cookie']).to eq 'some_param=foo.com.dev/index.html; Path=/; Domain=.foo.com.dev'
+      expect(response.headers['Set-Cookie']).to eq 'some_param=foo.com.dev/index.html; Path=/; Domain=.foo.bar.io'
     end
 
     it 'works with Rack::File' do
       response = request.get('/version.rb', 'HTTP_HOST' => 'foo.com.dev')
       expect(response.body).to include "class Hostrich\n  VERSION"
     end
+
+    it 'adds host suffix in response body' do
+      response = request.get('/', 'HTTP_HOST' => 'foo.com.dev')
+      expect(response.body).to eq 'Welcome to foo.com.dev, foo.com.dev or foo.bar.io, not foo.comzle, not ffoo.com and not bar.io'
+    end
+
+    it 'processes request successfully if no HTTP_HOST present' do
+      response = request.get('/')
+      expect(response.body).to eq 'Welcome to foo.com, foo.com.dev or foo.bar.io, not foo.comzle, not ffoo.com and not bar.io'
+    end
   end
 
   context 'passing host as a string' do
     let(:stack) { Hostrich.new(app, 'foo.com') }
-    it_behaves_like 'the whole deal'
+    include_examples 'adds suffix to single host'
   end
 
   context 'passing host as an array' do
     let(:stack) { Hostrich.new(app, ['foo.com']) }
-    it_behaves_like 'the whole deal'
+    include_examples 'adds suffix to single host'
   end
 
   context 'passing multiple hosts as an array' do
     let(:stack) { Hostrich.new(app, %w[foo.com foo.bar.io]) }
-    it_behaves_like 'the whole deal'
 
-    it 'adds host suffix for all hosts' do
+    it 'adds host suffix to multiple hosts in response headers' do
+      response = request.get('/redirect', 'HTTP_HOST' => 'foo.com.dev')
+      expect(response.headers['Location']).to eq 'http://foo.com.dev/index.html'
+
+      response = request.get('/cookie', 'HTTP_HOST' => 'foo.com.dev')
+      expect(response.headers['Set-Cookie']).to eq 'some_param=foo.com.dev/index.html; Path=/; Domain=.foo.bar.io.dev'
+    end
+
+    it 'adds host suffix to multiple hosts in response body' do
       response = request.get('/', 'HTTP_HOST' => 'foo.com.127.0.0.1.xip.io')
-      expect(response.body).to eq 'Welcome to foo.com.127.0.0.1.xip.io or foo.com.127.0.0.1.xip.io.dev, not foo.comzle, not ffoo.com and not bar.io'
+      expect(response.body).to eq 'Welcome to foo.com.127.0.0.1.xip.io, foo.com.127.0.0.1.xip.io.dev or foo.bar.io.127.0.0.1.xip.io, not foo.comzle, not ffoo.com and not bar.io'
     end
   end
 
@@ -65,12 +77,12 @@ describe Hostrich do
 
     it 'does nothing' do
       response = request.get('/', 'HTTP_HOST' => 'foo.com.dev')
-      expect(response.body).to eq 'Welcome to foo.com or foo.com.dev, not foo.comzle, not ffoo.com and not bar.io'
+      expect(response.body).to eq 'Welcome to foo.com, foo.com.dev or foo.bar.io, not foo.comzle, not ffoo.com and not bar.io'
     end
 
     context 'adding hosts after initialization' do
       before { Hostrich.hosts += ['foo.com'] }
-      it_behaves_like 'the whole deal'
+      include_examples 'adds suffix to single host'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hostrich
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Rafaël Blais Masson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-28 00:00:00.000000000 Z
+date: 2015-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack