twitterfeed 0.1.5 → 0.1.6

data/README.md

@@ -15,15 +15,19 @@ Add this line to your application's Gemfile:
 
 Just install and go!
 
-### Rails pre-3.1 or no asset pipeline
+### Rails pre-3.1 or no asset piplie
 
-    rails generate twitterfeed
+  rails generate twitterfeed
 
 ### In your view
 
 Place helper line anywhere in your project with an array of twitter handles or hashtags:
 
     <%= twitterfeed(["mark_cap", "wycats", "ruralocity", "#ruby", "#rails"]) %>
+    
+Options:
+    
+    <%= twitterfeed(["#ruby", "#rails"], :align => "left", :max => 10) %>
 
 Enjoy!
 

data/app/assets/stylesheets/twitterfeed.css

@@ -2,11 +2,18 @@
 
   margin: 20px;
   width: 300px;
-  float: right;
   font: Helvetica;
   font-size: 13px;
 }
   
+  .right {
+    float: right;
+  }
+  
+  .left {
+    float: left;
+  }
+  
   #twitterfeed_header {
     margin-bottom: 5px;
   }

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

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

data/lib/twitterfeed.rb

@@ -4,7 +4,7 @@ module Twitterfeed
   
   require 'twitterfeed/engine' if defined?(Rails)
   
-  def self.update_twitterfeed(twitterfeed_data, name_array)
+  def self.update_twitterfeed(twitterfeed_data, name_array, max_tweets)
     total_tweets = []
     name_array.first(150).each do |name|
       if name[0] == "#"
@@ -19,7 +19,7 @@ module Twitterfeed
     end
   
     tweet_array = [{"last_update" => Time.now}]
-    total_tweets.sort_by {|x| x.created_at}.reverse.first(20).each do |tweet|
+    total_tweets.sort_by {|x| x.created_at}.reverse.first(max_tweets).each do |tweet|
       tweet_array << {
                       #searches and users have different username methods
                       "handle" => tweet.user.nil? ? tweet.from_user : tweet.user.screen_name,

data/lib/twitterfeed/version.rb

@@ -1,3 +1,3 @@
 module Twitterfeed
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/lib/twitterfeed/view_helpers.rb

@@ -2,7 +2,10 @@ require 'twitter'
 
 module Twitterfeed
   module ViewHelpers
-    def twitterfeed(name_array)
+    def twitterfeed(name_array, options = {})
+
+      defaults = {:align => 'right', :max => 20}
+      defaults.merge!(options)
       
       twitterfeed_data = YAML.load(File.open("twitterfeed.yml", 'w+'))
       
@@ -11,13 +14,13 @@ module Twitterfeed
       #retrieved. 1 handle will be retrieved maximum of 150 times per hour etc.
       
       if !twitterfeed_data || twitterfeed_data.first["last_update"] < (Time.now - (60.0 * (60.0/(150.0/name_array.size))))
-        Twitterfeed.update_twitterfeed(twitterfeed_data, name_array)
+        Twitterfeed.update_twitterfeed(twitterfeed_data, name_array, defaults[:max])
       end  
       
       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}
+      render :partial => "twitterfeed/twitterfeed_box", :locals => { :tweet_array =>  twitterfeed_data, :align => defaults[:align]}
  
     end
     
@@ -36,6 +39,7 @@ module Twitterfeed
     end
     
     def linkify_tweet(tweet)
+      #this turns all hashtags, ats, and links into html links to click on
       @ats = tweet.scan(/@\w+/)
       @tags = tweet.scan(/#\S+/)
       @links = tweet.scan(/https?:\/\/\S+/)

metadata

@@ -2,7 +2,7 @@
 name: twitterfeed
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors: 
 - Mark Capodagli
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-19 00:00:00 Z
+date: 2012-08-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: twitter
@@ -76,3 +76,4 @@ specification_version: 3
 summary: Will allow you to see multiple feeds at once.
 test_files: []
 
+has_rdoc: