tweetlr 0.0.8 → 0.0.9

data/README.md

@@ -10,26 +10,27 @@ Use `gem install tweetlr` if you're using *rubygems* or add the line `gem 'tweet
 
 It's essential that you have a directory called `config` in the directory you are starting tweetlr in, which has to contain the configuration file `tweetlr.yml`:
 
-    results_per_page: 100
-    result_type: recent
-    search_term: <the term you want to search for>
-    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>
-    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!
-    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
-
+```yaml
+results_per_page: 100
+result_type: recent
+search_term: <the term you want to search for>
+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>
+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!
+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
+```
 
 ## Usage
 
 Make sure you put the configuration file in it's proper place as mentioned above, then: 
 
-start/stop tweetlr using  `tweetlr start`/`tweetlr stop`. Run `tweetlr` without arguments for a list of options concerning the daemon's options. 
+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).
 

data/Rakefile

@@ -7,7 +7,7 @@ require 'rake/testtask'
 
 spec = Gem::Specification.new do |s|
   s.name = 'tweetlr'
-  s.version = '0.0.8'
+  s.version = '0.0.9'
   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/lib/tweetlr.rb

@@ -42,7 +42,7 @@ class Tweetlr
     end
     
   end
-
+  #post a tumblr photo entry. required arguments are :type, :date, :source, :caption, :state
   def post_to_tumblr(options={})
     if options[:type] && options[:date] && options[:source] && options[:caption] && options[:state]
       response = Curl::Easy.http_post("#{@api_endpoint_tumblr}/api/write", 
@@ -58,6 +58,29 @@ class Tweetlr
     end
     response
   end
+  
+  #generate the data for a tumblr photo entry by parsing a tweet
+  def generate_tumblr_photo_post tweet
+    tumblr_post = nil
+    message = tweet['text']
+    if message && !message.index('RT @') #discard retweets
+      #@log.debug "tweet: #{tweet}"
+      #puts "tweet: #{tweet}"
+      tumblr_post = {}
+      tumblr_post[:type] = 'photo'
+      tumblr_post[:date] = tweet['created_at']
+      tumblr_post[:source] = extract_image_url tweet
+      user = tweet['from_user']
+      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
+    end
+    tumblr_post
+  end
 
   #fire a new search
   def search_twitter()
@@ -108,7 +131,7 @@ class Tweetlr
   def image_url_instagram(link_url)
     link_url['instagram.com'] = 'instagr.am' if link_url.index 'instagram.com' #instagram's oembed does not work for .com links
     response = http_get "http://api.instagram.com/oembed?url=#{link_url}"
-    response['url']
+    response['url'] if response
   end
 
   #find the image's url for a picplz short/longlink
@@ -119,7 +142,7 @@ class Tweetlr
     #if short url fails, try long url
     #response = HTTParty.get "http://picplz.com/api/v2/pic.json?longurl_ids=#{id}"
     #extract url
-    response['value']['pics'].first['pic_files']['640r']['img_url']
+    response['value']['pics'].first['pic_files']['640r']['img_url'] if response
   end
   #find the image's url for a twitpic link
   def image_url_twitpic(link_url)
@@ -128,7 +151,7 @@ class Tweetlr
   #find the image'S url for a yfrog link
   def image_url_yfrog(link_url)
     response = http_get("http://www.yfrog.com/api/oembed?url=#{link_url}")
-    response['url']
+    response['url'] if response
   end
   #find the image's url for a img.ly link
   def image_url_imgly(link_url)
@@ -142,7 +165,7 @@ class Tweetlr
   
   def link_url_redirect(short_url, stop_indicator = LOCATION_STOP_INDICATOR)
     resp = Curl::Easy.http_get(short_url) { |res| res.follow_location = true }
-    if(resp.header_str.index(LOCATION_START_INDICATOR) && resp.header_str.index(stop_indicator))
+    if(resp && resp.header_str.index(LOCATION_START_INDICATOR) && resp.header_str.index(stop_indicator))
       start = resp.header_str.index(LOCATION_START_INDICATOR) + LOCATION_START_INDICATOR.size
       stop  = resp.header_str.index(stop_indicator, start)
       resp.header_str[start...stop]
@@ -167,35 +190,19 @@ class Tweetlr
       end
     end
   end
-
-  def generate_tumblr_photo_post tweet
-    tumblr_post = nil
-    message = tweet['text']
-    if message && !message.index('RT @') #discard retweets
-      #@log.debug "tweet: #{tweet}"
-      #puts "tweet: #{tweet}"
-      tumblr_post = {}
-      tumblr_post[:type] = 'photo'
-      tumblr_post[:date] = tweet['created_at']
-      tumblr_post[:source] = extract_image_url tweet
-      user = tweet['from_user']
-      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
-    end
-    tumblr_post
-  end
   
   private
   
   #convenience method for curl http get calls
   def http_get(request)
-    res = Curl::Easy.http_get(request)
-    JSON.parse res.body_str
+    begin
+      res = Curl::Easy.http_get(request)
+      JSON.parse res.body_str
+    rescue Curl::Err::ConnectionFailedError => err
+      #@log.error "Connection failed: #{err}"
+      puts "Connection failed: #{err}"
+      nil
+    end
   end
   
 end

metadata

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