From 435b16b30a66f213ced8871a912be1b99a31dd0c Mon Sep 17 00:00:00 2001
From: Raphael Sofaer <raphael@joindiaspora.com>
Date: Wed, 30 Mar 2011 17:51:45 -0700
Subject: [PATCH] Don't index on just hidden

---
 ...20110328175936_add_hidden_to_post_visibilities.rb |  2 +-
 db/migrate/20110331004720_add_hidden_indicies.rb     | 12 ++++++++++++
 db/schema.rb                                         |  4 ++--
 lib/diaspora/taggable.rb                             |  4 ++--
 spec/controllers/conversations_controller_spec.rb    |  2 +-
 5 files changed, 18 insertions(+), 6 deletions(-)
 create mode 100644 db/migrate/20110331004720_add_hidden_indicies.rb

diff --git a/db/migrate/20110328175936_add_hidden_to_post_visibilities.rb b/db/migrate/20110328175936_add_hidden_to_post_visibilities.rb
index f9880522d..d663001be 100644
--- a/db/migrate/20110328175936_add_hidden_to_post_visibilities.rb
+++ b/db/migrate/20110328175936_add_hidden_to_post_visibilities.rb
@@ -5,7 +5,7 @@ class AddHiddenToPostVisibilities < ActiveRecord::Migration
   end
 
   def self.down
-    add_index :post_visibilities, :hidden
+    remove_index :post_visibilities, :hidden
     remove_column :post_visibilities, :hidden
   end
 end
diff --git a/db/migrate/20110331004720_add_hidden_indicies.rb b/db/migrate/20110331004720_add_hidden_indicies.rb
new file mode 100644
index 000000000..3c9779646
--- /dev/null
+++ b/db/migrate/20110331004720_add_hidden_indicies.rb
@@ -0,0 +1,12 @@
+class AddHiddenIndicies < ActiveRecord::Migration
+  def self.up
+    remove_index :post_visibilities, :hidden
+    add_index :post_visibilities, [:post_id, :hidden, :contact_id], :unique => true
+  end
+
+
+  def self.down
+    remove_index :post_visibilities, :column => [:post_id, :hidden, :contact_id]
+    add_index :post_visibilities, :hidden
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 244a946df..765daed3e 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20110330230206) do
+ActiveRecord::Schema.define(:version => 20110331004720) do
 
   create_table "aspect_memberships", :force => true do |t|
     t.integer  "aspect_id",  :null => false
@@ -221,7 +221,7 @@ ActiveRecord::Schema.define(:version => 20110330230206) do
 
   add_index "post_visibilities", ["contact_id", "post_id"], :name => "index_post_visibilities_on_contact_id_and_post_id", :unique => true
   add_index "post_visibilities", ["contact_id"], :name => "index_post_visibilities_on_contact_id"
-  add_index "post_visibilities", ["hidden"], :name => "index_post_visibilities_on_hidden"
+  add_index "post_visibilities", ["post_id", "hidden", "contact_id"], :name => "index_post_visibilities_on_post_id_and_hidden_and_contact_id", :unique => true
   add_index "post_visibilities", ["post_id"], :name => "index_post_visibilities_on_post_id"
 
   create_table "posts", :force => true do |t|
diff --git a/lib/diaspora/taggable.rb b/lib/diaspora/taggable.rb
index 9f85f3576..74b4377ff 100644
--- a/lib/diaspora/taggable.rb
+++ b/lib/diaspora/taggable.rb
@@ -4,8 +4,8 @@
 
 module Diaspora
   module Taggable
-    VALID_TAG_BODY = /[^_\s#*\[\]()\:\@\/"'\.%]+/
-    
+    VALID_TAG_BODY = /[^_,\s#*\[\]()\:\@\/"'\.%]+/
+
     def self.included(model)
       model.class_eval do
         cattr_accessor :field_with_tags
diff --git a/spec/controllers/conversations_controller_spec.rb b/spec/controllers/conversations_controller_spec.rb
index 98f706f2d..31daa37dc 100644
--- a/spec/controllers/conversations_controller_spec.rb
+++ b/spec/controllers/conversations_controller_spec.rb
@@ -96,7 +96,7 @@ describe ConversationsController do
       sign_in :user, eve
 
       get :show, :id => @conversation.id
-      response.code.should == '302'
+      response.code.should redirect_to conversations_path
     end
   end
 end