fix block var names

exstruct · Jul 1, 2015 · 6e3f6a0 · 6e3f6a0
1 parent 7746be0
commit 6e3f6a0
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 2 deletions.
diff --git a/lib/etude/node.ex b/lib/etude/node.ex
@@ -42,7 +42,7 @@ defimpl Etude.Node, for: Any do
     |> List.keysort(0)
     name(id, opts)
   end
-  def name(node, opts) do
+  def name(node, _opts) do
     "etude_#{:erlang.phash2(node)}"
     |> String.to_atom
   end

diff --git a/lib/etude/node/block.ex b/lib/etude/node/block.ex
@@ -6,7 +6,6 @@ defmodule Etude.Node.Block do
   defimpl Etude.Node, for: Etude.Node.Block do
     defdelegate name(node, opts), to: Etude.Node.Any
     defdelegate prop(node, opts), to: Etude.Node.Any
-    defdelegate var(node, opts), to: Etude.Node.Any
 
     def assign(node, opts) do
       last(node) |> Etude.Node.assign(opts)
@@ -28,6 +27,10 @@ defmodule Etude.Node.Block do
       Etude.Children.compile(node.children, opts)
     end
 
+    def var(node, opts) do
+      last(node) |> Etude.Node.var(opts)
+    end
+
     defp last(node) do
       List.last(node.children)
     end

diff --git a/test/block_test.exs b/test/block_test.exs
@@ -25,4 +25,31 @@ defmodule EtudeTest.Block do
       }
     ]
   ], {:parent, :child}
+
+  etudetest "should use vars outside of blocks", [
+    render: [
+      %Assign{
+        expression: true, line: nil,
+        name: :action
+      },
+      %Cond{
+        arms: [
+          %Block{
+            children: [
+              %Var{
+                line: nil,
+                name: :action
+              }
+            ],
+            line: nil, side_effects: true
+          },
+        ],
+        expression: %Var{
+          line: nil,
+          name: :action
+        },
+        line: nil
+      }
+    ]
+  ], true
 end