twitter2jabber 0.1.7 → 0.1.8

data/README

@@ -2,7 +2,7 @@
 
 == VERSION
 
-This documentation refers to twitter2jabber version 0.1.7
+This documentation refers to twitter2jabber version 0.1.8
 
 
 == DESCRIPTION

data/TODO

@@ -1,7 +1,6 @@
-- Jabber::ServerDisconnected in lib/twitter2jabber.rb:165 (??? => Jabber::ServerDisconnected < Jabber::JabberError)
 - threading?
 - 'direct message' command
-- persistent cache! (friends_timeline: since/since_id?)
+- persistent cache? (friends_timeline: since/since_id?)
 - OAuth (register: http://twitter.com/oauth_clients/new)
 - better interrupt handling (in loop mode)
 - daemonize after asking for credentials (in loop mode)

data/bin/twitter2jabber

@@ -56,6 +56,7 @@ options = {
   :template_dir => nil,
   :loop         => false,
   :pause        => nil,
+  :last         => nil,
   :verbose      => false,
   :debug        => false
 }
@@ -111,6 +112,12 @@ OptionParser.new { |opts|
     options[:pause] = p
   }
 
+  opts.separator ' '
+
+  opts.on('-S', '--since-id ID', 'Return tweets with status IDs greater than ID') { |i|
+    options[:last] = i
+  }
+
   opts.separator ' '
   opts.separator 'Generic options:'
 
@@ -163,9 +170,9 @@ begin
 
   if options[:loop]
     warn Process.pid if options[:verbose]
-    twitter2jabber.loop(recipients, options[:pause] || config[:pause])
+    twitter2jabber.loop(recipients, options[:pause] || config[:pause], options[:last])
   else
-    twitter2jabber.run(recipients)
+    twitter2jabber.run(recipients, options[:last])
   end
 rescue RuntimeError => err
   abort err

data/lib/twitter2jabber/version.rb

@@ -4,7 +4,7 @@ class Twitter2Jabber
 
     MAJOR = 0
     MINOR = 1
-    TINY  = 7
+    TINY  = 8
 
     class << self
 

data/lib/twitter2jabber.rb

@@ -48,12 +48,12 @@ class Twitter2Jabber
   JABBER_NS = 'http://jabber.org/protocol/xhtml-im'
   XHTML_NS  = 'http://www.w3.org/1999/xhtml'
 
-  def self.loop(options, recipients = [], pause = nil, &block)
-    new(options).loop(recipients, pause, &block)
+  def self.loop(options, recipients = [], pause = nil, last = nil, &block)
+    new(options).loop(recipients, pause, last, &block)
   end
 
-  def self.run(options, recipients = [], &block)
-    new(options).run(recipients, &block)
+  def self.run(options, recipients = [], last = nil, &block)
+    new(options).run(recipients, last, &block)
   end
 
   attr_reader :id, :verbose, :debug, :twitter, :jabber, :filter, :formats, :templates, :_erb
@@ -88,15 +88,17 @@ class Twitter2Jabber
     }
   end
 
-  def run(recipients = [], seen = {}, flag = true, &block)
-    deliver_tweets(recipients, seen, &block) if flag
+  def run(recipients = [], last = nil, flag = true, &block)
+    last = deliver_tweets(recipients, last, &block) if flag
     post_messages(recipients)
+
+    last
   end
 
-  def loop(recipients = [], pause = nil, &block)
+  def loop(recipients = [], pause = nil, last = nil, &block)
     pause ||= DEFAULT_PAUSE
 
-    i, seen = 1, Hash.new { |h, k| h[k] = true; false }
+    i = 1
 
     trap(:INT) {
       log 'SIGINT received, shutting down...'
@@ -104,7 +106,7 @@ class Twitter2Jabber
     }
 
     while i > 0
-      run(recipients, seen, i % pause == 1, &block)
+      last = run(recipients, last, i % pause == 1, &block)
 
       sleep 1
 
@@ -112,13 +114,13 @@ class Twitter2Jabber
     end
 
     log 'KTHXBYE!'
-  end
 
-  def deliver_tweets(recipients, seen = {}, &block)
-    get_tweets.each { |tweet|
-      next if seen[tweet.id]
+    last
+  end
 
-      logt tweet.id
+  def deliver_tweets(recipients, last = nil, &block)
+    get_tweets(last).each { |tweet|
+      logt last = tweet.id
 
       # apply filters
       next if filter && !filter[tweet]
@@ -132,6 +134,8 @@ class Twitter2Jabber
 
       sleep 1
     }
+
+    last
   end
 
   def post_messages(recipients = [])
@@ -173,8 +177,11 @@ class Twitter2Jabber
     raise "Can't connect to Jabber with JID '#{options[:user]}': #{err}"
   end
 
-  def get_tweets
-    tweets = twitter.friends_timeline
+  def get_tweets(last = nil)
+    options = {}
+    options[:since_id] = last if last
+
+    tweets = twitter.friends_timeline(options)
     return [] unless tweets.is_a?(Array)
 
     tweets.sort_by { |tweet|
@@ -224,8 +231,8 @@ class Twitter2Jabber
   end
 
   def process_html(text)
-    text.gsub(/(?=\A|\W)@(\w+)/, '@<a href="http://twitter.com/\1">\1</a>').
-         gsub(/(?=\A|\W)#(\w+)/, '<a href="http://search.twitter.com/search?q=%23\1">#\1</a>')
+    text.gsub(/(\A|\W)@(\w+)/, '\1@<a href="http://twitter.com/\2">\2</a>').
+         gsub(/(\A|\W)#(\w+)/, '\1<a href="http://search.twitter.com/search?q=%23\2">#\2</a>')
   end
 
   def process_text(text)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: twitter2jabber
 version: !ruby/object:Gem::Version 
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors: 
 - Jens Wille
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-11 00:00:00 +02:00
+date: 2009-09-13 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency