tweetlr 0.1.8 → 0.1.9

data/.gitignore

@@ -7,3 +7,4 @@ pkg
 Gemfile.lock
 tweetlr.tid
 tweetlr.yml.dev
+tweetlr.yml.orig

data/README.md

@@ -1,8 +1,10 @@
 # tweetlr
 
+<a href="http://travis-ci.org/#!/5v3n/tweetlr">![travis-ci](http://travis-ci.org/5v3n/tweetlr.png)</a>
+
 tweetlr crawls twitter for a given term, extracts photos out of the collected tweets' short urls and posts the images to tumblr. 
 
-<a href="http://travis-ci.org/#!/5v3n/tweetlr">![travis-ci](http://travis-ci.org/5v3n/tweetlr.png)</a>
+There is a new [tweetlr "as-a-service"](http://tweetlr.5v3n.com) where you can easily create an account without having to know or host anything.
 
 ## Supported image sharing services
 
@@ -16,7 +18,9 @@ tweetlr supports
 - twitter / photobucket
 - path.com
 - t.co shortened links to pictures
-- every service accessible via embed.ly (see [photo providers](http://embed.ly/providers))  
+- every photo service accessible via embed.ly (see [photo providers](http://embed.ly/providers))
+  - plus every service that delivers a thumbnail via embed.ly
+
 
 ## Installation
 
@@ -48,7 +52,7 @@ whitelist: #twitter accounts in that list will have their tweets published immed
 
 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 a easy to modify working example, check out the [tweetlr_demo](http://github.com/5v3n/tweetlr_demo).
 

data/lib/processors/photo_service.rb

@@ -56,8 +56,12 @@ module Processors
     def self.image_url_embedly(link_url, key)
       response = Processors::Http::http_get_json "http://api.embed.ly/1/oembed?key=#{key}&url=#{link_url}"
       log.debug "embedly call: http://api.embed.ly/1/oembed?key=#{key}&url=#{link_url}"
-      if response && response['type'] == 'photo'
-        image_url = response['url'] 
+      if response 
+        if response['type'] == 'photo'
+          image_url = response['url'] 
+        else
+          image_url = response['thumbnail_url'] 
+        end
       end
       image_url
     end

data/lib/tweetlr.rb

@@ -12,7 +12,7 @@ require 'log_aware'
 
 class Tweetlr
 
-  VERSION = '0.1.8'
+  VERSION = '0.1.9'
   
   API_ENDPOINT_TWITTER = 'http://search.twitter.com/search.json'
   API_ENDPOINT_TUMBLR = 'http://www.tumblr.com'

data/spec/processors/photo_services_processor_spec.rb

@@ -15,6 +15,11 @@ describe Processors::PhotoService do
       :twitter_pics => 'http://t.co/FmyBGfyY'
       }
   end
+  it "finds images in embedly results that are not explicitly marked as 'Photo' via the response's 'thumbnail_url' attribute" do
+    stub_embedly_no_photo
+    link = Processors::PhotoService::find_image_url 'im mocked anyways'
+    link.should == 'http://s3-media4.ak.yelpcdn.com/bphoto/py1D5XEyOHcOcg6GJD3SEQ/l.jpg'
+  end
   it "should find a picture's url from the supported services" do
     @links.each do |service,link|
       send "stub_#{service}"

data/spec/spec_helper.rb

@@ -403,3 +403,8 @@ def stub_embedly
   Curl::Easy.any_instance.stub(:body_str).and_return %|{"provider_url": "http://www.flickr.com/", "description": "Lady GaGa", "title": "Lady GaGa", "url": "http://farm6.static.flickr.com/5204/5319200155_c966f67dc3.jpg", "author_name": "mjcom18", "height": 468, "width": 307, "thumbnail_url": "http://farm6.static.flickr.com/5204/5319200155_c966f67dc3_t.jpg", "thumbnail_width": 66, "version": "1.0", "provider_name": "Flickr", "cache_age": 3600, "type": "photo", "thumbnail_height": 100, "author_url": "http://www.flickr.com/photos/57795463@N05/"}|
   Curl::Easy.any_instance.stub(:perform).and_return Curl::Easy.new
 end
+
+def stub_embedly_no_photo
+  Curl::Easy.any_instance.stub(:body_str).and_return %|{"provider_url": "http://www.yelp.de/", "description": "Fotos von Kopiba \u2013 #coffeediary \u2013 Hamburg", "title": "#coffeediary Yelp", "url": "http://www.yelp.de/biz_photos/wB1uHl_VnEbn7tqigTZKTQ?pt=biz_photo&ref=twitter&select=py1D5XEyOHcOcg6GJD3SEQ", "thumbnail_width": 298, "thumbnail_url": "http://s3-media4.ak.yelpcdn.com/bphoto/py1D5XEyOHcOcg6GJD3SEQ/l.jpg", "version": "1.0", "provider_name": "Yelp", "type": "link", "thumbnail_height": 400}|
+  Curl::Easy.any_instance.stub(:perform).and_return Curl::Easy.new
+end

data/tweetlr.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = "tweetlr"
-  s.version     = "0.1.8"
+  s.version     = "0.1.9"
   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.8
+  version: 0.1.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-19 00:00:00.000000000Z
+date: 2011-12-28 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: daemons
-  requirement: &2153787260 !ruby/object:Gem::Requirement
+  requirement: &2157402720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153787260
+  version_requirements: *2157402720
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &2153783620 !ruby/object:Gem::Requirement
+  requirement: &2157402220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153783620
+  version_requirements: *2157402220
 - !ruby/object:Gem::Dependency
   name: curb
-  requirement: &2153783080 !ruby/object:Gem::Requirement
+  requirement: &2157401780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153783080
+  version_requirements: *2157401780
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2153782640 !ruby/object:Gem::Requirement
+  requirement: &2157401360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153782640
+  version_requirements: *2157401360
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2153782200 !ruby/object:Gem::Requirement
+  requirement: &2157400940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153782200
+  version_requirements: *2157400940
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2153781780 !ruby/object:Gem::Requirement
+  requirement: &2157400520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153781780
+  version_requirements: *2157400520
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2153781340 !ruby/object:Gem::Requirement
+  requirement: &2157400100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153781340
+  version_requirements: *2157400100
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &2153780920 !ruby/object:Gem::Requirement
+  requirement: &2157399680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153780920
+  version_requirements: *2157399680
 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