RS MS added url for for the socket controller

app/controllers/socket_controller.rb

@@ -1,27 +1,31 @@
 class SocketController < ApplicationController 
+  include ApplicationHelper
+  include SocketHelper
+  include Rails.application.routes.url_helpers
+  
+  def default_url_options()
+    {:host=> 'example.com'}
+  end
 
   def incoming(msg)
     puts msg
   end
   
-  
   def new_subscriber
     WebSocket.subscribe
   end
   
-  
-  
   def outgoing(object)
     puts "made it sucka"
     WebSocket.push_to_clients(action_hash(object))
   end
   
-  
   def delete_subscriber(sid)
     WebSocket.unsubscribe(sid)
   end
   
   
+
 # need a data strucutre to keep track of who is where
 
 #the way this is set up now, we have users on pages

app/helpers/socket_helper.rb

@@ -1,13 +1,17 @@
 module SocketHelper
-  
+ include ApplicationHelper 
   def obj_id(object)
-    object.is_a? Post ? object.id : object.post_id
+    (object.is_a? Post) ? object.id : object.post_id
   end
   
+  def url_options
+    {:host => "", :only_path => true}
+  end
 
   def action_hash(object)
+      
     begin
-      v = render_to_string(type_partial(object), :post => object) unless object.is_a? Retraction
+      v = render_to_string(:partial => type_partial(object), :locals => {:post => object}) unless object.is_a? Retraction
 
     rescue Exception => e
       puts "in failzord " + v.inspect
@@ -19,4 +23,6 @@ module SocketHelper
     {:class =>object.class.to_s.underscore.pluralize, :html => v, :post_id => obj_id(object)}
   end
 
+  
+
 end

app/views/status_messages/_status_message.html.haml

@@ -1,6 +1,6 @@
 %li.message{:id => post.id, :class => ("mine" if mine?(post))}
   %span.from
-    = link_to_person post.person
+    = link_to post.person.real_name, post.person 
     = auto_link post.message
     
   %div.time
@@ -11,4 +11,4 @@
 
   - if mine?(post)
     .destroy_link
-      = link_to 'Delete', status_message_path(post), :confirm => 'Are you sure?', :method => :delete, :remote => true
+      = link_to 'Delete', status_message_url(post), :confirm => 'Are you sure?', :method => :delete, :remote => true

spec/controllers/socket_controller_spec.rb

@@ -2,8 +2,10 @@ require File.dirname(__FILE__) + '/../spec_helper'
 
 #require 'em-spec/rspec'
 describe SocketController do
+  render_views
+  
   before do
-    Factory.create(:user)
+    @user = Factory.create(:user)
     WebSocket.unstub!(:push_to_clients)
     WebSocket.unstub!(:unsubscribe)
     WebSocket.unstub!(:subscribe)
@@ -19,11 +21,25 @@ describe SocketController do
   end
   
   it 'should add a new subscriber to the websocket channel' do
-    
-    puts "balls"
       WebSocket.initialize_channel
-      puts "foobar"
       @controller.new_subscriber.should == 1
   end
-
+  describe 'actionhash' do
+    before do
+      @message = Factory.create(:status_message, :person => @user)
+    end
+
+    it 'should actionhash posts' do
+      hash = @controller.action_hash(@message)
+      hash[:html].include?(@message.message).should be_true
+      hash[:class].include?('status_message').should be_true
+    end
+
+    it 'should actionhash retractions' do
+      retraction = Retraction.for @message
+      hash = @controller.action_hash(retraction)
+      hash[:class].include?('retraction').should be_true
+      hash[:html].should be_nil
+    end
+  end
 end

spec/factories.rb

@@ -18,6 +18,7 @@ Factory.define :user do |u|
   u.sequence(:email) {|n| "bob#{n}@aol.com"}
   u.password "bluepin7"
   u.password_confirmation "bluepin7"
+  u.url  "www.example.com"
   u.profile Profile.new( :first_name => "Bob", :last_name => "Smith" )
 end
 

spec/helpers/socket_helper_spec.rb

@@ -0,0 +1,4 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+describe SocketHelper do
+
+end