Merge remote-tracking branch 'markzalar/master'

app/controllers/searches_controller.rb

@@ -9,7 +9,11 @@ def show
     @updates = []
     if params[:q]
       set_params_page
-      @updates = Update.where(:text => /\b#{Regexp.quote(params[:q])}\b/i).paginate(:page => params[:page], :per_page => params[:per_page], :order => :created_at.desc)
+      @leading_char = '\b'
+      if params[:q][0] == '#'
+        @leading_char = ''
+      end
+      @updates = Update.where(:text => /#{@leading_char}#{Regexp.quote(params[:q])}\b/i).paginate(:page => params[:page], :per_page => params[:per_page], :order => :created_at.desc)
       set_pagination_buttons(@updates)
     end
   end

app/models/update.rb

@@ -190,7 +190,7 @@ def generate_html
     end
 
     out.gsub!(/(^|\s+)#(\w+)/) do |match|
-      "#{$1}<a href='/hashtags/#{$2}'>##{$2}</a>"
+      "#{$1}<a href='/search?q=%23#{$2}'>##{$2}</a>"
     end
 
     self.html = out

test/acceptance/search_test.rb

@@ -90,5 +90,15 @@
 
       assert_match @update_text, page.body
     end
+
+    it "gets a match for hashtag search" do
+      @hashtag_update_text = "This is a test #hashtag"
+      Factory(:update, :text => @hashtag_update_text)
+      visit "/search"
+      fill_in "q", :with => "#hashtag"
+      click_button "Search"
+
+      assert has_link? "#hashtag"
+    end
   end
 end

test/acceptance/update_test.rb

@@ -106,7 +106,7 @@
     assert_match page.body, /#{update.text}/
   end
 
-  it "shows an update in reply to another upate" do
+  it "shows an update in reply to another update" do
     update = Factory(:update)
     update2 = Factory(:update)
     update2.referral_id = update.id
@@ -117,6 +117,24 @@
     assert_match page.body, /#{update.text}/
   end
 
+  describe "update with hashtag" do
+    it "creates a working hashtag link" do
+      u = Factory(:user)
+      a = Factory(:authorization, :user => u)
+
+      log_in(u, a.uid)
+
+      visit "/updates"
+      fill_in "text", :with => "So this one time #coolstorybro"
+      VCR.use_cassette('publish_to_hub') {click_button "Share"}
+
+      visit "/updates"
+      click_link "#coolstorybro"
+      assert_match "Search Updates", page.body
+      assert has_link? "#coolstorybro"
+    end
+  end
+
   describe "pagination" do
     it "does not paginate when there are too few" do
       5.times do

test/models/update_test.rb

@@ -113,22 +113,22 @@
   describe "hashtags" do
     it "makes links if hash starts a word (before create)" do
       u = Factory.build(:update, :text => "This is a message with a #hashtag.")
-      assert_match /<a href='\/hashtags\/hashtag'>#hashtag<\/a>/, u.to_html
+      assert_match /<a href='\/search\?q=%23hashtag'>#hashtag<\/a>/, u.to_html
       u = Factory.build(:update, :text => "This is a message with a#hashtag.")
       assert_equal "This is a message with a#hashtag.", u.to_html
     end
 
     it "makes links if hash starts a word (after create)" do
       u = Factory(:update, :text => "This is a message with a #hashtag.")
-      assert_match /<a href='\/hashtags\/hashtag'>#hashtag<\/a>/, u.to_html
+      assert_match /<a href='\/search\?q=%23hashtag'>#hashtag<\/a>/, u.to_html
       u = Factory(:update, :text => "This is a message with a#hashtag.")
       assert_equal "This is a message with a#hashtag.", u.to_html
     end
 
     it "makes links for both a hashtag and a URL (after create)" do
       u = Factory(:update, :text => "This is a message with a #hashtag and mentions http://rstat.us/.")
 
-      assert_match /<a href='\/hashtags\/hashtag'>#hashtag<\/a>/, u.to_html
+      assert_match /<a href='\/search\?q=%23hashtag'>#hashtag<\/a>/, u.to_html
       assert_match /<a href='http:\/\/rstat.us\/'>http:\/\/rstat.us\/<\/a>/, u.to_html
     end