Current section
16 Versions
Jump to
Current section
16 Versions
Compare versions
5
files changed
+8
additions
-12
deletions
| @@ -130,7 +130,7 @@ The package can be installed as: | |
| 130 130 | |
| 131 131 | ```elixir |
| 132 132 | def deps do |
| 133 | - [{:xarango, "~> 0.6.0"}] |
| 133 | + [{:xarango, "~> 0.6.1"}] |
| 134 134 | end |
| 135 135 | ``` |
| @@ -28,4 +28,4 @@ | |
| 28 28 | {<<"name">>,<<"httpoison">>}, |
| 29 29 | {<<"optional">>,false}, |
| 30 30 | {<<"requirement">>,<<"> 0.0.0">>}]]}. |
| 31 | - {<<"version">>,<<"0.6.0">>}. |
| 31 | + {<<"version">>,<<"0.6.1">>}. |
| @@ -85,6 +85,7 @@ defmodule Xarango.Domain.Node do | |
| 85 85 | |
| 86 86 | def one(params, collection, graph, database) do |
| 87 87 | case params do |
| 88 | + %{id: nil} -> nil |
| 88 89 | %{id: id} -> Vertex.vertex(%Vertex{_id: id}, collection, graph, database) |
| 89 90 | %{vertex: vertex} -> Vertex.vertex(vertex, collection, graph, database) |
| 90 91 | _ -> SimpleQuery.first_example(%SimpleQuery{example: params, collection: collection.collection}, database) |> to_vertex |
| @@ -92,15 +92,10 @@ defmodule Xarango.Util do | |
| 92 92 | end |
| 93 93 | |
| 94 94 | def to_resource(resource, options\\[]) |
| 95 | - def to_resource(resources, options) when is_list(resources) do |
| 96 | - resources |> Enum.map(&to_resource(&1, options)) |
| 97 | - end |
| 98 | - def to_resource(%{vertex: vertex} = node, options) do |
| 99 | - vertex |> to_resource(options) |> add_resource_relationships(node, options) |
| 100 | - end |
| 101 | - def to_resource(%{doc: document}, options) do |
| 102 | - document |> to_resource(options) |
| 103 | - end |
| 95 | + def to_resource(resources, options) when is_list(resources), do: resources |> Enum.map(&to_resource(&1, options)) |
| 96 | + def to_resource(%{vertex: vertex} = node, options), do: vertex |> to_resource(options) |> add_resource_relationships(node, options) |
| 97 | + def to_resource(%{doc: document}, options), do: document |> to_resource(options) |
| 98 | + def to_resource(%{result: result}, options), do: result |> to_resource(options) |
| 104 99 | def to_resource(%{_data: data, _id: id}, options) do |
| 105 100 | id = options[:encode_id] == true && form_encode(id) || id |
| 106 101 | %{id: id} |
| @@ -4,7 +4,7 @@ defmodule Xarango.Mixfile do | |
| 4 4 | def project do |
| 5 5 | [ |
| 6 6 | app: :xarango, |
| 7 | - version: "0.6.0", |
| 7 | + version: "0.6.1", |
| 8 8 | elixir: "~> 1.3", |
| 9 9 | build_embedded: Mix.env == :prod, |
| 10 10 | start_permanent: Mix.env == :prod, |