twitterfeed 0.1.2 → 0.1.3

data/README.md

@@ -2,40 +2,25 @@
 
 Gem that will retrieve and display tweets from a predetermined set of twitter handles. 
 
-== Installation
+## Installation
 
 Add this line to your application's Gemfile:
 
     gem 'twitterfeed'
 
-=== Rails 3.x with asset pipeline enabled:
 
-Just install and you're good to go!
+## Usage
 
-=== Rails without pipeline asset
+Place helper line anywhere in your project with an array of twitter handles or hashtags:
 
-  rails g twitterfeed
-  
-== Usage
-
-Place helper line anywhere in your project with an array of twitter handles:
-
-    <%= twitterfeed(["mark_cap", "wycats", "ruralocity"]) %>
+    <%= twitterfeed(["mark_cap", "wycats", "ruralocity", "#ruby", "#rails"]) %>
 
 Enjoy!
 
 Twitter API only allows 150 requests per hour, so to help with this, the frequency on which twitterfeed will update is based on how many handles are passed. I.E. 1 handle will be able to be updated 150 times an hour or every 24 seconds, 10 handles will update every 4 minutes, etc. Maximum of 150 handles. 
 
-== TODO
+## TODO
 
 - Add authentication to boost limit up to 350
 - Read a file with twitter handles to initialize
 - Ability to include searches
-
-== Contributing
-
-1. Fork it
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Added some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request

data/app/assets/stylesheets/twitterfeed.css

@@ -55,6 +55,7 @@
     #twitterfeed_pic{
       float: left;
       margin-right: 10px;
+      margin-top: 5px;
       height: 100% !important;
       width: 50px;
     }

data/app/views/twitterfeed/_twitterfeed_box.html.haml

@@ -8,12 +8,12 @@
     - tweet_array.each do |tweet|
       #twitterfeed_tweet{:class => cycle('even','odd')}
         #twitterfeed_pic
-          = image_tag tweet["pic_url"]
+          = link_to image_tag(tweet["pic_url"]), "http://twitter.com/#{tweet['handle']}", :target => '_new'
         #twitterfeed_handle
           =link_to tweet["handle"], "http://twitter.com/#{tweet['handle']}", :target => '_new'
         
           .twitterfeed_time
             =tweet_time(tweet["created_at"])
         #twitterfeed_text
-          = tweet["text"]
+          = linkify_tweet(tweet["text"])
       

data/lib/twitterfeed.rb

@@ -7,16 +7,28 @@ module Twitterfeed
   def self.update_twitterfeed(twitterfeed_data, name_array)
     total_tweets = []
     name_array.first(150).each do |name|
-      Twitter.user_timeline(name, :include_rts => true).each do |tweet|
-        total_tweets << tweet 
+      if name[0] == "#"
+        Twitter.search(name, :rpp => 20).each do |tweet|
+          total_tweets << tweet 
+        end
+      else
+        Twitter.user_timeline(name, :include_rts => true).each do |tweet|
+          total_tweets << tweet 
+        end
       end
     end
   
     tweet_array = [{"last_update" => Time.now}]
     total_tweets.sort_by {|x| x.created_at}.reverse.first(20).each do |tweet|
-      tweet_array << {"handle" => tweet.user.screen_name, "text" => tweet.text, "created_at" => tweet.created_at,
-                      "pic_url" => tweet.user.profile_image_url_https}
+      tweet_array << {
+                      #searches and users have different username methods
+                      "handle" => tweet.user.nil? ? tweet.from_user : tweet.user.screen_name,
+                      "text" => tweet.text, 
+                      "created_at" => tweet.created_at,
+                      "pic_url" => tweet.user.nil? ? tweet.profile_image_url_https : tweet.user.profile_image_url_https
+                      }
     end
     File.open('tmp/twitterfeed.yml', 'w') {|f| f.write(tweet_array.to_yaml) }
   end
+  
 end

data/lib/twitterfeed/version.rb

@@ -1,3 +1,3 @@
 module Twitterfeed
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/lib/twitterfeed/view_helpers.rb

@@ -34,6 +34,26 @@ module Twitterfeed
         end
       end
     end
+    
+    def linkify_tweet(tweet)
+      @ats = tweet.scan(/@\w+/)
+      @tags = tweet.scan(/#\S+/)
+      @links = tweet.scan(/http:\/\/\S+/)
+      
+      @ats.each do |a|
+        tweet.gsub!(/#{a}/, "<a href='http://twitter.com/#{a[1..(a.length - 1)]}' target='_blank'>#{a}</a>")
+      end
+      
+      @tags.each do |t|
+        tweet.gsub!(/#{t}/, "<a href='http://twitter.com/search/%23#{t[1..(t.length - 1)]}' target='_blank'>#{t}</a>")
+      end
+      
+      @links.each do |l|
+        tweet.gsub!(/#{l}/, "<a href='#{l}' target='_blank'>#{l}</a>")
+      end
+      
+      tweet.html_safe
+    end
   end
 end
 

metadata

@@ -2,7 +2,7 @@
 name: twitterfeed
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Mark Capodagli
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-28 00:00:00 Z
+date: 2012-06-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: twitter