nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add many more hashtag regexp specs for Taggable#tag_strings . Make them pass.

Browse source
This commit is contained in:
Pistos 2011-11-01 00:28:04 -04:00
parent e123b72d35
commit 24702b9f6a
2 changed files with 45 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/diaspora/taggable.rb
View file

@ -27,10 +27,11 @@ module Diaspora
end end
def tag_strings def tag_strings
regex = /(?:^|\s)#(#{VALID_TAG_BODY})/ regex = /(?:^|\s)#([\w-]+|<3)/
matches = self.send(self.class.field_with_tags).scan(regex).map do |match| matches = self.
match.last send( self.class.field_with_tags ).
end scan(regex).
map { |match| match[0] }
unique_matches = matches.inject(Hash.new) do |h,element| unique_matches = matches.inject(Hash.new) do |h,element|
h[element.downcase] = element unless h[element.downcase] h[element.downcase] = element unless h[element.downcase]
h h

41
spec/shared_behaviors/taggable.rb
View file

@ -44,12 +44,51 @@ describe Diaspora::Taggable do
describe '#tag_strings' do describe '#tag_strings' do
it 'returns a string for every #thing' do it 'returns a string for every #thing' do
str = '#what #hey #that"smybike. #@hey ##boo # #THATWASMYBIKE #vöglein #hey#there #135440we #abc/23 ### #h!gh #ok? #see: #re:publica' str = '#what #hey #that"smybike. #@hey ##boo # #THATWASMYBIKE #vöglein #hey#there #135440we #abc/23 ### #h!gh #ok? #see: #re:publica'
arr = ['what', 'hey', 'that', 'THATWASMYBIKE', 'vöglein', '135440we', 'abc', 'h!gh', 'ok', 'see', 're:publica'] arr = ['what', 'hey', 'that', 'THATWASMYBIKE', 'vöglein', '135440we', 'abc', 'h', 'ok', 'see', 're']
@object.send(@object.class.field_with_tags_setter, str) @object.send(@object.class.field_with_tags_setter, str)
@object.tag_strings.should =~ arr @object.tag_strings.should =~ arr
end end
it 'extracts tags despite surrounding text' do
expected = {
'#foobar' => 'foobar',
'#foocar<br>' => 'foocar',
'#fooo@oo' => 'fooo',
'#num3ric hash tags' => 'num3ric',
'#12345 tag' => '12345',
'#12cde tag' => '12cde',
'#abc45 tag' => 'abc45',
'#<3' => '<3',
'#<4' => nil,
'test#foo test' => nil,
'test.#joo bar' => nil,
'test #foodar test' => 'foodar',
'test #foofar<br> test ' => 'foofar',
'test #gooo@oo test' => 'gooo',
'test #<3 test' => '<3',
'test #foo-test test' => 'foo-test',
'test #hoo' => 'hoo',
'test #two_word tags' => 'two_word',
'test #three_word_tags' => 'three_word_tags',
'#terminal_underscore_' => 'terminal_underscore_',
'#terminalunderscore_' => 'terminalunderscore_',
'#_initialunderscore' => '_initialunderscore',
'#_initial_underscore' => '_initial_underscore',
'#terminalhyphen-' => 'terminalhyphen-',
'#terminal-hyphen-' => 'terminal-hyphen-',
'#terminalhyphen- tag' => 'terminalhyphen-',
'#-initialhyphen' => '-initialhyphen',
'#-initialhyphen tag' => '-initialhyphen',
'#-initial-hyphen' => '-initial-hyphen',
}
expected.each do |text,hashtag|
@object.send @object.class.field_with_tags_setter, text
@object.tag_strings.should == [hashtag].compact
end
end
it 'returns no duplicates' do it 'returns no duplicates' do
str = '#what #what #what #whaaaaaaaaaat' str = '#what #what #what #whaaaaaaaaaat'
arr = ['what','whaaaaaaaaaat'] arr = ['what','whaaaaaaaaaat']