Clean up lazy block evaluation and add spec

Author: tylerhunt

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## Unreleased
+
+  * Lazily evaluate block ([Robert Keresnyei][yenshirak])
+
 ## 1.3.0 (2024-03-15)
 
   * Respond to invalid request URL with 400 ([Gareth Jones][G-Rath])
@@ -100,3 +104,4 @@
 [olleolleolle]: https://github.com/olleolleolle
 [vinnydiehl]: https://github.com/vinnydiehl
 [G-Rath]: https://github.com/G-Rath
+[yenshirak]: https://github.com/yenshirak

lib/rack/canonical_host/redirect.rb

@@ -18,6 +18,7 @@ class Redirect
       def initialize(env, host, options={}, &block)
         self.env = env
         self.host = host
+        self.block = block
         self.ignore = Array(options[:ignore])
         self.conditions = Array(options[:if])
         self.cache_control = options[:cache_control]
@@ -37,6 +38,7 @@ def response
 
       attr_accessor :env
       attr_accessor :host
+      attr_accessor :block
       attr_accessor :ignore
       attr_accessor :conditions
       attr_accessor :cache_control
@@ -55,6 +57,17 @@ def any_match?(patterns, request_uri)
         }
       end
 
+      def enabled?
+        return true if conditions.empty?
+
+        any_match?(conditions, request_uri)
+      end
+
+      def evaluated_host
+        return @evaluated_host if defined?(@evaluated_host)
+        @evaluated_host = block && block.call(env) || host
+      end
+
       def headers
         {
           'cache-control' => cache_control,
@@ -63,12 +76,6 @@ def headers
         }.reject { |_, value| !value }
       end
 
-      def enabled?
-        return true if conditions.empty?
-
-        any_match?(conditions, request_uri)
-      end
-
       def ignored?
         return false if ignore.empty?
 
@@ -85,10 +92,6 @@ def new_url
         uri.normalize.to_s
       end
 
-      def evaluated_host
-        @evaluated_host ||= block and block.call(env) or host
-      end
-
       def request_uri
         @request_uri ||= Addressable::URI.parse(Rack::Request.new(env).url)
       end

spec/rack/canonical_host_spec.rb

@@ -298,6 +298,18 @@ def call_app
           let(:url) { 'http://www.example.com/full/path' }
         end
       end
+
+      context 'with :if option that rejects the request' do
+        let(:url) { 'http://api.example.com/full/path' }
+
+        let(:app) {
+          build_app(nil, if: ->(uri) { uri.host == 'example.com' }) { raise }
+        }
+
+        it 'does not evaluate the block' do
+          expect { call_app }.to_not raise_error
+        end
+      end
     end
   end
 end