tweetlr 0.0.9 → 0.0.10

data/README.md

@@ -13,14 +13,14 @@ It's essential that you have a directory called `config` in the directory you ar
 ```yaml
 results_per_page: 100
 result_type: recent
-search_term: <the term you want to search for>
+search_term: 'cat+dog+unicorn' #find tweets containing any of these terms
 twitter_timestamp: 61847783463854082 # the timestamp you want to start searching at
 api_endpoint_twitter: 'http://search.twitter.com/search.json'
 api_endpoint_tumblr: 'http://www.tumblr.com'
-tumblr_username: <your tumblr username / e-mail address>
-tumblr_password: <your tumblr password>
+tumblr_username: YOUR_TUMBLR_EMAIL
+tumblr_password: YOUR_TUMBLR_PW
 update_period: 300 #check for updates every 300 secs = 5 minutes
-shouts: 'says' # will be concatenated after the username, before the message: @mr_x <shouts>: awesome things on a photo!
+shouts: 'says' # will be concatenated after the username, before the message: @mr_x says: awesome things on a photo!
 whitelist: #twitter accounts in that list will have their tweets published immediately. post from others will be saved as drafts
   - whitey_mc_whitelist
   - sven_kr
@@ -32,7 +32,7 @@ Make sure you put the configuration file in it's proper place as mentioned above
 
 start/stop tweetlr using `tweetlr start`/`tweetlr stop`. Run `tweetlr` without arguments for a list of options concerning the daemon's options. 
 
-For further details on the configuration part, check out the [tweetlr_demo](http://github.com/5v3n/tweetlr_demo).
+For a easy to modify working example, check out the [tweetlr_demo](http://github.com/5v3n/tweetlr_demo).
 
 Enjoy!
 

data/Rakefile

@@ -7,7 +7,7 @@ require 'rake/testtask'
 
 spec = Gem::Specification.new do |s|
   s.name = 'tweetlr'
-  s.version = '0.0.9'
+  s.version = '0.0.10'
   s.has_rdoc = true
   s.extra_rdoc_files = ['README.md', 'LICENSE']
   s.summary = %{tweetlr crawls twitter for a given term, extracts photos out of the collected tweets' short urls and posts the images to tumblr.}

data/bin/tweetlr

@@ -23,28 +23,32 @@ end
 
 Daemons.run_proc('tweetlr', :dir_mode => :script, :dir => './', :backtrace => true, :log_output => true) do
   #@log = Logger.new(@log_file)
-  puts('starting tweetlr daemon...')
+  puts "#{Time.now} - starting tweetlr daemon..." 
   puts "creating a new tweetlr instance using this config: #{CONFIG.inspect}"   
   EventMachine::run { 
     EventMachine::add_periodic_timer( UPDATE_PERIOD ) {
-     puts 'starting tweetlr crawl...'
+     puts "#{Time.now} - starting tweetlr crawl..."
      response = @tweetlr.lazy_search_twitter
-     tweets = response['results']
-     if tweets
-     tweets.each do |tweet|
-         tumblr_post = @tweetlr.generate_tumblr_photo_post tweet
-         if tumblr_post.nil? ||  tumblr_post[:source].nil?
-            puts "could not get image source: tweet: #{tweet} --- tumblr post: #{tumblr_post.inspect}"
-       else
-           #@log.debug tumblr_post
-           #@log.debug @tweetlr.post_to_tumblr tumblr_post
-           #puts "tumblr post: #{tumblr_post}"
-           res = @tweetlr.post_to_tumblr tumblr_post
-           puts "tumblr response: #{res.header_str} #{res.body_str}" unless res.response_code == 201
+     if response
+       tweets = response['results']
+       if tweets
+       tweets.each do |tweet|
+           tumblr_post = @tweetlr.generate_tumblr_photo_post tweet
+           if tumblr_post.nil? ||  tumblr_post[:source].nil?
+              puts "could not get image source: tweet: #{tweet} --- tumblr post: #{tumblr_post.inspect}"
+         else
+             #@log.debug tumblr_post
+             #@log.debug @tweetlr.post_to_tumblr tumblr_post
+             #puts "tumblr post: #{tumblr_post}"
+             res = @tweetlr.post_to_tumblr tumblr_post
+             puts "tumblr response: #{res.header_str} #{res.body_str}" unless res.response_code == 201
+           end
          end
        end
+     else
+       puts "#{Time.now} - twitter serach returned no response. Hail the whale!"
      end
-     puts('finished tweetlr crawl.')
+     puts "#{Time.now} - finished tweetlr crawl."
      }
    }
 

data/lib/tweetlr.rb

@@ -9,7 +9,7 @@ class Tweetlr
   LOCATION_START_INDICATOR = 'Location: '
   LOCATION_STOP_INDICATOR  = "\r\n"
   
-  def initialize(email, password, cookie=nil, since_id=nil, term=nil, config_file) #TODO use a hash or sth more elegant here...
+  def initialize(email, password, cookie=nil, since_id=nil, terms=nil, config_file) #TODO use a hash or sth more elegant here...
     @log = Logger.new(File.join( Dir.pwd, 'tweetlr.log'))
     config = YAML.load_file(config_file)
     @results_per_page = config['results_per_page']
@@ -19,12 +19,11 @@ class Tweetlr
     @whitelist = config['whitelist']
     @shouts = config['shouts']
     @since_id = since_id
-    @search_term = term
+    @search_term = terms
     @whitelist.each {|entry| entry.downcase!}
     @email = email
     @password = password
-    @term = term
-    @refresh_url = "#{@api_endpoint_twitter}?q=#{term}&since_id=#{since_id}" if (since_id && term)
+    @refresh_url = "#{@api_endpoint_twitter}?ors=#{terms}&since_id=#{since_id}&rpp=#{@results_per_page}&result_type=#{@result_type}" if (since_id && terms)
     if !cookie
       response = Curl::Easy.http_post(
         "#{@api_endpoint_tumblr}/login",
@@ -63,7 +62,7 @@ class Tweetlr
   def generate_tumblr_photo_post tweet
     tumblr_post = nil
     message = tweet['text']
-    if message && !message.index('RT @') #discard retweets
+    if !retweet? message
       #@log.debug "tweet: #{tweet}"
       #puts "tweet: #{tweet}"
       tumblr_post = {}
@@ -71,20 +70,27 @@ class Tweetlr
       tumblr_post[:date] = tweet['created_at']
       tumblr_post[:source] = extract_image_url tweet
       user = tweet['from_user']
+      tweet_id = tweet['id']
       if @whitelist.member? user.downcase
         state = 'published'
       else
         state = 'draft'
       end
       tumblr_post[:state] = state
-      tumblr_post[:caption] = %?<a href="http://twitter.com/#{user}" alt="#{user}">@#{user}</a> #{@shouts}: #{tweet['text']}? #TODO make this a bigger matter of yml configuration
+      shouts = " #{@shouts}" if @shouts
+      tumblr_post[:caption] = %?<a href="http://twitter.com/#{user}/statuses/#{tweet_id}" alt="#{user}">@#{user}</a>#{shouts}: #{tweet['text']}? #TODO make this a bigger matter of yml configuration
     end
     tumblr_post
   end
+  
+  #checks if the message is a retweet
+  def retweet?(message)
+    message.index('RT @') || message.index(%{ "@}) || message.index(" \u201c@") #detect retweets
+  end
 
   #fire a new search
   def search_twitter()
-    search_call = "#{@api_endpoint_twitter}?q=#{@search_term}&result_type=#{@result_type}&rpp=#{@results_per_page}"
+    search_call = "#{@api_endpoint_twitter}?ors=#{@search_term}&result_type=#{@result_type}&rpp=#{@results_per_page}"
     @response = http_get search_call
   end
   # lazy update - search for a term or refresh the search if a response is available already
@@ -93,11 +99,12 @@ class Tweetlr
     if @refresh_url
      #FIXME persist the refresh url - server restart would be a pain elsewise
      #@log.info "lazy search using '#{@refresh_url}'"
-     puts "lazy search using '#{@refresh_url}'" #workaround to get refresh url logged w/ the Daemons gem
-     @response = http_get @refresh_url
+     search_url = "#{@refresh_url}&result_type=#{@result_type}&rpp=#{@results_per_page}"
+     puts "lazy search using '#{search_url}'" #workaround to get refresh url logged w/ the Daemons gem
+     @response = http_get search_url
     else
       #@log.debug "regular search using '#{term}'"
-      puts "regular search using '#{term}'"
+      puts "regular search using '#{@search_term}'"
       @response = search_twitter()
     end
   end

metadata

@@ -2,7 +2,7 @@
 name: tweetlr
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors: 
 - Sven Kraeuter
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-16 00:00:00 Z
+date: 2011-05-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: daemons