Merge branch 'master' of github.com:chrismccord/phoenix

lib/phoenix/socket.ex

@@ -7,7 +7,7 @@ defmodule Phoenix.Socket do
             topic: nil,
             router: nil,
             channels: [],
-            assigns: []
+            assigns: %{}
 
   def set_current_channel(socket, channel, topic) do
     %Socket{socket | channel: channel, topic: topic}
@@ -28,6 +28,10 @@ defmodule Phoenix.Socket do
   def authenticated?(socket, channel, topic) do
     Enum.member? socket.channels, {channel, topic}
   end
+
+  def assign(socket, key, value) do
+    %Socket{socket | assigns: Map.put(socket.assigns, key, value)}
+  end
 end
 
 

lib/phoenix/statuses.txt

@@ -38,6 +38,7 @@
 415	Unsupported Media Type
 416	Requested Range Not Satisfiable
 417	Expectation Failed
+418	Teapot
 422	Unprocessable Entity
 423	Locked
 424	Failed Dependency

test/phoenix/socket/socket_test.exs

@@ -6,7 +6,7 @@ defmodule Phoenix.Socket.SocketTest do
     %Socket{pid: self,
             router: nil,
             channels: [],
-            assigns: []}
+            assigns: %{}}
   end
 
   test "#set_current_channel sets the current channel" do
@@ -47,5 +47,12 @@ defmodule Phoenix.Socket.SocketTest do
     socket = Socket.delete_channel(socket, "test", "topic")
     assert socket.channels == []
   end
+
+  test "#assign assigns into the assigns map (yo dog)" do
+    socket = new_socket
+    assert socket.assigns == %{}
+    socket = Socket.assign(socket, :foo, "bar")
+    assert socket.assigns == %{foo: "bar"}
+  end
 end