From ebbb47e6cdb4a4b6e58c7d1af2f0041f56ab1f77 Mon Sep 17 00:00:00 2001
From: Tomek Gryszkiewicz <grych@tg.pl>
Date: Wed, 2 Aug 2017 20:11:58 +0200
Subject: [PATCH] 0.5.2

---
 CHANGELOG.md                    | 5 +++--
 mix.exs                         | 2 +-
 test/integration/query_test.exs | 8 ++++----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7fdd613..f1a65e0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,10 +1,11 @@
 # CHANGELOG
 
 # v0.5.2
-Fixed on Elixir 1.4 due to elixir-lang/elixir#6391
+This is a small update to make Drab compatible with Elixir 1.5. 
+Due to an issue with 1.5.0 (elixir-lang/elixir#6391) Elixir version is fixed on 1.4 or >= 1.5.1.
 
 ### Fixes:
-* #26, #27, #30, #33
+* #26, #27, #30, #31, #33
 
 
 # v0.5.1
diff --git a/mix.exs b/mix.exs
index d96bb6b..ad7d87c 100644
--- a/mix.exs
+++ b/mix.exs
@@ -5,7 +5,7 @@ defmodule Drab.Mixfile do
   def project do
     [app: :drab,
      version: @version,
-     elixir: "~> 1.4.0",
+     elixir: ">= 1.4.0 and < 1.5.0 or >= 1.5.1 and < 1.6.0", # a bug in EEx in 1.5.0
      build_embedded: Mix.env == :prod,
      start_permanent: Mix.env == :prod,
      elixirc_paths: elixirc_paths(Mix.env),
diff --git a/test/integration/query_test.exs b/test/integration/query_test.exs
index f4c75e7..0fbcc55 100644
--- a/test/integration/query_test.exs
+++ b/test/integration/query_test.exs
@@ -316,7 +316,7 @@ defmodule DrabTestApp.QueryTest do
       socket |> insert(" appended", append: selector)
       assert visible_text(wrapper) == "Insert DIV appended"
       assert visible_text(div) == "Insert DIV appended"
-      assert inner_html(wrapper) |> String.strip == "<div id=\"insert1_div\">Insert DIV appended</div>"
+      assert inner_html(wrapper) |> String.trim() == "<div id=\"insert1_div\">Insert DIV appended</div>"
     end
 
     test "insert/3 prepend" do
@@ -325,7 +325,7 @@ defmodule DrabTestApp.QueryTest do
       socket |> insert("Prepended ", prepend: selector)
       assert visible_text(wrapper) == "Prepended Insert DIV"
       assert visible_text(div) == "Prepended Insert DIV"
-      assert inner_html(wrapper) |> String.strip == "<div id=\"insert1_div\">Prepended Insert DIV</div>"
+      assert inner_html(wrapper) |> String.trim() == "<div id=\"insert1_div\">Prepended Insert DIV</div>"
     end
 
     test "insert/3 after" do
@@ -334,7 +334,7 @@ defmodule DrabTestApp.QueryTest do
       socket |> insert(" appended", after: selector)
       assert visible_text(wrapper) == "Insert DIV\nappended"
       assert visible_text(div) == "Insert DIV"
-      assert inner_html(wrapper) |> String.strip == "<div id=\"insert1_div\">Insert DIV</div> appended"
+      assert inner_html(wrapper) |> String.trim() == "<div id=\"insert1_div\">Insert DIV</div> appended"
     end
 
     test "insert/3 before" do
@@ -343,7 +343,7 @@ defmodule DrabTestApp.QueryTest do
       socket |> insert("Prepended ", before: selector)
       assert visible_text(wrapper) == "Prepended\nInsert DIV"
       assert visible_text(div) == "Insert DIV"
-      assert inner_html(wrapper) |> String.strip == "Prepended <div id=\"insert1_div\">Insert DIV</div>"
+      assert inner_html(wrapper) |> String.trim() == "Prepended <div id=\"insert1_div\">Insert DIV</div>"
     end
   end