@@ -21,7 +21,6 @@ features/support/mocha.rb features/support/time_machine_helpers.rb lib/tweet-tail.rb lib/tweet-tail/ansi_tweet_formatter.rb -lib/tweet-tail/html_tweet_formatter.rb lib/tweet-tail/cli.rb lib/tweet-tail/tweet_poller.rb script/console Manifest.txt @@ -12,6 +12,4 @@ require "open-uri" require "tweet-tail/tweet_poller" -require "tweet-tail/ansi_tweet_formatter" - -require "tweet-tail/html_tweet_formatter" \ No newline at end of file +require "tweet-tail/ansi_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, :html => false } + options = { :polling => false, :output_format => :text } parser = OptionParser.new do |opts| opts.banner = <<-BANNER.gsub(/^ /,'') @@ -17,7 +17,8 @@ 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.on("-y", "--yaml", "output yaml") { |arg| options[:output_format] = :yaml } + opts.on("-j", "--json", "output json") { |arg| options[:output_format] = :json } opts.parse!(arguments) end @@ -31,24 +32,24 @@ module TweetTail::CLI app.extend(TweetTail::AnsiTweetFormatter) if stdout.tty? app.refresh - if options[:html] - stdout.puts app.render_latest_results(TweetTail::HtmlTweetFormatter) - else - stdout.puts app.render_latest_results - end + render(stdout, app, options[:output_format]) while(options[:polling]) Kernel::sleep(15) app.refresh if app.render_latest_results.size > 0 - if options[:html] - stdout.puts app.render_latest_results(TweetTail::HtmlTweetFormatter) - else - stdout.puts app.render_latest_results - end + render(stdout, app, options[:output_format]) end end rescue Interrupt end end + def self.render(stdout, poller, format) + if format == :text + stdout.puts poller.render_latest_results + else + stdout.puts poller.latest_results.send "to_#{format}".to_sym + end + end + end lib/tweet-tail/cli.rb @@ -19,15 +19,13 @@ class TweetTail::TweetPoller @refresh_url = @latest_feed["refresh_url"] end - def render_latest_results(formatter = nil, &block) + def render_latest_results(&block) format_block = block unless block.nil? @latest_results.inject("") do |output, tweet| - if formatter.nil? && block.nil? + if block.nil? output += format(tweet) - elsif formatter.nil? - output += block.call(tweet) else - output += formatter.format(tweet) + output += block.call(tweet) end end end lib/tweet-tail/tweet_poller.rb @@ -10,24 +10,36 @@ class TestTweetPoller < Test::Unit::TestCase "text": "reading my own abstract for JAOO presentation", "from_user": "drnic", "id": 1666627310, + "from_user_id": 10890961, + "iso_language_code": "en", + "profile_image_url": "http://example.com/", "created_at": "10:45 PM Apr 30th", "source" : "https://twitter.com/drnic/status/1666627310" },{ "text": "Come speak with Matt at JAOO next week", "from_user": "theRMK", "id": 1666334207, + "from_user_id": 10890961, + "iso_language_code": "en", + "profile_image_url": "http://example.com/", "created_at": "10:01 PM Apr 30th", "source": "http://twitter.com/theRMK/statuses/1666334207" },{ "text": "@VenessaP I think they went out for noodles. #jaoo", "from_user": "Steve_Hayes", "id": 1666166639, + "from_user_id": 10890961, + "iso_language_code": "en", + "profile_image_url": "http://example.com/", "created_at": "10:01 PM Apr 30th", "source": "http://not.in.google/" },{ "text": "Come speak with me at JAOO next week - http:\/\/jaoo.dk\/", "from_user": "mattnhodges", "id": 1664823944, + "from_user_id": 10890961, + "iso_language_code": "en", + "profile_image_url": "http://example.com/", "created_at": "10:01 PM Apr 30th", "source": "http://not.in.google/" }], @@ -48,39 +60,61 @@ 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(nil)) + assert_equal(expected, @app.render_latest_results) end - 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| - screen_name = tweet['from_user'] - created_at = tweet['created_at'] - link = tweet['source'] - message = tweet['text'] - "<div class='tweet'>\n#{screen_name}: #{message}<br />\n<a href='#{link}'>#{created_at}</a>\n</div>\n" - end - assert_equal(expected, actual) + def test_ready_for_refresh + assert_equal('?since_id=1682666650&q=jaoo', @app.refresh_url) end - def test_message_render_html_formatter + def test_message_render_yaml 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> + --- + - created_at: 10:01 PM Apr 30th\n profile_image_url: http://example.com/\n from_user: mattnhodges\n text: Come speak with me at JAOO next week - http://jaoo.dk/\n id: 1664823944\n from_user_id: 10890961\n iso_language_code: en\n source: http://not.in.google/ + - created_at: 10:01 PM Apr 30th\n profile_image_url: http://example.com/\n from_user: Steve_Hayes\n text: \"@VenessaP I think they went out for noodles. #jaoo\"\n id: 1666166639\n from_user_id: 10890961\n iso_language_code: en\n source: http://not.in.google/ + - created_at: 10:01 PM Apr 30th\n profile_image_url: http://example.com/\n from_user: theRMK\n text: Come speak with Matt at JAOO next week\n id: 1666334207\n from_user_id: 10890961\n iso_language_code: en\n source: http://twitter.com/theRMK/statuses/1666334207 + - created_at: 10:45 PM Apr 30th\n profile_image_url: http://example.com/\n from_user: drnic\n text: reading my own abstract for JAOO presentation\n id: 1666627310\n from_user_id: 10890961\n iso_language_code: en\n source: https://twitter.com/drnic/status/1666627310 RESULTS - actual = @app.render_latest_results(TweetTail::HtmlTweetFormatter) + actual = @app.latest_results.to_yaml assert_equal(expected, actual) end - def test_ready_for_refresh - assert_equal('?since_id=1682666650&q=jaoo', @app.refresh_url) + def test_message_render_json + expected = + [{"created_at"=>"10:01 PM Apr 30th", + "profile_image_url"=>"http://example.com/", + "from_user"=>"mattnhodges", + "text"=>"Come speak with me at JAOO next week - http://jaoo.dk/", + "id"=>1664823944, + "from_user_id"=>10890961, + "iso_language_code"=>"en", + "source"=>"http://not.in.google/"}, + {"created_at"=>"10:01 PM Apr 30th", + "profile_image_url"=>"http://example.com/", + "from_user"=>"Steve_Hayes", + "text"=>"@VenessaP I think they went out for noodles. #jaoo", + "id"=>1666166639, + "from_user_id"=>10890961, + "iso_language_code"=>"en", + "source"=>"http://not.in.google/"}, + {"created_at"=>"10:01 PM Apr 30th", + "profile_image_url"=>"http://example.com/", + "from_user"=>"theRMK", + "text"=>"Come speak with Matt at JAOO next week", + "id"=>1666334207, + "from_user_id"=>10890961, + "iso_language_code"=>"en", + "source"=>"http://twitter.com/theRMK/statuses/1666334207"}, + {"created_at"=>"10:45 PM Apr 30th", + "profile_image_url"=>"http://example.com/", + "from_user"=>"drnic", + "text"=>"reading my own abstract for JAOO presentation", + "id"=>1666627310, + "from_user_id"=>10890961, + "iso_language_code"=>"en", + "source"=>"https://twitter.com/drnic/status/1666627310"}] + actual = @app.latest_results + assert_equal(expected, actual) end def test_refresh_data @@ -98,7 +132,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(nil)) + assert_equal(expected, @app.render_latest_results) assert_equal('?since_id=1711269079&q=jaoo', @app.refresh_url) end end test/test_tweet_poller.rb lib/tweet-tail/html_tweet_formatter.rb 2f25168f0eeea608d37b09e11726b35ff5acaf29 gaustin gaustin@gmail.com http://github.com/gaustin/tweet-tail/commit/4ded78ee921e7c7846d13ccf31d0ac08c5e47c50 4ded78ee921e7c7846d13ccf31d0ac08c5e47c50 2009-06-08T10:26:06-07:00 2009-06-08T10:26:06-07:00 Removed previously added HTML mode. Added YAML and JSON output to CLI... Still in that floundering stage with actually designing Ruby code. 55d6f3f34c81d424cd18ad495ce21b13d1dbc68e gaustin gaustin@gmail.com