jugyo-termtter 0.2.0 → 0.2.1

data/lib/termtter/notify-send.rb

@@ -3,8 +3,8 @@ Termtter::Client.add_hook do |statuses, event|
     max = 10
     
     text = statuses[0..(max - 1)].map{|s|
-      status_text = s['text'].gsub(%r{https?://[-_.!~*\'()a-zA-Z0-9;\/?:\@&=+\$,%#]+},'<a href="\0">\0</a>')
-      "<b>#{s['user/screen_name']}</b> <span font=\"9.0\">#{status_text}</span>"
+      status_text = s.text.gsub(%r{https?://[-_.!~*\'()a-zA-Z0-9;\/?:\@&=+\$,%#]+},'<a href="\0">\0</a>')
+      "<b>#{s.user_screen_name}</b> <span font=\"9.0\">#{status_text}</span>"
     }.join("\n")
     
     text += "\n<a href=\"http://twitter.com/\">more…</a>" if statuses.size > max
@@ -12,4 +12,3 @@ Termtter::Client.add_hook do |statuses, event|
     system 'notify-send', 'Termtter', text, '-t', '60000'
   end
 end
-

data/lib/termtter/stdout.rb

@@ -10,11 +10,11 @@ Termtter::Client.add_hook do |statuses, event|
     unless statuses.empty?
       if event == :update_friends_timeline then statuses = statuses.reverse end
       statuses.each do |s|
-        text = s['text'].gsub("\n", '')
-        color_num = colors[s['user/screen_name'].hash % colors.size]
-        status = "#{s['user/screen_name']}: #{text}"
-        unless s['in_reply_to_status_id'] && s['in_reply_to_status_id'].empty?
-          status += " (reply to #{s['in_reply_to_status_id']})"
+        text = s.text.gsub("\n", '')
+        color_num = colors[s.user_screen_name.hash % colors.size]
+        status = "#{s.user_screen_name}: #{text}"
+        unless s.in_reply_to_status_id && s.in_reply_to_status_id.empty?
+          status += " (reply to #{s.in_reply_to_status_id})"
         end
 
         case event
@@ -23,20 +23,19 @@ Termtter::Client.add_hook do |statuses, event|
         else
           time_format = '%m-%d %H:%d'
         end
-        time_str = "(#{s['created_at'].strftime(time_format)})"
+        time_str = "(#{s.created_at.strftime(time_format)})"
 
         puts "#{color(time_str, 90)} #{color(status, color_num)}"
       end
     end
   when :search
     statuses.each do |s|
-      text = s['text'].gsub("\n", '')
-      color_num = colors[s['user/screen_name'].hash % colors.size]
-      status = "#{s['user/screen_name']}: #{text}"
-      time_str = "(#{s['created_at'].strftime('%m-%d %H:%d')})"
+      text = s.text.gsub("\n", '')
+      color_num = colors[s.user_screen_name.hash % colors.size]
+      status = "#{s.user_screen_name}: #{text}"
+      time_str = "(#{s.created_at.strftime('%m-%d %H:%d')})"
 
       puts "#{color(time_str, 90)} #{color(status, color_num)}"
     end
   end
 end
-

data/lib/termtter.rb

@@ -10,7 +10,7 @@ $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 module Termtter
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
   
   class Client
     
@@ -73,13 +73,13 @@ module Termtter
       statuses = []
       ns = {'atom' => 'http://www.w3.org/2005/Atom'}
       doc.xpath('//atom:entry', ns).each do |node|
-        status = {}
+        status = Status.new
         published = node.xpath('atom:published', ns).text
-        status['created_at'] = Time.utc(*ParseDate::parsedate(published)).localtime
-        status['text'] = CGI.unescapeHTML(node.xpath('atom:content', ns).text.gsub(/<\/?[^>]*>/, ''))
+        status.created_at = Time.utc(*ParseDate::parsedate(published)).localtime
+        status.text = CGI.unescapeHTML(node.xpath('atom:content', ns).text.gsub(/<\/?[^>]*>/, ''))
         name = node.xpath('atom:author/atom:name', ns).text
-        status['user/screen_name'] = name.scan(/^([^\s]+) /).flatten[0]
-        status['user/name'] = name.scan(/\((.*)\)/).flatten[0]
+        status.user_screen_name = name.scan(/^([^\s]+) /).flatten[0]
+        status.user_name = name.scan(/\((.*)\)/).flatten[0]
         statuses << status
       end
 
@@ -112,20 +112,21 @@ module Termtter
       doc = Nokogiri::XML(open(uri, :http_basic_authentication => [@user_name, @password]))
 
       statuses = []
-      doc.xpath('//status').each do |s|
-        status = {}
+      doc.xpath('//status').each do |node|
+        status = Status.new
         %w(
           id text created_at truncated in_reply_to_status_id in_reply_to_user_id 
           user/id user/name user/screen_name
         ).each do |key|
-          status[key] = CGI.unescapeHTML(s.xpath(key).text)
+          method = "#{key.gsub('/', '_')}=".to_sym
+          status.send(method, node.xpath(key).text)
         end
-        status['created_at'] = Time.utc(*ParseDate::parsedate(status['created_at'])).localtime
+        status.created_at = Time.utc(*ParseDate::parsedate(status.created_at)).localtime
         statuses << status
       end
 
       if update_since_id && !statuses.empty?
-        @since_id = statuses[0]['id']
+        @since_id = statuses[0].id
       end
 
       return statuses
@@ -213,5 +214,14 @@ Enter "help" for instructions
     end
 
   end
-end
+  
+  class Status
+    %w(
+      id text created_at truncated in_reply_to_status_id in_reply_to_user_id 
+      user_id user_name user_screen_name
+    ).each do |attr|
+      attr_accessor attr.to_sym
+    end
+  end
 
+end

data/test/test_termtter.rb

@@ -23,16 +23,16 @@ class TestTermtter < Test::Unit::TestCase
     statuses = @termtter.get_timeline('')
 
     assert_equal 3, statuses.size
-    assert_equal '102', statuses[0]['user/id']
-    assert_equal 'test2', statuses[0]['user/screen_name']
-    assert_equal 'Test User 2', statuses[0]['user/name']
-    assert_equal 'texttext 2', statuses[0]['text']
-    assert_equal 'Thu Dec 25 22:19:57 +0900 2008', statuses[0]['created_at'].to_s
-    assert_equal '100', statuses[2]['user/id']
-    assert_equal 'test0', statuses[2]['user/screen_name']
-    assert_equal 'Test User 0', statuses[2]['user/name']
-    assert_equal 'texttext 0', statuses[2]['text']
-    assert_equal 'Thu Dec 25 22:10:57 +0900 2008', statuses[2]['created_at'].to_s
+    assert_equal '102', statuses[0].user_id
+    assert_equal 'test2', statuses[0].user_screen_name
+    assert_equal 'Test User 2', statuses[0].user_name
+    assert_equal 'texttext 2', statuses[0].text
+    assert_equal 'Thu Dec 25 22:19:57 +0900 2008', statuses[0].created_at.to_s
+    assert_equal '100', statuses[2].user_id
+    assert_equal 'test0', statuses[2].user_screen_name
+    assert_equal 'Test User 0', statuses[2].user_name
+    assert_equal 'texttext 0', statuses[2].text
+    assert_equal 'Thu Dec 25 22:10:57 +0900 2008', statuses[2].created_at.to_s
   end
   
   def test_get_timeline_with_update_since_id
@@ -51,14 +51,14 @@ class TestTermtter < Test::Unit::TestCase
 
     statuses = @termtter.search('')
     assert_equal 3, statuses.size
-    assert_equal 'test2', statuses[0]['user/screen_name']
-    assert_equal 'Test User 2', statuses[0]['user/name']
-    assert_equal 'texttext 2', statuses[0]['text']
-    assert_equal 'Thu Dec 25 22:52:36 +0900 2008', statuses[0]['created_at'].to_s
-    assert_equal 'test0', statuses[2]['user/screen_name']
-    assert_equal 'Test User 0', statuses[2]['user/name']
-    assert_equal 'texttext 0', statuses[2]['text']
-    assert_equal 'Thu Dec 25 22:42:36 +0900 2008', statuses[2]['created_at'].to_s
+    assert_equal 'test2', statuses[0].user_screen_name
+    assert_equal 'Test User 2', statuses[0].user_name
+    assert_equal 'texttext 2', statuses[0].text
+    assert_equal 'Thu Dec 25 22:52:36 +0900 2008', statuses[0].created_at.to_s
+    assert_equal 'test0', statuses[2].user_screen_name
+    assert_equal 'Test User 0', statuses[2].user_name
+    assert_equal 'texttext 0', statuses[2].text
+    assert_equal 'Thu Dec 25 22:42:36 +0900 2008', statuses[2].created_at.to_s
   end
   
   def test_add_hook
@@ -80,4 +80,3 @@ class TestTermtter < Test::Unit::TestCase
     assert_equal false, call_hook
   end
 end
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jugyo-termtter
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - jugyo