Merge branch 'releases/1.1.0'

Author: crbelaus

.gitignore

@@ -4,3 +4,6 @@
 erl_crash.dump
 *.ez
 /doc
+
+# Ignore test configuration.
+config/test.exs

README.md

@@ -12,7 +12,11 @@ gem for Ruby.
 `Trans` is published on [hex.pm](https://hex.pm/packages/trans) and the documentation
 is also [available online](https://hexdocs.pm/trans/).
 
-## Requirements
+## Optional Requirements
+
+Having Ecto and Postgrex in your application will allow you to use the `Trans.QueryBuilder`
+component to generate database queries based on translated data.  You can still
+use the `Trans.Translator` component without those dependencies though.
 
 - Ecto 2.0 or higher
 - PostgreSQL 9.4 or higher (since `Trans` leverages the JSONB datatype)

config/test.exs config/test.sample.exsconfig/test.exs renamed to config/test.sample.exs

@@ -11,7 +11,8 @@ defmodule Trans do
   should take a look at this module**.
   * `Trans.QueryBuilder` - provides functions that can be chained in queries and
   allow filtering by translated values.  **If you want to filter queries using
-  translated fields you should take a look at this module**.
+  translated fields you should take a look at this module**. To use this module
+  you must have `Ecto` among your dependencies.
 
   ## What does this package do?
 
@@ -91,17 +92,19 @@ defmodule Trans do
 
   defp setup_convenience_functions(defaults, translatables) do
     quote do
-      # Wrapper of Trans.QueryBuilder.with_translations/3
-      def with_translations(query, locale, opts \\ []) do
-        Trans.QueryBuilder.with_translations(query, locale, opts ++ unquote(defaults))
-      end
+      if Code.ensure_compiled?(Trans.QueryBuilder) do
+        # Wrapper of Trans.QueryBuilder.with_translations/3
+        def with_translations(query, locale, opts \\ []) do
+          Trans.QueryBuilder.with_translations(query, locale, opts ++ unquote(defaults))
+        end
 
-      # Wrapper of Trans.QueryBuilder.with_translations
-      def with_translation(query, locale, field, expected, opts \\ []) do
-        if not Enum.member?(unquote(translatables), field) do
-          raise ArgumentError, "The field `#{field}` is not declared as translatable"
+        # Wrapper of Trans.QueryBuilder.with_translations
+        def with_translation(query, locale, field, expected, opts \\ []) do
+          if not Enum.member?(unquote(translatables), field) do
+            raise ArgumentError, "The field `#{field}` is not declared as translatable"
+          end
+          Trans.QueryBuilder.with_translation(query, locale, field, expected, opts ++ unquote(defaults))
         end
-        Trans.QueryBuilder.with_translation(query, locale, field, expected, opts ++ unquote(defaults))
       end
     end
   end