Merge pull request #116 from shimomura1004/id/115

add some info to chat view refs #115

app/helpers/chat_helper.rb

@@ -18,6 +18,15 @@ def cache_message(message, has_class, &block)
     end
   end
 
+  def current_info(room)
+    {
+      :user => current_user && current_user.screen_name,
+      :room => room.id,
+      :public => room.is_public,
+      :member => room.owner_and_members.map{|user| user._id}
+    }
+  end
+
   private
   def publish_message(event, message, room)
     data = if event == :delete

app/models/room.rb

@@ -47,7 +47,10 @@ def self.all_live(user = nil)
   end
 
   def owner_and_members
-    [self.user] + self.members
+    if self.is_public
+    then []
+    else [self.user] + self.members
+    end
   end
 
   def messages(offset, order = nil)

app/views/chat/room.html.haml

@@ -26,10 +26,7 @@
  = javascript_include_tag "room"
  :javascript
   var AsakusaSatellite = {
-    current : {
-        user : "#{current_user && current_user.screen_name}",
-        room : "#{@room.id}"
-    },
+    current : #{current_info(@room).to_json},
     pusher    : #{AsakusaSatellite::MessagePusher.jsClass},
     form_auth : "#{form_authenticity_token}",
     url : {

spec/models/room_spec.rb

@@ -202,6 +202,7 @@
       @member = User.create
       @room = Room.create(:title => 'room private', :user => @user, :is_public => false)
       @room.members << @member
+      @public_room = Room.create(:title => 'room public', :user => @user, :is_public => true)
     end
 
     context "user" do
@@ -228,6 +229,11 @@
         subject { @room.owner_and_members.to_set }
         it { should == [@user].to_set }
       end
+
+      context "public room" do
+        subject { @public_room.owner_and_members }
+        it { should == [] }
+      end
     end
   end