tweetlr 0.0.5 → 0.0.6

data/Rakefile

@@ -7,15 +7,14 @@ require 'rake/testtask'
 
 spec = Gem::Specification.new do |s|
   s.name = 'tweetlr'
-  s.version = '0.0.5'
+  s.version = '0.0.6'
   s.has_rdoc = true
   s.extra_rdoc_files = ['README.md', 'LICENSE']
-  s.summary = 'an unholy alliance between twitter and tumblr'
+  s.summary = %{tweetlr crawls twitter for a given term, extracts photos out of the collected tweets' short urls and posts the images to tumblr.}
   s.description = s.summary
   s.author = 'Sven Kraeuter'
   s.email = 'mail@svenkraeuter.com'
   s.homepage = "http://github.com/5v3n/#{s.name}"
-  # s.executables = ['your_executable_here']
   s.files = %w(LICENSE README.md Rakefile) + Dir.glob("{bin,lib}/**/*")
   s.require_path = "lib"
   s.executables  = ['tweetlr']

data/bin/tweetlr

@@ -8,7 +8,7 @@ require_relative '../lib/tweetlr.rb'
 
 begin
   config_file = File.join( Dir.pwd,  'config', 'tweetlr.yml')
-  @log_file = File.join( Dir.pwd, 'tweetlr.log')
+  @log_file = File.join( Dir.pwd, 'tweetlrd.log')
   CONFIG = YAML.load_file(config_file)
   TERM = CONFIG['search_term']
   USER = CONFIG['tumblr_username']

data/lib/tweetlr.rb

@@ -1,12 +1,15 @@
 require 'httparty'
 require 'logger'
 require 'yaml'
+require 'curb'
 
 
 class Tweetlr
 
   GENERATOR = %{tweetlr - http://github.com/5v3n/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...
     @log = Logger.new(File.join( Dir.pwd, 'tweetlr.log'))
     config = YAML.load_file(config_file)
@@ -81,6 +84,7 @@ class Tweetlr
       url = image_url_picplz link if link.index 'picplz'
       url = image_url_twitpic link if link.index 'twitpic'
       url = image_url_yfrog link if link.index 'yfrog'
+      url = image_url_imgly link if link.index 'img.ly'
     end
     url
   end
@@ -104,13 +108,29 @@ class Tweetlr
   end
   #find the image's url for a twitpic link
   def image_url_twitpic(link_url)
-    "http://twitpic.com/show/full/#{extract_id link_url}"
+    image_url_redirect link_url, "http://twitpic.com/show/full/"
   end
   #find the image'S url for a yfrog link
   def image_url_yfrog(link_url)
     response = HTTParty.get("http://www.yfrog.com/api/oembed?url=#{link_url}")
     response.parsed_response['url']
   end
+  #find the image's url for a img.ly link
+  def image_url_imgly(link_url)
+    image_url_redirect link_url, "http://img.ly/show/full/", "\r\n"
+  end
+  
+  # extract image url from services like twitpic & img.ly that do not offer oembed interfaces
+  def image_url_redirect(link_url, service_endpoint, stop_indicator = LOCATION_STOP_INDICATOR)
+    resp = Curl::Easy.http_get("#{service_endpoint}#{extract_id link_url}") { |res| res.follow_location = true }
+    if(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]
+    else
+      nil
+    end
+  end
 
   #extract the pic id from a given <code>link</code>
   def extract_id(link)

metadata

@@ -2,7 +2,7 @@
 name: tweetlr
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors: 
 - Sven Kraeuter
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-25 00:00:00 Z
+date: 2011-05-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: daemons
@@ -45,7 +45,7 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id003
-description: an unholy alliance between twitter and tumblr
+description: tweetlr crawls twitter for a given term, extracts photos out of the collected tweets' short urls and posts the images to tumblr.
 email: mail@svenkraeuter.com
 executables: 
 - tweetlr
@@ -86,6 +86,6 @@ rubyforge_project:
 rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
-summary: an unholy alliance between twitter and tumblr
+summary: tweetlr crawls twitter for a given term, extracts photos out of the collected tweets' short urls and posts the images to tumblr.
 test_files: []