sarnesjo-twhere 0.0.10 → 0.0.11

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :minor: 0
-:patch: 10
+:patch: 11
 :major: 0

data/lib/twhere.rb

@@ -4,7 +4,7 @@ require 'twitter'
 
 module TwhereHelperMethods
   def hashtag(str)
-    md = str.match(/#([^#\s]+)/) and md[1]
+    md = str.match(/#([A-Za-z0-9]+)/) and md[1]
   end
 end
 

data/spec/hashtag_spec.rb

@@ -4,40 +4,52 @@ require 'spec_helper'
 describe 'hashtag method' do
   include TwhereHelperMethods
 
-  it 'should find hashtags' do
-    # no hashtags
+  it 'should return nil when there are no hashtags' do
     hashtag('').should == nil
     hashtag('a').should == nil
     hashtag('#').should == nil
     hashtag('##').should == nil
+  end
 
-    # lowercase
+  it 'should find hashtags containing only lowercase letters' do
     hashtag('#a').should == 'a'
     hashtag('#aa').should == 'aa'
+  end
 
-    # uppercase
+  it 'should find hashtags containing only uppercase letters' do
     hashtag('#A').should == 'A'
     hashtag('#AA').should == 'AA'
+  end
 
-    # digits
+  it 'should find hashtags containing only digits' do
     hashtag('#1').should == '1'
     hashtag('#11').should == '11'
+  end
 
-    # TODO: unicode?
-
-    # mixed character classes
+  it 'should find hashtags containing mixed character classes' do
     hashtag('#aA').should == 'aA'
     hashtag('#Aa').should == 'Aa'
     hashtag('#a1').should == 'a1'
     hashtag('#1a').should == '1a'
     hashtag('#A1').should == 'A1'
     hashtag('#1A').should == '1A'
+  end
 
-    # in text
+  it 'should find hashtags in text' do
     hashtag('a #b').should == 'b'
     hashtag('#a b').should == 'a'
+  end
 
-    # multiple hashtags, use first
+  it 'should return the first hashtag found' do
     hashtag('#a #b').should == 'a'
   end
+
+  it 'should not include punctuation in hashtags' do
+    hashtag('#a.').should == 'a'
+    hashtag('#a,').should == 'a'
+    hashtag('#a:').should == 'a'
+    hashtag('#a;').should == 'a'
+    hashtag('#a!').should == 'a'
+    hashtag('#a?').should == 'a'
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sarnesjo-twhere
 version: !ruby/object:Gem::Version 
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors: 
 - "Jesper S\xC3\xA4rnesj\xC3\xB6"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-30 00:00:00 -07:00
+date: 2009-05-04 00:00:00 -07:00
 default_executable: twhere
 dependencies: 
 - !ruby/object:Gem::Dependency