Allow use of and with fragments

Add test for and with fragment

Use List.wrap/1 instead of flattening

Author: ankhers

lib/mongo_ecto/normalized_query.ex

@@ -367,7 +367,7 @@ defmodule Mongo.Ecto.NormalizedQuery do
   end)
 
   defp mapped_pair_or_value({op, _, _} = tuple, params, pk, query, place) when is_op(op) do
-    [pair(tuple, params, pk, query, place)]
+    List.wrap(pair(tuple, params, pk, query, place))
   end
   defp mapped_pair_or_value(value, params, pk, query, place) do
     value(value, params, pk, query, place)

mix.lock

@@ -6,6 +6,6 @@
   "ecto": {:hex, :ecto, "2.1.6", "29b45f393c2ecd99f83e418ea9b0a2af6078ecb30f401481abac8a473c490f84", [:mix], [{:db_connection, "~> 1.1", [hex: :db_connection, optional: true]}, {:decimal, "~> 1.2", [hex: :decimal, optional: false]}, {:mariaex, "~> 0.8.0", [hex: :mariaex, optional: true]}, {:poison, "~> 2.2 or ~> 3.0", [hex: :poison, optional: true]}, {:poolboy, "~> 1.5", [hex: :poolboy, optional: false]}, {:postgrex, "~> 0.13.0", [hex: :postgrex, optional: true]}, {:sbroker, "~> 1.0", [hex: :sbroker, optional: true]}]},
   "ex_doc": {:hex, :ex_doc, "0.16.2", "3b3e210ebcd85a7c76b4e73f85c5640c011d2a0b2f06dcdf5acdb2ae904e5084", [:mix], [{:earmark, "~> 1.1", [hex: :earmark, optional: false]}]},
   "inch_ex": {:hex, :inch_ex, "0.5.6", "418357418a553baa6d04eccd1b44171936817db61f4c0840112b420b8e378e67", [:mix], [{:poison, "~> 1.5 or ~> 2.0 or ~> 3.0", [hex: :poison, optional: false]}]},
-  "mongodb": {:git, "https://github.com/ankhers/mongodb.git", "d2d0954da6385a525d8d3577d28c19fb0b215349", [branch: "reboot_replica_sets"]},
+  "mongodb": {:git, "https://github.com/ankhers/mongodb.git", "27767600c4049c7d15fc8185d25bb7678854bfb7", [branch: "reboot_replica_sets"]},
   "poison": {:hex, :poison, "3.1.0", "d9eb636610e096f86f25d9a46f35a9facac35609a7591b3be3326e99a0484665", [:mix], []},
   "poolboy": {:hex, :poolboy, "1.5.1", "6b46163901cfd0a1b43d692657ed9d7e599853b3b21b95ae5ae0a777cf9b6ca8", [:rebar], []}}

test/mongo_ecto_test.exs

@@ -26,7 +26,7 @@ defmodule Mongo.EctoTest do
     p2 = TestRepo.insert!(%Post{title: "other text"})
 
     assert [p1] == TestRepo.all(from p in Post, where: fragment(title: ["$regex": "some"]))
-    assert [p2] == TestRepo.all(from p in Post, where: fragment(title: ^regex("other")))
+    assert [p2] == TestRepo.all(from p in Post, where: fragment(title: ^regex("other")) and fragment(title: ^regex("text")))
   end
 
   test "retrieve whole document" do