more reek cleanup
This commit is contained in:
parent
55c44f079c
commit
487c503b21
2
Rakefile
2
Rakefile
@ -43,5 +43,5 @@ Rake::RDocTask.new do |rdoc|
|
|||||||
end
|
end
|
||||||
|
|
||||||
task :reek do
|
task :reek do
|
||||||
system('reek lib/*')
|
system('reek -c config/config.reek lib/*')
|
||||||
end
|
end
|
||||||
|
4
config/config.reek
Normal file
4
config/config.reek
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
---
|
||||||
|
FeatureEnvy:
|
||||||
|
exclude:
|
||||||
|
- Apache::Logging#handle_log
|
@ -1,2 +1 @@
|
|||||||
require 'apache/config'
|
require 'apache/config'
|
||||||
require 'apache/apachify'
|
|
||||||
|
@ -36,6 +36,17 @@ class String
|
|||||||
end
|
end
|
||||||
|
|
||||||
alias :blockify :quoteize
|
alias :blockify :quoteize
|
||||||
|
|
||||||
|
def headerize
|
||||||
|
"#{self.quoteize}"
|
||||||
|
end
|
||||||
|
|
||||||
|
def replace_placeholderize(opts)
|
||||||
|
self.gsub(%r{%\{([^\}]+)\}}) do |match|
|
||||||
|
key = $1.downcase.to_sym
|
||||||
|
opts[key] || ''
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
# Ruby symbols
|
# Ruby symbols
|
||||||
@ -56,6 +67,10 @@ class Symbol
|
|||||||
def blockify
|
def blockify
|
||||||
self.to_s
|
self.to_s
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def headerize
|
||||||
|
"#{self.quoteize}"
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
# Ruby everything
|
# Ruby everything
|
||||||
@ -84,4 +99,44 @@ class Array
|
|||||||
end
|
end
|
||||||
|
|
||||||
alias :commentize :to_a
|
alias :commentize :to_a
|
||||||
|
|
||||||
|
def headerize
|
||||||
|
"#{self.first.quoteize} #{self.last}"
|
||||||
|
end
|
||||||
|
|
||||||
|
def rewrite_cond_optionify
|
||||||
|
self.collect do |opt|
|
||||||
|
{
|
||||||
|
:or => 'OR',
|
||||||
|
:case_insensitive => 'NC',
|
||||||
|
:no_vary => 'NV'
|
||||||
|
}[opt]
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
def rewrite_option_listify
|
||||||
|
(!self.empty?) ? "[#{self * ','}]" : nil
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
# Ruby hashes
|
||||||
|
class Hash
|
||||||
|
REWRITE_RULE_CONDITIONS = {
|
||||||
|
:last => 'L',
|
||||||
|
:forbidden => 'F',
|
||||||
|
:no_escape => 'NE',
|
||||||
|
:redirect => lambda { |val| val == true ? 'R' : "R=#{val}" },
|
||||||
|
:pass_through => 'PT',
|
||||||
|
:preserve_query_string => 'QSA',
|
||||||
|
:query_string_append => 'QSA',
|
||||||
|
:env => lambda { |val| "E=#{val}" }
|
||||||
|
}
|
||||||
|
|
||||||
|
def rewrite_rule_optionify
|
||||||
|
self.collect do |key, value|
|
||||||
|
what = REWRITE_RULE_CONDITIONS[key]
|
||||||
|
what = what.call(value) if what.kind_of? Proc
|
||||||
|
what
|
||||||
|
end.compact.sort
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
@ -19,11 +19,16 @@ module Apache
|
|||||||
[ :custom, :error, :script, :rewrite ].each do |type|
|
[ :custom, :error, :script, :rewrite ].each do |type|
|
||||||
class_eval <<-EOT
|
class_eval <<-EOT
|
||||||
def #{type}_log(*opts)
|
def #{type}_log(*opts)
|
||||||
handle_log '#{type.to_s.capitalize}Log', opts.first, opts.first.quoteize, opts[1..-1]
|
handle_log :tag => '#{type.to_s.capitalize}Log',
|
||||||
|
:path => opts.first,
|
||||||
|
:additional_options => opts[1..-1]
|
||||||
end
|
end
|
||||||
|
|
||||||
def rotate_#{type}_log(*opts)
|
def rotate_#{type}_log(*opts)
|
||||||
handle_log '#{type.to_s.capitalize}Log', opts.first, rotatelogs(*opts[0..1]).quoteize, opts[2..-1]
|
handle_log :tag => '#{type.to_s.capitalize}Log',
|
||||||
|
:path => opts.first,
|
||||||
|
:real_path => rotatelogs(*opts[0..1]),
|
||||||
|
:additional_options => opts[2..-1]
|
||||||
end
|
end
|
||||||
EOT
|
EOT
|
||||||
end
|
end
|
||||||
@ -37,9 +42,12 @@ module Apache
|
|||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
def handle_log(tag, path, real_path, *opts)
|
def handle_log(info)
|
||||||
writable? path
|
writable? (path = info[:path])
|
||||||
self << "#{tag} #{[real_path, opts].flatten * " "}"
|
|
||||||
|
real_path = (info[:real_path] || path).quoteize
|
||||||
|
|
||||||
|
self << "#{info[:tag]} #{[real_path, info[:additional_options]].flatten * " "}"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -23,9 +23,9 @@ module Apache
|
|||||||
# runner('www', 'www-data') #=>
|
# runner('www', 'www-data') #=>
|
||||||
# User www
|
# User www
|
||||||
# Group www-data
|
# Group www-data
|
||||||
def runner(user, group = nil)
|
def runner(user, group)
|
||||||
user! user
|
user! user
|
||||||
group! group if group
|
group! group
|
||||||
end
|
end
|
||||||
|
|
||||||
# Enable Passenger on this server
|
# Enable Passenger on this server
|
||||||
@ -94,14 +94,7 @@ module Apache
|
|||||||
# Header set "Content-dispoaition" "attachment" env=only-for-downloads
|
# Header set "Content-dispoaition" "attachment" env=only-for-downloads
|
||||||
def set_header(hash)
|
def set_header(hash)
|
||||||
hash.each do |key, value|
|
hash.each do |key, value|
|
||||||
output = "Header set #{key.quoteize}"
|
self << "Header set #{key.quoteize} #{value.headerize}"
|
||||||
case value
|
|
||||||
when String, Symbol
|
|
||||||
output += " #{value.quoteize}"
|
|
||||||
when Array
|
|
||||||
output += " #{value.first.quoteize} #{value.last}"
|
|
||||||
end
|
|
||||||
self << output
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -170,23 +170,11 @@ module Apache
|
|||||||
module RegularExpressionMatcher
|
module RegularExpressionMatcher
|
||||||
# Test this rewritable thing
|
# Test this rewritable thing
|
||||||
def test(from, opts = {})
|
def test(from, opts = {})
|
||||||
from = from.gsub(@from, @to.gsub(/\$([0-9])/) { |match| '\\' + $1 })
|
from.gsub(@from, @to.gsub(/\$([0-9])/) { |match| '\\' + $1 }).replace_placeholderize(opts)
|
||||||
replace_placeholders(from, opts)
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def match?(from, opts = {})
|
def match?(from, opts = {})
|
||||||
replace_placeholders(from, opts)[@from]
|
from.replace_placeholderize(opts)[@from]
|
||||||
end
|
|
||||||
|
|
||||||
# Replace the placeholders in this rewritable thing
|
|
||||||
def replace_placeholders(string, opts)
|
|
||||||
opts.each do |opt, value|
|
|
||||||
case value
|
|
||||||
when String
|
|
||||||
string = string.gsub('%{' + opt.to_s.upcase + '}', value)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
string.gsub(%r{%\{[^\}]+\}}, '')
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -203,6 +191,8 @@ module Apache
|
|||||||
end
|
end
|
||||||
|
|
||||||
def rule(from, to)
|
def rule(from, to)
|
||||||
|
raise "from must be a Regexp" if (!from.kind_of?(Regexp) && require_regexp?)
|
||||||
|
|
||||||
@from = from
|
@from = from
|
||||||
@to = to
|
@to = to
|
||||||
end
|
end
|
||||||
@ -217,6 +207,7 @@ module Apache
|
|||||||
|
|
||||||
def stop_if_match?; false; end
|
def stop_if_match?; false; end
|
||||||
def forbidden?; false; end
|
def forbidden?; false; end
|
||||||
|
def require_regexp?; false; end
|
||||||
end
|
end
|
||||||
|
|
||||||
# A RewriteRule definition
|
# A RewriteRule definition
|
||||||
@ -235,33 +226,23 @@ module Apache
|
|||||||
# Define the rule, passing in additional options
|
# Define the rule, passing in additional options
|
||||||
#
|
#
|
||||||
# rule %r{^/here}, '/there', { :last => true, :preserve_query_string => true }
|
# rule %r{^/here}, '/there', { :last => true, :preserve_query_string => true }
|
||||||
|
#
|
||||||
|
# Options for the options hash are:
|
||||||
|
# * :last => true #=> [L]
|
||||||
|
# * :forbidden => true #=> [F]
|
||||||
|
# * :no_escape => true #=> [NE]
|
||||||
|
# * :redirect => true #=> [R]
|
||||||
|
# * :redirect => 302 #=> [R=302]
|
||||||
|
# * :pass_through => true #=> [PT]
|
||||||
|
# * :preserve_query_string => true #=> [QSA]
|
||||||
|
# * :query_string_append => true #=> [QSA]
|
||||||
|
# * :env => 'what' #=> [E=what]
|
||||||
def rule(from, to, options = {})
|
def rule(from, to, options = {})
|
||||||
super(from, to)
|
super(from, to)
|
||||||
|
|
||||||
raise "from must be a Regexp" if !from.kind_of?(Regexp)
|
|
||||||
|
|
||||||
@input_options = options
|
@input_options = options
|
||||||
|
|
||||||
options = options.collect do |key, value|
|
@options = options.rewrite_rule_optionify.rewrite_option_listify
|
||||||
case key
|
|
||||||
when :last
|
|
||||||
'L'
|
|
||||||
when :forbidden
|
|
||||||
'F'
|
|
||||||
when :no_escape
|
|
||||||
'NE'
|
|
||||||
when :redirect
|
|
||||||
(value == true) ? 'R' : "R=#{value}"
|
|
||||||
when :pass_through
|
|
||||||
'PT'
|
|
||||||
when :preserve_query_string, :query_string_append
|
|
||||||
'QSA'
|
|
||||||
when :env
|
|
||||||
"E=#{value}"
|
|
||||||
end
|
|
||||||
end.compact.sort
|
|
||||||
|
|
||||||
@options = !options.empty? ? "[#{options * ','}]" : nil
|
|
||||||
end
|
end
|
||||||
|
|
||||||
# Add a RewriteCondition to this RewriteRule
|
# Add a RewriteCondition to this RewriteRule
|
||||||
@ -287,22 +268,17 @@ module Apache
|
|||||||
|
|
||||||
result = super(from, opts) if match?(from, opts)
|
result = super(from, opts) if match?(from, opts)
|
||||||
|
|
||||||
replace_placeholders(result, opts)
|
result.replace_placeholderize(opts)
|
||||||
end
|
end
|
||||||
|
|
||||||
def match?(from, opts = {})
|
def match?(from, opts = {})
|
||||||
opts[:request_uri] = from
|
opts[:request_uri] = from
|
||||||
ok = true
|
|
||||||
|
|
||||||
@conditions.each do |c|
|
@conditions.each do |cond|
|
||||||
ok = false if !c.test(from, opts)
|
return false if !cond.test(from, opts)
|
||||||
end
|
end
|
||||||
|
|
||||||
if ok
|
super(from, opts)
|
||||||
super(from, opts)
|
|
||||||
else
|
|
||||||
false
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def stop_if_match?
|
def stop_if_match?
|
||||||
@ -312,25 +288,32 @@ module Apache
|
|||||||
def forbidden?
|
def forbidden?
|
||||||
@input_options[:forbidden]
|
@input_options[:forbidden]
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def require_regexp?; true; end
|
||||||
end
|
end
|
||||||
|
|
||||||
# A permanent RedirectMatch
|
# A permanent RedirectMatch
|
||||||
class RedirectMatchPermanent < MatchableThing
|
class RedirectMatchPermanent < MatchableThing
|
||||||
include RegularExpressionMatcher
|
include RegularExpressionMatcher
|
||||||
|
|
||||||
|
# The Apache directive for this object.
|
||||||
def tag; 'RedirectMatch permanent'; end
|
def tag; 'RedirectMatch permanent'; end
|
||||||
|
|
||||||
|
# Define a RedirectMatch rule.
|
||||||
def rule(from, to)
|
def rule(from, to)
|
||||||
super(from, to)
|
super(from, to)
|
||||||
|
|
||||||
raise "from must be a Regexp" if !from.kind_of?(Regexp)
|
raise "from must be a Regexp" if !from.kind_of?(Regexp)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
# Convert this tag to a String.
|
||||||
def to_s
|
def to_s
|
||||||
"#{tag} #{[@from.source, @to].quoteize.compact.flatten * " "}"
|
"#{tag} #{[@from.source, @to].quoteize.compact.flatten * " "}"
|
||||||
end
|
end
|
||||||
|
|
||||||
|
# Stop rewrite testing if this object matches.
|
||||||
def stop_if_match; true; end
|
def stop_if_match; true; end
|
||||||
|
def require_regexp?; true; end
|
||||||
end
|
end
|
||||||
|
|
||||||
# A RewriteCond
|
# A RewriteCond
|
||||||
@ -343,30 +326,26 @@ module Apache
|
|||||||
#
|
#
|
||||||
# rule "%{REQUEST_FILENAME}", "^/here", :case_insensitive #=>
|
# rule "%{REQUEST_FILENAME}", "^/here", :case_insensitive #=>
|
||||||
# RewriteCond "%{REQUEST_FILENAME}" "^/here" [NC]
|
# RewriteCond "%{REQUEST_FILENAME}" "^/here" [NC]
|
||||||
|
#
|
||||||
|
# Additional parameters can include the following:
|
||||||
|
# * :or #=> [OR]
|
||||||
|
# * :case_insensitive #=> [NC]
|
||||||
|
# * :no_vary #=> [NV]
|
||||||
def rule(from, to, *opts)
|
def rule(from, to, *opts)
|
||||||
super(from, to)
|
super(from, to)
|
||||||
|
|
||||||
options = opts.collect do |opt|
|
@options = opts.rewrite_cond_optionify.rewrite_option_listify
|
||||||
case opt
|
|
||||||
when :or
|
|
||||||
'OR'
|
|
||||||
when :case_insensitive
|
|
||||||
'NC'
|
|
||||||
when :no_vary
|
|
||||||
'NV'
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
@options = (!options.empty?) ? "[#{options * ','}]" : nil
|
|
||||||
end
|
end
|
||||||
|
|
||||||
alias :cond :rule
|
alias :cond :rule
|
||||||
|
|
||||||
|
# Create a new RewriteCond
|
||||||
def initialize
|
def initialize
|
||||||
super
|
super
|
||||||
@options = nil
|
@options = nil
|
||||||
end
|
end
|
||||||
|
|
||||||
|
# Convert this tag to a String.
|
||||||
def to_s
|
def to_s
|
||||||
"#{tag} #{[@from.quoteize, @to.quoteize, @options].compact.flatten * " "}"
|
"#{tag} #{[@from.quoteize, @to.quoteize, @options].compact.flatten * " "}"
|
||||||
end
|
end
|
||||||
@ -374,7 +353,7 @@ module Apache
|
|||||||
# Test this RewriteCond
|
# Test this RewriteCond
|
||||||
def test(from, opts = {})
|
def test(from, opts = {})
|
||||||
super(from, opts)
|
super(from, opts)
|
||||||
source = replace_placeholders(@from, opts)
|
source = @from.replace_placeholderize(opts)
|
||||||
|
|
||||||
to = @to
|
to = @to
|
||||||
reverse = false
|
reverse = false
|
||||||
|
Loading…
Reference in New Issue
Block a user