From 294b5e4a9138292cf6a4feda312a6199b2f7ab8b Mon Sep 17 00:00:00 2001 From: Joe Pearson Date: Thu, 4 Mar 2021 14:10:02 -0800 Subject: [PATCH 1/2] Fix warnings --- lib/mongo/grid_fs/bucket.ex | 8 ++++---- mix.exs | 9 ++++++--- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/lib/mongo/grid_fs/bucket.ex b/lib/mongo/grid_fs/bucket.ex index 38d087db..691225f6 100644 --- a/lib/mongo/grid_fs/bucket.ex +++ b/lib/mongo/grid_fs/bucket.ex @@ -121,17 +121,17 @@ defmodule Mongo.GridFs.Bucket do Mongo.find(topology_pid, files_collection_name(bucket), filter, opts) end + @doc """ - Finds one file document with the file_id as a string + Finds one file document by `file_id` specified either as a string or `BSON.ObjectId`. """ + def find_one(bucket, file_id) + @spec find_one(Bucket.t, String.t) :: BSON.document | nil def find_one(%Bucket{} = bucket, file_id) when is_binary(file_id) do find_one(bucket, ObjectId.decode!(file_id)) end - @doc """ - Finds one file document with the file_id as an ObjectID-struct - """ @spec find_one(Bucket.t, BSON.ObjectId.t) :: BSON.document | nil def find_one(%Bucket{topology_pid: topology_pid, opts: opts} = bucket, %BSON.ObjectId{} = oid) do Mongo.find_one(topology_pid, files_collection_name(bucket), %{"_id" => oid}, opts) diff --git a/mix.exs b/mix.exs index 84db9e46..d45aa82c 100644 --- a/mix.exs +++ b/mix.exs @@ -28,9 +28,12 @@ defmodule Mongodb.Mixfile do defp elixirc_paths(_), do: ["lib"] def application() do - [applications: applications(Mix.env), - mod: {Mongo.App, []}, - env: []] + [ + applications: applications(Mix.env), + env: [], + extra_applications: [:crypto, :ssl], + mod: {Mongo.App, []} + ] end def applications(:test), do: [:logger, :connection, :db_connection] From 06437dc4a4baa2dc2d60e05a3f7ba07bdf4ff4e9 Mon Sep 17 00:00:00 2001 From: Joe Pearson Date: Thu, 4 Mar 2021 14:10:33 -0800 Subject: [PATCH 2/2] Remove superfluous empty line --- lib/mongo/grid_fs/bucket.ex | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/mongo/grid_fs/bucket.ex b/lib/mongo/grid_fs/bucket.ex index 691225f6..13600557 100644 --- a/lib/mongo/grid_fs/bucket.ex +++ b/lib/mongo/grid_fs/bucket.ex @@ -121,7 +121,6 @@ defmodule Mongo.GridFs.Bucket do Mongo.find(topology_pid, files_collection_name(bucket), filter, opts) end - @doc """ Finds one file document by `file_id` specified either as a string or `BSON.ObjectId`. """