twitterfeed 0.1.8 → 0.2.0

data/.gitignore

@@ -16,3 +16,4 @@ test/tmp
 test/version_tmp
 tmp
 .DS_Store
+.gitignore

data/README.md

@@ -27,7 +27,7 @@ Place helper line anywhere in your project with an array of twitter handles or h
     
 Options:
     
-    <%= twitterfeed(["#ruby", "#rails"], :align => "left", :max => 10) %>
+    <%= twitterfeed(["#ruby", "#rails"], :align => "left", :max => 10, :title => "Cool Ruby Tweets") %>
 
 Enjoy!
 

data/app/assets/stylesheets/twitterfeed.css

@@ -16,15 +16,20 @@
   
   #twitterfeed_header {
     margin-bottom: 5px;
-  }
+    font-family: arial;
+    font-size: 15px;
+    font-style: italic;}
+    
+    #twitterfeed_header img{
+      margin-left: 10px;
+      }
   
   #twitterfeed_content {
     height: 300px;
     overflow: scroll;
     overflow-x:hidden;
     border: 1px solid black;
-    -webkit-border-radius: 5px;
-  	-moz-border-radius: 5px;
+  	border-radius: 5px;
   }
 
   #twitterfeed_tweet {

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

@@ -2,8 +2,10 @@
 
 #twitterfeed{:class => align}
 
-  / #twitterfeed_header
-  /   = link_to image_tag('/assets/twitterfeed-logo.gif'), "https://github.com/markcap/twitterfeed", :target => '_blank'
+  - if title
+    #twitterfeed_header
+      = title
+      = image_tag("bird.jpg")
   #twitterfeed_content
     - tweet_array.each do |tweet|
       #twitterfeed_tweet{:class => cycle('even','odd')}

data/lib/twitterfeed.rb

@@ -8,11 +8,11 @@ module Twitterfeed
     total_tweets = []
     name_array.first(150).each do |name|
       if name[0] == "#"
-        Twitter.search(name, :rpp => 20).results.each do |tweet|
+        Twitter.search("#{name} -rt", :rpp => 20).results.each do |tweet|
           total_tweets << tweet 
         end
       else
-        Twitter.user_timeline(name, :include_rts => true).each do |tweet|
+        Twitter.user_timeline(name, :include_rts => true, :exclude_replies => true, :count => 100).first(20).each do |tweet|
           total_tweets << tweet 
         end
       end
@@ -34,7 +34,7 @@ module Twitterfeed
   def self.set_defaults(options)
     #sets values for twitterfeed window options, with some validations
     
-    defaults = {:align => 'right', :max => 20}
+    defaults = {:align => 'right', :max => 20, :title => nil}
     defaults.merge!(options)
     
     if (defaults[:align] != ("left" || "right"))

data/lib/twitterfeed/version.rb

@@ -1,3 +1,3 @@
 module Twitterfeed
-  VERSION = "0.1.8"
+  VERSION = "0.2.0"
 end

data/lib/twitterfeed/view_helpers.rb

@@ -2,6 +2,7 @@ require 'twitter'
 
 module Twitterfeed
   module ViewHelpers
+    
     def twitterfeed(name_array, options = {})
 
       defaults = Twitterfeed.set_defaults(options)
@@ -19,7 +20,8 @@ module Twitterfeed
       twitterfeed_data = YAML.load(File.open("twitterfeed.yml"))
       #removing update time from array
       twitterfeed_data.slice!(0)
-      render :partial => "twitterfeed/twitterfeed_box", :locals => { :tweet_array =>  twitterfeed_data, :align => defaults[:align]}
+      render :partial => "twitterfeed/twitterfeed_box", 
+        :locals => { :tweet_array =>  twitterfeed_data, :align => defaults[:align], :title => defaults[:title]}
  
     end
     
@@ -44,23 +46,31 @@ module Twitterfeed
       @links = tweet.scan(/https?:\/\/\S+/)
       
       @ats.each do |a|
-        tweet.gsub!(/#{a}/, "<a href='http://twitter.com/#{a[1..(a.length - 1)]}' target='_blank'>#{a}</a>")
+        at = sanitize_link(a)
+        tweet.gsub!(/#{at}/, "<a href='http://twitter.com/#{at[1..(at.length - 1)]}' target='_blank'>#{at}</a>")
       end
       
       @tags.each do |t|
-        t.delete! "\""
-        t.delete! ")"
-        tweet.gsub!(/#{t}/, "<a href='http://twitter.com/search/%23#{t[1..(t.length - 1)]}' target='_blank'>#{t}</a>")
+        tag = sanitize_link(t)
+        tweet.gsub!(/#{tag}(\Z|[\s.,()!?\"\'*])/, "<a href='http://twitter.com/search/%23#{tag[1..(tag.length - 1)]}' target='_blank'>#{tag}</a> ")
       end
       
       @links.each do |l|
-        l.delete! "\""
-        l.delete! ")"
-        tweet.gsub!(/#{l}/, "<a href='#{l}' target='_blank'>#{l}</a>")
+        link = sanitize_link(l)
+        tweet.gsub!(/#{link}/, "<a href='#{link}' target='_blank'>#{link}</a>")
       end
       
       tweet.html_safe
     end
+    
+    def sanitize_link(item)
+      #this enables crap like (#ruby) and "http://yahoo.com" to link properly in tweets
+      while item.last =~ /[.,()!?\"\'*]/
+        item.chop!
+      end
+      item
+    end
+    
   end
 end
 

metadata

@@ -2,7 +2,7 @@
 name: twitterfeed
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.8
+  version: 0.2.0
 platform: ruby
 authors: 
 - Mark Capodagli
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-15 00:00:00 Z
+date: 2012-09-02 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: twitter
@@ -38,6 +38,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- app/assets/images/bird.jpg
 - app/assets/images/twitterfeed-logo.gif
 - app/assets/stylesheets/twitterfeed.css
 - app/views/twitterfeed/_twitterfeed_box.html.haml