sarnesjo-twhere 0.0.11 → 0.0.12

data/Rakefile

@@ -18,5 +18,5 @@ end
 
 require 'spec/rake/spectask'
 Spec::Rake::SpecTask.new do |spec|
-  spec.spec_files = %w{spec/hashtag_spec.rb spec/twhere_spec.rb}
+  spec.spec_files = %w{spec/hashtags_spec.rb spec/twhere_spec.rb}
 end

data/VERSION.yml

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

data/lib/twhere.rb

@@ -3,8 +3,8 @@ require 'erb'
 require 'twitter'
 
 module TwhereHelperMethods
-  def hashtag(str)
-    md = str.match(/#([A-Za-z0-9]+)/) and md[1]
+  def hashtags(str)
+    str.scan(/#([A-Za-z0-9]+)/).flatten.uniq
   end
 end
 
@@ -34,8 +34,8 @@ class Twhere
     # group tweets by location
     @located_tweets = {}
     @tweets.each do |t|
-      ht = hashtag(t[:text])
-      if ht and @locations.keys.include? ht
+      located_hashtags = hashtags(t[:text]) & @locations.keys
+      located_hashtags.each do |ht|
         @located_tweets[ht] ||= []
         @located_tweets[ht] << t
       end

data/spec/hashtags_spec.rb

@@ -0,0 +1,60 @@
+$:.unshift(File.dirname(__FILE__))
+require 'spec_helper'
+
+describe 'hashtags method' do
+  include TwhereHelperMethods
+
+  it 'should return empty array when there are no hashtags' do
+    hashtags('').should == []
+    hashtags('a').should == []
+    hashtags('#').should == []
+    hashtags('##').should == []
+  end
+
+  it 'should find hashtags containing only lowercase letters' do
+    hashtags('#a').should == ['a']
+    hashtags('#aa').should == ['aa']
+  end
+
+  it 'should find hashtags containing only uppercase letters' do
+    hashtags('#A').should == ['A']
+    hashtags('#AA').should == ['AA']
+  end
+
+  it 'should find hashtags containing only digits' do
+    hashtags('#1').should == ['1']
+    hashtags('#11').should == ['11']
+  end
+
+  it 'should find hashtags containing mixed character classes' do
+    hashtags('#aA').should == ['aA']
+    hashtags('#Aa').should == ['Aa']
+    hashtags('#a1').should == ['a1']
+    hashtags('#1a').should == ['1a']
+    hashtags('#A1').should == ['A1']
+    hashtags('#1A').should == ['1A']
+  end
+
+  it 'should find hashtags in text' do
+    hashtags('a #b').should == ['b']
+    hashtags('#a b').should == ['a']
+  end
+
+  it 'should return all hashtags found' do
+    hashtags('#a #b').should == ['a', 'b']
+  end
+
+  it 'should only return each hashtag once' do
+    hashtags('#a #a').should == ['a']
+    hashtags('#a #a #b').should == ['a', 'b']
+  end
+
+  it 'should not include punctuation in hashtags' do
+    hashtags('#a.').should == ['a']
+    hashtags('#a,').should == ['a']
+    hashtags('#a:').should == ['a']
+    hashtags('#a;').should == ['a']
+    hashtags('#a!').should == ['a']
+    hashtags('#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.11
+  version: 0.0.12
 platform: ruby
 authors: 
 - "Jesper S\xC3\xA4rnesj\xC3\xB6"
@@ -68,6 +68,6 @@ signing_key:
 specification_version: 3
 summary: Twitter/Google Maps mashup
 test_files: 
-- spec/hashtag_spec.rb
+- spec/hashtags_spec.rb
 - spec/spec_helper.rb
 - spec/twhere_spec.rb

data/spec/hashtag_spec.rb

@@ -1,55 +0,0 @@
-$:.unshift(File.dirname(__FILE__))
-require 'spec_helper'
-
-describe 'hashtag method' do
-  include TwhereHelperMethods
-
-  it 'should return nil when there are no hashtags' do
-    hashtag('').should == nil
-    hashtag('a').should == nil
-    hashtag('#').should == nil
-    hashtag('##').should == nil
-  end
-
-  it 'should find hashtags containing only lowercase letters' do
-    hashtag('#a').should == 'a'
-    hashtag('#aa').should == 'aa'
-  end
-
-  it 'should find hashtags containing only uppercase letters' do
-    hashtag('#A').should == 'A'
-    hashtag('#AA').should == 'AA'
-  end
-
-  it 'should find hashtags containing only digits' do
-    hashtag('#1').should == '1'
-    hashtag('#11').should == '11'
-  end
-
-  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
-
-  it 'should find hashtags in text' do
-    hashtag('a #b').should == 'b'
-    hashtag('#a b').should == 'a'
-  end
-
-  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