twitter2jabber 0.4.0 → 0.5.0

data/README

@@ -2,7 +2,7 @@
 
 == VERSION
 
-This documentation refers to twitter2jabber version 0.4.0
+This documentation refers to twitter2jabber version 0.5.0
 
 
 == DESCRIPTION

data/lib/twitter2jabber/version.rb

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

data/lib/twitter2jabber.rb

@@ -159,7 +159,7 @@ class Twitter2Jabber
   def twitter_connect(options = @twitter_options)
     @twitter_options = options
 
-    @twitter = Twitter.client(
+    @twitter = Twitter.new(
       :consumer_key       => options[:consumer_token],
       :consumer_secret    => options[:consumer_secret],
       :oauth_token        => options[:access_token],
@@ -183,7 +183,7 @@ class Twitter2Jabber
     logj 'connected'
 
     @jabber
-  rescue Jabber::JabberError => err
+  rescue Jabber::JabberError, Errno::ETIMEDOUT => err
     raise "Can't connect to Jabber with JID '#{options[:user]}': #{err}"
   end
 
@@ -197,7 +197,7 @@ class Twitter2Jabber
     tweets.sort_by { |tweet|
       tweet.created_at = Time.parse(tweet.created_at)
     }
-  rescue Twitter::Error, Twitter::ServiceUnavailable, Timeout::Error
+  rescue Twitter::Error, Timeout::Error
     []
   rescue => err
     warn "#{err} (#{err.class})"
@@ -323,7 +323,7 @@ le[n[gth]] STATUS                         -- Determine length
             id, colon = $1, $2
 
             tweet = twitter.status(id)
-            raise Twitter::NotFound unless tweet.is_a?(Hashie::Rash)
+            raise Twitter::NotFound unless tweet.is_a?(Hashie::Hash)
 
             if body.empty?
               options[:id] = id
@@ -335,7 +335,7 @@ le[n[gth]] STATUS                         -- Determine length
             id, colon = $1, $2
 
             tweet = twitter.status(id)
-            raise Twitter::NotFound unless tweet.is_a?(Hashie::Rash)
+            raise Twitter::NotFound unless tweet.is_a?(Hashie::Hash)
 
             body.insert(0, ' ') unless body.empty?
             body.insert(0, "@#{tweet.user.screen_name}#{colon}")
@@ -357,7 +357,8 @@ le[n[gth]] STATUS                         -- Determine length
         end
 
         body.gsub!(/https?:\/\/\S+/) { |match|
-          match.length < 30 ? match : ShortURL.shorten(match)
+          short = ShortURL.shorten(match, :tinyurl)
+          short && short.length < match.length ? short : match
         }
 
         return body unless execute

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: twitter2jabber
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 11
   prerelease: 
   segments: 
   - 0
-  - 4
+  - 5
   - 0
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Jens Wille
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-03 00:00:00 Z
+date: 2011-07-29 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: twitter
@@ -142,14 +142,14 @@ licenses: []
 
 post_install_message: 
 rdoc_options: 
-- --line-numbers
+- --all
 - --main
 - README
 - --charset
 - UTF-8
-- --all
 - --title
-- twitter2jabber Application documentation (v0.4.0)
+- twitter2jabber Application documentation (v0.5.0)
+- --line-numbers
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -173,7 +173,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: twitter2jabber
-rubygems_version: 1.7.2
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Twitter-to-Jabber gateway.