added more tests, clean up code

Author: zookzook

coveralls.json

@@ -1,6 +1,7 @@
 {
   "skip_files": [
     "lib/bson/utils.ex",
-    "lib/mongo/binary_utils.ex"
+    "lib/mongo/binary_utils.ex",
+    "test/"
   ]
 }

lib/mongo.ex

@@ -47,6 +47,7 @@ defmodule Mongo do
   """
 
   import Keywords
+  import Mongo.Utils
   import Mongo.WriteConcern
 
   require Logger
@@ -1081,19 +1082,6 @@ defmodule Mongo do
     |> Stream.map(fn coll -> coll["name"] end)
   end
 
-  defp modifier_docs([{key, _}|_], type), do: key |> key_to_string |> modifier_key(type)
-  defp modifier_docs(map, _type) when is_map(map) and map_size(map) == 0,  do: :ok
-  defp modifier_docs(map, type) when is_map(map), do: Enum.at(map, 0) |> elem(0) |> key_to_string |> modifier_key(type)
-  defp modifier_docs(list, type) when is_list(list),  do: Enum.map(list, &modifier_docs(&1, type))
-
-  defp modifier_key(<<?$, _::binary>> = other, :replace),  do: raise(ArgumentError, "replace does not allow atomic modifiers, got: #{other}")
-  defp modifier_key(<<?$, _::binary>>, :update),  do: :ok
-  defp modifier_key(<<_, _::binary>> = other, :update),  do: raise(ArgumentError, "update only allows atomic modifiers, got: #{other}")
-  defp modifier_key(_, _),  do: :ok
-
-  defp key_to_string(key) when is_atom(key), do: Atom.to_string(key)
-  defp key_to_string(key) when is_binary(key), do: key
-
   defp cursor(topology_pid, cmd, opts) do
     %Mongo.Cursor{topology_pid: topology_pid, cmd: cmd, on_resume_token: nil, opts: opts}
   end
@@ -1131,33 +1119,4 @@ defmodule Mongo do
     Keyword.put_new(opts, :timeout, @timeout)
   end
 
-  defp assign_ids(list) when is_list(list) do
-    Enum.map(list, &assign_id/1)
-    |> Enum.unzip
-  end
-
-  defp assign_id(%{_id: id} = map) when id != nil,  do: {id, map}
-  defp assign_id(%{"_id" => id} = map) when id != nil, do: {id, map}
-  defp assign_id([{_, _} | _] = keyword) do
-    case Keyword.take(keyword, [:_id, "_id"]) do
-      [{_key, id} | _] when id != nil -> {id, keyword}
-      [] -> add_id(keyword)
-    end
-  end
-
-  defp assign_id(map) when is_map(map) do
-    map |> Map.to_list |> add_id
-  end
-
-  ##
-  # Inserts an ID to the document. A distinction is made as to whether binaries or atoms are used as keys.
-  #
-  defp add_id(doc) do
-    id = Mongo.IdServer.new
-    {id, add_id(doc, id)}
-  end
-  defp add_id([{key, _}|_] = list, id) when is_atom(key), do: [{:_id, id}|list]
-  defp add_id([{key, _}|_] = list, id) when is_binary(key), do: [{"_id", id}|list]
-  defp add_id([], id), do: [{"_id", id}]
-
 end

lib/mongo/bulk_ops.ex

@@ -29,6 +29,7 @@ defmodule Mongo.BulkOps do
                    {atom, {BSON.document, Keyword.t}} |
                    {atom, {BSON.document, BSON.document, Keyword.t}}
 
+  import Keywords
   import Mongo.Utils
 
   @doc """

lib/mongo/bulk_write.ex

@@ -154,6 +154,7 @@ defmodule Mongo.BulkWrite do
 
   """
 
+  import Keywords
   import Mongo.Utils
   import Mongo.WriteConcern
   alias Mongo.UnorderedBulk

lib/utils.ex

@@ -1,14 +1,5 @@
 defmodule Mongo.Utils do
 
-  def filter_nils(keyword) when is_list(keyword) do
-    Enum.reject(keyword, fn {_key, value} -> is_nil(value) end)
-  end
-
-  def filter_nils(map) when is_map(map) do
-    Enum.reject(map, fn {_key, value} -> is_nil(value) end)
-    |> Enum.into(%{})
-  end
-
   def assign_ids(list) when is_list(list) do
     Enum.map(list, &assign_id/1)
     |> Enum.unzip