removed virtual fields

Author: briksoftware

README.md

@@ -22,7 +22,6 @@ You make your model JSON-encodable using Poison. You should also use `Ecto.UUID`
 The Crudex.Model also provides the following macros:
 
 * `crudex_schema` => is like `schema` from Ecto.Model but defines ID/foreign keys to be UUID and creates timestamps. You should use this if you want to use the CRUD controller functionalities. It also allows using the two macros below
-* `virtual_field` => creates a virtual field, which value will be resolved during encoding, by invoking a callback.
 * `hidden_field` => creates a regular field which will be excluded when encoding
 
 ### Example
@@ -33,15 +32,12 @@ defmodule Example.User do
   crudex_schema "users" do 
     field :name, :string   
     field :surname, :string   
-    virtual_field :full_name, :string
     field :email, :string
     hidden_field :salt, Crudex.JSONBinary
     hidden_field :password, Crudex.JSONBinary
     field :role, :string
   end
-  
-  def __crudex_virtuals__(:resolve, :full_name, %{name: name, surname: surname}), do: name <> " " <> surname
-  
+    
   ...
 end
 ```

lib/crudex/crud_controller.ex

@@ -25,14 +25,14 @@ defmodule Crudex.CrudController do
   end
 
   def do_index(conn, repo, module, user_scoped, _) do
-    json conn, module |> apply_scope(conn, user_scoped) |> repo.all |> Crudex.Model.resolve_all_virtuals(module)
+    json conn, module |> apply_scope(conn, user_scoped) |> repo.all
   end
 
   def do_create(conn, repo, module, user_scoped, %{"data" => data}) do
     changeset = module.changeset(struct(module), add_user_id(data, conn, user_scoped))
 
     case changeset.valid? do
-      true -> changeset |> repo.insert |> Crudex.Model.resolve_virtuals(module) |> send_data(conn)
+      true -> changeset |> repo.insert |> send_data(conn)
       false -> send_error(conn, :bad_request, format_errors(changeset.errors))
     end
   end
@@ -43,7 +43,7 @@ defmodule Crudex.CrudController do
 
     case from(r in module, where: r.id == ^data_id, preload: ^assocs) |> apply_scope(conn, user_scoped) |> repo.one do
       nil -> send_error(conn, :not_found, %{message: "not found"})
-      data -> data |> Crudex.Model.resolve_virtuals_recursively(module, assocs) |> send_data(conn)
+      data -> data |> send_data(conn)
     end 
   end
   def do_show(conn, _repo, _module, _user_scoped, _params), do: send_error(conn, :not_found, %{message: "not found"})
@@ -52,7 +52,7 @@ defmodule Crudex.CrudController do
     sanitized_fields = sanitize(updated_fields, user_scoped)
     case from(r in module, where: r.id == ^data_id) |> apply_scope(conn, user_scoped) |> repo.one do
       nil -> send_error(conn, :not_found, %{message: "not found"})
-      data -> data |> module.changeset(sanitized_fields) |> _update_data(module, conn, repo)
+      data -> data |> module.changeset(sanitized_fields) |> _update_data(conn, repo)
     end
   end
   def do_update(conn, _repo, _module, _user_scoped, %{"data" => _updated_fields}), do: send_error(conn, :not_found, %{message: "not found"})
@@ -80,9 +80,9 @@ defmodule Crudex.CrudController do
     apply_scope(query, conn, true)
   end
 
-  defp _update_data(changeset, module, conn, repo) do
+  defp _update_data(changeset, conn, repo) do
     case changeset.valid? do
-      true -> changeset |> repo.update |> Crudex.Model.resolve_virtuals(module) |> send_data(conn)
+      true -> changeset |> repo.update |> send_data(conn)
       false -> send_error(conn, :bad_request, format_errors(changeset.errors))
     end    
   end

lib/crudex/model.ex

@@ -4,9 +4,8 @@ defmodule Crudex.Model do
   defmacro __using__(_) do
     quote do
       use Ecto.Model
-      import Crudex.Model, only: [crudex_schema: 2, virtual_field: 2, hidden_field: 2]
+      import Crudex.Model, only: [crudex_schema: 2, hidden_field: 2]
 
-      Module.register_attribute __MODULE__, :crudex_virtuals, accumulate: true, persist: false
       Module.register_attribute __MODULE__, :crudex_hidden, accumulate: true, persist: false
 
       defimpl Poison.Encoder, for: __MODULE__ do
@@ -24,23 +23,12 @@ defmodule Crudex.Model do
         timestamps inserted_at: :created_at
       end
 
-      def __crudex_virtuals__(:fields) do
-        @crudex_virtuals
-      end
-
       def __crudex_hidden__ do
         @crudex_hidden
       end
     end
   end
 
-  defmacro virtual_field(name, type) do
-    quote do
-      Module.put_attribute __MODULE__, :crudex_virtuals, {unquote(name), unquote(type)}
-      field unquote(name), unquote(type), virtual: true
-    end
-  end
-
   defmacro hidden_field(name, type) do
     quote do
       Module.put_attribute __MODULE__, :crudex_hidden, unquote(name)
@@ -61,22 +49,6 @@ defmodule Crudex.Model do
     Enum.reduce(module.__crudex_hidden__, model, &Map.delete(&2, &1))
   end
 
-  def resolve_virtuals_recursively(model, module, assocs) do
-    model = resolve_virtuals(model, module)
-    Enum.reduce(assocs, model, &resolve_for_association(&1, &2, module))
-  end
-
-  defp resolve_for_association(assoc, model, module) do
-    Map.put(model, assoc, resolve_all_virtuals(Map.get(model, assoc), module))
-  end
-
-  def resolve_all_virtuals(models, module) do
-    for model <- models, do: resolve_virtuals(model, module) 
-  end
-
-  def resolve_virtuals(model, module), do: Enum.reduce(module.__crudex_virtuals__(:fields), model, &resolve_virtual(&1, &2, module))
-  defp resolve_virtual({field, _type}, model, module), do: Map.put(model, field, module.__crudex_virtuals__(:resolve, field, model))
-
   ## Implementation
   defp encode_model_associations(model, module) do
     reduce_on_associations(model, module, fn field, model ->