diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2010-09-30 23:29:23 +0100 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2010-09-30 23:29:23 +0100 |
| commit | 704961ce688f5bc1942529f44ea6b00014ef8378 (patch) | |
| tree | b951112aed4914cdc4203bca6e810a7b71d37e82 /actionpack/lib/action_controller/vendor/html-scanner/html | |
| parent | b689834bcf2730353d066277f43047f10abb8d30 (diff) | |
| parent | 91deff08c940f16ed149e7628694faff0393fe0a (diff) | |
| download | rails-704961ce688f5bc1942529f44ea6b00014ef8378.tar.gz rails-704961ce688f5bc1942529f44ea6b00014ef8378.tar.bz2 rails-704961ce688f5bc1942529f44ea6b00014ef8378.zip | |
Merge branch 'master' into nested_has_many_through_2
Diffstat (limited to 'actionpack/lib/action_controller/vendor/html-scanner/html')
| -rw-r--r-- | actionpack/lib/action_controller/vendor/html-scanner/html/node.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/actionpack/lib/action_controller/vendor/html-scanner/html/node.rb b/actionpack/lib/action_controller/vendor/html-scanner/html/node.rb index 85250721e7..22b3243104 100644 --- a/actionpack/lib/action_controller/vendor/html-scanner/html/node.rb +++ b/actionpack/lib/action_controller/vendor/html-scanner/html/node.rb @@ -18,14 +18,14 @@ module HTML #:nodoc: hash[k] = Conditions.new(v) when :children hash[k] = v = keys_to_symbols(v) - v.each do |k,v2| - case k + v.each do |key,value| + case key when :count, :greater_than, :less_than # keys are valid, and require no further processing when :only - v[k] = Conditions.new(v2) + v[key] = Conditions.new(value) else - raise "illegal key #{k.inspect} => #{v2.inspect}" + raise "illegal key #{key.inspect} => #{value.inspect}" end end else |