twitter2jabber 0.5.0 → 0.6.0

data/README

@@ -2,7 +2,7 @@
 
 == VERSION
 
-This documentation refers to twitter2jabber version 0.5.0
+This documentation refers to twitter2jabber version 0.6.0
 
 
 == DESCRIPTION
@@ -28,7 +28,7 @@ RubyForge project:: http://rubyforge.org/projects/twitter2jabber
 
 == LICENSE AND COPYRIGHT
 
-Copyright (C) 2009-2011 Jens Wille
+Copyright (C) 2009-2012 Jens Wille
 
 twitter2jabber is free software: you can redistribute it and/or modify it
 under the terms of the GNU Affero General Public License as published by

data/bin/twitter2jabber

@@ -1,4 +1,4 @@
-#! /usr/bin/ruby
+#! /usr/bin/env ruby
 
 #--
 ###############################################################################
@@ -26,7 +26,7 @@
 ###############################################################################
 #++
 
-$KCODE = 'u' unless RUBY_VERSION >= '1.9'
+$KCODE = 'u' if RUBY_VERSION < '1.9'
 
 require 'optparse'
 require 'yaml'

data/lib/twitter2jabber.rb

@@ -3,7 +3,7 @@
 #                                                                             #
 # twitter2jabber - Twitter-to-Jabber gateway.                                 #
 #                                                                             #
-# Copyright (C) 2009-2011 Jens Wille                                          #
+# Copyright (C) 2009-2012 Jens Wille                                          #
 #                                                                             #
 # Authors:                                                                    #
 #     Jens Wille <ww@blackwinter.de>                                          #
@@ -24,7 +24,6 @@
 ###############################################################################
 #++
 
-require 'time'
 require 'erb'
 
 require 'rubygems'
@@ -159,7 +158,7 @@ class Twitter2Jabber
   def twitter_connect(options = @twitter_options)
     @twitter_options = options
 
-    @twitter = Twitter.new(
+    @twitter = Twitter::Client.new(
       :consumer_key       => options[:consumer_token],
       :consumer_secret    => options[:consumer_secret],
       :oauth_token        => options[:access_token],
@@ -191,12 +190,10 @@ class Twitter2Jabber
     options = {}
     options[:since_id] = last if last
 
-    tweets = twitter.friends_timeline(options)
+    tweets = twitter.home_timeline(options)
     return [] unless tweets.is_a?(Array)
 
-    tweets.sort_by { |tweet|
-      tweet.created_at = Time.parse(tweet.created_at)
-    }
+    tweets.sort_by { |tweet| tweet.created_at }
   rescue Twitter::Error, Timeout::Error
     []
   rescue => err
@@ -237,12 +234,12 @@ class Twitter2Jabber
   end
 
   def process_message(text)
-    text.gsub(/https?:\/\/\S+/) { |match| LongURL.expand(match) rescue match }
+    text.gsub(%r{https?://\S+}) { |match| LongURL.expand(match) rescue match }
   end
 
   def process_html(text)
-    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>')
+    text.gsub(/(?:\A|\W)@(\w+)/, '@<a href="https://twitter.com/\1">\1</a>').
+         gsub(/(?:\A|\W)#(\w+)/, '<a href="https://search.twitter.com/search?q=%23\1">#\1</a>')
   end
 
   def process_text(text)
@@ -323,7 +320,6 @@ le[n[gth]] STATUS                         -- Determine length
             id, colon = $1, $2
 
             tweet = twitter.status(id)
-            raise Twitter::NotFound unless tweet.is_a?(Hashie::Hash)
 
             if body.empty?
               options[:id] = id
@@ -335,14 +331,13 @@ le[n[gth]] STATUS                         -- Determine length
             id, colon = $1, $2
 
             tweet = twitter.status(id)
-            raise Twitter::NotFound unless tweet.is_a?(Hashie::Hash)
 
             body.insert(0, ' ') unless body.empty?
             body.insert(0, "@#{tweet.user.screen_name}#{colon}")
 
             options[:in_reply_to_status_id] = id
           end
-        rescue Twitter::NotFound
+        rescue Twitter::Error::NotFound
           deliver(from, "TWEET NOT FOUND: #{id}")
           return
         end

data/lib/twitter2jabber/version.rb

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

metadata

@@ -1,181 +1,179 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: twitter2jabber
-version: !ruby/object:Gem::Version 
-  hash: 11
+version: !ruby/object:Gem::Version
+  version: 0.6.0
   prerelease: 
-  segments: 
-  - 0
-  - 5
-  - 0
-  version: 0.5.0
 platform: ruby
-authors: 
+authors:
 - Jens Wille
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-29 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-09-20 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: twitter
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: xmpp4r-simple
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: xmpp4r-simple
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: shorturl
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: shorturl
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: longurl
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: longurl
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: highline
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: highline
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: elif
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: elif
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: ruby-nuggets
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: ruby-nuggets
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id007
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Twitter-to-Jabber gateway.
 email: ww@blackwinter.de
-executables: 
+executables:
 - twitter2jabber
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README
 - COPYING
 - ChangeLog
-files: 
-- lib/twitter2jabber.rb
+files:
 - lib/twitter2jabber/version.rb
+- lib/twitter2jabber.rb
 - bin/twitter2jabber
-- README
+- COPYING
+- TODO
 - ChangeLog
 - Rakefile
-- TODO
-- COPYING
-- example/templates/tweet.txt
-- example/templates/tweet.html
+- README
 - example/config.yaml
+- example/templates/tweet.html
+- example/templates/tweet.txt
 homepage: http://twitter2jabber.rubyforge.org/
 licenses: []
-
 post_install_message: 
-rdoc_options: 
-- --all
-- --main
-- README
+rdoc_options:
 - --charset
 - UTF-8
-- --title
-- twitter2jabber Application documentation (v0.5.0)
 - --line-numbers
-require_paths: 
+- --all
+- --title
+- twitter2jabber Application documentation (v0.6.0)
+- --main
+- README
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: twitter2jabber
-rubygems_version: 1.8.6
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Twitter-to-Jabber gateway.
 test_files: []
-