twitter2jabber 0.0.4 → 0.0.5

data/README

@@ -2,7 +2,7 @@
 
 == VERSION
 
-This documentation refers to twitter2jabber version 0.0.4
+This documentation refers to twitter2jabber version 0.0.5
 
 
 == DESCRIPTION

data/Rakefile

@@ -16,7 +16,7 @@ begin
       :homepage     => %q{http://twitter2jabber.rubyforge.org/},
       :files        => FileList['lib/**/*.rb', 'bin/*'].to_a,
       :extra_files  => FileList['[A-Z]*', 'sample/**/*'].to_a,
-      :dependencies => %w[twitter xmpp4r-simple highline]
+      :dependencies => %w[twitter xmpp4r-simple highline shorturl]
     }
   }}
 rescue LoadError

data/TODO

@@ -1,4 +1,5 @@
 - 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)
 - additional commands?

data/lib/twitter2jabber/version.rb

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

data/lib/twitter2jabber.rb

@@ -30,6 +30,7 @@ require 'erb'
 require 'rubygems'
 require 'twitter'
 require 'xmpp4r-simple'
+require 'shorturl'
 
 require 'twitter2jabber/version'
 
@@ -54,7 +55,7 @@ class Twitter2Jabber
     new(options).run(recipients, &block)
   end
 
-  attr_reader :id, :verbose, :debug, :twitter, :jabber, :filter, :formats, :templates
+  attr_reader :id, :verbose, :debug, :twitter, :jabber, :filter, :formats, :templates, :_erb
 
   def initialize(options, &block)
     [:twitter, :jabber].each { |client|
@@ -77,11 +78,16 @@ class Twitter2Jabber
     ].inject({}) { |hash, template|
       hash.update(File.extname(template).sub(/\A\./, '') => File.read(template))
     }
+
+    @_erb = Hash.new { |hash, format|
+      template = templates[format]
+      hash[format] = template && ERB.new(template)
+    }
   end
 
   def run(recipients = [], seen = {}, flag = true, &block)
     deliver_tweets(recipients, seen, &block) if flag
-    post_messages
+    post_messages(recipients)
   end
 
   def loop(recipients = [], pause = nil, &block)
@@ -94,16 +100,16 @@ class Twitter2Jabber
     # sleep at least one second
     pause = 1 if pause < 1
 
-    i, seen = 0, Hash.new { |h, k| h[k] = true; false }
+    i, seen = 1, Hash.new { |h, k| h[k] = true; false }
 
-    trap(:INT) { i = nil }
-
-    while i
-      i += 1
+    trap(:INT) { i = -1 }
 
+    while i > 0
       run(recipients, seen, i % ratio == 1, &block)
 
       sleep pause
+
+      i += 1
     end
   end
 
@@ -127,9 +133,12 @@ class Twitter2Jabber
     }
   end
 
-  def post_messages
+  def post_messages(recipients = [])
+    allowed = %r{\A(?:#{recipients.map { |r| Regexp.escape(r) }.join('|')})\z}i
+
     jabber.received_messages { |msg|
       next unless msg.type == :chat
+      next unless msg.from.bare.to_s =~ allowed
 
       logj msg.id
 
@@ -178,10 +187,8 @@ class Twitter2Jabber
     msg = Jabber::Message.new.set_type(:chat)
 
     formats.each { |format|
-      if template = templates[format]
-        msg.add_element format_element(format) {
-          ERB.new(template).result(binding)
-        }
+      if erb = _erb[format]
+        msg.add_element(format_element(format, erb.result(binding)))
       end
     }
 
@@ -189,35 +196,41 @@ class Twitter2Jabber
   end
 
   # cf. <http://devblog.famundo.com/articles/2006/10/18/ruby-and-xmpp-jabber-part-3-adding-html-to-the-messages>
-  def format_element(format)
+  def format_element(format, text)
     body = REXML::Element.new('body')
-    REXML::Text.new(yield, format != 'html', body, true, nil, /.^/)
 
     case format
       when 'html'
+        REXML::Text.new(process_html(text), false, body, true, nil, /.^/)
+
         html = REXML::Element.new('html').add_namespace(JABBER_NS)
         html.add(body.add_namespace(XHTML_NS))
         html
       else
+        REXML::Text.new(text, true, body, true, nil, /.^/)
         body
     end
   end
 
+  def process_html(text)
+    text.gsub(/((?:\A|\s)@)(\w+)/, '\1<a href="http://twitter.com/\2">\2</a>')
+  end
+
   def handle_command(body, from, execute = true)
     case body
       when /\Ahe?(?:lp)?\z/i
         deliver(from, <<-HELP) if execute
-h[e[lp]]            -- Print this help
+h[e[lp]]                     -- Print this help
 
-de[bug]             -- Print debug mode
-de[bug] on|off      -- Turn debug mode on/off
+de[bug]                      -- Print debug mode
+de[bug] on|off               -- Turn debug mode on/off
 
-bl[ock] #ID         -- Block ID
-fa[v[orite]] #ID    -- Create favorite #ID
+bl[ock] #ID                  -- Block ID
+fa[v[orite]] #ID             -- Create favorite #ID
 
-re[ply] #ID: ...    -- Reply to ID
-le[n[gth]] ...      -- Determine length
-...                 -- Update status
+re[ply] #ID[:] [!] STATUS    -- Reply to ID (Force if too long)
+le[n[gth]] STATUS            -- Determine length
+[!] STATUS                   -- Update status (Force if too long)
 
 (Note: Message body must be shorter than #{MAX_LENGTH} characters)
         HELP
@@ -256,9 +269,17 @@ le[n[gth]] ...      -- Determine length
           options[:in_reply_to_status_id] = $1
         end
 
+        if body.sub!(/\A!\s+/, '')
+          force = true
+        end
+
+        body.gsub!(/https?:\/\/\S+/) { |match|
+          match.length < 30 ? match : ShortURL.shorten(match)
+        }
+
         return body unless execute
 
-        if body.length <= MAX_LENGTH
+        if force || body.length <= MAX_LENGTH
           update(body, options)
         else
           deliver(from, "MSG TOO LONG (> #{MAX_LENGTH}): #{body}")

data/sample/templates/tweet.html

@@ -1,7 +1,3 @@
-<%= user.name %>
-(<a href="http://twitter.com/<%= user.screen_name %>"><%= user.screen_name %></a>)
-[<%= tweet.created_at %>]:
+<%= user.name %> (<a href="http://twitter.com/<%= user.screen_name %>"><%= user.screen_name %></a>) [<%= tweet.created_at %>]:
 <br /><br />
-<img src="<%= user.profile_image_url %>" alt="[<%= user.screen_name %>]" />
-<%= tweet.text %>
-| #<%= tweet.id %>
+<img src="<%= user.profile_image_url %>" alt="[<%= user.screen_name %>]" /> <%= tweet.text %> | #<%= tweet.id %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: twitter2jabber
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Jens Wille
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-02 00:00:00 +02:00
+date: 2009-08-03 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,6 +42,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: shorturl
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: Twitter-to-Jabber gateway.
 email: jens.wille@uni-koeln.de
 executables: