resource.rb in rails-auth-0.4.0

- old
+ new

@@ -3,17 +3,17 @@
 module Rails
   module Auth
     class ACL
       # Rules for a particular route
       class Resource
-        attr_reader :http_methods, :path, :predicates
+        attr_reader :http_methods, :path, :host, :predicates
 
         # Valid HTTP methods
         HTTP_METHODS = %w(GET HEAD PUT POST DELETE OPTIONS PATCH LINK UNLINK).freeze
 
         # Options allowed for resource matchers
-        VALID_OPTIONS = %w(method path).freeze
+        VALID_OPTIONS = %w(method path host).freeze
 
         # @option :options [String] :method HTTP method allowed ("ALL" for all methods)
         # @option :options [String] :path path to the resource (regex syntax allowed)
         # @param [Hash] :predicates matchers for this resource
         #
@@ -23,36 +23,44 @@
 
           unless (extra_keys = options.keys - VALID_OPTIONS).empty?
             raise ParseError, "unrecognized key in ACL resource: #{extra_keys.first}"
           end
 
-          @http_methods = extract_methods(options["method"])
-          @path         = /\A#{options.fetch("path")}\z/
+          methods = options["method"] || raise(ParseError, "no 'method' key in resource: #{options.inspect}")
+          path    = options["path"]   || raise(ParseError, "no 'path' key in resource: #{options.inspect}")
+
+          @http_methods = extract_methods(methods)
+          @path         = /\A#{path}\z/
           @predicates   = predicates.freeze
+
+          # Unlike method and path, host is optional
+          host = options["host"]
+          @host = /\A#{host}\z/ if host
         end
 
         # Match this resource against the given Rack environment, checking all
         # predicates to ensure at least one of them matches
         #
         # @param [Hash] :env Rack environment
         #
         # @return [Boolean] resource and predicates match the given request
         #
         def match(env)
-          return false unless match_method_and_path(env)
+          return false unless match!(env)
           @predicates.any? { |_name, predicate| predicate.match(env) }
         end
 
-        # Match *only* the request method/path against the given Rack environment.
+        # Match *only* the request method/path/host against the given Rack environment.
         # Predicates are NOT checked.
         #
         # @param [Hash] :env Rack environment
         #
         # @return [Boolean] method and path *only* match the given environment
         #
-        def match_method_and_path(env)
+        def match!(env)
           return false unless @http_methods.nil? || @http_methods.include?(env["REQUEST_METHOD".freeze])
           return false unless @path =~ env["REQUEST_PATH".freeze]
+          return false unless @host.nil? || @host =~ env["HTTP_HOST".freeze]
           true
         end
 
         private
 