add members to room.to_json

app/models/room.rb

@@ -94,7 +94,8 @@ def to_json
       :name => self.title,
       :nickname => self.nickname,
       :updated_at => self.updated_at.to_s,
-      :user => (self.user ? self.user.to_json : nil)
+      :user => (self.user ? self.user.to_json : nil),
+      :members => self.members.map(&:to_json)
     }
   end
 

spec/models/room_spec.rb

@@ -95,6 +95,7 @@
     its([:user])  { should == @user.to_json }
     its([:nickname])  { should == "nickname" }
     its([:updated_at]) { should == @room.updated_at.to_s }
+    its([:members]) { should == [] }
   end
 
   describe "yaml field" do
@@ -318,6 +319,11 @@
         it { should == [] }
       end
     end
+
+    context "to_json" do
+      subject { @room.to_json }
+      its([:members]) { should == [@member.to_json] }
+    end
   end
 
   describe "accessible?" do