tweetlr 0.1.14 → 0.1.15

data/README.md

@@ -40,6 +40,7 @@ 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
+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/bin/tweetlr

@@ -25,6 +25,7 @@ begin
   @tweetlr_config = {
     :tumblr_email => CONFIG['tumblr_username'], 
     :tumblr_password => CONFIG['tumblr_password'],
+    :group => CONFIG['group'],
     :whitelist => CONFIG['whitelist'], 
     :shouts => CONFIG['shouts'], 
     :since_id => CONFIG['start_at_tweet_id'] , 

data/lib/combinators/twitter_tumblr.rb

@@ -32,6 +32,7 @@ module Combinators
       if !Processors::Twitter::retweet? message
         log.debug "tweet: #{tweet}"
         tumblr_post = {}
+        tumblr_post[:group] = 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

@@ -13,11 +13,12 @@ module Processors
     #
     #required arguments are :email, :password, :type, :date, :source, :caption, :state, :source
     #
-    #optional arguments: :api_endpoint_tumblr, :tags
+    #optional arguments: :api_endpoint_tumblr, :tags, :group
     #
     def self.post(options={})
       tries = 3
-      tags = options[:tags]
+      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),
@@ -28,7 +29,8 @@ module Processors
         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('tags', tags),
+        Curl::PostField.content('group', group)
         )
       rescue Curl::Err::CurlError => err
         log.error "Failure in Curl call: #{err}"

data/lib/tweetlr.rb

@@ -9,7 +9,7 @@ require 'uri'
 
 class Tweetlr
 
-  VERSION = '0.1.13'
+  VERSION = '0.1.15'
   
   API_ENDPOINT_TWITTER = 'http://search.twitter.com/search.json'
   API_ENDPOINT_TUMBLR = 'http://www.tumblr.com'
@@ -61,7 +61,7 @@ class Tweetlr
       tweets = response['results']
       if tweets
       tweets.each do |tweet|
-        tumblr_post = Combinators::TwitterTumblr::generate_photo_post_from_tweet(tweet, {:whitelist => config[:whitelist], :embedly_key => config[:embedly_key]}) 
+        tumblr_post = Combinators::TwitterTumblr::generate_photo_post_from_tweet(tweet, {:whitelist => config[:whitelist], :embedly_key => config[:embedly_key], :group => config[:group]}) 
         if tumblr_post.nil? ||  tumblr_post[:source].nil?
            log.warn "could not get image source: tweet: #{tweet} --- tumblr post: #{tumblr_post.inspect}"
         else

data/spec/combinators/twitter_tumblr_combinator_spec.rb

@@ -95,4 +95,17 @@ describe Combinators::TwitterTumblr do
       post.should_not be
     end
   end
+  context "copes with different tumblelogs namely" do
+    it "uses the main blog as default" do
+      stub_instagram
+      tumblr_post = Combinators::TwitterTumblr.generate_photo_post_from_tweet @twitter_response, :whitelist => @whitelist
+      tumblr_post[:group].should_not be
+    end
+    it "uses a given sub-log (aka group)" 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
+    end
+  end
 end

data/tweetlr.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = "tweetlr"
-  s.version     = "0.1.14"
+  s.version     = "0.1.15"
   s.author      = "Sven Kraeuter"
   s.email       = "sven.kraeuter@gmail.com"
   s.homepage    = "http://tweetlr.5v3n.com"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tweetlr
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.15
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-15 00:00:00.000000000 Z
+date: 2012-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: daemons
-  requirement: &2156435720 !ruby/object:Gem::Requirement
+  requirement: &2160515000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156435720
+  version_requirements: *2160515000
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &2156435200 !ruby/object:Gem::Requirement
+  requirement: &2160514500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156435200
+  version_requirements: *2160514500
 - !ruby/object:Gem::Dependency
   name: curb
-  requirement: &2156434700 !ruby/object:Gem::Requirement
+  requirement: &2160514020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156434700
+  version_requirements: *2160514020
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2156434200 !ruby/object:Gem::Requirement
+  requirement: &2160513600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156434200
+  version_requirements: *2160513600
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2156433720 !ruby/object:Gem::Requirement
+  requirement: &2160513180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156433720
+  version_requirements: *2160513180
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2156433220 !ruby/object:Gem::Requirement
+  requirement: &2160512640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156433220
+  version_requirements: *2160512640
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2156432400 !ruby/object:Gem::Requirement
+  requirement: &2160511780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156432400
+  version_requirements: *2160511780
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &2156431860 !ruby/object:Gem::Requirement
+  requirement: &2160511300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156431860
+  version_requirements: *2160511300
 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