rack-canonical-host 0.0.5 → 0.0.6

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## Rack::CanonicalHost 0.0.6
+
+  * Prevent redirect if the canonical host name is `nil`
+
 ## Rack::CanonicalHost 0.0.5
 
   * Rename `ignored_hosts` option to `ignore`

data/lib/rack/canonical_host.rb

@@ -14,7 +14,7 @@ module Rack
       host = host(env)
       redirect = Redirect.new(env, host, @options)
 
-      if redirect.known_host?
+      if redirect.canonical?
         @app.call(env)
       else
         redirect.response

data/lib/rack/canonical_host/redirect.rb

@@ -18,8 +18,8 @@ module Rack
         @ignore = options[:ignore]
       end
 
-      def known_host?
-        request_uri.host == @host || ignored?
+      def canonical?
+        known? || ignored?
       end
 
       def response
@@ -27,8 +27,13 @@ module Rack
         [301, headers, [HTML_TEMPLATE % new_url]]
       end
 
+      def known?
+        @host.nil? || request_uri.host == @host
+      end
+      private :known?
+
       def ignored?
-        @ignore.include?(request_uri.host) if @ignore
+        @ignore && @ignore.include?(request_uri.host)
       end
       private :ignored?
 

data/lib/rack/canonical_host/version.rb

@@ -1,5 +1,5 @@
 module Rack
   class CanonicalHost
-    VERSION = '0.0.5'
+    VERSION = '0.0.6'
   end
 end

data/spec/rack/canonical_host_spec.rb

@@ -12,7 +12,7 @@ describe Rack::CanonicalHost do
     end
   end
 
-  shared_context 'matching and non-matching requests' do
+  shared_context 'a matching request' do
     context 'with a request to a matching host' do
       let(:url) { 'http://example.com/full/path' }
 
@@ -23,7 +23,9 @@ describe Rack::CanonicalHost do
         subject
       end
     end
+  end
 
+  shared_context 'a non-matching request' do
     context 'with a request to a non-matching host' do
       let(:url) { 'http://www.example.com/full/path' }
 
@@ -36,11 +38,22 @@ describe Rack::CanonicalHost do
     end
   end
 
+  shared_context 'matching and non-matching requests' do
+    include_context 'a matching request'
+    include_context 'a non-matching request'
+  end
+
   context '#call' do
     let(:env) { Rack::MockRequest.env_for(url) }
 
     subject { app.call(env) }
 
+    context 'without a host' do
+      let(:app) { build_app(nil) }
+
+      include_context 'a matching request'
+    end
+
     context 'without any options' do
       let(:app) { build_app('example.com') }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-canonical-host
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors: