Act on newer Arizona interface constraints

paulo-ferraz-oliveira · paulo-ferraz-oliveira · commit 33956c848b2a · 2024-06-28T00:05:12.000+01:00
Expects a recent pull request to be merged: arizona-framework/arizona#104
diff --git a/src/arizona_example_live_counter.erl b/src/arizona_example_live_counter.erl
@@ -20,18 +20,17 @@
 -spec mount(Socket) -> Mounted
     when Socket :: arizona_socket:t(),
          Mounted :: {ok, arizona_socket:t()}.
-mount(#{assigns := Assigns} = Socket) ->
-    Count = maps:get(count, Assigns, 0),
-    {ok, arizona_socket:assign(count, Count, Socket)}.
+mount(Socket) ->
+    Count = arizona_socket:get_assign(count, Socket, 0),
+    {ok, arizona_socket:put_assign(count, Count, Socket)}.
 
 -spec render(Macros) -> Tree
     when Macros :: arizona_live_view:macros(),
          Tree :: arizona_live_view:tree().
 render(Macros0) ->
-    Macros = Macros0#{
-        title => maps:get(title, Macros0, ~"Arizona")
-    },
-    ?ARIZONA_LIVEVIEW(~"""
+    Title = arizona_live_view:get_macro(title, Macros0, ~"Arizona"),
+    Macros = arizona_live_view:put_macro(title, Title, Macros0),
+    ?ARIZONA_LIVEVIEW(Macros, ~"""
     <!DOCTYPE html>
     <html lang="en">
     <head>
@@ -61,12 +60,12 @@ render(Macros0) ->
          Payload :: arizona:payload(),
          Socket :: arizona_socket:t(),
          Handled :: {noreply, arizona_socket:t()}.
-handle_event(<<"incr">>, #{}, #{assigns := Assigns} = Socket) ->
-    Count = maps:get(count, Assigns) + 1,
-    {noreply, arizona_socket:assign(count, Count, Socket)};
-handle_event(<<"decr">>, #{}, #{assigns := Assigns} = Socket) ->
-    Count = maps:get(count, Assigns) - 1,
-    {noreply, arizona_socket:assign(count, Count, Socket)}.
+handle_event(<<"incr">>, _Payload, Socket) ->
+    Count = arizona_socket:get_assign(count, Socket) + 1,
+    {noreply, arizona_socket:put_assign(count, Count, Socket)};
+handle_event(<<"decr">>, _Payload, Socket) ->
+    Count = arizona_socket:get_assign(count, Socket) - 1,
+    {noreply, arizona_socket:put_assign(count, Count, Socket)}.
 
 %% --------------------------------------------------------------------
 %% Component functions.
@@ -76,7 +75,7 @@ handle_event(<<"decr">>, #{}, #{assigns := Assigns} = Socket) ->
     when Macros :: arizona_live_view:macros(),
          Tree :: arizona_live_view:tree().
 counter(Macros) ->
-    ?ARIZONA_LIVEVIEW(~s"""
+    ?ARIZONA_LIVEVIEW(Macros, ~s"""
     <div :stateful>
         <div>Count: {_@count}</div>
         <.button event={_@event} text={_@btn_text} />
@@ -87,11 +86,10 @@ counter(Macros) ->
     when Macros :: arizona_live_view:macros(),
          Tree :: arizona_live_view:tree().
 button(Macros) ->
-    ?ARIZONA_LIVEVIEW(~s"""
+    ?ARIZONA_LIVEVIEW(Macros, ~s"""
     {% NOTE: On this example, :onclick is and expression to be }
     {%       dynamic. It could be just, e.g., :onclick="incr". }
     <button type="button" :onclick={arizona_js:send(_@event)}>
         {_@text}
     </button>
     """).
-
