Feature/improved parsing

.formatter.exs

@@ -1,3 +1,4 @@
 [
-  inputs: ["mix.exs", "{config,lib,test}/**/*.{ex,exs}"]
+  inputs: ["mix.exs", "{config,lib,test}/**/*.{ex,exs}"],
+  line_length: 98
 ]

.gitignore

@@ -5,3 +5,5 @@
 /bench/snapshots
 erl_crash.dump
 /cover
+/bench/results/
+/.elixir_ls

.travis.yml

@@ -1,7 +1,7 @@
 language: elixir
 sudo: false
 elixir:
-  - 1.5.1
+  - 1.6.6
   - 1.7.4
   - 1.8.0
 otp_release:
@@ -10,8 +10,6 @@ otp_release:
   - 21.2
 matrix:
   exclude:
-    - elixir: 1.5.1
-      otp_release: 21.2
     - elixir: 1.8.0
       otp_release: 18.3
     - elixir: 1.8.0

bench/full_benchmark.exs

@@ -0,0 +1,36 @@
+Liquid.start()
+
+path = "test/templates"
+levels = ["simple", "medium", "complex"]
+
+data =
+  "#{path}/db.json"
+  |> File.read!()
+  |> Poison.decode!()
+
+levels_map =
+  for level <- levels,
+    test_case <- File.ls!("#{path}/#{level}"),
+    into: %{} do
+      markup = File.read!("#{path}/#{level}/#{test_case}/input.liquid")
+      parsed = Liquid.Template.parse(markup)
+      {level, %{test_case => %{parse: markup, render: parsed}}}
+  end
+
+create_phase = fn cases, phase ->
+  fn ->
+    for {_, %{^phase => param}} <- cases do
+      args = if phase == :render, do: [param, data], else: [param]
+      apply(Liquid.Template, phase, args)
+    end
+  end
+end
+
+for phase <- [:parse] do
+  time = DateTime.to_string(DateTime.utc_now())
+  benchmark = for {level, cases} <- levels_map, into: %{} do
+    {"#{level} #{phase}", create_phase.(cases, phase)}
+  end
+
+  Benchee.run(benchmark, warmup: 5, time: 60)
+end

bench/parser_benchmark.exs

@@ -0,0 +1,43 @@
+Liquid.start()
+
+complex = File.read!("test/templates/complex/01/input.liquid")
+
+middle = """
+  <h1>{{ product.name }}</h1>
+  <h2>{{ product.price }}</h2>
+  <h2>{{ product.price }}</h2>
+  {% comment %}This is a commentary{% endcomment %}
+  {% raw %}This is a raw tag{% endraw %}
+  {% for item in array %} Repeat this {% else %} Array Empty {% endfor %}
+"""
+
+simple = """
+  {% for item in array %} Repeat this {% else %} Array Empty {% endfor %}
+"""
+
+empty = ""
+
+templates = [complex: complex, middle: middle, simple: simple, empty: empty]
+
+time = DateTime.to_string(DateTime.utc_now())
+
+Enum.each(templates,
+  fn {name, template} ->
+    IO.puts "running: #{name}"
+    Benchee.run(
+      %{
+        "#{name}-regex" => fn -> Liquid.Template.old_parse(template) end,
+        "#{name}-nimble-with-translate" => fn -> Liquid.Template.parse(template) end,
+        "#{name}-nimble" => fn -> Liquid.NimbleParser.parse(template) end
+      },
+      warmup: 5,
+      time: 60,
+      formatters: [
+        Benchee.Formatters.Console,
+        Benchee.Formatters.CSV
+      ],
+      formatter_options: [csv: [file: "bench/results/parser-benchmarks-#{time}.csv"]]
+    )
+  end
+)
+

bench/parser_custom_benchmark.exs

@@ -0,0 +1,44 @@
+Liquid.start()
+
+defmodule Random do
+  def render(output, tag, context) do
+    {"MyCustomTag Results...output:#{output} tag:#{tag}", context}
+  end
+end
+
+defmodule RandomBlock do
+  def render(output, tag, context) do
+    {"MyCustomBlock Results...output:#{output} tag:#{tag}", context}
+  end
+end
+
+
+Liquid.Registers.register("random", Random, Liquid.Tag)
+Liquid.Registers.register("randomblock", RandomBlock, Liquid.Block)
+
+custom_tag = "{% random 5 %}"
+custom_block = "{% randomblock 5 %} This is a Random Number: ^^^ {% endrandomblock %}"
+
+templates = [
+  custom_tag: custom_tag,
+  custom_block: custom_block
+]
+
+benchmarks =
+  for {name, template} <- templates, into: %{} do
+    {name, fn -> Liquid.Parser.parse(template) end}
+  end
+
+Benchee.run(
+  benchmarks,
+  warmup: 5,
+  time: 20,
+  print: [
+    benchmarking: true,
+    configuration: false,
+    fast_warning: false
+  ],
+  console: [
+    comparison: false
+  ]
+)

bench/parser_tags_benchmark.exs

@@ -0,0 +1,69 @@
+Liquid.start()
+
+complex =
+  "{% increment a %}{% if true %}{% decrement b %}{% if false %}{% increment c %}One{% decrement d %}{% elsif true %}Two{% else %}Three{% endif %}{% endif %}{% decrement d %}{% if false %}Four{% endif %}Last"
+
+big_literal = File.read!("bench/templates/big_literal.liquid")
+big_literal_with_tags = File.read!("bench/templates/big_literal_with_tags.liquid")
+small_literal = "X"
+assign = "Price in stock {% assign a = 5 %} Final Price"
+
+capture = """
+Lorem Ipsum is simply dummy text {% capture first_variable %}Hey{% endcapture %}of the printing and typesetting industry. Lorem Ipsum has {% capture first_variable %}Hey{% endcapture %}been the industry's standard dummy text ever since the {% capture first_variable %}Hey{% endcapture %}1500s, when an unknown printer {% capture first_variable %}Hey{% endcapture %}took a galley of type and scrambled it {% capture first_variable %}Hey{% endcapture %}to make a type specimen book. It has survived {% capture first_variable %}Hey{% endcapture %}not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged{% capture first_variable %}Hey{% endcapture %}. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker {% capture first_variable %}Hey{% endcapture %}including versions of Lorem Ipsum.Open{% capture first_variable %}Hey{% endcapture %}{% capture second_variable %}Hello{% endcapture %}{% capture last_variable %}{% endcapture %}CloseOpen{% capture first_variable %}Hey{% endcapture %}{% capture second_variable %}Hello{% endcapture %}{% capture last_variable %}{% endcapture %}Close
+"""
+
+small_capture = "{% capture x %}X{% endcapture %}"
+case_tag = "{% case condition %}{% when 1 %} its 1 {% when 2 %} its 2 {% endcase %}"
+comment = "{% comment %} {% if true %} This is a commented block  {% afi true %}{% endcomment %}"
+cycle = "This time {%cycle \"one\", \"two\"%} we win MF!"
+decrement = "Total Price: {% decrement a %}"
+for_tag = "{%for i in array.items offset:continue limit:1000 %}{{i}}{%endfor%}"
+
+if_tag =
+  "{% if false %} this text should not {% elsif true %} tests {% else %} go into the output {% endif %}"
+
+include =
+  "With text {% include 'snippet', my_variable: 'apples', my_other_variable: 'oranges' %} finally!"
+
+increment = "Price with discount: {% increment a %}"
+raw = "{% raw %} {% if true %} this is a raw block {% endraw %}"
+tablerow = "{% tablerow item in array %}{% endtablerow %}"
+
+templates = [
+  complex: complex,
+  literal: big_literal,
+  big_literal_with_tags: big_literal_with_tags,
+  small_literal: small_literal,
+  assign: assign,
+  capture: capture,
+  small_capture: small_capture,
+  case: case_tag,
+  comment: comment,
+  cycle: cycle,
+  decrement: decrement,
+  for: for_tag,
+  if: if_tag,
+  include: include,
+  increment: increment,
+  raw: raw,
+  tablerow: tablerow
+]
+
+benchmarks =
+  for {name, template} <- templates, into: %{} do
+    {name, fn -> Liquid.Parser.parse(template) end}
+  end
+
+Benchee.run(
+  benchmarks,
+  warmup: 5,
+  time: 20,
+  print: [
+    benchmarking: true,
+    configuration: false,
+    fast_warning: false
+  ],
+  console: [
+    comparison: false
+  ]
+)

bench/render_tags_benchmark.exs

@@ -0,0 +1,80 @@
+alias Liquid.Template
+
+Liquid.start()
+
+complex =
+  Template.parse(
+    "{% increment a %}{% if true %}{% decrement b %}{% if false %}{% increment c %}One{% decrement d %}{% elsif true %}Two{% else %}Three{% endif %}{% endif %}{% decrement d %}{% if false %}Four{% endif %}Last"
+  )
+
+big_literal = Template.parse(File.read!("bench/templates/big_literal.liquid"))
+big_literal_with_tags = Template.parse(File.read!("bench/templates/big_literal_with_tags.liquid"))
+small_literal = Template.parse("X")
+assign = Template.parse("Price in stock {% assign a = 5 %} Final Price")
+
+capture =
+  Template.parse("""
+  Lorem Ipsum is simply dummy text {% capture first_variable %}Hey{% endcapture %}of the printing and typesetting industry. Lorem Ipsum has {% capture first_variable %}Hey{% endcapture %}been the industry's standard dummy text ever since the {% capture first_variable %}Hey{% endcapture %}1500s, when an unknown printer {% capture first_variable %}Hey{% endcapture %}took a galley of type and scrambled it {% capture first_variable %}Hey{% endcapture %}to make a type specimen book. It has survived {% capture first_variable %}Hey{% endcapture %}not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged{% capture first_variable %}Hey{% endcapture %}. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker {% capture first_variable %}Hey{% endcapture %}including versions of Lorem Ipsum.Open{% capture first_variable %}Hey{% endcapture %}{% capture second_variable %}Hello{% endcapture %}{% capture last_variable %}{% endcapture %}CloseOpen{% capture first_variable %}Hey{% endcapture %}{% capture second_variable %}Hello{% endcapture %}{% capture last_variable %}{% endcapture %}Close
+  """)
+
+small_capture = Template.parse("{% capture x %}X{% endcapture %}")
+
+case_tag =
+  Template.parse("{% case condition %}{% when 1 %} its 1 {% when 2 %} its 2 {% endcase %}")
+
+comment =
+  Template.parse(
+    "{% comment %} {% if true %} This is a commented block  {% afi true %}{% endcomment %}"
+  )
+
+cycle = Template.parse(~S(This time {%cycle "one", "two"%} we win MF!))
+decrement = Template.parse("Total Price: {% decrement a %}")
+for_tag = Template.parse("{%for i in array.items offset:continue limit:1000 %}{{i}}{%endfor%}")
+
+if_tag =
+  Template.parse(
+    "{% if false %} this text should not {% elsif true %} tests {% else %} go into the output {% endif %}"
+  )
+
+increment = Template.parse("Price with discount: {% increment a %}")
+raw = Template.parse("{% raw %} {% if true %} this is a raw block {% endraw %}")
+tablerow = Template.parse("{% tablerow item in array %}{% endtablerow %}")
+
+templates = [
+  complex: complex,
+  literal: big_literal,
+  big_literal_with_tags: big_literal_with_tags,
+  small_literal: small_literal,
+  assign: assign,
+  capture: capture,
+  small_capture: small_capture,
+  case: case_tag,
+  comment: comment,
+  cycle: cycle,
+  decrement: decrement,
+  for: for_tag,
+  if: if_tag,
+  increment: increment,
+  raw: raw,
+  tablerow: tablerow
+]
+
+benchmarks =
+  for {name, template} <- templates, into: %{} do
+    {name, fn -> Liquid.Template.render(template) end}
+  end
+
+Benchee.run(
+  benchmarks,
+  warmup: 5,
+  time: 20,
+  print: [
+    benchmarking: true,
+    configuration: false,
+    fast_warning: false
+  ],
+  console: [
+    comparison: false
+  ],
+  memory_time: 10
+)