Run all parser tests with new implementation

slime-lang · May 9, 2017 · da9dfd1 · da9dfd1
1 parent d9eac96
commit da9dfd1
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 26 deletions.
diff --git a/lib/slime/parser/transform.ex b/lib/slime/parser/transform.ex
@@ -58,7 +58,7 @@ defmodule Slime.Parser.Transform do
   def transform(:tag, {:blank, _}, _index), do: {0, ""}
   def transform(:tag, input, _index) do
     case input do
-      [indent, {:eex, content: content, inline: false} = tag] ->
+      [indent, {:eex, [{:content, content}, {:inline, false} | _]} = tag] ->
         indent = indent_size(indent)
         # TODO: handle if/unless with else in grammar
         if content =~ ~r/^\s*else\s*$/ do
@@ -175,9 +175,7 @@ defmodule Slime.Parser.Transform do
       "-" -> {false, %{}}
       [_, _, spaces] -> {true, spaces}
     end
-    opts = [content: code, inline: inline]
-    opts = if spaces == %{}, do: opts, else: [{:spaces, spaces} | opts]
-    {:eex, opts}
+    {:eex, [content: code, inline: inline, spaces: spaces]}
   end
 
   def transform(:code_lines, input, _index) do

diff --git a/test/parser/multiline_elixir_test.exs b/test/parser/multiline_elixir_test.exs
@@ -8,7 +8,7 @@ defmodule ParserMultilineElixirTest do
       "        another_expression \\",
       "     Final_expression"
     ]
-    parsed  = Parser.parse_lines(lines)
+    parsed  = Parser.parse(Enum.join(lines, "\n"))
     content = lines |> Enum.join("\n") |> String.lstrip(?=) |> String.lstrip
 
     assert parsed == [{0, {:eex, [content: content, inline: true, spaces: %{}]}}]
@@ -20,7 +20,7 @@ defmodule ParserMultilineElixirTest do
       "             param2,",
       "             param3"
     ]
-    parsed  = Parser.parse_lines(lines)
+    parsed  = Parser.parse(Enum.join(lines, "\n"))
     content = lines |> Enum.join("\n") |> String.lstrip(?=) |> String.lstrip
 
     assert parsed == [{0, {:eex, [content: content, inline: true, spaces: %{}]}}]
@@ -32,7 +32,7 @@ defmodule ParserMultilineElixirTest do
       "        another_expression \\",
       "     Final_expression"
     ]
-    parsed  = Parser.parse_lines(lines)
+    parsed  = Parser.parse(Enum.join(lines, "\n"))
     content = lines |> Enum.join("\n") |> String.lstrip(?-) |> String.lstrip
 
     assert parsed == [{0, {:eex, [content: content, inline: false, spaces: %{}]}}]
@@ -44,7 +44,7 @@ defmodule ParserMultilineElixirTest do
       "             param2,",
       "             param3"
     ]
-    parsed  = Parser.parse_lines(lines)
+    parsed  = Parser.parse(Enum.join(lines, "\n"))
     content = lines |> Enum.join("\n") |> String.lstrip(?-) |> String.lstrip
 
     assert parsed == [{0, {:eex, [content: content, inline: false, spaces: %{}]}}]

diff --git a/test/parser_test.exs b/test/parser_test.exs
@@ -19,26 +19,28 @@ defmodule ParserTest do
   end
 
   test "parses inline nesting" do
-    parsed = [".row: .col-lg-12: p Hello World"] |> Parser.parse_lines
+    parsed = Parser.parse(".row: .col-lg-12: p Hello World")
     assert parsed == [
       {0, {"div",
-           children: [
-             {"div",
-              children: [
-                {"p",
-                 attributes: [],
-                 children: ["Hello World"],
-                 spaces: %{},
-                 close: false}
-              ],
-              attributes: [class: "col-lg-12"],
-              spaces: %{},
-              close: false}
-           ],
-           attributes: [class: "row"],
-           spaces: %{},
-           close: false}
-      }
+        attributes: [{"class", "row"}],
+        spaces: %{},
+        children: [
+          {"div",
+            attributes: [{"class", "col-lg-12"}],
+            spaces: %{},
+            children: [
+              {"p",
+                attributes: [],
+                spaces: %{},
+                children: ["Hello World"],
+                close: false
+              }
+            ],
+            close: false
+          }
+        ],
+        close: false
+      }}
     ]
   end