Merge pull request #9 from naqvis/fix-issue-8

Fix: spec issue and linting issues

Author: naqvis

shard.yml

@@ -1,12 +1,12 @@
 name: html5
-version: 0.4.0
+version: 0.5.0
 
 authors:
   - Ali Naqvi <[email protected]>
 description: |
   HTML5-compliant Parser and Tokenizer with XPath2 and CSS Selector support.
 
-crystal: ">= 0.36.0, < 2.0.0"
+crystal: ~> 1.0
 
 dependencies:
   xpath2:

spec/token_spec.cr

@@ -541,23 +541,23 @@ module HTML5
 
   it "Test Convert New Lines" do
     tests = {
-      "Mac\rDOS\r\nUnix\n"  => "Mac\nDOS\nUnix\n",
-      "Unix\nMac\rDOS\r\n"  => "Unix\nMac\nDOS\n",
-      "DOS\r\nDOS\r\nDOS\r\n": "DOS\nDOS\nDOS\n",
-      ""                    => "",
-      "\n"                  => "\n",
-      "\n\r"                => "\n\n",
-      "\r"                  => "\n",
-      "\r\n"                => "\n",
-      "\r\n\n"              => "\n\n",
-      "\r\n\r"              => "\n\n",
-      "\r\n\r\n"            => "\n\n",
-      "\r\r"                => "\n\n",
-      "\r\r\n"              => "\n\n",
-      "\r\r\n\n"            => "\n\n\n",
-      "\r\r\r\n"            => "\n\n\n",
-      "\r \n"               => "\n \n",
-      "xyz"                 => "xyz",
+      "Mac\rDOS\r\nUnix\n"    => "Mac\nDOS\nUnix\n",
+      "Unix\nMac\rDOS\r\n"    => "Unix\nMac\nDOS\n",
+      "DOS\r\nDOS\r\nDOS\r\n" => "DOS\nDOS\nDOS\n",
+      ""                      => "",
+      "\n"                    => "\n",
+      "\n\r"                  => "\n\n",
+      "\r"                    => "\n",
+      "\r\n"                  => "\n",
+      "\r\n\n"                => "\n\n",
+      "\r\n\r"                => "\n\n",
+      "\r\n\r\n"              => "\n\n",
+      "\r\r"                  => "\n\n",
+      "\r\r\n"                => "\n\n",
+      "\r\r\n\n"              => "\n\n\n",
+      "\r\r\r\n"              => "\n\n\n",
+      "\r \n"                 => "\n \n",
+      "xyz"                   => "xyz",
     }
 
     tests.each do |k, v|

src/html5.cr

@@ -14,7 +14,7 @@
 # Parsing is done by calling `HTML5.parse` with either a String containing HTML
 # or an IO instance. `HTML5.parse` returns a document root as `HTML5::Node` instance.
 module HTML5
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 
   class HTMLException < Exception
   end

src/html5/css/lexer.cr

@@ -269,8 +269,8 @@ module CSS
       raise CSSException.new("expected ' or \" before calling parse_string") unless ['\'', '"'].includes?(schar)
       loop do
         case r = self.next
-        when EOF              then raise ("unmatched string quote")
-        when '\n', '\r', '\f' then raise ("invalid unescaped string character")
+        when EOF              then raise("unmatched string quote")
+        when '\n', '\r', '\f' then raise("invalid unescaped string character")
         when '\\'
           case self.peek
           when '\n', '\f' then self.next

src/html5/css/selector.cr

@@ -35,16 +35,16 @@ module CSS
     def initialize(@sel_seq : SelectorSequence, @combs = Array(CombinatorSelector).new)
     end
 
-    def select(n : HTML5::Node, matched = [] of HTML5::Node) : Array(HTML5::Node)
-      matched = @sel_seq.select(n, matched)
+    def select(n : HTML5::Node, selected = [] of HTML5::Node) : Array(HTML5::Node)
+      selected = @sel_seq.select(n, selected)
       @combs.each do |comb|
         comb_matched = [] of HTML5::Node
-        matched.each do |m|
+        selected.each do |m|
           comb_matched = comb.select(m, comb_matched)
         end
-        matched = comb_matched
+        selected = comb_matched
       end
-      matched
+      selected
     end
   end
 
@@ -107,38 +107,38 @@ module CSS
     def initialize(@combinator : TokenType, @sel_seq : SelectorSequence)
     end
 
-    def select(n : HTML5::Node, matched = [] of HTML5::Node) : Array(HTML5::Node)
+    def select(n : HTML5::Node, selected = [] of HTML5::Node) : Array(HTML5::Node)
       case @combinator
       when .greater?
         child = n.first_child
         while (child)
-          matched << child if @sel_seq.matches(child) && !child.parent.nil?
+          selected << child if @sel_seq.matches(child) && !child.parent.nil?
           child = child.next_sibling
         end
       when .tilde?
         sibl = n.next_sibling
         while (sibl)
-          matched << sibl if @sel_seq.matches(sibl) && !matched.includes?(sibl)
+          selected << sibl if @sel_seq.matches(sibl) && !selected.includes?(sibl)
           sibl = sibl.next_sibling
         end
       when .plus?
         sibl = n.next_sibling
         while (sibl)
-          matched << sibl if @sel_seq.matches(sibl)
+          selected << sibl if @sel_seq.matches(sibl)
           # check matches against only the first element
           break if sibl.element?
           sibl = sibl.next_sibling
         end
       when .not?
-        matched << n if !@sel_seq.matches(n)
+        selected << n if !@sel_seq.matches(n)
       else
         child = n.first_child
         while (child)
-          matched = @sel_seq.select(child, matched)
+          selected = @sel_seq.select(child, selected)
           child = child.next_sibling
         end
       end
-      matched
+      selected
     end
   end