Merge pull request #125 from mischov/chore/update-meeseeks-html5ever-to-0.15.0

Update Meeseeks_Html5ever to v0.15.0

Author: mischov

.github/workflows/ci.yml

@@ -16,8 +16,8 @@ jobs:
       - name: Set up Elixir
         uses: erlef/setup-beam@v1
         with:
-          otp-version: 25.0
-          elixir-version: 1.14
+          otp-version: 27.0
+          elixir-version: 1.18
 
       - name: Check Elixir formatting
         run: mix format --check-formatted
@@ -32,17 +32,14 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - elixir: 1.12
-            otp: 23
-          - elixir: 1.13
-            otp: 24
-          - elixir: 1.14
-            otp: 25
+          - elixir: 1.16
+            otp: 26
+          - elixir: 1.17
+            otp: 27
+          - elixir: 1.18
+            otp: 27
 
-    # TODO change this to ubuntu-latest after OTP 23 is deprecated, see
-    # https://github.com/erlef/setup-beam#compatibility-between-operating-system-and-erlangotp
-    # for compatibility
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
 
     steps:
       - uses: actions/checkout@v3

README.md

@@ -35,7 +35,7 @@ end
 
 ## Compatibility
 
-Meeseeks requires a minimum combination of Elixir 1.12.0 and Erlang/OTP 23.0, and is tested with a maximum combination of Elixir 1.14.0 and Erlang/OTP 25.0.
+Meeseeks is tested with a a minimum combination of Elixir 1.16.0 and Erlang/OTP 26.0 and a maximum combination of Elixir 1.18.0 and Erlang/OTP 27.0.
 
 ## Installation
 

lib/meeseeks/selector/css/parser.ex

@@ -31,18 +31,18 @@ defmodule Meeseeks.Selector.CSS.Parser do
     {element, []}
   end
 
-  defp parse_element([',' | toks], element) do
+  defp parse_element([~c"," | toks], element) do
     element = %{element | selectors: Enum.reverse(element.selectors)}
     {element, toks}
   end
 
-  defp parse_element([{:ident, namespace}, '|' | toks], element) do
+  defp parse_element([{:ident, namespace}, ~c"|" | toks], element) do
     selector = %Namespace{value: List.to_string(namespace)}
     element = %{element | selectors: [selector | element.selectors]}
     parse_element(toks, element)
   end
 
-  defp parse_element(['*', '|' | toks], element) do
+  defp parse_element([~c"*", ~c"|" | toks], element) do
     selector = %Namespace{value: "*"}
     element = %{element | selectors: [selector | element.selectors]}
     parse_element(toks, element)
@@ -54,7 +54,7 @@ defmodule Meeseeks.Selector.CSS.Parser do
     parse_element(toks, element)
   end
 
-  defp parse_element(['*' | toks], element) do
+  defp parse_element([~c"*" | toks], element) do
     selector = %Tag{value: "*"}
     element = %{element | selectors: [selector | element.selectors]}
     parse_element(toks, element)
@@ -72,45 +72,45 @@ defmodule Meeseeks.Selector.CSS.Parser do
     parse_element(toks, element)
   end
 
-  defp parse_element(['[' | toks], element) do
+  defp parse_element([~c"[" | toks], element) do
     {selector, toks} = parse_attribute(toks)
     element = %{element | selectors: [selector | element.selectors]}
     parse_element(toks, element)
   end
 
-  defp parse_element([':' | toks], element) do
+  defp parse_element([~c":" | toks], element) do
     {selector, toks} = parse_pseudo_class(toks)
     element = %{element | selectors: [selector | element.selectors]}
     Selector.validate!(selector)
     parse_element(toks, element)
   end
 
-  defp parse_element(['>' | toks], element) do
+  defp parse_element([~c">" | toks], element) do
     {combinator_selector, toks} = parse_element(toks)
     combinator = %Combinator.ChildElements{selector: combinator_selector}
     element = %{element | combinator: combinator}
-    parse_element([',' | toks], element)
+    parse_element([~c"," | toks], element)
   end
 
   defp parse_element([:space | toks], element) do
     {combinator_selector, toks} = parse_element(toks)
     combinator = %Combinator.DescendantElements{selector: combinator_selector}
     element = %{element | combinator: combinator}
-    parse_element([',' | toks], element)
+    parse_element([~c"," | toks], element)
   end
 
-  defp parse_element(['+' | toks], element) do
+  defp parse_element([~c"+" | toks], element) do
     {combinator_selector, toks} = parse_element(toks)
     combinator = %Combinator.NextSiblingElement{selector: combinator_selector}
     element = %{element | combinator: combinator}
-    parse_element([',' | toks], element)
+    parse_element([~c"," | toks], element)
   end
 
-  defp parse_element(['~' | toks], element) do
+  defp parse_element([~c"~" | toks], element) do
     {combinator_selector, toks} = parse_element(toks)
     combinator = %Combinator.NextSiblingElements{selector: combinator_selector}
     element = %{element | combinator: combinator}
-    parse_element([',' | toks], element)
+    parse_element([~c"," | toks], element)
   end
 
   defp parse_element(toks, element) do
@@ -132,24 +132,24 @@ defmodule Meeseeks.Selector.CSS.Parser do
     :value_suffix
   ]
 
-  defp parse_attribute(['^', {:ident, attr}, ']' | toks]) do
+  defp parse_attribute([~c"^", {:ident, attr}, ~c"]" | toks]) do
     selector = %Attribute.AttributePrefix{attribute: List.to_string(attr)}
     {selector, toks}
   end
 
-  defp parse_attribute([{:ident, attr}, type, {:ident, val}, ']' | toks])
+  defp parse_attribute([{:ident, attr}, type, {:ident, val}, ~c"]" | toks])
        when type in @attribute_value_selector_types do
     selector = attribute_value_selector(type, List.to_string(attr), List.to_string(val))
     {selector, toks}
   end
 
-  defp parse_attribute([{:ident, attr}, type, {:string, val}, ']' | toks])
+  defp parse_attribute([{:ident, attr}, type, {:string, val}, ~c"]" | toks])
        when type in @attribute_value_selector_types do
     selector = attribute_value_selector(type, List.to_string(attr), List.to_string(val))
     {selector, toks}
   end
 
-  defp parse_attribute([{:ident, attr}, ']' | toks]) do
+  defp parse_attribute([{:ident, attr}, ~c"]" | toks]) do
     selector = %Attribute.Attribute{attribute: List.to_string(attr)}
     {selector, toks}
   end
@@ -185,15 +185,15 @@ defmodule Meeseeks.Selector.CSS.Parser do
     {selector, toks}
   end
 
-  defp parse_pseudo_class_args('not', toks) do
+  defp parse_pseudo_class_args(~c"not", toks) do
     parse_not_args(toks, 0, [])
   end
 
   defp parse_pseudo_class_args(type, toks) do
     parse_pseudo_class_args(type, toks, [])
   end
 
-  defp parse_pseudo_class_args(_type, [')' | toks], args) do
+  defp parse_pseudo_class_args(_type, [~c")" | toks], args) do
     {Enum.reverse(args), toks}
   end
 
@@ -243,15 +243,15 @@ defmodule Meeseeks.Selector.CSS.Parser do
     |> String.to_integer()
   end
 
-  defp parse_not_args([')' | toks], 0, acc) do
+  defp parse_not_args([~c")" | toks], 0, acc) do
     tokens = Enum.reverse(acc)
     selectors = parse_elements(tokens)
 
     {[selectors], toks}
   end
 
-  defp parse_not_args([')' | toks], depth, acc) do
-    parse_not_args(toks, depth - 1, [')' | acc])
+  defp parse_not_args([~c")" | toks], depth, acc) do
+    parse_not_args(toks, depth - 1, [~c")" | acc])
   end
 
   defp parse_not_args([{:function, _type} = tok | toks], depth, acc) do
@@ -264,31 +264,31 @@ defmodule Meeseeks.Selector.CSS.Parser do
 
   defp pseudo_class_selector(type, args) do
     case type do
-      'first-child' ->
+      ~c"first-child" ->
         %PseudoClass.FirstChild{args: args}
 
-      'first-of-type' ->
+      ~c"first-of-type" ->
         %PseudoClass.FirstOfType{args: args}
 
-      'last-child' ->
+      ~c"last-child" ->
         %PseudoClass.LastChild{args: args}
 
-      'last-of-type' ->
+      ~c"last-of-type" ->
         %PseudoClass.LastOfType{args: args}
 
-      'not' ->
+      ~c"not" ->
         %PseudoClass.Not{args: args}
 
-      'nth-child' ->
+      ~c"nth-child" ->
         %PseudoClass.NthChild{args: args}
 
-      'nth-last-child' ->
+      ~c"nth-last-child" ->
         %PseudoClass.NthLastChild{args: args}
 
-      'nth-last-of-type' ->
+      ~c"nth-last-of-type" ->
         %PseudoClass.NthLastOfType{args: args}
 
-      'nth-of-type' ->
+      ~c"nth-of-type" ->
         %PseudoClass.NthOfType{args: args}
 
       _ ->

lib/meeseeks/selector/xpath/expr/helpers.ex

@@ -116,7 +116,8 @@ defmodule Meeseeks.Selector.XPath.Expr.Helpers do
   def string(true, _document), do: "true"
   def string([], _document), do: ""
   def string(0, _document), do: "0"
-  def string(0.0, _document), do: "0"
+  def string(+0.0, _document), do: "0"
+  def string(-0.0, _document), do: "0"
   def string(:NaN, _document), do: "NaN"
   def string(:Infinity, _document), do: "Infinity"
   def string(:"-Infinity", _document), do: "-Infinity"

mix.exs

@@ -14,6 +14,7 @@ defmodule Meeseeks.Mixfile do
       app: :meeseeks,
       version: @version,
       elixir: "~> 1.7",
+      compilers: compilers(),
       deps: deps(),
 
       # Hex
@@ -30,9 +31,13 @@ defmodule Meeseeks.Mixfile do
     [extra_applications: [:logger, :xmerl]]
   end
 
+  defp compilers do
+    [:leex, :yecc] ++ Mix.compilers()
+  end
+
   defp deps do
     [
-      {:meeseeks_html5ever, "~> 0.14.3"},
+      {:meeseeks_html5ever, "~> 0.15.0"},
 
       # Dev
       {:dialyxir, "~> 0.5", only: :dev, runtime: false},

mix.lock

@@ -1,6 +1,6 @@
 %{
   "bunt": {:hex, :bunt, "0.2.0", "951c6e801e8b1d2cbe58ebbd3e616a869061ddadcc4863d0a2182541acae9a38", [:mix], [], "hexpm"},
-  "castore": {:hex, :castore, "1.0.1", "240b9edb4e9e94f8f56ab39d8d2d0a57f49e46c56aced8f873892df8ff64ff5a", [:mix], [], "hexpm", "b4951de93c224d44fac71614beabd88b71932d0b1dea80d2f80fb9044e01bbb3"},
+  "castore": {:hex, :castore, "1.0.14", "4582dd7d630b48cf5e1ca8d3d42494db51e406b7ba704e81fbd401866366896a", [:mix], [], "hexpm", "7bc1b65249d31701393edaaac18ec8398d8974d52c647b7904d01b964137b9f4"},
   "credo": {:hex, :credo, "0.6.1", "a941e2591bd2bd2055dc92b810c174650b40b8290459c89a835af9d59ac4a5f8", [:mix], [{:bunt, "~> 0.2.0", [hex: :bunt, repo: "hexpm", optional: false]}], "hexpm"},
   "dialyxir": {:hex, :dialyxir, "0.5.0", "5bc543f9c28ecd51b99cc1a685a3c2a1a93216990347f259406a910cf048d1d7", [:mix], [], "hexpm", "7c5c6c1eceb93e26a06c36148cb6f8021ae6f4f9a07bb1ae95f588e0a01ea8e1"},
   "earmark": {:hex, :earmark, "1.4.3", "364ca2e9710f6bff494117dbbd53880d84bebb692dafc3a78eb50aa3183f2bfd", [:mix], [], "hexpm", "8cf8a291ebf1c7b9539e3cddb19e9cef066c2441b1640f13c34c1d3cfc825fec"},
@@ -12,9 +12,9 @@
   "makeup_elixir": {:hex, :makeup_elixir, "0.15.1", "b5888c880d17d1cc3e598f05cdb5b5a91b7b17ac4eaf5f297cb697663a1094dd", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}, {:nimble_parsec, "~> 1.1", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "db68c173234b07ab2a07f645a5acdc117b9f99d69ebf521821d89690ae6c6ec8"},
   "makeup_erlang": {:hex, :makeup_erlang, "0.1.1", "3fcb7f09eb9d98dc4d208f49cc955a34218fc41ff6b84df7c75b3e6e533cc65f", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}], "hexpm", "174d0809e98a4ef0b3309256cbf97101c6ec01c4ab0b23e926a9e17df2077cbb"},
   "markdown": {:git, "https://github.com/devinus/markdown.git", "d065dbcc4e242a85ca2516fdadd0082712871fd8", []},
-  "meeseeks_html5ever": {:hex, :meeseeks_html5ever, "0.14.3", "7827c6ce393d9f99dd0220c356fd66ee7101718037ec6f7f18d4bcba84ef1798", [:mix], [{:rustler, ">= 0.0.0", [hex: :rustler, repo: "hexpm", optional: true]}, {:rustler_precompiled, "~> 0.6.1", [hex: :rustler_precompiled, repo: "hexpm", optional: false]}], "hexpm", "6b69573b97120fcc6e97045178ad085fd3ee10a5b49c1e9ebb8a28bd4a9c538b"},
+  "meeseeks_html5ever": {:hex, :meeseeks_html5ever, "0.15.0", "f7bcc8ac84703ad49c4c4c53f568041c37788fcab93c8bea4e53f2c6cbb66c08", [:mix], [{:rustler, ">= 0.0.0", [hex: :rustler, repo: "hexpm", optional: true]}, {:rustler_precompiled, "~> 0.8.2", [hex: :rustler_precompiled, repo: "hexpm", optional: false]}], "hexpm", "7ed72d30bbad1a50cb513a261ab5210e93eb5a09d0bf6712ea65f0d309cdf71b"},
   "nimble_parsec": {:hex, :nimble_parsec, "1.1.0", "3a6fca1550363552e54c216debb6a9e95bd8d32348938e13de5eda962c0d7f89", [:mix], [], "hexpm", "08eb32d66b706e913ff748f11694b17981c0b04a33ef470e33e11b3d3ac8f54b"},
   "rustler": {:hex, :rustler, "0.22.2", "f92d6dba71bef6fe5f0d955649cb071127adc92f32a78890e8fa9939e59a1b41", [:mix], [{:jason, "~> 1.2", [hex: :jason, repo: "hexpm", optional: false]}, {:toml, "~> 0.5.2", [hex: :toml, repo: "hexpm", optional: false]}], "hexpm", "56b129141e86d60a2d670af9a2b55a9071e10933ef593034565af77e84655118"},
-  "rustler_precompiled": {:hex, :rustler_precompiled, "0.6.1", "160b545bce8bf9a3f1b436b2c10f53574036a0db628e40f393328cbbe593602f", [:mix], [{:castore, "~> 0.1 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: false]}, {:rustler, "~> 0.23", [hex: :rustler, repo: "hexpm", optional: true]}], "hexpm", "0dd269fa261c4e3df290b12031c575fff07a542749f7b0e8b744d72d66c43600"},
+  "rustler_precompiled": {:hex, :rustler_precompiled, "0.8.2", "5f25cbe220a8fac3e7ad62e6f950fcdca5a5a5f8501835d2823e8c74bf4268d5", [:mix], [{:castore, "~> 0.1 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: false]}, {:rustler, "~> 0.23", [hex: :rustler, repo: "hexpm", optional: true]}], "hexpm", "63d1bd5f8e23096d1ff851839923162096364bac8656a4a3c00d1fff8e83ee0a"},
   "toml": {:hex, :toml, "0.5.2", "e471388a8726d1ce51a6b32f864b8228a1eb8edc907a0edf2bb50eab9321b526", [:mix], [], "hexpm", "f1e3dabef71fb510d015fad18c0e05e7c57281001141504c6b69d94e99750a07"},
 }