Merge pull request #49 from belaustegui/releases/2.0.2

Prepare 2.0.2 release

Author: crbelaus

.travis.yml

@@ -1,19 +1,22 @@
 language: elixir
 elixir:
-  - 1.3.2
-  - 1.3.3
   - 1.3.4
-  - 1.4.0
-  - 1.4.1
-  - 1.4.2
+  - 1.4.5
+  - 1.5.1
 otp_release:
   - 18.3
   - 19.0
   - 19.1
   - 19.2
   - 19.3
+  - 20.0
 addons:
   postgresql: "9.4"
+matrix:
+  exclude:
+    - elixir: 1.3.4
+      otp_release: 20.0
+
 before_script:
   - cp config/test.travis.exs config/test.exs
   - mix deps.get

CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## 2.0.2 - 2017-09-29
+- Support Elixir 1.5 and Erlant/OTP 20.
+- Fix bug when passing the locale in a variable to `Trans.QueryBuilder.translated/3`.
+
 ## 2.0.1 - 2017-07-09
 - Relax `Poison` dependency version restriction.
 - Integrate Ebert for code style checks and static analysis.

lib/trans/query_builder.ex

@@ -82,27 +82,23 @@ if Code.ensure_loaded?(Ecto.Query) do
       with field <- field(translatable) do
         with {module_name, []} <- Module.eval_quoted(__CALLER__, module) do
           validate_field(module_name, field)
-          generate_query(schema(translatable), module_name, field, locale(locale))
+          generate_query(schema(translatable), module_name, field, locale)
         end
       end
     end
 
     defp generate_query(schema, module, nil, locale) do
       quote do
-        fragment("(?->?)", field(unquote(schema), unquote(module.__trans__(:container))), ^unquote(locale))
+        fragment("(?->?)", field(unquote(schema), unquote(module.__trans__(:container))), ^to_string(unquote(locale)))
       end
     end
 
     defp generate_query(schema, module, field, locale) do
       quote do
-        fragment("(?->?->>?)", field(unquote(schema), unquote(module.__trans__(:container))), ^unquote(locale), ^unquote(field))
+        fragment("(?->?->>?)", field(unquote(schema), unquote(module.__trans__(:container))), ^to_string(unquote(locale)), ^unquote(field))
       end
     end
 
-    defp locale(locale) when is_atom(locale) and not is_nil(locale), do: to_string(locale)
-    defp locale(locale) when is_binary(locale), do: locale
-    defp locale(_), do: raise ArgumentError, message: "The locale code must be either an atom or a string"
-
     defp schema({{:., _, [schema, _field]}, _metadata, _args}), do: schema
     defp schema(schema), do: schema
 

mix.exs

@@ -1,7 +1,7 @@
 defmodule Trans.Mixfile do
   use Mix.Project
 
-  @version "2.0.1"
+  @version "2.0.2"
 
   def project do
     [app: :trans,

test/query_builder_test.exs

@@ -148,21 +148,10 @@ defmodule QueryBuilderTest do
       fn -> Code.eval_quoted(invalid_module) end
   end
 
-  test "should raise when an invalid locale is specified" do
-    invalid_module = quote do
-      defmodule TestWrongQuery do
-        require Ecto.Query
-        import Ecto.Query, only: [from: 2]
-
-        def invalid_query do
-          from a in Article,
-            where: not is_nil(translated(Article, a.title, nil))
-        end
-      end
-    end
-
-    assert_raise ArgumentError,
-      "The locale code must be either an atom or a string",
-      fn -> Code.eval_quoted(invalid_module) end
+  test "should allow passing the locale from a variable" do
+    locale = :es
+    articles = Repo.all(from a in Article,
+      order_by: translated(Article, a.title, locale))
+    assert Enum.any?(articles)
   end
 end