jugyo-termtter 0.3.3 → 0.3.5

data/Rakefile

@@ -9,7 +9,7 @@ $hoe = Hoe.new('termtter', Termtter::VERSION) do |p|
   p.post_install_message = 'PostInstall.txt' # TODO remove if post-install message not required
   p.rubyforge_name       = p.name # TODO this is default value
   p.extra_deps         = [
-    ['nokogiri'],
+    ['json'],
     ['configatron'],
   ]
   #p.extra_dev_deps = [

data/lib/termtter/stdout.rb

@@ -13,7 +13,7 @@ Termtter::Client.add_hook do |statuses, event|
         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?
+        unless s.in_reply_to_status_id && s.in_reply_to_status_id.nil?
           status += " (reply to #{s.in_reply_to_status_id})"
         end
 

data/lib/termtter.rb

@@ -1,5 +1,5 @@
 require 'rubygems'
-require 'nokogiri'
+require 'json'
 require 'open-uri'
 require 'cgi'
 require 'readline'
@@ -10,7 +10,7 @@ $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 module Termtter
-  VERSION = '0.3.3'
+  VERSION = '0.3.5'
 
   class CommandNotFound < StandardError; end
 
@@ -59,12 +59,12 @@ module Termtter
     end
 
     def list_friends_timeline
-      statuses = get_timeline("http://twitter.com/statuses/friends_timeline.xml")
+      statuses = get_timeline("http://twitter.com/statuses/friends_timeline.json")
       call_hooks(statuses, :list_friends_timeline)
     end
 
     def update_friends_timeline
-      uri = "http://twitter.com/statuses/friends_timeline.xml"
+      uri = "http://twitter.com/statuses/friends_timeline.json"
       if @since_id && !@since_id.empty?
         uri += "?since_id=#{@since_id}"
       end
@@ -74,23 +74,19 @@ module Termtter
     end
 
     def get_user_timeline(screen_name)
-      statuses = get_timeline("http://twitter.com/statuses/user_timeline/#{screen_name}.xml")
+      statuses = get_timeline("http://twitter.com/statuses/user_timeline/#{screen_name}.json")
       call_hooks(statuses, :list_user_timeline)
     end
 
     def search(query)
-      doc = Nokogiri::XML(open('http://search.twitter.com/search.atom?q=' + CGI.escape(query)))
-
       statuses = []
-      ns = {'atom' => 'http://www.w3.org/2005/Atom'}
-      doc.xpath('//atom:entry', ns).each do |node|
+
+      results = JSON.parse(open('http://search.twitter.com/search.json?q=' + CGI.escape(query)).read)['results']
+      results.each do |s|
         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(/<\/?[^>]*>/, ''))
-        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.text = s['text']
+        status.created_at = Time.utc(*ParseDate::parsedate(s["created_at"])).localtime
+        status.user_screen_name = s['from_user']
         statuses << status
       end
 
@@ -99,12 +95,12 @@ module Termtter
     end
 
     def show(id)
-      statuses = get_timeline("http://twitter.com/statuses/show/#{id}.xml")
+      statuses = get_timeline("http://twitter.com/statuses/show/#{id}.json")
       call_hooks(statuses, :show)
     end
 
     def replies
-      statuses = get_timeline("http://twitter.com/statuses/replies.xml")
+      statuses = get_timeline("http://twitter.com/statuses/replies.json")
       call_hooks(statuses, :show)
     end
 
@@ -120,19 +116,18 @@ module Termtter
     end
 
     def get_timeline(uri, update_since_id = false)
-      doc = Nokogiri::XML(open(uri, :http_basic_authentication => [@user_name, @password]))
-
       statuses = []
-      doc.xpath('//status').each do |node|
+
+      JSON.parse(open(uri, :http_basic_authentication => [@user_name, @password]).read).each do |s|
+        u = s["user"]
         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 user/url user/profile_image_url
-        ).each do |key|
-          method = "#{key.gsub('/', '_')}=".to_sym
-          status.send(method, node.xpath(key).text)
+        status.created_at = Time.utc(*ParseDate::parsedate(s["created_at"])).localtime
+        %w(id text truncated in_reply_to_status_id in_reply_to_user_id).each do |key|
+          status.send("#{key}=".to_sym, s[key])
+        end
+        %w(id name screen_name url profile_image_url).each do |key|
+          status.send("user_#{key}=".to_sym, u[key])
         end
-        status.created_at = Time.utc(*ParseDate::parsedate(status.created_at)).localtime
         statuses << status
       end
 
@@ -145,7 +140,7 @@ module Termtter
 
     def call_commands(text)
       return if text.empty?
-      
+
       command_found = false
       @@commands.each do |key, command|
         if key =~ text

data/test/test_termtter.rb

@@ -17,43 +17,41 @@ class TestTermtter < Test::Unit::TestCase
   end
 
   def test_get_timeline
-    statuses = swap_open('friends_timeline.xml') { @termtter.get_timeline('') }
+    statuses = swap_open('friends_timeline.json') { @termtter.get_timeline('') }
 
     assert_equal 3, statuses.size
 
-    assert_equal '102', statuses[0].user_id
+    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 'http://twitter.com/test2', statuses[0].user_url
-    assert_equal 'http://xxx2', statuses[0].user_profile_image_url
-    assert_equal 'Thu Dec 25 22:19:57 +0900 2008', statuses[0].created_at.to_s
+    assert_equal 'http://s3.amazonaws.com/twitter_production/profile_images/000/102.png', statuses[0].user_profile_image_url
+    assert_equal 'Sat Jan 03 21:13:45 +0900 2009', statuses[0].created_at.to_s
 
-    assert_equal '100', statuses[2].user_id
+    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 'http://twitter.com/test0', statuses[2].user_url
-    assert_equal 'http://xxx0', statuses[2].user_profile_image_url
-    assert_equal 'Thu Dec 25 22:10:57 +0900 2008', statuses[2].created_at.to_s
+    assert_equal 'http://s3.amazonaws.com/twitter_production/profile_images/000/100.png', statuses[2].user_profile_image_url
+    assert_equal 'Sat Jan 03 21:13:45 +0900 2009', statuses[2].created_at.to_s
   end
 
   def test_get_timeline_with_update_since_id
-    statuses = swap_open('friends_timeline.xml') { @termtter.get_timeline('', true) }
-    assert_equal '10002', @termtter.since_id
+    statuses = swap_open('friends_timeline.json') { @termtter.get_timeline('', true) }
+    assert_equal 10002, @termtter.since_id
   end
 
   def test_search
-    statuses = swap_open('search.atom') { @termtter.search('') }
+    statuses = swap_open('search.json') { @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 'Sat Jan 03 21:49:09 +0900 2009', 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 'Sat Jan 03 21:49:09 +0900 2009', statuses[2].created_at.to_s
   end
 
   def test_add_hook
@@ -61,7 +59,7 @@ class TestTermtter < Test::Unit::TestCase
     Termtter::Client.add_hook do |statuses, event|
       call_hook = true
     end
-    swap_open('search.atom'){ @termtter.search('') }
+    swap_open('search.json'){ @termtter.search('') }
 
     assert_equal true, call_hook
 
@@ -71,7 +69,7 @@ class TestTermtter < Test::Unit::TestCase
 
     assert_equal false, call_hook
   end
-  
+
   def test_add_command
     command_text = nil
     matche_text = nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jugyo-termtter
 version: !ruby/object:Gem::Version 
-  version: 0.3.3
+  version: 0.3.5
 platform: ruby
 authors: 
 - jugyo
@@ -13,7 +13,7 @@ date: 2009-01-03 00:00:00 -08:00
 default_executable: termtter
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: nokogiri
+  name: json
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: