twitter2jabber 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d434391b12803f08dec2790028dccd36ec5db99c
-  data.tar.gz: 7ab9bac4e82d981f0281f16990ef2fc7ea6d52fb
+  metadata.gz: 22d1efa034a7df52c0417d0122d5a6cfc86ac732
+  data.tar.gz: 679a722cd4e6384fb5fbd1e52a9ea78d689b867f
 SHA512:
-  metadata.gz: f6909849d8bd8705a47aeb84c940841344e4a41f852d349108e0c8c7edd9ae44b78179ec6ccea5cfdbbe9f37f93dd252bcf34cbd549dab9efe42587b31daf1f2
-  data.tar.gz: ed809ca1fce70a4479d196232d506e4585dd77197e66f6b27b781177ccd6be0abba952c4ecee7b11facf8727a75ed0c719af8070ccbe77711ed19520555227f5
+  metadata.gz: 34e9362d7eefa5aeb5fff91f850d0cb08df52e85f3f5855edbd954b00c6fa8b6863d27e6912056d13d711650c1405be210a81f02206956652d889944a05b079d
+  data.tar.gz: 85a22de2e19cb87a963b2479da076ca59dda43d3d735e9aeceb8520e607c776d0ee8803939ed989d50096bf60444f6ecc31f400b8b09ad2d9f60a36b79264539

data/ChangeLog

@@ -2,6 +2,14 @@
 
 = Revision history for twitter2jabber
 
+== 0.8.1 [2014-04-25]
+
+* Exhaust the Twitter stream by buffering all tweets received since the last
+  time, or one batch when run for the first time.
+* Relies on the order in Twitter::REST::Client#home_timeline (descending by
+  ID).
+* Disconnects Twitter and Jabber clients when finished.
+
 == 0.8.0 [2014-04-15]
 
 * Dropped "write" functionality. Only forwards Twitter messages to Jabber.

data/README

@@ -2,7 +2,7 @@
 
 == VERSION
 
-This documentation refers to twitter2jabber version 0.8.0
+This documentation refers to twitter2jabber version 0.8.1
 
 
 == DESCRIPTION

data/TODO

@@ -1,6 +1,4 @@
 - include_entities=true (http://dev.twitter.com/pages/tweet_entities)
 - include_rts=true (?)
-- use streaming API? (http://apiwiki.twitter.com/Streaming-API-Documentation)
-- persistent cache? (friends_timeline: since/since_id?)
 - SPECS!!!
 - DOCS!!

data/lib/twitter2jabber/{jabber.rb → jabber_client.rb}

@@ -68,6 +68,11 @@ class Twitter2Jabber
       raise "Can't connect to Jabber with JID '#{spec}': #{err}"
     end
 
+    def disconnect
+      close if @client
+      log 'disconnected'
+    end
+
     def format(tweet)
       user = tweet.user
       text = @erb.result(binding)
@@ -113,14 +118,18 @@ class Twitter2Jabber
     rescue Errno::EPIPE, IOError
       raise if attempts > 3
 
+      close
+      sleep 1
+      retry
+    end
+
+    def close
       begin
         @client.close
       rescue Errno::EPIPE, IOError
       end
 
       @client = nil
-      sleep 1
-      retry
     end
 
     def log(msg)

data/lib/twitter2jabber/{twitter.rb → twitter_client.rb}

@@ -31,6 +31,8 @@ class Twitter2Jabber
 
   class TwitterClient
 
+    BATCH_SIZE = Twitter::REST::Timelines::MAX_TWEETS_PER_REQUEST
+
     def initialize(gw, config)
       @gw, @config, @client = gw, config, Twitter::REST::Client.new(
         consumer_key:        @spec = config[:consumer_token],
@@ -49,11 +51,13 @@ class Twitter2Jabber
       raise "Can't connect to Twitter with ID '#{spec}': #{err}"
     end
 
-    def tweets(since_id = nil)
-      tweets = client.home_timeline(since_id: since_id)
-      return unless tweets.is_a?(Array)
+    def disconnect
+      @client = nil
+      log 'disconnected'
+    end
 
-      tweets.sort_by { |tweet| tweet.created_at }.each { |tweet|
+    def tweets(since_id = nil)
+      get_tweets(since_id).reverse_each { |tweet|
         log since_id = tweet.id
         yield tweet
         sleep 1
@@ -80,6 +84,20 @@ class Twitter2Jabber
 
     private
 
+    def get_tweets(since_id = nil)
+      options, buffer = { count: BATCH_SIZE }, []
+      options[:since_id] = since_id if since_id
+
+      loop {
+        buffer.concat(batch = client.home_timeline(options))
+
+        break if batch.empty? || !since_id ||
+          since_id >= options[:max_id] = batch.last.id - 1
+      }
+
+      buffer
+    end
+
     def log(msg)
       @gw.log("TWITTER #{msg}")
     end

data/lib/twitter2jabber/version.rb

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

data/lib/twitter2jabber.rb

@@ -29,7 +29,7 @@ class Twitter2Jabber
   class << self
 
     def run(options, since_id = nil)
-      new(options).connect.deliver_tweets(since_id)
+      new(options).connect.deliver_tweets(since_id).disconnect
     end
 
     def client(client)
@@ -54,6 +54,8 @@ class Twitter2Jabber
     end
   end
 
+  attr_reader :twitter, :jabber, :debug
+
   def connect
     log 'Connecting...'
 
@@ -63,10 +65,18 @@ class Twitter2Jabber
     self
   end
 
-  attr_reader :twitter, :jabber, :debug
+  def disconnect
+    log 'Disconnecting...'
+
+    twitter.disconnect
+    jabber.disconnect
+
+    self
+  end
 
   def deliver_tweets(since_id = nil)
     twitter.tweets(since_id) { |tweet| jabber.deliver(tweet) }
+    self
   end
 
   def log(msg)
@@ -84,5 +94,5 @@ class Twitter2Jabber
 end
 
 require_relative 'twitter2jabber/version'
-require_relative 'twitter2jabber/twitter'
-require_relative 'twitter2jabber/jabber'
+require_relative 'twitter2jabber/twitter_client'
+require_relative 'twitter2jabber/jabber_client'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: twitter2jabber
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Jens Wille
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-15 00:00:00.000000000 Z
+date: 2014-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cyclops
@@ -115,8 +115,8 @@ files:
 - example/templates/tweet.txt
 - lib/twitter2jabber.rb
 - lib/twitter2jabber/cli.rb
-- lib/twitter2jabber/jabber.rb
-- lib/twitter2jabber/twitter.rb
+- lib/twitter2jabber/jabber_client.rb
+- lib/twitter2jabber/twitter_client.rb
 - lib/twitter2jabber/version.rb
 homepage: http://github.com/blackwinter/twitter2jabber
 licenses:
@@ -124,16 +124,17 @@ licenses:
 metadata: {}
 post_install_message: |2+
 
-  twitter2jabber-0.8.0 [2014-04-15]:
+  twitter2jabber-0.8.1 [2014-04-25]:
 
-  * Dropped "write" functionality. Only forwards Twitter messages to Jabber.
-  * Dropped Ruby 1.8 support.
-  * Reduced external dependencies.
-  * Cut down command line options.
+  * Exhaust the Twitter stream by buffering all tweets received since the last
+    time, or one batch when run for the first time.
+  * Relies on the order in Twitter::REST::Client#home_timeline (descending by
+    ID).
+  * Disconnects Twitter and Jabber clients when finished.
 
 rdoc_options:
 - "--title"
-- twitter2jabber Application documentation (v0.8.0)
+- twitter2jabber Application documentation (v0.8.1)
 - "--charset"
 - UTF-8
 - "--line-numbers"
@@ -154,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.2.x
 signing_key: 
 specification_version: 4
 summary: Twitter-to-Jabber gateway.