Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/ebin
/_build
/deps
erl_crash.dump
*.ez
/tmp
8 changes: 4 additions & 4 deletions lib/mongoex/base.ex
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,15 @@ defmodule Mongoex.Base do
Mongoex.Server.delete_all(table_name, selector)
end

def delete_all(selector // []) do
def delete_all(selector \\ []) do
Mongoex.Server.delete_all(table_name, selector)
end

def destroy(record) do
delete(record)
end

def destroy_all(selector // []) do
def destroy_all(selector \\ []) do
delete_all(selector)
end

Expand All @@ -55,7 +55,7 @@ defmodule Mongoex.Base do
end
end

def find_all(selector, options // []) do
def find_all(selector, options \\ []) do
{:ok, res} = Mongoex.Server.find_all(table_name, selector, options)
case :mongo_cursor.rest(res) do
[] ->
Expand All @@ -65,7 +65,7 @@ defmodule Mongoex.Base do
end
end

def count(selector // []) do
def count(selector \\ []) do
{:ok, res} = Mongoex.Server.count(table_name, selector)
res
end
Expand Down
2 changes: 1 addition & 1 deletion lib/mongoex/base/fields.ex
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
defmodule Mongoex.Base.Fields do
defmacro fields(values // []) do
defmacro fields(values \\ []) do
Record.deffunctions(Keyword.merge(values, [_id: nil]), __CALLER__)
end
end
8 changes: 4 additions & 4 deletions lib/mongoex/server.ex
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ defmodule Mongoex.Server do
setup_pool
end

def setup(options // []) do
def setup(options \\ []) do
:ets.new(:mongoex_server, [:set, :protected, :named_table])
:ets.insert(:mongoex_server, {:mongoex_server, Keyword.merge(default_options, options)})
end
Expand All @@ -29,7 +29,7 @@ defmodule Mongoex.Server do
execute(fn() -> :mongo.find_one(table, selector) end)
end

def find_all(table, selector, options // []) do
def find_all(table, selector, options \\ []) do
skip = options[:skip]
if skip == nil do
skip = 0
Expand Down Expand Up @@ -75,7 +75,7 @@ defmodule Mongoex.Server do
mongo_do = Module.function(:mongo, :do, 5)
mongo_do.(:safe, :master, conn, config[:database], auth)
end

{seq, [conn|acc]}
end

Expand All @@ -85,7 +85,7 @@ defmodule Mongoex.Server do

defp get_connection_from_pool do
pool = :ets.lookup(:mongoex_pool, :mongoex_pool)[:mongoex_pool]

case Enum.count(pool) do
0 ->
{:error, :no_available_connections}
Expand Down
2 changes: 0 additions & 2 deletions test/mongoex_test.exs
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
Code.require_file "../test_helper.exs", __FILE__

defmodule MongoexTest do
use ExUnit.Case

Expand Down