Merge pull request #255 from kelostrada/bugfix/default-field-value-lazy-load

Lazy load default kaffy field value

Author: ghenry

lib/kaffy/resource_schema.ex

@@ -157,7 +157,6 @@ defmodule Kaffy.ResourceSchema do
   end
 
   def kaffy_field_value(conn, schema, {field, options}) do
-    default_value = kaffy_field_value(schema, field)
     ft = Kaffy.ResourceSchema.field_type(schema.__struct__, field)
     value = Map.get(options || %{}, :value)
 
@@ -184,7 +183,7 @@ defmodule Kaffy.ResourceSchema do
         value
 
       true ->
-        default_value
+        kaffy_field_value(schema, field)
     end
   end
 

test/kaffy_test.exs

@@ -1,7 +1,7 @@
 defmodule KaffyTest do
   use ExUnit.Case
   doctest Kaffy
-  alias KaffyTest.Schemas.{Person, Pet}
+  alias KaffyTest.Schemas.{Company, Person, Pet}
   # alias KaffyTest.Admin.PersonAdmin
 
   test "greets the world" do
@@ -56,9 +56,16 @@ defmodule KaffyTest do
       assert "Abdullah" == ResourceSchema.kaffy_field_value(nil, person, field)
     end
 
+    test "kaffy_field_value/3 should handle preloaded structs with a custom function" do
+      person = %Person{company: %Company{name: "Dashbit"}}
+
+      options = {:company, %{name: "Company", value: fn p -> p.company.name end}}
+      assert "Dashbit" == ResourceSchema.kaffy_field_value(%{}, person, options)
+    end
+
     test "associations/1 must return all associations for the schema" do
       associations = ResourceSchema.associations(Person)
-      assert [:pets] == associations
+      assert [:pets, :company] == associations
       pet_assoc = ResourceSchema.associations(Pet)
       assert [:person] == pet_assoc
     end

test/test_helper.exs

@@ -11,6 +11,7 @@ defmodule KaffyTest.Schemas.Person do
     field(:birth_date, :date)
     field(:address, :string)
     has_many(:pets, KaffyTest.Schemas.Pet)
+    belongs_to(:company, KaffyTest.Schemas.Company)
   end
 end
 
@@ -33,3 +34,12 @@ defmodule KaffyTest.Schemas.Pet do
     belongs_to(:person, KaffyTest.Schemas.Person)
   end
 end
+
+defmodule KaffyTest.Schemas.Company do
+  use Ecto.Schema
+
+  schema "companies" do
+    field(:name, :string)
+    has_many(:people, KaffyTest.Schemas.Person)
+  end
+end