lib/tweet-tail/html_tweet_formatter.rb @@ -1,4 +1,5 @@ -* configurable output format [gaustin] +* configurable output format with formatter class [gaustin] +* configurable output format with optional block [gaustin] * colour highlighting [bcarlso] * dependency on json gem * explicit development dependencies History.txt @@ -12,4 +12,6 @@ require "open-uri" require "tweet-tail/tweet_poller" -require "tweet-tail/ansi_tweet_formatter" \ No newline at end of file +require "tweet-tail/ansi_tweet_formatter" + +require "tweet-tail/html_tweet_formatter" \ No newline at end of file lib/tweet-tail.rb @@ -2,7 +2,7 @@ require 'optparse' module TweetTail::CLI def self.execute(stdout, arguments=[]) - options = { :polling => false } + options = { :polling => false, :html => false } parser = OptionParser.new do |opts| opts.banner = <<-BANNER.gsub(/^ /,'') @@ -17,6 +17,7 @@ module TweetTail::CLI ) { |arg| options[:polling] = true } opts.on("-h", "--help", "Show this help message.") { stdout.puts opts; exit } + opts.on("--html", "output html") { |arg| options[:html] = true } opts.parse!(arguments) end @@ -30,12 +31,20 @@ module TweetTail::CLI app.extend(TweetTail::AnsiTweetFormatter) if stdout.tty? app.refresh - stdout.puts app.render_latest_results + if options[:html] + stdout.puts app.render_latest_results(TweetTail::HtmlTweetFormatter) + else + stdout.puts app.render_latest_results(nil) + end while(options[:polling]) Kernel::sleep(15) app.refresh if app.render_latest_results.size > 0 - stdout.puts app.render_latest_results + if options[:html] + stdout.puts app.render_latest_results(TweetTail::HtmlTweetFormatter) + else + stdout.puts app.render_latest_results(nil) + end end end rescue Interrupt lib/tweet-tail/cli.rb @@ -19,13 +19,15 @@ class TweetTail::TweetPoller @refresh_url = @latest_feed["refresh_url"] end - def render_latest_results(&block) + def render_latest_results(formatter, &block) format_block = block unless block.nil? @latest_results.inject("") do |output, tweet| - if block.nil? + if formatter.nil? && block.nil? output += format(tweet) - else + elsif formatter.nil? output += block.call(tweet) + else + output += formatter.format(tweet) end end end lib/tweet-tail/tweet_poller.rb @@ -48,17 +48,17 @@ class TestTweetPoller < Test::Unit::TestCase theRMK: Come speak with Matt at JAOO next week drnic: reading my own abstract for JAOO presentation RESULTS - assert_equal(expected, @app.render_latest_results) + assert_equal(expected, @app.render_latest_results(nil)) end - def test_message_render_html + def test_message_render_html_block expected = <<-RESULTS.gsub(/^ /, '') <div class='tweet'>\nmattnhodges: Come speak with me at JAOO next week - http://jaoo.dk/<br />\n<a href='http://not.in.google/'>10:01 PM Apr 30th</a>\n</div> <div class='tweet'>\nSteve_Hayes: @VenessaP I think they went out for noodles. #jaoo<br />\n<a href='http://not.in.google/'>10:01 PM Apr 30th</a>\n</div> <div class='tweet'>\ntheRMK: Come speak with Matt at JAOO next week<br />\n<a href='http://twitter.com/theRMK/statuses/1666334207'>10:01 PM Apr 30th</a>\n</div> <div class='tweet'>\ndrnic: reading my own abstract for JAOO presentation<br />\n<a href='https://twitter.com/drnic/status/1666627310'>10:45 PM Apr 30th</a>\n</div> RESULTS - actual = @app.render_latest_results do |tweet| + actual = @app.render_latest_results(nil) do |tweet| screen_name = tweet['from_user'] created_at = tweet['created_at'] link = tweet['source'] @@ -68,6 +68,17 @@ class TestTweetPoller < Test::Unit::TestCase assert_equal(expected, actual) end + def test_message_render_html_formatter + expected = <<-RESULTS.gsub(/^ /, '') + <div class='tweet'>\nmattnhodges: Come speak with me at JAOO next week - http://jaoo.dk/<br />\n<a href='http://not.in.google/'>10:01 PM Apr 30th</a>\n</div> + <div class='tweet'>\nSteve_Hayes: @VenessaP I think they went out for noodles. #jaoo<br />\n<a href='http://not.in.google/'>10:01 PM Apr 30th</a>\n</div> + <div class='tweet'>\ntheRMK: Come speak with Matt at JAOO next week<br />\n<a href='http://twitter.com/theRMK/statuses/1666334207'>10:01 PM Apr 30th</a>\n</div> + <div class='tweet'>\ndrnic: reading my own abstract for JAOO presentation<br />\n<a href='https://twitter.com/drnic/status/1666627310'>10:45 PM Apr 30th</a>\n</div> + RESULTS + actual = @app.render_latest_results(TweetTail::HtmlTweetFormatter) + assert_equal(expected, actual) + end + def test_ready_for_refresh assert_equal('?since_id=1682666650&q=jaoo', @app.refresh_url) end @@ -87,7 +98,7 @@ class TestTweetPoller < Test::Unit::TestCase expected = <<-RESULTS.gsub(/^ /, '') CaioProiete: Wish I could be at #JAOO Australia... RESULTS - assert_equal(expected, @app.render_latest_results) + assert_equal(expected, @app.render_latest_results(nil)) assert_equal('?since_id=1711269079&q=jaoo', @app.refresh_url) end end test/test_tweet_poller.rb 7c9b243ae0132ed72d4e472c6180f18201ebd2af gaustin gaustin@gmail.com http://github.com/gaustin/tweet-tail/commit/cead8708ea02676748553daec8ae6b284990a34f cead8708ea02676748553daec8ae6b284990a34f 2009-06-07T10:06:38-07:00 2009-06-07T10:06:38-07:00 Added formatter class and test for html format. Added command line option for HTML format. 89ce604e6ee4d90323488fc1f6a4f9948f28f363 gaustin gaustin@gmail.com