fixes the incorrect creation of indices, added more test cases for bucket api

Author: zookzook

lib/mongo.ex

@@ -1030,6 +1030,16 @@ defmodule Mongo do
     |> Stream.map(fn %{"name" => name } -> name end)
   end
 
+  @doc """
+  Convenient function that drops the index `name` in the collection `coll`.
+  """
+  @spec drop_index(GenServer.server, String.t, String.t, Keyword.t) :: :ok | {:error, Mongo.Error.t}
+  def drop_index(topology_pid, coll, name, opts \\ []) do
+    cmd = [dropIndexes: coll, index: name]
+    with {:ok, _} <- Mongo.issue_command(topology_pid, cmd, :write, opts) do
+      :ok
+    end
+  end
 
   @doc """
   Getting Collection Names

lib/mongo/grid_fs/bucket.ex

@@ -156,15 +156,15 @@ defmodule Mongo.GridFs.Bucket do
 
   def check_and_create_files_index(bucket) do
     case check_files_index(bucket) do
-      true  -> create_files_index(bucket)
-      false -> :ok
+      false -> create_files_index(bucket)
+      true  -> :ok
     end
   end
 
   def check_and_chunks_files_index(bucket) do
     case check_chunks_index(bucket) do
-      true  -> create_chunks_index(bucket)
-      false -> :ok
+      false -> create_chunks_index(bucket)
+      true  -> :ok
     end
   end
 
@@ -228,21 +228,4 @@ defmodule Mongo.GridFs.Bucket do
     end
   end
 
-
-  defimpl Inspect, for: Bucket do
-
-    def inspect(%Bucket{name: fs, chunk_size: size, topology_pid: topology_pid}, _opts) do
-      "#Bucket(" <> fs <> ", " <> to_string(size) <> ", topology_pid: " <> (inspect topology_pid) <> ")"
-    end
-
-  end
-
-  defimpl String.Chars, for: Bucket do
-
-    def to_string(%Bucket{name: fs, chunk_size: size, topology_pid: topology_pid}) do
-      "#Bucket(" <> fs <> ", " <> Kernel.to_string(size) <> ", topology_pid: " <> (inspect topology_pid) <> ")"
-    end
-
-  end
-
 end

mix.exs

@@ -13,7 +13,9 @@ defmodule Mongodb.Mixfile do
      docs: docs(),
      description: description(),
      package: package(),
-     dialyzer: [
+      test_coverage: [tool: ExCoveralls],
+      preferred_cli_env: [docs: :docs, coveralls: :test, "coveralls.detail": :test, "coveralls.post": :test, "coveralls.html": :test],
+      dialyzer: [
        flags: [:underspecs, :unknown, :unmatched_returns],
        plt_add_apps: [:logger, :connection, :db_connection, :mix, :elixir, :ssl, :public_key],
        plt_add_deps: :transitive,
@@ -38,6 +40,7 @@ defmodule Mongodb.Mixfile do
     [
       {:db_connection, "~> 2.1.1"},
       {:decimal,       "~> 1.8"},
+      {:excoveralls,   "~> 0.12.1", only: :test},
       {:benchee,       "~> 1.0", only: :dev},
       {:jason,         "~> 1.0.0", only: :test},
       {:ex_doc,        "~> 0.20.1 ", only: :dev},

mix.lock

@@ -1,5 +1,6 @@
 %{
   "benchee": {:hex, :benchee, "1.0.1", "66b211f9bfd84bd97e6d1beaddf8fc2312aaabe192f776e8931cb0c16f53a521", [:mix], [{:deep_merge, "~> 1.0", [hex: :deep_merge, repo: "hexpm", optional: false]}], "hexpm"},
+  "certifi": {:hex, :certifi, "2.5.1", "867ce347f7c7d78563450a18a6a28a8090331e77fa02380b4a21962a65d36ee5", [:rebar3], [{:parse_trans, "~>3.3", [hex: :parse_trans, repo: "hexpm", optional: false]}], "hexpm"},
   "connection": {:hex, :connection, "1.0.4", "a1cae72211f0eef17705aaededacac3eb30e6625b04a6117c1b2db6ace7d5976", [:mix], [], "hexpm"},
   "db_connection": {:hex, :db_connection, "2.1.1", "a51e8a2ee54ef2ae6ec41a668c85787ed40cb8944928c191280fe34c15b76ae5", [:mix], [{:connection, "~> 1.0.2", [hex: :connection, repo: "hexpm", optional: false]}], "hexpm"},
   "decimal": {:hex, :decimal, "1.8.0", "ca462e0d885f09a1c5a342dbd7c1dcf27ea63548c65a65e67334f4b61803822e", [:mix], [], "hexpm"},
@@ -9,9 +10,17 @@
   "elixir_uuid": {:hex, :elixir_uuid, "1.2.0", "ff26e938f95830b1db152cb6e594d711c10c02c6391236900ddd070a6b01271d", [:mix], [], "hexpm"},
   "erlex": {:hex, :erlex, "0.1.6", "c01c889363168d3fdd23f4211647d8a34c0f9a21ec726762312e08e083f3d47e", [:mix], [], "hexpm"},
   "ex_doc": {:hex, :ex_doc, "0.20.2", "1bd0dfb0304bade58beb77f20f21ee3558cc3c753743ae0ddbb0fd7ba2912331", [:mix], [{:earmark, "~> 1.3", [hex: :earmark, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.10", [hex: :makeup_elixir, repo: "hexpm", optional: false]}], "hexpm"},
+  "excoveralls": {:hex, :excoveralls, "0.12.1", "a553c59f6850d0aff3770e4729515762ba7c8e41eedde03208182a8dc9d0ce07", [:mix], [{:hackney, "~> 1.0", [hex: :hackney, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm"},
+  "hackney": {:hex, :hackney, "1.15.2", "07e33c794f8f8964ee86cebec1a8ed88db5070e52e904b8f12209773c1036085", [:rebar3], [{:certifi, "2.5.1", [hex: :certifi, repo: "hexpm", optional: false]}, {:idna, "6.0.0", [hex: :idna, repo: "hexpm", optional: false]}, {:metrics, "1.0.1", [hex: :metrics, repo: "hexpm", optional: false]}, {:mimerl, "~>1.1", [hex: :mimerl, repo: "hexpm", optional: false]}, {:ssl_verify_fun, "1.1.5", [hex: :ssl_verify_fun, repo: "hexpm", optional: false]}], "hexpm"},
+  "idna": {:hex, :idna, "6.0.0", "689c46cbcdf3524c44d5f3dde8001f364cd7608a99556d8fbd8239a5798d4c10", [:rebar3], [{:unicode_util_compat, "0.4.1", [hex: :unicode_util_compat, repo: "hexpm", optional: false]}], "hexpm"},
   "jason": {:hex, :jason, "1.0.1", "ef108e64c6e086364b9f15b0073cf794061670af8f331d545d7308c0ba2e67f9", [:mix], [{:decimal, "~> 1.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm"},
   "makeup": {:hex, :makeup, "1.0.0", "671df94cf5a594b739ce03b0d0316aa64312cee2574b6a44becb83cd90fb05dc", [:mix], [{:nimble_parsec, "~> 0.5.0", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm"},
   "makeup_elixir": {:hex, :makeup_elixir, "0.14.0", "cf8b7c66ad1cff4c14679698d532f0b5d45a3968ffbcbfd590339cb57742f1ae", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}], "hexpm"},
+  "metrics": {:hex, :metrics, "1.0.1", "25f094dea2cda98213cecc3aeff09e940299d950904393b2a29d191c346a8486", [:rebar3], [], "hexpm"},
+  "mimerl": {:hex, :mimerl, "1.2.0", "67e2d3f571088d5cfd3e550c383094b47159f3eee8ffa08e64106cdf5e981be3", [:rebar3], [], "hexpm"},
   "nimble_parsec": {:hex, :nimble_parsec, "0.5.1", "c90796ecee0289dbb5ad16d3ad06f957b0cd1199769641c961cfe0b97db190e0", [:mix], [], "hexpm"},
+  "parse_trans": {:hex, :parse_trans, "3.3.0", "09765507a3c7590a784615cfd421d101aec25098d50b89d7aa1d66646bc571c1", [:rebar3], [], "hexpm"},
   "poolboy": {:hex, :poolboy, "1.5.2", "392b007a1693a64540cead79830443abf5762f5d30cf50bc95cb2c1aaafa006b", [:rebar3], [], "hexpm"},
+  "ssl_verify_fun": {:hex, :ssl_verify_fun, "1.1.5", "6eaf7ad16cb568bb01753dbbd7a95ff8b91c7979482b95f38443fe2c8852a79b", [:make, :mix, :rebar3], [], "hexpm"},
+  "unicode_util_compat": {:hex, :unicode_util_compat, "0.4.1", "d869e4c68901dd9531385bb0c8c40444ebf624e60b6962d95952775cac5e90cd", [:rebar3], [], "hexpm"},
 }

test/mongo/grid_fs/bucket_test.exs

@@ -1,19 +1,16 @@
 defmodule Mongo.GridFs.BucketTest do
-  use ExUnit.Case
+  use ExUnit.Case, async: false
 
   alias Mongo.GridFs.Bucket
   alias Mongo.GridFs.Upload
+  alias BSON.ObjectId
+  alias Mongo.Session
 
   setup_all do
     assert {:ok, pid} = Mongo.TestConnection.connect
     {:ok, [pid: pid]}
   end
 
-  test "check implementation of the protocols Inspect and String.Chars", c do
-    b = Bucket.new(c.pid)
-    assert inspect b == to_string(b)
-  end
-
   test "check if the name can be overridden", c do
     new_name = "my_fs"
     %Bucket{name: fs} = Bucket.new(c.pid, name: "my_fs")
@@ -47,6 +44,27 @@ defmodule Mongo.GridFs.BucketTest do
     assert chunk == nil
   end
 
+  test "delete a file with ID a string", c do
+    bucket        = Bucket.new(c.pid)
+    upload_stream = Upload.open_upload_stream(bucket, "my-file-to-delete.txt")
+    src_filename  = "./test/data/test.txt"
+
+    File.stream!(src_filename, [], 512) |> Stream.into(upload_stream) |> Stream.run()
+
+    file_id = upload_stream.id
+
+    file = Bucket.find_one(bucket, file_id)
+    assert file != nil
+
+    Bucket.delete(bucket, ObjectId.encode!(file_id))
+
+    file = Bucket.find_one(bucket, file_id)
+    assert file == nil
+
+    chunk = Mongo.find_one(c.pid, Bucket.chunks_collection_name(bucket), %{files_id: file_id})
+    assert chunk == nil
+  end
+
   test "rename a file", c do
 
     bucket        = Bucket.new(c.pid)
@@ -70,7 +88,7 @@ defmodule Mongo.GridFs.BucketTest do
 
   test "drop bucket", c do
 
-    bucket        = Bucket.new(c.pid, fs: "killme")
+    bucket        = Bucket.new(c.pid, name: "killme")
     upload_stream = Upload.open_upload_stream(bucket, "my-example-file.txt")
     src_filename  = "./test/data/test.txt"
 
@@ -90,4 +108,67 @@ defmodule Mongo.GridFs.BucketTest do
 
   end
 
+  test "check find and find_one", c do
+
+    bucket        = Bucket.new(c.pid, name: "killme")
+    upload_stream = Upload.open_upload_stream(bucket, "my-example-file.txt")
+    src_filename  = "./test/data/test.txt"
+
+    File.stream!(src_filename, [], 512) |> Stream.into(upload_stream) |> Stream.run()
+
+    file_id = upload_stream.id
+    [file] = Bucket.find(bucket, [_id: file_id]) |> Enum.to_list()
+    assert file != nil
+    file = Bucket.find_one(bucket, ObjectId.encode!(file_id))
+    assert file != nil
+
+    Bucket.drop(bucket)
+  end
+
+  test "explicit sessions", c do
+
+    top = c.pid
+    {:ok, session} = Session.start_session(top, :write, [])
+    assert :ok = Session.start_transaction(session)
+
+    bucket = Bucket.new(top, name: "sessions") |> Bucket.add_session(session: session)
+
+    upload_stream = Upload.open_upload_stream(bucket, "my-example-file.txt")
+    src_filename  = "./test/data/test.txt"
+
+    File.stream!(src_filename, [], 512) |> Stream.into(upload_stream) |> Stream.run()
+
+    file_id = upload_stream.id
+    file = Bucket.find_one(bucket, file_id)
+    assert file != nil
+
+    assert :ok = Session.abort_transaction(session)
+    assert :ok == Session.end_session(top, session)
+
+    bucket = Bucket.new(top, name: "sessions")
+    file = Bucket.find_one(bucket, file_id)
+    assert file == nil
+
+  end
+
+  test "check if indices are created", c do
+
+    top = c.pid
+    _bucket = Bucket.new(top, name: "index_test")
+
+    assert Mongo.list_index_names(top, "index_test.files") |> Enum.any?(fn name -> name == "filename_1_uploadDate_1" end)
+    assert Mongo.list_index_names(top, "index_test.chunks") |> Enum.any?(fn name -> name == "files_id_1_n_1" end)
+
+    assert :ok == Mongo.drop_index(top, "index_test.files", "filename_1_uploadDate_1")
+    assert :ok == Mongo.drop_index(top, "index_test.chunks", "files_id_1_n_1")
+
+    assert false == Mongo.list_index_names(top, "index_test.files") |> Enum.any?(fn name -> name == "filename_1_uploadDate_1" end)
+    assert false == Mongo.list_index_names(top, "index_test.chunks") |> Enum.any?(fn name -> name == "files_id_1_n_1" end)
+
+    _bucket = Bucket.new(top, name: "index_test")
+
+    assert Mongo.list_index_names(top, "index_test.files") |> Enum.any?(fn name -> name == "filename_1_uploadDate_1" end)
+    assert Mongo.list_index_names(top, "index_test.chunks") |> Enum.any?(fn name -> name == "files_id_1_n_1" end)
+  end
+
 end