a bunch of small/superficial changes to make the ruby implementation more ruby-like

--HG--
extra : convert_revision : svn%3Aacbfec75-9323-0410-a652-858a13e371e0/trunk%40936

Author: ryanking

lib/html5/filters/inject_meta_charset.rb

@@ -21,17 +21,17 @@ def each
           when :EmptyTag
             if token[:name].downcase == "meta"
               # replace charset with actual encoding
-              token[:data].each_with_index do |(name,value),index|
+              token[:data].each_with_index do |(name, value), index|
                 if name == 'charset'
-                  token[:data][index][1]=@encoding
+                  token[:data][index][1] = @encoding
                   meta_found = true
                 end
               end
 
               # replace charset with actual encoding
               has_http_equiv_content_type = false
               content_index = -1
-              token[:data].each_with_index do |(name,value),i|
+              token[:data].each_with_index do |(name, value), i|
                 if name.downcase == 'charset'
                   token[:data][i] = ['charset', @encoding]
                   meta_found = true
@@ -43,15 +43,14 @@ def each
                 end
               end
 
-              if not meta_found
-                if has_http_equiv_content_type and content_index >= 0
-                  token[:data][content_index][1] =
-                    'text/html; charset=%s' % @encoding
+              if !meta_found
+                if has_http_equiv_content_type && content_index >= 0
+                  token[:data][content_index][1] = 'text/html; charset=%s' % @encoding
                   meta_found = true
                 end
               end
 
-            elsif token[:name].downcase == "head" and not meta_found
+            elsif token[:name].downcase == "head" && !meta_found
               # insert meta into empty head
               yield(:type => :StartTag, :name => "head", :data => token[:data])
               yield(:type => :EmptyTag, :name => "meta",
@@ -62,11 +61,10 @@ def each
             end
 
           when :EndTag
-            if token[:name].downcase == "head" and pending.any?
+            if token[:name].downcase == "head" && pending.any?
               # insert meta into head (if necessary) and flush pending queue
               yield pending.shift
-              yield(:type => :EmptyTag, :name => "meta",
-                    :data => [["charset", @encoding]]) if not meta_found
+              yield(:type => :EmptyTag, :name => "meta", :data => [["charset", @encoding]]) if !meta_found
               yield pending.shift while pending.any?
               meta_found = true
               state = :post_head

lib/html5/filters/optionaltags.rb

@@ -75,8 +75,7 @@ def is_optional_start(tagname, previous, nexttok)
           if type == :StartTag
             # omit the thead and tfoot elements' end tag when they are
             # immediately followed by a tbody element. See is_optional_end.
-            if previous and previous[:type] == :EndTag and \
-              %w(tbody thead tfoot).include?(previous[:name])
+            if previous and previous[:type] == :EndTag && %w(tbody thead tfoot).include?(previous[:name])
               return false
             end
 
@@ -85,7 +84,7 @@ def is_optional_start(tagname, previous, nexttok)
             return false
           end
         end
-      return false
+        return false
       end
 
       def is_optional_end(tagname, nexttok)

lib/html5/html5parser.rb

@@ -28,7 +28,7 @@ def self.parse(stream, options = {})
     def self.parseFragment(stream, options = {})
       container = options.delete(:container) || 'div'
       encoding = options.delete(:encoding)
-      new(options).parseFragment(stream,container,encoding)
+      new(options).parseFragment(stream, container, encoding)
     end
 
     @@phases = %w( initial rootElement beforeHead inHead afterHead inBody inTable inCaption
@@ -44,8 +44,8 @@ def initialize(options = {})
 
       @tokenizer =  HTMLTokenizer
       @tree = TreeBuilders::REXML::TreeBuilder
- 
-      options.each { |name, value| instance_variable_set("@#{name}", value) }
+
+      options.each {|name, value| instance_variable_set("@#{name}", value) }
 
       @tree = @tree.new
 
@@ -126,11 +126,11 @@ def _parse(stream, innerHTML, encoding, container = 'div')
     # element)
     def parse(stream, encoding=nil)
       _parse(stream, false, encoding)
-      return @tree.getDocument
+      @tree.getDocument
     end
-  
+
     # Parse a HTML fragment into a well-formed tree fragment
-    
+
     # container - name of the element we're setting the innerHTML property
     # if set to nil, default to 'div'
     #
@@ -142,7 +142,7 @@ def parse(stream, encoding=nil)
     # element)
     def parseFragment(stream, container='div', encoding=nil)
       _parse(stream, true, encoding, container)
-      return @tree.getFragment
+      @tree.getFragment
     end
 
     def parseError(data = 'XXX ERROR MESSAGE NEEDED')
@@ -174,7 +174,7 @@ def normalizeToken(token)
         # to a dict so that [["x", "y"], ["x", "z"]] becomes {"x": "y"}
 
         unless token[:data].empty?
-          data = token[:data].reverse.map { |attr, value| [attr.tr(ASCII_UPPERCASE, ASCII_LOWERCASE), value] }
+          data = token[:data].reverse.map {|attr, value| [attr.tr(ASCII_UPPERCASE, ASCII_LOWERCASE), value] }
           token[:data] = Hash[*data.flatten]
         end
 
@@ -183,22 +183,22 @@ def normalizeToken(token)
         token[:name] = token[:name].downcase
       end
 
-      return token
+      token
     end
 
     @@new_modes = {
-      'select' => :inSelect,
-      'td' => :inCell,
-      'th' => :inCell,
-      'tr' => :inRow,
-      'tbody' => :inTableBody,
-      'thead' => :inTableBody,
-      'tfoot' => :inTableBody,
-      'caption' => :inCaption,
+      'select'   => :inSelect,
+      'td'       => :inCell,
+      'th'       => :inCell,
+      'tr'       => :inRow,
+      'tbody'    => :inTableBody,
+      'thead'    => :inTableBody,
+      'tfoot'    => :inTableBody,
+      'caption'  => :inCaption,
       'colgroup' => :inColumnGroup,
-      'table' => :inTable,
-      'head' => :inBody,
-      'body' => :inBody,
+      'table'    => :inTable,
+      'head'     => :inBody,
+      'body'     => :inBody,
       'frameset' => :inFrameset
     }
 
@@ -210,7 +210,7 @@ def resetInsertionMode
       @tree.openElements.reverse.each do |node|
         nodeName = node.name
 
-        if node == @tree.openElements[0]
+        if node == @tree.openElements.first
           last = true
           unless ['td', 'th'].include?(nodeName)
             # XXX

lib/html5/html5parser/after_body_phase.rb

@@ -8,7 +8,7 @@ class AfterBodyPhase < Phase
     def processComment(data)
       # This is needed because data is to be appended to the <html> element
       # here and not to whatever is currently open.
-      @tree.insertComment(data, @tree.openElements[0])
+      @tree.insertComment(data, @tree.openElements.first)
     end
 
     def processCharacters(data)

lib/html5/html5parser/after_head_phase.rb

@@ -2,7 +2,7 @@
 
 module HTML5
   class AfterHeadPhase < Phase
-  
+
     handle_start 'html', 'body', 'frameset', %w( base link meta script style title ) => 'FromHead'
 
     def processEOF

lib/html5/html5parser/in_body_phase.rb

@@ -60,7 +60,7 @@ def processSpaceCharactersDropNewline(data)
       alias processSpaceCharacters processSpaceCharactersNonPre
 
       if (data.length > 0 and data[0] == ?\n && 
-        %w[pre textarea].include?(@tree.openElements[-1].name) && !@tree.openElements[-1].hasContent)
+        %w[pre textarea].include?(@tree.openElements.last.name) && !@tree.openElements.last.hasContent)
         data = data[1..-1]
       end
 
@@ -95,8 +95,7 @@ def startTagTitle(name, attributes)
     def startTagBody(name, attributes)
       @parser.parseError(_('Unexpected start tag (body).'))
 
-      if (@tree.openElements.length == 1 or
-        @tree.openElements[1].name != 'body')
+      if (@tree.openElements.length == 1 || @tree.openElements[1].name != 'body')
         assert @parser.innerHTML
       else
         attributes.each do |attr, value|
@@ -132,17 +131,14 @@ def startTagListItem(name, attributes)
         if stopName.include?(node.name)
           poppedNodes = (0..i).collect { @tree.openElements.pop }
           if i >= 1
-            @parser.parseError(_("Missing end tag%s (%s)" % [
-              (i>1 ? 's' : ''),
-              poppedNodes.reverse.map {|item| item.name}.join(', ')]))
+            @parser.parseError(_("Missing end tag%s (%s)" % [(i>1 ? 's' : ''), poppedNodes.reverse.map{|item| item.name}.join(', ')]))
           end
           break
         end
 
         # Phrasing elements are all non special, non scoping, non
         # formatting elements
-        break if ((SPECIAL_ELEMENTS + SCOPING_ELEMENTS).include?(node.name) and
-          not ['address', 'div'].include?(node.name))
+        break if ((SPECIAL_ELEMENTS + SCOPING_ELEMENTS).include?(node.name) && !%w[address div].include?(node.name))
       end
 
       # Always insert an <li> element.
@@ -320,7 +316,7 @@ def startTagOther(name, attributes)
 
     def endTagP(name)
       @tree.generateImpliedEndTags('p') if in_scope?('p')
-      @parser.parseError(_('Unexpected end tag (p).')) unless @tree.openElements[-1].name == 'p'
+      @parser.parseError(_('Unexpected end tag (p).')) unless @tree.openElements.last.name == 'p'
       if in_scope?('p')
         @tree.openElements.pop while in_scope?('p')
       else
@@ -338,7 +334,7 @@ def endTagBody(name)
         @parser.parseError
         return
       end
-      unless @tree.openElements[-1].name == 'body'
+      unless @tree.openElements.last.name == 'body'
         @parser.parseError(_("Unexpected end tag (body). Missing end tag (#{@tree.openElements[-1].name})."))
       end
       @parser.phase = @parser.phases[:afterBody]
@@ -355,7 +351,7 @@ def endTagBlock(name)
 
       @tree.generateImpliedEndTags if in_scope?(name)
 
-      unless @tree.openElements[-1].name == name
+      unless @tree.openElements.last.name == name
         @parser.parseError(_("End tag (#{name}) seen too early. Expected other end tag."))
       end
 
@@ -368,7 +364,7 @@ def endTagForm(name)
       if in_scope?(name)
         @tree.generateImpliedEndTags
       end
-      if @tree.openElements[-1].name != name
+      if @tree.openElements.last.name != name
         @parser.parseError(_("End tag (form) seen too early. Ignored."))
       else
         @tree.openElements.pop
@@ -380,9 +376,8 @@ def endTagListItem(name)
       # AT Could merge this with the Block case
       @tree.generateImpliedEndTags(name) if in_scope?(name)
 
-      unless @tree.openElements[-1].name == name
-        @parser.parseError(_("End tag (#{name}) seen too early. " + 
-          'Expected other end tag.'))
+      unless @tree.openElements.last.name == name
+        @parser.parseError(_("End tag (#{name}) seen too early. " + 'Expected other end tag.'))
       end
 
       remove_open_elements_until(name) if in_scope?(name)
@@ -396,13 +391,13 @@ def endTagHeading(name)
         end
       end
 
-      unless @tree.openElements[-1].name == name
+      unless @tree.openElements.last.name == name
         @parser.parseError(_("Unexpected end tag (#{name}). Expected other end tag."))
       end
 
       HEADING_ELEMENTS.each do |element|
         if in_scope?(element)
-          remove_open_elements_until { |element| HEADING_ELEMENTS.include?(element.name) }
+          remove_open_elements_until {|element| HEADING_ELEMENTS.include?(element.name)}
           break
         end
       end
@@ -415,7 +410,7 @@ def endTagFormatting(name)
       while true
         # Step 1 paragraph 1
         afeElement = @tree.elementInActiveFormattingElements(name)
-        if not afeElement or (@tree.openElements.include?(afeElement) and not in_scope?(afeElement.name))
+        if !afeElement or (@tree.openElements.include?(afeElement) && !in_scope?(afeElement.name))
           @parser.parseError(_("End tag (#{name}) violates step 1, paragraph 1 of the adoption agency algorithm."))
           return
         # Step 1 paragraph 2
@@ -426,7 +421,7 @@ def endTagFormatting(name)
         end
 
         # Step 1 paragraph 3
-        if afeElement != @tree.openElements[-1]
+        if afeElement != @tree.openElements.last
           @parser.parseError(_("End tag (#{name}) violates step 1, paragraph 3 of the adoption agency algorithm."))
         end
 
@@ -443,7 +438,7 @@ def endTagFormatting(name)
 
         # Step 3
         if furthestBlock.nil?
-          element = remove_open_elements_until { |element| element == afeElement }
+          element = remove_open_elements_until {|element| element == afeElement }
           @tree.activeFormattingElements.delete(element)
           return
         end
@@ -523,13 +518,13 @@ def endTagFormatting(name)
     def endTagButtonMarqueeObject(name)
       @tree.generateImpliedEndTags if in_scope?(name)
 
-      unless @tree.openElements[-1].name == name
+      unless @tree.openElements.last.name == name
         @parser.parseError(_("Unexpected end tag (#{name}). Expected other end tag first."))
       end
 
       if in_scope?(name)
         remove_open_elements_until(name)
-      
+
         @tree.clearActiveFormattingElements
       end
     end
@@ -552,7 +547,7 @@ def endTagNone(name)
     end
 
     def endTagCdataTextAreaXmp(name)
-      if @tree.openElements[-1].name == name
+      if @tree.openElements.last.name == name
         @tree.openElements.pop
       else
         @parser.parseError(_("Unexpected end tag (#{name}). Ignored."))
@@ -573,11 +568,11 @@ def endTagOther(name)
         if node.name == name
           @tree.generateImpliedEndTags
 
-          unless @tree.openElements[-1].name == name
+          unless @tree.openElements.last.name == name
             @parser.parseError(_("Unexpected end tag (#{name})."))
           end
 
-          remove_open_elements_until { |element| element == node }
+          remove_open_elements_until {|element| element == node }
 
           break
         else
@@ -593,7 +588,7 @@ def endTagOther(name)
 
     def addFormattingElement(name, attributes)
       @tree.insertElement(name, attributes)
-      @tree.activeFormattingElements.push(@tree.openElements[-1])
+      @tree.activeFormattingElements.push(@tree.openElements.last)
     end
 
   end

lib/html5/html5parser/in_caption_phase.rb

@@ -10,7 +10,7 @@ class InCaptionPhase < Phase
     handle_end 'caption', 'table', %w( body col colgroup html tbody td tfoot th thead tr ) => 'Ignore'
 
     def ignoreEndTagCaption
-      not in_scope?('caption', true)
+      !in_scope?('caption', true)
     end
 
     def processCharacters(data)

lib/html5/html5parser/in_cell_phase.rb

@@ -32,7 +32,7 @@ def startTagOther(name, attributes)
     def endTagTableCell(name)
       if in_scope?(name, true)
         @tree.generateImpliedEndTags(name)
-        if @tree.openElements[-1].name != name
+        if @tree.openElements.last.name != name
           @parser.parseError("Got table cell end tag (#{name}) while required end tags are missing.")
 
           remove_open_elements_until(name)