From 4b65519a829c89490c6a94d3e094fd28c025d8ef Mon Sep 17 00:00:00 2001 From: parroty Date: Sat, 8 Mar 2014 01:50:50 +0900 Subject: [PATCH] Fix for elixir v0.12.4 --- .gitignore | 3 ++- lib/mongoex/base.ex | 8 ++++---- lib/mongoex/base/fields.ex | 2 +- lib/mongoex/server.ex | 8 ++++---- test/mongoex_test.exs | 2 -- 5 files changed, 11 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 36f9a79..e6a60a6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ -/ebin +/_build /deps erl_crash.dump +*.ez /tmp diff --git a/lib/mongoex/base.ex b/lib/mongoex/base.ex index df8208f..47429dc 100644 --- a/lib/mongoex/base.ex +++ b/lib/mongoex/base.ex @@ -35,7 +35,7 @@ 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 @@ -43,7 +43,7 @@ defmodule Mongoex.Base do delete(record) end - def destroy_all(selector // []) do + def destroy_all(selector \\ []) do delete_all(selector) end @@ -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 [] -> @@ -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 diff --git a/lib/mongoex/base/fields.ex b/lib/mongoex/base/fields.ex index b330691..87550fc 100644 --- a/lib/mongoex/base/fields.ex +++ b/lib/mongoex/base/fields.ex @@ -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 diff --git a/lib/mongoex/server.ex b/lib/mongoex/server.ex index fdaa219..4f83bab 100644 --- a/lib/mongoex/server.ex +++ b/lib/mongoex/server.ex @@ -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 @@ -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 @@ -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 @@ -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} diff --git a/test/mongoex_test.exs b/test/mongoex_test.exs index 6905c6a..69f0af9 100644 --- a/test/mongoex_test.exs +++ b/test/mongoex_test.exs @@ -1,5 +1,3 @@ -Code.require_file "../test_helper.exs", __FILE__ - defmodule MongoexTest do use ExUnit.Case