tweetlr 0.0.6 → 0.0.7

data/Rakefile

@@ -7,7 +7,7 @@ require 'rake/testtask'
 
 spec = Gem::Specification.new do |s|
   s.name = 'tweetlr'
-  s.version = '0.0.6'
+  s.version = '0.0.7'
   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.}
@@ -20,7 +20,7 @@ spec = Gem::Specification.new do |s|
   s.executables  = ['tweetlr']
   s.add_dependency('daemons')
   s.add_dependency('eventmachine')
-  s.add_dependency('httparty')
+  s.add_dependency('curb')
 end
 
 Rake::GemPackageTask.new(spec) do |p|

data/bin/tweetlr

@@ -21,27 +21,30 @@ rescue SystemCallError
   exit(1)
 end
 
-Daemons.run_proc('tweetlr') do
-  @log = Logger.new(@log_file)
-  @log.info('starting tweetlr daemon...')
-  @log.info "creating a new tweetlr instance using this config: #{CONFIG.inspect}"   
+Daemons.run_proc('tweetlr', :dir_mode => :script, :dir => './', :backtrace => true, :log_output => true) do
+  #@log = Logger.new(@log_file)
+  puts('starting tweetlr daemon...')
+  puts "creating a new tweetlr instance using this config: #{CONFIG.inspect}"   
   EventMachine::run { 
     EventMachine::add_periodic_timer( UPDATE_PERIOD ) {
-     @log.info('starting tweetlr crawl...')
+     puts 'starting tweetlr crawl...'
      response = @tweetlr.lazy_search_twitter
-     tweets = response.parsed_response['results']
+     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?
-            @log.error "could not get image source: #{tumblr_post.inspect}"
+            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
+           #@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}"
          end
        end
      end
-     @log.info('finished tweetlr crawl.')
+     puts('finished tweetlr crawl.')
      }
    }
 

data/lib/tweetlr.rb

@@ -1,7 +1,7 @@
-require 'httparty'
 require 'logger'
 require 'yaml'
 require 'curb'
+require 'json'
 
 
 class Tweetlr
@@ -27,7 +27,7 @@ class Tweetlr
     @term = term
     @refresh_url = "#{@api_endpoint_twitter}?q=#{term}&since_id=#{since_id}" if (since_id && term)
     if !cookie
-      response = HTTParty.post(
+      response = Curl::Easy.http_post(
         "#{@api_endpoint_tumblr}/login",
         :body => {
           :email => @email,
@@ -45,32 +45,37 @@ class Tweetlr
   end
 
   def post_to_tumblr(options={})
-    options[:generator] = GENERATOR
-    options[:email] = @email #TODO get cookie auth working!
-    options[:password] = @password
-    #options[:headers] = {'Cookie' => @cookie}
-    #arguments=options.collect { |key, value| "#{key}=#{value}" }.join('&')
-    @log.debug("------------********** post_to_tumblr options: #{options.inspect}")
-    @log.debug("------------********** post_to_tumblr options: #{{'Cookie' => @cookie}.inspect}")
-    response = HTTParty.post("#{@api_endpoint_tumblr}/api/write", :body => options, :headers => {'Cookie' => @cookie})
-    @log.debug("------------********** post_to_tumblr response: #{response.inspect}" )
+    if options[:type] && options[:date] && options[:source] && options[:caption] && options[:state]
+      response = Curl::Easy.http_post("#{@api_endpoint_tumblr}/api/write", 
+      Curl::PostField.content('generator', GENERATOR),
+      Curl::PostField.content('email', @email), 
+      Curl::PostField.content('password', @password),
+      Curl::PostField.content('type', options[:type]),
+      Curl::PostField.content('date', options[:date]),
+      Curl::PostField.content('source', options[:source]),
+      Curl::PostField.content('caption', options[:caption]),
+      Curl::PostField.content('state', options[:state])
+      )
+    end
     response
   end
 
   #fire a new search
   def search_twitter()
     search_call = "#{@api_endpoint_twitter}?q=#{@search_term}&result_type=#{@result_type}&rpp=#{@results_per_page}"
-    @response = HTTParty.get(search_call)
+    @response = http_get search_call
   end
   # lazy update - search for a term or refresh the search if a response is available already
   def lazy_search_twitter()
     @refresh_url = "#{@api_endpoint_twitter}#{@response['refresh_url']}" unless (@response.nil? || @response['refresh_url'].nil? || @response['refresh_url'].empty?)
     if @refresh_url
      #FIXME persist the refresh url - server restart would be a pain elsewise
-     @log.info "lazy search using '#{@refresh_url}'"
-     @response = HTTParty.get(@refresh_url)
+     #@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
     else
-      @log.debug "regular search using '#{term}'"
+      #@log.debug "regular search using '#{term}'"
+      puts "regular search using '#{term}'"
       @response = search_twitter()
     end
   end
@@ -92,15 +97,15 @@ class Tweetlr
   #find the image's url for an instagram link
   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 = HTTParty.get "http://api.instagram.com/oembed?url=#{link_url}"
-    response.parsed_response['url']
+    response = http_get "http://api.instagram.com/oembed?url=#{link_url}"
+    response['url']
   end
 
   #find the image's url for a picplz short/longlink
   def image_url_picplz(link_url)
     id = extract_id link_url
     #try short url
-    response = HTTParty.get "http://picplz.com/api/v2/pic.json?shorturl_ids=#{id}"
+    response = http_get "http://picplz.com/api/v2/pic.json?shorturl_ids=#{id}"
     #if short url fails, try long url
     #response = HTTParty.get "http://picplz.com/api/v2/pic.json?longurl_ids=#{id}"
     #extract url
@@ -112,8 +117,8 @@ class Tweetlr
   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']
+    response = http_get("http://www.yfrog.com/api/oembed?url=#{link_url}")
+    response['url']
   end
   #find the image's url for a img.ly link
   def image_url_imgly(link_url)
@@ -153,7 +158,8 @@ class Tweetlr
     tumblr_post = nil
     message = tweet['text']
     if message && !message.index('RT @') #discard retweets
-      @log.debug "tweet: #{tweet}"
+      #@log.debug "tweet: #{tweet}"
+      #puts "tweet: #{tweet}"
       tumblr_post = {}
       tumblr_post[:type] = 'photo'
       tumblr_post[:date] = tweet['created_at']
@@ -170,6 +176,14 @@ class Tweetlr
     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
+  end
+  
 end
 
 

metadata

@@ -2,7 +2,7 @@
 name: tweetlr
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors: 
 - Sven Kraeuter
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-03 00:00:00 Z
+date: 2011-05-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: daemons
@@ -35,7 +35,7 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: httparty
+  name: curb
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false