db/migrate/20090826125345_remove_description_from_convos.rb
@@ -23,3 +23,4 @@ attachments
*.log
coverage.data
coverage/*
+*.swp
.gitignore
@@ -1,9 +1,10 @@
class ConversationsController < ApplicationController
-
- before_filter :login_or_oauth_required, :except => [:index, :show, :auto_complete_for_conversation_name, :complete_name]
- before_filter :find_conversation, :except => [:bookmarked, :complete_name, :create, :spawn, :new, :index, :new_messages]
+
+ before_filter :login_or_oauth_required,
+ :except => [:index, :show, :auto_complete_for_conversation_name, :complete_name]
+ before_filter :find_conversation,
+ :except => [:bookmarked, :complete_name, :create, :spawn, :new, :index, :new_messages]
before_filter :check_read_access, :only => [:show]
-
after_filter :store_location, :only => [:show, :new]
auto_complete_for :conversation, :name # multiple scopes can be chained like 'published.readonly'
@@ -51,17 +52,12 @@ class ConversationsController < ApplicationController
@conversation = Conversation.new
if params[:message_id]
@message = Message.find(params[:message_id])
-
if current_user.conversations.find_by_parent_message_id( @message.id )
flash[:error] = t("conversations.already_spawned_warning")
redirect_to conversation_path(@message.conversation_id)
return
end
-
@conversation.parent_message_id = @message.id
- @conversation.description = %Q(
-#{ t( "conversations.user_spawned_convo_description", :login => current_user.login, :original_message_link => conversation_message_url(@message.conversation_id, @message) ) }
- )
end
respond_to do |format|
format.html # new.html.erb
@@ -89,8 +85,6 @@ class ConversationsController < ApplicationController
# now add the attachment markup to the copied message if the original message has an attachment
copied_message.message_html = @conversation.parent_message.attachment_markup + copied_message.message_html if @conversation.parent_message.has_attachment?
copied_message.save
- else # create a first message that is the same as the convo description
- message = current_user.messages.create!( :conversation => @conversation, :message => @conversation.description)
end
# now let's create a system message and send it to the the creator's followers
@@ -323,4 +317,4 @@ private
end
end
-end
\ No newline at end of file
+end
app/controllers/conversations_controller.rb
@@ -7,7 +7,6 @@
# parent_message_id :integer(4)
# user_id :integer(4)
# delta :boolean(1)
-# description :text(16777215)
# messages_count :integer(4) default(0)
# name :string(255)
# private :boolean(1)
@@ -42,38 +41,23 @@ class Conversation < ActiveRecord::Base
:limit => 10
validates_presence_of :name
- validates_uniqueness_of :name, :unless => :spawned?
- validates_length_of :name, :within => 3..100
- validates_presence_of :description
- validates_length_of :description, :maximum => 10000
+ validates_uniqueness_of :name, :unless => :spawned?
+ validates_length_of :name, :within => 3..100
validates_format_of :something, :with => /^$/ # anti spam, honeypot field must be blank
validates_presence_of :uuid
-
+
named_scope :non_private, :conditions => { :private => false }
named_scope :no_owned_by, lambda { |user_id| { :conditions => ['conversations.user_id <> ?', user_id] }}
-
+
# sphinx index
define_index do
indexes :name
- indexes description
has created_at
set_property :delta => :delayed
end
-
- ##
- # class methods
- #
- # def self.add_personal(user)
- # name = user.name || user.login
- # desc = "This is a personal conversation for #{name}. If you wish to collaborate with #{name}, do it here."
- # convo = user.conversations.create(:name => user.login, :personal_conversation => true, :description => desc)
- # convo.tag_list.add("personal_convo")
- # convo.save
- # convo
- # end
def self.most_popular
- #conversations = ConversationVisit.find(:all, :conditions => ["updated_at >= ?", Date.today - 30.days ], :group => :conversation_id, :order => "visits_count DESC", :limit => 10).map { |convo_visit| convo_visit.conversation }
+ #conversations = ConversationVisit.find(:all, :conditions => ["updated_at >= ?", Date.today - 30.days ], :group => :conversation_id, :order => "visits_count DESC", :limit => 10).map { |convo_visit| convo_visit.conversation }
#conversations
Conversation.find(:all, :order => "posted_at DESC", :limit => 10)
end
@@ -85,47 +69,43 @@ class Conversation < ActiveRecord::Base
ConversationVisit.find(:first, :group => :conversation_id, :conditions => ["conversation_id = ?", self.id]).visits_count
end
- def owner
+ def owner
self.user
end
-
+
def escaped_name
escaped(self.name)
end
- def escaped_description
- escaped(self.description)
- end
-
def followed_by?(user)
self.subscriptions.find_by_user_id( user.id ).nil? ? false : true
end
-
+
def readable_by?(user)
return false if user.blank?
self.owner == user ||
!self.private? ||
self.followed_by?(user)
end
-
+
def writable_by?(user)
self.owner == user ||
( !self.read_only && !self.private? ) ||
( self.private? && self.followed_by?(user) && !self.read_only )
end
-
+
def private?
self.private
end
-
+
def public?
!self.private
end
-
+
def spawned?
!self.parent_message_id.nil?
end
-
+
def add_visit(user)
if cv = ConversationVisit.find_by_user_id_and_conversation_id(user.id, self.id)
cv.increment!( :visits_count )
@@ -159,7 +139,7 @@ class Conversation < ActiveRecord::Base
def messages_before(first_message_id)
self.messages.published.find(:all, :include => [:user], :conditions => ["id < ?", first_message_id], :limit => 100, :order => 'id DESC')
end
-
+
def has_messages_before?(first_message)
return false if(first_message == nil)
messages = self.messages.published.find(:first, :conditions => ["id < ?", first_message.id], :order => 'id DESC')
@@ -169,39 +149,39 @@ class Conversation < ActiveRecord::Base
def messages_after(last_message_id)
self.messages.published.find(:all, :include => [:user], :conditions => ["id > ?", last_message_id], :limit => 100, :order => 'id ASC').reverse
end
-
+
def has_messages_after?(last_message)
return false if(last_message == nil)
- messages = self.messages.published.find(:first, :conditions => ["id > ?", last_message.id], :order => 'id ASC')
+ messages = self.messages.published.find(:first, :conditions => ["id > ?", last_message.id], :order => 'id ASC')
messages ? true : false
end
- def after_create
+ def after_create
owner.follow(self)
- self.user.tag(self, :with => self.tag_list.to_s + ", " + self.user.login, :on => :tags)
+ self.user.tag(self, :with => self.tag_list.to_s + ", " + self.user.login, :on => :tags)
end
-
+
def date_time12
self.created_at.strftime '%m/%d/%Y %I:%M%p'
end
-
+
def to_param
"#{id}-#{name.parameterize}"
end
-
+
def reset_uuid!
generate_uuid
self.save
end
-
+
def generate_uuid
self.uuid = UUID.create_v4.to_s
end
-
+
private
def escaped(value)
value.gsub(/"/, '"').gsub(/'/, '.').gsub(/(\r\n|\n|\r)/,' <br />')
end
-
+
end
app/models/conversation.rb
@@ -1,8 +1,6 @@
<li class="conversation">
- <h3><%= render :partial => 'conversations/star', :locals => { :conversation => conversation } %> <% if conversation.private? %><%= image_tag("/images/icons/icono_candado.gif") %> <% end %><%= link_to h(conversation.name), conversation_path(conversation) %></h3>
+ <h3><%= render :partial => 'conversations/star', :locals => { :conversation => conversation } %> <% if conversation.private? %><%= image_tag("/images/icons/icono_candado.gif") %> <% end %><%= link_to h(conversation.name), conversation_path(conversation) %></h3>
- <div class="description"><%= conversation.escaped_description %></div>
-
<div class="clear"></div>
<span class="quiet small">
app/views/conversations/_conversation.html.erb
@@ -15,10 +15,6 @@
</p>
<p><%= f.check_box :private %> <%= f.label t("ui.private_convo") %></p>
<p>
- <%= f.label t("ui.description") %><br />
- <%= f.text_area :description, :rows => 8, :cols => 60 %>
- </p>
- <p>
<%= f.submit t("ui.create") %>
</p>
<% end %>
app/views/conversations/new.html.erb
@@ -16,10 +16,6 @@
<%= f.text_field :name %>
</p>
<p>
- <%= f.label t("ui.description") %><br />
- <%= f.text_area :description, :rows => 8, :cols => 60 %>
- </p>
- <p>
<%= f.submit t("ui.create") %>
</p>
<% end %>
@@ -30,4 +26,4 @@
<br/>
<hr/>
<h4><%= t("messages.original_message") %></h4>
-<%= render :partial => 'messages/message', :locals => {:message => @message} %>
\ No newline at end of file
+<%= render :partial => 'messages/message', :locals => {:message => @message} %>
app/views/conversations/spawn.html.erb
@@ -17,8 +17,6 @@
<li>
<%= link_to highlight(h(conversation.name), params[:q].split), conversation_path(conversation) %>
<br/>
- <%= highlight(conversation.escaped_description, params[:q].split) %>
- <br/>
<span class="quiet small"><%= conversation.date_time12 %></span>
</li>
<% end %>
@@ -48,4 +46,4 @@
</div>
</div>
-</div>
\ No newline at end of file
+</div>
app/views/convosearches/create.html.erb
@@ -3,7 +3,7 @@
<div id="convos_links" class="padding5">
<h4>
<% if @conversation.private? %><%= image_tag("/images/icons/icono_candado.gif") %> <% end %>
- <% if @conversation.read_only %><span class="highlight"><%= t("ui.read_only") %></span> <% end %><%= link_to h(@conversation.name), conversation_path(@conversation), :class => 'tip', :title => @conversation.escaped_description %>
+ <% if @conversation.read_only %><span class="highlight"><%= t("ui.read_only") %></span> <% end %><%= link_to h(@conversation.name), conversation_path(@conversation) %>
</h4>
<%= render :partial => 'conversations/star', :locals => { :conversation => @conversation } %>
app/views/messages/_convo_controls.html.erb
@@ -1,3 +1,3 @@
<li class="conversation_for_user" id="<%= dom_id conversation%>">
- <%= link_to h(conversation.name), conversation_path(conversation), :class => 'tip', :title => conversation.escaped_description %>
-</li>
\ No newline at end of file
+ <%= link_to h(conversation.name), conversation_path(conversation) %>
+</li>
app/views/users/_conversation.html.erb
@@ -3,7 +3,7 @@
<b><%= t("ui.my_conversations") %>:</b><br/>
<ul>
<% current_user.subscribed_conversations.each do |conversation| %>
- <li><%= link_to h(conversation.escaped_name), conversation_path(conversation), :class => 'tip', :title => conversation.escaped_description %></li>
+ <li><%= link_to h(conversation.escaped_name), conversation_path(conversation) %></li>
<% end %>
</ul>
<%end%>
app/views/users/_my_conversations.html.erb
@@ -1,5 +1,5 @@
<%if(subscription.conversation != @conversation) %>
<div class="subscription_for_user" id="CONVERSATION_NOTIFY_CHANNEL_<%=subscription.conversation.id%>">
- <span class="msgcount"><%= subscription.new_messages_count %></span> <%= link_to subscription.conversation.escaped_name, conversation_path(subscription.conversation), :class => 'tip', :title => subscription.conversation.escaped_description %>
+ <span class="msgcount"><%= subscription.new_messages_count %></span> <%= link_to subscription.conversation.escaped_name, conversation_path(subscription.conversation) %>
</div>
<%end%>
app/views/users/_subscription.html.erb
@@ -55,7 +55,6 @@ end
Factory.define :conversation do |conversation|
conversation.name { Factory.next :name }
- conversation.description "this is a test conversation that serves no other purpose but test"
conversation.association :user
conversation.uuid { Factory.next :uuid }
end
test/factories.rb
@@ -7,7 +7,6 @@
# parent_message_id :integer(4)
# user_id :integer(4)
# delta :boolean(1)
-# description :text(16777215)
# messages_count :integer(4) default(0)
# name :string(255)
# private :boolean(1)
@@ -25,7 +24,6 @@
#
crossblaim_convo:
name: "crossblaim convo"
- description: "this is a convo for crossblaim"
read_only: false
private: false
user: crossblaim
@@ -36,7 +34,6 @@ crossblaim_convo:
dmitry_convo:
name: "dmitry convo"
- description: "this is a convo for dmitry"
read_only: false
private: false
user: dmitry
@@ -47,7 +44,6 @@ dmitry_convo:
akira_convo:
name: "akira convo"
- description: "this is a convo for akira"
read_only: false
private: false
user: akira
@@ -58,7 +54,6 @@ akira_convo:
crossblaim_test_public_convo:
name: "crossblaim test public convo"
- description: "this is a test public convo for crossblaim"
read_only: false
private: false
user: crossblaim
@@ -69,11 +64,10 @@ crossblaim_test_public_convo:
crossblaim_test_private_convo:
name: "crossblaim test private convo"
- description: "this is a test private convo for crossblaim"
read_only: false
private: true
user: crossblaim
# abuse_report
# parent_message
something: ""
- uuid: "d01b270f-e9d1-4d57-8f81-ef7901ba4373"
\ No newline at end of file
+ uuid: "d01b270f-e9d1-4d57-8f81-ef7901ba4373"
test/fixtures/conversations.yml
@@ -209,7 +209,7 @@ class MessagesControllerTest < ActionController::TestCase
setup do
@u2 = Factory.create( :user )
@c2 = Factory.create( :conversation, :user => @u2 )
- Conversation.expects( :find ).with( @c2.id.to_s ).returns( @c2 )
+ Conversation.expects( :find ).returns( @c2 )
Message.any_instance.stubs( :save ).returns( true )
end
test/functional/messages_controller_test.rb
@@ -12,7 +12,7 @@ class FollowersNotificationTest < ActionController::IntegrationTest
post_via_redirect "/user_session", :user_session => { :login => "crossblaim", :password => "secret" }
assert_response :success
# create a new convo
- post_via_redirect "/conversations", :conversation => { :name => 'new crossblaim convo', :description => 'test convo'}
+ post_via_redirect "/conversations", :conversation => { :name => 'new crossblaim convo' }
assert_response :success
assert_equal "Conversation was successfully created.", flash[:notice]
# the actual messages for this convo are requested in js after the page loads
@@ -28,4 +28,4 @@ class FollowersNotificationTest < ActionController::IntegrationTest
end
end
-end
\ No newline at end of file
+end
test/integration/followers_notification_test.rb
@@ -7,12 +7,12 @@ class SingleAccessTokenTest < ActionController::IntegrationTest
end
context "creating a convo" do
should "don't create a convo" do
- post_via_redirect "/conversations", :conversation => { :name => 'new crossblaim convo', :description => 'test convo'}
+ post_via_redirect "/conversations", :conversation => { :name => 'new crossblaim convo' }
assert_template "user_sessions/new.html.erb"
end
should "create a convo" do
- post_via_redirect "/conversations", :conversation => { :name => 'new crossblaim convo', :description => 'test convo'}, :user_credentials => users(:crossblaim).single_access_token
+ post_via_redirect "/conversations", :conversation => { :name => 'new crossblaim convo' }, :user_credentials => users(:crossblaim).single_access_token
assert_template "conversations/show.html.erb"
assert_response :success
assert_equal "Conversation was successfully created.", flash[:notice]
@@ -39,4 +39,4 @@ class SingleAccessTokenTest < ActionController::IntegrationTest
end
-end
\ No newline at end of file
+end
test/integration/single_access_token_test.rb
@@ -7,7 +7,6 @@
# parent_message_id :integer(4)
# user_id :integer(4)
# delta :boolean(1)
-# description :text(16777215)
# messages_count :integer(4) default(0)
# name :string(255)
# private :boolean(1)
@@ -46,7 +45,6 @@ class ConversationTest < ActiveSupport::TestCase
subject { @conversation }
should_validate_presence_of :uuid
- should_validate_presence_of :name, :description
should_validate_uniqueness_of :name
should_have_db_index :name
@@ -224,7 +222,7 @@ class ConversationTest < ActiveSupport::TestCase
context "A regular conversation instance" do
setup do
@user = Factory.create( :user )
- @conversation = Factory.create( :conversation, :user => @user, :name => 'Convo name', :description => 'convo description' )
+ @conversation = Factory.create( :conversation, :user => @user, :name => 'Convo name' )
end
should "respond to #owner" do
test/unit/conversation_test.rb
fbf8bc6258cfe596f78408bd16e98ea085f64fb2
Claudio Perez Gamayo
crossblaim@gmail.com
http://github.com/dmitryame/echowaves/commit/8f0ba1f244ffb18078a409fb160076161c904b9c
8f0ba1f244ffb18078a409fb160076161c904b9c
2009-08-26T06:48:46-07:00
2009-08-26T06:48:46-07:00
Remove convo description and fix two failing tests
ee6714ef65d389e30ec1ba9932b0dc6753a1d425
Claudio Perez Gamayo
crossblaim@gmail.com