Skip to content

Commit a0185bd

Browse files
author
Adrián Quintás
committed
Use elixir format
1 parent 412d4c7 commit a0185bd

File tree

10 files changed

+56
-38
lines changed

10 files changed

+56
-38
lines changed

Diff for: .formatter.exs

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
[
2+
inputs: [
3+
"{lib,config,test}/**/*.{ex,exs}",
4+
"mix.exs"
5+
]
6+
]
7+

Diff for: config/config.exs

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@ config :exsolr,
3131
# Configuration from the imported file will override the ones defined
3232
# here (which is why it is important to import them last).
3333
#
34-
import_config "#{Mix.env}.exs"
34+
import_config "#{Mix.env()}.exs"

Diff for: lib/exsolr.ex

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ defmodule Exsolr do
1616
%{hostname: "localhost", port: 8983, core: "elixir_test"}
1717
"""
1818
def info do
19-
Config.info
19+
Config.info()
2020
end
2121

2222
@doc """
@@ -48,7 +48,7 @@ defmodule Exsolr do
4848
Commits the pending changes to Solr
4949
"""
5050
def commit do
51-
Indexer.commit
51+
Indexer.commit()
5252
end
5353

5454
@doc """
@@ -64,6 +64,6 @@ defmodule Exsolr do
6464
https://wiki.apache.org/solr/FAQ#How_can_I_delete_all_documents_from_my_index.3F
6565
"""
6666
def delete_all do
67-
Indexer.delete_all
67+
Indexer.delete_all()
6868
end
6969
end

Diff for: lib/exsolr/config.ex

-1
Original file line numberDiff line numberDiff line change
@@ -46,4 +46,3 @@ defmodule Exsolr.Config do
4646

4747
defp base_url, do: "http://#{hostname}:#{port}/solr/#{core}"
4848
end
49-

Diff for: lib/exsolr/http_response.ex

+5-3
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,15 @@ defmodule Exsolr.HttpResponse do
88
def body({status, response}) do
99
case {status, response} do
1010
{:ok, %HTTPoison.Response{status_code: 200, body: response_body}} ->
11-
_ = Logger.debug response_body
11+
_ = Logger.debug(response_body)
1212
response_body
13+
1314
{:ok, %HTTPoison.Response{status_code: status_code, body: response_body}} ->
14-
_ = Logger.warn "status_code: #{status_code} - #{response_body}"
15+
_ = Logger.warn("status_code: #{status_code} - #{response_body}")
1516
nil
17+
1618
{_, %HTTPoison.Error{id: _, reason: error_reason}} ->
17-
_ = Logger.error error_reason
19+
_ = Logger.error(error_reason)
1820
nil
1921
end
2022
end

Diff for: lib/exsolr/indexer.ex

+10-8
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ defmodule Exsolr.Indexer do
99
def add(document) do
1010
json_docs_update_url
1111
|> HTTPoison.post(encode(document), json_headers)
12-
|> HttpResponse.body
12+
|> HttpResponse.body()
1313
end
1414

1515
@doc """
@@ -47,9 +47,9 @@ defmodule Exsolr.Indexer do
4747
end
4848

4949
defp update_request(headers, body) do
50-
Config.update_url
50+
Config.update_url()
5151
|> HTTPoison.post(body, headers)
52-
|> HttpResponse.body
52+
|> HttpResponse.body()
5353
end
5454

5555
defp json_headers, do: [{"Content-Type", "application/json"}]
@@ -67,25 +67,27 @@ defmodule Exsolr.Indexer do
6767
~s({"delete":{"id":"42"}})
6868
6969
"""
70-
def delete_by_id_json_body(id) when is_integer(id) do
70+
def delete_by_id_json_body(id) when is_integer(id) do
7171
id
7272
|> Integer.to_string()
7373
|> delete_by_id_json_body
7474
end
75+
7576
def delete_by_id_json_body(id) do
76-
{:ok, body} = %{delete: %{id: id}}
77-
|> Poison.encode
77+
{:ok, body} =
78+
%{delete: %{id: id}}
79+
|> Poison.encode()
7880

7981
body
8082
end
8183

8284
defp delete_all_xml_body, do: "<delete><query>*:*</query></delete>"
8385
defp commit_xml_body, do: "<commit/>"
8486

85-
defp json_docs_update_url, do: "#{Config.update_url}/json/docs"
87+
defp json_docs_update_url, do: "#{Config.update_url()}/json/docs"
8688

8789
defp encode(document) do
8890
{:ok, body} = Poison.encode(document)
8991
body
9092
end
91-
end
93+
end

Diff for: lib/exsolr/query.ex

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+

Diff for: lib/exsolr/searcher.ex

+19-14
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ defmodule Exsolr.Searcher do
5151
defp build_solr_query_params(params) do
5252
params
5353
|> add_default_params
54-
|> Enum.map(fn({key, value}) -> build_solr_query_parameter(key, value) end)
54+
|> Enum.map(fn {key, value} -> build_solr_query_parameter(key, value) end)
5555
|> Enum.join("&")
5656
end
5757

@@ -65,14 +65,17 @@ defmodule Exsolr.Searcher do
6565
end
6666

6767
defp build_solr_query_parameter(_, []), do: nil
68-
defp build_solr_query_parameter(key, [head|tail]) do
68+
69+
defp build_solr_query_parameter(key, [head | tail]) do
6970
[build_solr_query_parameter(key, head), build_solr_query_parameter(key, tail)]
70-
|> Enum.reject(fn(x) -> x == nil end)
71+
|> Enum.reject(fn x -> x == nil end)
7172
|> Enum.join("&")
7273
end
74+
7375
defp build_solr_query_parameter(:q, value) do
7476
"q=#{URI.encode_www_form(value)}"
7577
end
78+
7679
defp build_solr_query_parameter(key, value) do
7780
[Atom.to_string(key), value]
7881
|> Enum.join("=")
@@ -81,26 +84,28 @@ defmodule Exsolr.Searcher do
8184
def do_search(solr_query) do
8285
solr_query
8386
|> build_solr_url
84-
|> HTTPoison.get
85-
|> HttpResponse.body
87+
|> HTTPoison.get()
88+
|> HttpResponse.body()
8689
end
8790

8891
defp build_solr_url(solr_query) do
89-
url = Config.select_url <> solr_query
90-
_ = Logger.debug url
92+
url = Config.select_url() <> solr_query
93+
_ = Logger.debug(url)
9194
url
9295
end
9396

9497
defp extract_response(solr_response) do
95-
case solr_response |> Poison.decode do
96-
{:ok, %{"response" => response, "moreLikeThis" => moreLikeThis}} -> Map.put(response, "mlt", extract_mlt_result(moreLikeThis))
97-
{:ok, %{"response" => response}} -> response
98+
case solr_response |> Poison.decode() do
99+
{:ok, %{"response" => response, "moreLikeThis" => moreLikeThis}} ->
100+
Map.put(response, "mlt", extract_mlt_result(moreLikeThis))
101+
102+
{:ok, %{"response" => response}} ->
103+
response
98104
end
99105
end
100106

101-
defp extract_mlt_result(mlt) do
102-
result =
103-
for k <- Map.keys(mlt), do: get_in(mlt, [k, "docs"])
104-
result |> List.flatten
107+
defp extract_mlt_result(mlt) do
108+
result = for k <- Map.keys(mlt), do: get_in(mlt, [k, "docs"])
109+
result |> List.flatten()
105110
end
106111
end

Diff for: mix.exs

+8-6
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ defmodule Exsolr.Mixfile do
66
app: :exsolr,
77
version: "0.0.1",
88
elixir: "~> 1.2",
9-
build_embedded: Mix.env == :prod,
10-
start_permanent: Mix.env == :prod,
9+
build_embedded: Mix.env() == :prod,
10+
start_permanent: Mix.env() == :prod,
1111
description: description,
1212
package: package,
13-
deps: deps,
13+
deps: deps
1414
]
1515
end
1616

@@ -25,8 +25,10 @@ defmodule Exsolr.Mixfile do
2525
files: ["lib", "mix.exs", "README.md"],
2626
maintainers: ["Daniel Carneiro"],
2727
licenses: ["MIT License (MIT)"],
28-
links: %{"GitHub" => "https://github.com/dcarneiro/exsolr",
29-
"Docs" => "http://hexdocs.pm/exsolr/"}
28+
links: %{
29+
"GitHub" => "https://github.com/dcarneiro/exsolr",
30+
"Docs" => "http://hexdocs.pm/exsolr/"
31+
}
3032
]
3133
end
3234

@@ -53,7 +55,7 @@ defmodule Exsolr.Mixfile do
5355
{:credo, "~> 0.3", only: [:dev, :test]},
5456
{:earmark, "~> 0.1", only: :dev},
5557
{:ex_doc, "~> 0.11", only: :dev},
56-
{:dialyxir, "~> 0.3", only: :dev},
58+
{:dialyxir, "~> 0.3", only: :dev}
5759
]
5860
end
5961
end

Diff for: test/exsolr_test.exs

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ defmodule ExsolrTest do
77
end
88

99
test "add a document" do
10-
document = %{id: "3", title: "Doc 3" }
10+
document = %{id: "3", title: "Doc 3"}
1111
Exsolr.add(document)
1212
end
1313

@@ -16,6 +16,6 @@ defmodule ExsolrTest do
1616
end
1717

1818
test "commit" do
19-
assert Exsolr.commit
19+
assert Exsolr.commit()
2020
end
2121
end

0 commit comments

Comments
 (0)