twitter2jabber 0.0.8 → 0.0.9

data/README

@@ -2,7 +2,7 @@
 
 == VERSION
 
-This documentation refers to twitter2jabber version 0.0.8
+This documentation refers to twitter2jabber version 0.0.9
 
 
 == 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 shorturl]
+      :dependencies => %w[twitter xmpp4r-simple highline shorturl longurl]
     }
   }}
 rescue LoadError

data/lib/twitter2jabber/version.rb

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

data/lib/twitter2jabber.rb

@@ -199,6 +199,7 @@ class Twitter2Jabber
 
   # cf. <http://devblog.famundo.com/articles/2006/10/18/ruby-and-xmpp-jabber-part-3-adding-html-to-the-messages>
   def format_element(format, text)
+    text = process_message(text)
     body = REXML::Element.new('body')
 
     case format
@@ -209,15 +210,23 @@ class Twitter2Jabber
         html.add(body.add_namespace(XHTML_NS))
         html
       else
-        REXML::Text.new(text, true, body, true, nil, /.^/)
+        REXML::Text.new(process_text(text), true, body, true, nil, /.^/)
         body
     end
   end
 
+  def process_message(text)
+    text.gsub(/https?:\/\/\S+/) { |match| LongURL.expand(match) rescue match }
+  end
+
   def process_html(text)
     text.gsub(/((?:\A|\s)@)(\w+)/, '\1<a href="http://twitter.com/\2">\2</a>')
   end
 
+  def process_text(text)
+    text
+  end
+
   def handle_command(body, from, execute = true)
     case body
       when /\Ahe?(?:lp)?\z/i

data/sample/templates/tweet.html

@@ -1,3 +1,3 @@
 <%= 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 %><% if tweet.in_reply_to_status_id %> (irt <a href="http://twitter.com/<%= tweet.in_reply_to_screen_name %>/status/<%= tweet.in_reply_to_status_id %>"><%= tweet.in_reply_to_screen_name %></a>)<% end %>
+<img src="<%= user.profile_image_url %>" alt="[<%= user.screen_name %>]" /> <%= tweet.text %> | #<a href="http://twitter.com/<%= user.screen_name %>/status/<%= tweet.id %>"><%= tweet.id %></a><% if tweet.in_reply_to_status_id %> (irt <a href="http://twitter.com/<%= tweet.in_reply_to_screen_name %>/status/<%= tweet.in_reply_to_status_id %>"><%= tweet.in_reply_to_screen_name %></a>)<% end %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: twitter2jabber
 version: !ruby/object:Gem::Version 
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors: 
 - Jens Wille
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-23 00:00:00 +02:00
+date: 2009-08-31 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -52,6 +52,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: longurl
+  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: