tweetlr 0.1.17pre → 0.1.17

data/bin/tweetlr

@@ -21,11 +21,14 @@ begin
   CONFIG['start_at_tweet_id'] = start_at_tweet_id || CONFIG['start_at_tweet_id'] || CONFIG['twitter_timestamp'] #check the latter for backwards compability
    
   UPDATE_PERIOD = CONFIG['update_period']  
-  
+
   @tweetlr_config = {
-    :tumblr_email => CONFIG['tumblr_username'], 
-    :tumblr_password => CONFIG['tumblr_password'],
-    :group => CONFIG['group'],
+    :tumblr_blog_hostname => CONFIG['tumblr_blog_hostname'] || CONFIG['group'],
+    :tumblr_oauth_api_key => CONFIG['tumblr_oauth_api_key'],
+    :tumblr_oauth_api_secret => CONFIG['tumblr_oauth_api_secret'],
+    :tumblr_blog_hostname => CONFIG['tumblr_blog_hostname'],
+    :tumblr_oauth_access_token_key => CONFIG['tumblr_oauth_access_token_key'],
+    :tumblr_oauth_access_token_secret => CONFIG['tumblr_oauth_access_token_secret'],
     :whitelist => CONFIG['whitelist'], 
     :shouts => CONFIG['shouts'], 
     :since_id => CONFIG['start_at_tweet_id'] , 
@@ -46,7 +49,7 @@ end
 Daemons.run_proc('tweetlr', :dir_mode => :script, :dir => './', :backtrace => true, :log_output => true) do
   @log = Logger.new(STDOUT)
   @log.info "starting tweetlr daemon..." 
-  @log.info "creating a new tweetlr instance using this config: #{CONFIG.inspect}"   
+  @log.info "creating a new tweetlr instance using this config: #{@tweetlr_config.inspect}"   
   EventMachine::run do 
     EventMachine::add_periodic_timer( UPDATE_PERIOD ) do
       response = Tweetlr.crawl(@tweetlr_config)

data/config/tweetlr.yml

@@ -4,8 +4,11 @@ search_term: 'cat+dog+unicorn' #find tweets containing any of these terms
 start_at_tweet_id: 61847783463854082 # the tweet id to start searching at
 api_endpoint_twitter: 'http://search.twitter.com/search.json'
 api_endpoint_tumblr: 'http://www.tumblr.com'
-tumblr_username: YOUR_TUMBLR_EMAIL
-tumblr_password: YOUR_TUMBLR_PW
+tumblr_oauth_api_key: YOUR APPS TUMBLR API TOKEN
+tumblr_oauth_api_secret: YOUR APPS TUMBLR API SECRET
+tumblr_oauth_access_token_key: YOUR BLOGS OAUTH ACCESS TOKEN KEY
+tumblr_oauth_access_token_secret: YOUR BLOGS OAUTH ACCESS TOKEN SECRE
+group: TUMBLR_GROUP_TO_POST_TO #e.g. mysubblog.tumblr.com
 embedly_key: '' #tweetlr uses http://embedly.com for link processing. a free plan containing an api key is available & recommended to use in order to ensure full support
 update_period: 300 #check for updates every 300 secs = 5 minutes
 shouts: 'says' # will be concatenated after the username, before the message: @mr_x says: awesome things on a photo!

data/lib/combinators/twitter_tumblr.rb

@@ -32,7 +32,7 @@ module Combinators
       if !Processors::Twitter::retweet? message
         log.debug "tweet: #{tweet}"
         tumblr_post = {}
-        tumblr_post[:group] = options[:group]
+        tumblr_post[:tumblr_blog_hostname] = options[:tumblr_blog_hostname] || options[:group]
         tumblr_post[:type] = 'photo'
         tumblr_post[:date] = tweet['created_at']
         tumblr_post[:source] = extract_image_url tweet, options[:embedly_key]

data/lib/processors/tumblr.rb

@@ -1,4 +1,5 @@
 require 'log_aware'
+require 'oauth'
 
 module Processors
   #utilities for handling tumblr
@@ -11,38 +12,40 @@ module Processors
     end
     #post a tumblr photo entry. 
     #
-    #required arguments are :email, :password, :type, :date, :source, :caption, :state, :source
+    #required arguments are :tumblr_blog_hostname, :tumblr_blog_hostname, :tumblr_oauth_api_secret, :tumblr_oauth_access_token_secret, :source, :caption, :state
     #
-    #optional arguments: :api_endpoint_tumblr, :tags, :group
+    #optional arguments: :tags, :type (default: 'photo') 
     #
     def self.post(options={})
-      tries = 3
-      tags = options[:tags] || ''
-      group = options[:group] || ''
-      begin
-        response = Curl::Easy.http_post("#{options[:api_endpoint_tumblr] || API_ENDPOINT_TUMBLR}/api/write", 
-        Curl::PostField.content('generator', GENERATOR),
-        Curl::PostField.content('email', options[:email]), 
-        Curl::PostField.content('password', options[: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]),
-        Curl::PostField.content('tags', tags),
-        Curl::PostField.content('group', group)
-        )
-      rescue Curl::Err::CurlError => err
-        log.error "Failure in Curl call: #{err}"
-        tries -= 1
-        sleep 3
-        if tries > 0
-            retry
-        else
-            response = nil
-        end
-      end
-      response
+      base_hostname       = options[:tumblr_blog_hostname] || options[:group]
+      tumblr_oauth_api_key= options[:tumblr_oauth_api_key] 
+      tumblr_oauth_api_secret= options[:tumblr_oauth_api_secret] 
+      access_token_key    = options[:tumblr_oauth_access_token_key]
+      access_token_secret = options[:tumblr_oauth_access_token_secret]
+      type                = options[:type] || 'photo'
+      tags                = options[:tags] || ''
+
+      consumer = OAuth::Consumer.new(tumblr_oauth_api_key, tumblr_oauth_api_secret,
+                                     { :site => 'http://www.tumblr.com',
+                                       :request_token_path => '/oauth/request_token',
+                                       :authorize_path => '/oauth/authorize',
+                                       :access_token_path => '/oauth/access_token',
+                                       :http_method => :post } )
+
+      access_token = OAuth::AccessToken.new(consumer, access_token_key, access_token_secret)
+
+      post_response = access_token.post(
+        "http://api.tumblr.com/v2/blog/#{base_hostname}/post", { 
+          :type => type, 
+          :source => options[:source], 
+          :caption => options[:caption],
+          :date => options[:date],
+          :tags => tags,
+          :state => options[:state],
+          :generator => GENERATOR
+           }
+          )
+      post_response
     end
   end
 end

data/lib/tweetlr.rb

@@ -9,7 +9,7 @@ require 'uri'
 
 class Tweetlr
 
-  VERSION = '0.1.17pre'
+  VERSION = '0.1.17'
   
   API_ENDPOINT_TWITTER = 'http://search.twitter.com/search.json'
   API_ENDPOINT_TUMBLR = 'http://www.tumblr.com'
@@ -53,6 +53,13 @@ class Tweetlr
       :result_type => config[:result_type] || TWITTER_RESULTS_TYPE,  
       :api_endpoint_twitter => config[:api_endpoint_twitter] || API_ENDPOINT_TWITTER
     }
+    tumblr_config = { :tumblr_oauth_access_token_key => config[:tumblr_oauth_access_token_key],
+                      :tumblr_oauth_access_token_secret => config[:tumblr_oauth_access_token_secret],
+                      :tumblr_oauth_api_key => config[:tumblr_oauth_api_key],
+                      :tumblr_oauth_api_secret => config[:tumblr_oauth_api_secret],
+                      :tumblr_blog_hostname => config[:tumblr_blog_hostname] || config[:group]
+                    }
+      
     twitter_config[:search_term] = URI::escape(twitter_config[:search_term]) if twitter_config[:search_term]
     log.info "starting tweetlr crawl..."
     response = {}
@@ -66,8 +73,8 @@ class Tweetlr
            log.warn "could not get image source: tweet: #{tweet} --- tumblr post: #{tumblr_post.inspect}"
         else
           log.debug "tumblr post: #{tumblr_post}"
-          res = Processors::Tumblr.post tumblr_post.merge({:password => config[:tumblr_password], :email => config[:tumblr_email]})
-          log.warn "tumblr response: #{res.header_str} #{res.body_str}" unless res.response_code == 201
+          res = Processors::Tumblr.post tumblr_post.merge(tumblr_config)
+          log.warn "tumblr response: #{res.header} #{res.body}" unless res.code == "201"
         end
        end
         # store the highest tweet id

data/spec/combinators/twitter_tumblr_combinator_spec.rb

@@ -96,16 +96,17 @@ describe Combinators::TwitterTumblr do
     end
   end
   context "copes with different tumblelogs namely" do
-    it "uses the main blog as default" do
+    it "uses a given blog via group option to post to" do
       stub_instagram
-      tumblr_post = Combinators::TwitterTumblr.generate_photo_post_from_tweet @twitter_response, :whitelist => @whitelist
-      tumblr_post[:group].should_not be
+      desired_group = 'mygroup.tumblr.com'
+      tumblr_post = Combinators::TwitterTumblr.generate_photo_post_from_tweet @twitter_response, {:whitelist => @whitelist, :group => desired_group}
+      tumblr_post[:tumblr_blog_hostname].should eq desired_group
     end
-    it "uses a given sub-log (aka group)" do
+    it "uses a given blog via tumblr_blog_hostname to post to" do
       stub_instagram
       desired_group = 'mygroup.tumblr.com'
-      tumblr_post = Combinators::TwitterTumblr.generate_photo_post_from_tweet @twitter_response, {:whitelist => @whitelist, :group => desired_group}
-      tumblr_post[:group].should eq desired_group
+      tumblr_post = Combinators::TwitterTumblr.generate_photo_post_from_tweet @twitter_response, {:whitelist => @whitelist, :tumblr_blog_hostname => desired_group}
+      tumblr_post[:tumblr_blog_hostname].should eq desired_group
     end
   end
 end

data/spec/processors/tumblr_processor_spec.rb

@@ -0,0 +1,31 @@
+require 'spec_helper'
+
+describe Processors::Tumblr do
+  before :all do
+    config_file = File.join( Dir.pwd, 'config', 'tweetlr.yml')
+    config = YAML.load_file(config_file)
+    @twitter_response = {"from_user_id_str"=>"1915714", "profile_image_url"=>"http://a0.twimg.com/profile_images/386000279/2_normal.jpg", "created_at"=>"Sun, 17 Apr 2011 16:48:42 +0000", "from_user"=>"whitey_Mc_whIteLIst", "id_str"=>"59659561224765440", "metadata"=>{"result_type"=>"recent"}, "to_user_id"=>nil, "text"=>"Rigaer #wirsounterwegs #{@first_link}  @ Augenarzt Dr. Lierow #{@second_link} #{@third_link}", "id"=>59659561224765440, "from_user_id"=>1915714, "geo"=>{"type"=>"Point", "coordinates"=>[52.5182, 13.454]}, "iso_language_code"=>"de", "place"=>{"id"=>"3078869807f9dd36", "type"=>"city", "full_name"=>"Berlin, Berlin"}, "to_user_id_str"=>nil, "source"=>"<a href="http://instagr.am" rel="nofollow">instagram</a>"}
+    @tweetlr_config =  {
+      :since_id => 0,
+      :search_term => 'moped',
+      :results_per_page => 100,
+      :result_type => 'recent',  
+      :api_endpoint_twitter => Tweetlr::API_ENDPOINT_TWITTER,
+      :tumblr_oauth_api_key => config['tumblr_oauth_api_key'],
+      :tumblr_oauth_api_secret => config['tumblr_oauth_api_secret'],
+      :tumblr_blog_hostname => config['tumblr_blog_hostname'],
+      :tumblr_oauth_access_token_key => config['tumblr_oauth_access_token_key'],
+      :tumblr_oauth_access_token_secret => config['tumblr_oauth_access_token_secret']
+    }
+  end
+  it "posts to tumblr" do
+    stub_tumblr
+    stub_oauth
+    tumblr_post = Combinators::TwitterTumblr::generate_photo_post_from_tweet @twitter_response, @tweetlr_config
+    tumblr_post[:date] = Time.now.to_s
+    tumblr_post[:source] = 'http://distilleryimage6.instagram.com/db72627effde11e1b3f322000a1e8899_7.jpg'
+    response = Processors::Tumblr::post @tweetlr_config.merge(tumblr_post)
+    response.should be
+    response.code.should == "201"
+  end
+end

data/spec/spec_helper.rb

@@ -12,6 +12,10 @@ def check_pic_url_extraction(service)
   image_url.should =~ Processors::PhotoService::PIC_REGEXP
 end
 
+def stub_oauth
+  OAuth::AccessToken.any_instance.stub(:post).and_return(Net::HTTPCreated.new("Created.", "201", nil))
+end
+
 def stub_tumblr
   Curl::Easy.any_instance.stub(:response_code).and_return 201
   Curl::Easy.any_instance.stub(:header_str).and_return %|HTTP/1.1 201 Created

data/spec/tweetlr_spec.rb

@@ -4,8 +4,6 @@ describe Tweetlr do
 
   config_file = File.join( Dir.pwd, 'config', 'tweetlr.yml')
   config = YAML.load_file(config_file)
-  USER = config['tumblr_username']
-  PW   = config['tumblr_password']
   TIMESTAMP = config['twitter_timestamp']
   WHITELIST = config['whitelist']
 
@@ -15,9 +13,6 @@ describe Tweetlr do
     @third_link = "https://imageurl.com"
     @twitter_response = {"from_user_id_str"=>"1915714", "profile_image_url"=>"http://a0.twimg.com/profile_images/386000279/2_normal.jpg", "created_at"=>"Sun, 17 Apr 2011 16:48:42 +0000", "from_user"=>"whitey_Mc_whIteLIst", "id_str"=>"59659561224765440", "metadata"=>{"result_type"=>"recent"}, "to_user_id"=>nil, "text"=>"Rigaer #wirsounterwegs #{@first_link}  @ Augenarzt Dr. Lierow #{@second_link} #{@third_link}", "id"=>59659561224765440, "from_user_id"=>1915714, "geo"=>{"type"=>"Point", "coordinates"=>[52.5182, 13.454]}, "iso_language_code"=>"de", "place"=>{"id"=>"3078869807f9dd36", "type"=>"city", "full_name"=>"Berlin, Berlin"}, "to_user_id_str"=>nil, "source"=>"<a href="http://instagr.am" rel="nofollow">instagram</a>"}
     @tweetlr_config =  {
-      :tumblr_email => USER,
-      :tumblr_pw => PW,
-      :whitelist => WHITELIST,
       :since_id => 0,
       :search_term => 'moped',
       :results_per_page => 100,
@@ -25,19 +20,9 @@ describe Tweetlr do
       :api_endpoint_twitter => Tweetlr::API_ENDPOINT_TWITTER
     }
   end
-  it "should post to tumblr" do
-    stub_tumblr
-    tumblr_post = Combinators::TwitterTumblr::generate_photo_post_from_tweet @twitter_response
-    tumblr_post[:date] = Time.now.to_s
-    response = Processors::Tumblr::post tumblr_post.merge({:email => USER, :password => PW})
-    response.should be
-    response.response_code.should be 201
-  end
   it "crawls twitter and posts to tumblr" do 
     stub_tumblr
     stub_twitter
     Tweetlr.crawl(@tweetlr_config)
   end
-
-
 end

data/tweetlr.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = "tweetlr"
-  s.version     = "0.1.17pre"
+  s.version     = "0.1.17"
   s.author      = "Sven Kraeuter"
   s.email       = "sven.kraeuter@gmail.com"
   s.homepage    = "http://tweetlr.5v3n.com"
@@ -15,6 +15,7 @@ Gem::Specification.new do |s|
   s.add_dependency "curb"
   s.add_dependency "json"
   s.add_dependency "nokogiri"
+  s.add_dependency "oauth"
 
   s.add_development_dependency "rake"
   s.add_development_dependency "rspec"

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: tweetlr
 version: !ruby/object:Gem::Version
-  version: 0.1.17pre
-  prerelease: 6
+  version: 0.1.17
+  prerelease: 
 platform: ruby
 authors:
 - Sven Kraeuter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-10 00:00:00.000000000 Z
+date: 2012-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: daemons
-  requirement: &2152750420 !ruby/object:Gem::Requirement
+  requirement: &2160430840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152750420
+  version_requirements: *2160430840
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &2152749860 !ruby/object:Gem::Requirement
+  requirement: &2160430180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152749860
+  version_requirements: *2160430180
 - !ruby/object:Gem::Dependency
   name: curb
-  requirement: &2152749440 !ruby/object:Gem::Requirement
+  requirement: &2160429480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152749440
+  version_requirements: *2160429480
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2152748880 !ruby/object:Gem::Requirement
+  requirement: &2160429020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152748880
+  version_requirements: *2160429020
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2152748460 !ruby/object:Gem::Requirement
+  requirement: &2160428580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152748460
+  version_requirements: *2160428580
+- !ruby/object:Gem::Dependency
+  name: oauth
+  requirement: &2160428140 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *2160428140
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2152748040 !ruby/object:Gem::Requirement
+  requirement: &2160427720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152748040
+  version_requirements: *2160427720
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2152747620 !ruby/object:Gem::Requirement
+  requirement: &2160427240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152747620
+  version_requirements: *2160427240
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &2152747180 !ruby/object:Gem::Requirement
+  requirement: &2160426820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +109,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152747180
+  version_requirements: *2160426820
 description: tweetlr crawls twitter for a given term, extracts photos out of the collected
   tweets' short urls and posts the images to tumblr.
 email: sven.kraeuter@gmail.com
@@ -128,6 +139,7 @@ files:
 - lib/tweetlr.rb
 - spec/combinators/twitter_tumblr_combinator_spec.rb
 - spec/processors/photo_services_processor_spec.rb
+- spec/processors/tumblr_processor_spec.rb
 - spec/processors/twitter_processor_spec.rb
 - spec/spec_helper.rb
 - spec/tweetlr_spec.rb
@@ -147,9 +159,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: tweetlr
 rubygems_version: 1.8.16
@@ -160,6 +172,7 @@ summary: tweetlr crawls twitter for a given term, extracts photos out of the col
 test_files:
 - spec/combinators/twitter_tumblr_combinator_spec.rb
 - spec/processors/photo_services_processor_spec.rb
+- spec/processors/tumblr_processor_spec.rb
 - spec/processors/twitter_processor_spec.rb
 - spec/spec_helper.rb
 - spec/tweetlr_spec.rb