tweetlr 0.1.22 → 0.1.23

data/README.md

@@ -1,6 +1,9 @@
 # tweetlr
 
-<a href="http://travis-ci.org/#!/5v3n/tweetlr">![travis-ci](https://api.travis-ci.org/5v3n/tweetlr.png?branch=master)</a>&nbsp;<a href="https://codeclimate.com/github/5v3n/tweetlr"><img src="https://codeclimate.com/github/5v3n/tweetlr.png" /></a>
+<a href="http://travis-ci.org/#!/5v3n/tweetlr">![travis-ci](https://api.travis-ci.org/5v3n/tweetlr.png?branch=master)</a>&nbsp;
+<a href="https://codeclimate.com/github/5v3n/tweetlr"><img src="https://codeclimate.com/github/5v3n/tweetlr.png" /></a>&nbsp;
+<a href='https://coveralls.io/r/5v3n/tweetlr'><img src='https://coveralls.io/repos/5v3n/tweetlr/badge.png?branch=master' alt='Coverage Status' /></a>
+
 
 
 

data/lib/tweetlr/combinators/twitter_tumblr.rb

@@ -25,30 +25,36 @@ module Tweetlr::Combinators
     #generate the data for a tumblr photo entry by parsing a tweet
     def self.generate_photo_post_from_tweet(tweet, options = {})
       log.debug "#{self}.generate_photo_post_from_tweet with options: #{options.inspect}"
-      tumblr_post = nil
+      process_options_and_tweet options, tweet
+    end
+private 
+    def self.process_options_and_tweet(options, tweet)
       whitelist = options[:whitelist]
       whitelist.each {|entry| entry.downcase!} if (whitelist && whitelist.size != 0)
       if !Tweetlr::Processors::Twitter::retweet? tweet['text']
         log.debug "tweet: #{tweet}"
-        tumblr_post = {}
-        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]
-        user = tweet['from_user']
-        tumblr_post[:tags] = user
-        tweet_id = tweet['id']
-        if !whitelist || whitelist.size == 0 || whitelist.member?(user.downcase)
-          state = 'published'
-        else
-          state = 'draft'
-        end
-        tumblr_post[:state] = state
-        shouts = " #{@shouts}" if @shouts
-        tumblr_post[:caption] = %?<a href="http://twitter.com/#{user}/statuses/#{tweet_id}" alt="tweet">@#{user}</a>#{shouts}: #{tweet['text']}? 
-        #TODO make the caption a bigger matter of yml/ general configuration
+        tumblr_post = prepare_tumblr_post options, tweet, whitelist
+      end
+    end
+    def self.prepare_tumblr_post(options, tweet, whitelist)
+      tumblr_post = {}
+      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]
+      user = tweet['from_user']
+      tumblr_post[:tags] = user
+      tweet_id = tweet['id']
+      if !whitelist || whitelist.size == 0 || whitelist.member?(user.downcase)
+        state = 'published'
+      else
+        state = 'draft'
       end
-      tumblr_post
+      tumblr_post[:state] = state
+      shouts = " #{@shouts}" if @shouts
+      tumblr_post[:caption] = %?<a href="http://twitter.com/#{user}/statuses/#{tweet_id}" alt="tweet">@#{user}</a>#{shouts}: #{tweet['text']}? 
+      #TODO make the caption a bigger matter of yml/ general configuration
+      tumblr_post  
     end
   end
 end

data/lib/tweetlr/processors/photo_service.rb

@@ -20,16 +20,7 @@ module Tweetlr::Processors
     def self.find_image_url(link, embedly_key=nil)
       url = nil
       if link && !(photo? link)
-        url = image_url_eyeem link if link.index 'eyeem.com'
-        url = image_url_instagram link if (link.index('instagr.am') || link.index('instagram.com'))
-        url = image_url_twitpic link if link.index 'twitpic'
-        url = image_url_yfrog link if link.index 'yfrog'
-        url = image_url_imgly link, embedly_key if link.index 'img.ly'
-        url = image_url_tco link, embedly_key if link.index 't.co'
-        url = image_url_twimg link if link.index 'twitter.com'
-        url = image_url_path link if link.index 'path.com'
-        url = image_url_foursqaure link if (link.index('4sq.com') || link.index('foursquare.com'))
-        url = image_url_embedly link, embedly_key if url.nil? #just try embed.ly for anything else. could do all image url processing w/ embedly, but there's probably some kind of rate limit invovled.
+        url = process_link link, embedly_key
       elsif photo? link
         url = link
       end
@@ -50,7 +41,7 @@ module Tweetlr::Processors
     def self.image_url_foursqaure(link_url)
       link_url = follow_redirect(link_url)
       image_url = retrieve_image_url_by_css link_url, 'meta[property="og:image"]', 'content'
-      image_url
+      image_url unless image_url.include? "foursquare.com/img/categories"
     end
     #extract the image of a path.com pic
     def self.image_url_path(link_url)
@@ -131,6 +122,20 @@ module Tweetlr::Processors
       return image_url
     end
 private
+    def self.process_link(link, embedly_key)
+      url = nil
+      url = image_url_eyeem link if link.index 'eyeem.com'
+      url = image_url_instagram link if (link.index('instagr.am') || link.index('instagram.com'))
+      url = image_url_twitpic link if link.index 'twitpic'
+      url = image_url_yfrog link if link.index 'yfrog'
+      url = image_url_imgly link, embedly_key if link.index 'img.ly'
+      url = image_url_tco link, embedly_key if link.index 't.co'
+      url = image_url_twimg link if link.index 'twitter.com'
+      url = image_url_path link if link.index 'path.com'
+      url = image_url_foursqaure link if (link.index('4sq.com') || link.index('foursquare.com'))
+      url = image_url_embedly link, embedly_key if url.nil? #just try embed.ly for anything else. could do all image url processing w/ embedly, but there's probably some kind of rate limit invovled.
+      url
+    end
     def self.process_reponse_header(resp, stop_indicator)
       if(resp && resp.header_str && 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

data/lib/tweetlr.rb

@@ -2,7 +2,7 @@ require 'tweetlr/log_aware'
 require 'tweetlr/core'
 
 module Tweetlr
-  VERSION = '0.1.22'
+  VERSION = '0.1.23'
     
   API_ENDPOINT_TWITTER = 'http://search.twitter.com/search.json'
   API_ENDPOINT_TUMBLR = 'http://www.tumblr.com'

data/spec/processors/photo_services_processor_spec.rb

@@ -19,7 +19,6 @@ describe Tweetlr::Processors::PhotoService do
   it "finds a picture's url from the supported services" do
     @links.each do |service,link|
       send "stub_#{service}"
-      #puts "checking #{service}"
       url = Tweetlr::Processors::PhotoService::find_image_url link
       url.should be, "service #{service} not working!"
       check_pic_url_extraction service if [:twimg, :instagram,:yfrog,:imgly,:foursqaure,:not_listed].index service
@@ -36,11 +35,18 @@ describe Tweetlr::Processors::PhotoService do
     link = Tweetlr::Processors::PhotoService::find_image_url 'http://makersand.co/'
     link.should be_nil
   end
-  it "does find an image for foursquare that is not he profile pic" do
-    stub_foursquare
-    link = Tweetlr::Processors::PhotoService::find_image_url @links[:foursquare]
-    link.should be
-    link.index('userpix_thumbs').should_not be
+  describe "for foursqaure" do
+    it "does find an image that is not he profile pic" do
+      stub_foursquare
+      link = Tweetlr::Processors::PhotoService::find_image_url @links[:foursquare]
+      link.should be
+      link.index('userpix_thumbs').should_not be
+    end
+    it "does not extract symbols from tweeted links that contain no images" do
+      stub_foursquare_no_photo
+      link = Tweetlr::Processors::PhotoService::find_image_url @links[:foursquare]
+      link.should_not be
+    end
   end
   it "finds path images for redirected moments as well" do
     stub_path_redirected

data/spec/spec_helper.rb

@@ -1,6 +1,12 @@
 #encoding: utf-8
-require 'simplecov'
-SimpleCov.start
+
+if ENV['RACK_ENV']=='test'
+  require 'coveralls'
+  Coveralls.wear!
+elsif ENV['RACK_ENV']=='development'
+  require 'simplecov'
+  SimpleCov.start
+end
 
 require "bundler"
 require "logger"
@@ -514,6 +520,11 @@ def stub_foursquare
 ^
 end
 
+def stub_foursquare_no_photo
+  Curl::Easy.any_instance.stub(:perform).and_return Curl::Easy.new
+  Curl::Easy.any_instance.stub(:body_str).and_return %^<!DOCTYPE html><html xmlns="http://www.w3.org/1999/xhtml" xmlns:og="http://opengraphprotocol.org/schema/" xmlns:fb="http://www.facebook.com/2008/fbml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><meta name="application-name" content="Foursquare"/><meta name="msapplication-TileColor" content="#0ca9c9"/><meta name="msapplication-TileImage" content="https://playfoursquare.s3.amazonaws.com/misc/foursquare-144-logo.png"/><meta name="msapplication-tooltip" content="Start the foursquare App" /><meta name="msapplication-starturl" content="/" /><meta name="msapplication-window" content="width=1024;height=768" /><meta name="msapplication-task" content="name=Recent Check-ins; action-uri=/; icon-uri=/favicon.ico" /><meta name="msapplication-task" content="name=Profile;action-uri=/user;icon-uri=/favicon.ico" /><meta name="msapplication-task" content="name=History;action-uri=/user/history;icon-uri=/favicon.ico" /><meta name="msapplication-task" content="name=Badges;action-uri=/user/badges;icon-uri=/favicon.ico"  /><meta name="msapplication-task" content="name=Stats;action-uri=/user/stats;icon-uri=/favicon.ico"  /><link rel="icon" href="/favicon.ico" type="image/x-icon"/><link rel="shortcut icon" href="/favicon.ico" type="image/x-icon"/><link rel="apple-touch-icon-precomposed" sizes="72x72" href="/img/touch-icon-ipad.png" /><link rel="apple-touch-icon-precomposed" sizes="144x144" href="/img/touch-icon-ipad-retina.png" /><link rel="logo" href="https://playfoursquare.s3.amazonaws.com/press/logo/foursquare-logo.svg" type="image/svg" /><link rel="search" type="application/opensearchdescription+xml" href="/opensearch.xml" title="foursquare" /><title>Sven @ Le Lion</title><meta content="de" http-equiv="Content-Language" /><meta content="https://foursquare.com/sven_kr/checkin/5180436ae4b098ea8af76e3a?ref=fb&amp;source=openGraph&amp;s=9aAHdtIEpzZ-t1yziwX8ASs_81c" property="og:url" /><meta content="Ein Check-in bei Le Lion" property="og:title" /><meta content="Ein Check-in" property="og:description" /><meta content="playfoursquare:checkin" property="og:type" /><meta content="https://foursquare.com/img/categories_map/nightlife/cocktails.png" property="og:image" /><meta content="2013-04-30T22:19:22.000Z" property="playfoursquare:date" /><meta content="https://foursquare.com/v/le-lion/4b0f0baaf964a520895e23e3" property="playfoursquare:place" /><meta content="Foursquare" property="og:site_name" /><meta content="86734274142" property="fb:app_id" /><meta content="@foursquare" name="twitter:site" /><meta content="summary" name="twitter:card" /><meta content="Foursquare" name="twitter:app:name:iphone" /><meta content="Foursquare" name="twitter:app:name:ipad" /><meta content="Foursquare" name="twitter:app:name:googleplay" /><meta content="foursquare://checkins/5180436ae4b098ea8af76e3a?s=9aAHdtIEpzZ-t1yziwX8ASs_81c" name="twitter:app:url:iphone" /><meta content="foursquare://checkins/5180436ae4b098ea8af76e3a?s=9aAHdtIEpzZ-t1yziwX8ASs_81c" name="twitter:app:url:ipad" /><meta content="foursquare://checkins/5180436ae4b098ea8af76e3a?s=9aAHdtIEpzZ-t1yziwX8ASs_81c" name="twitter:app:url:googleplay" /><meta content="306934924" name="twitter:app:id:iphone" /><meta content="306934924" name="twitter:app:id:ipad" /><meta content="com.joelapenna.foursquared" name="twitter:app:id:googleplay" /><link href="https://ss1.4sqi.net/styles/third_party/hfjfonts-5a7f8781ee1be1bb12433f1d74f0948c.css" type="text/css" rel="stylesheet"/><link href="https://ss1.4sqi.net/styles/master-d343426b4dbbd81a7e427d6f8c032b5a.css" type="text/css" rel="stylesheet"/><link href="https://ss0.4sqi.net/styles/standalone-pages/checkin-detail-1aabc265046d80b7c1e392c47dd3f8c9.css" type="text/css" rel="stylesheet"/><link rel="alternate" href="https://it.foursquare.com/sven_kr/checkin/5180436ae4b098ea8af76e3a?s=9aAHdtIEpzZ-t1yziwX8ASs_81c&amp;ref=tw" hreflang="it"/><link rel="alternate" href="https://de.foursquare.com/sven_kr/checkin/5180436ae4b098ea8af76e3a?s=9aAHdtIEpzZ-t1yziwX8ASs_81c&amp;ref=tw" hreflang="de"/><link rel="alternate" href="https://es.foursquare.com/sven_kr/checkin/5180436ae4b098ea8af76e3a?s=9aAHdtIEpzZ-t1yziwX8ASs_81c&amp;ref=tw" hreflang="es"/><link rel="alternate" href="https://fr.foursquare.com/sven_kr/checkin/5180436ae4b098ea8af76e3a?s=9aAHdtIEpzZ-t1yziwX8ASs_81c&amp;ref=tw" hreflang="fr"/><link rel="alternate" href="https://ja.foursquare.com/sven_kr/checkin/5180436ae4b098ea8af76e3a?s=9aAHdtIEpzZ-t1yziwX8ASs_81c&amp;ref=tw" hreflang="ja"/><link rel="alternate" href="https://th.foursquare.com/sven_kr/checkin/5180436ae4b098ea8af76e3a?s=9aAHdtIEpzZ-t1yziwX8ASs_81c&amp;ref=tw" hreflang="th"/><link rel="alternate" href="https://ko.foursquare.com/sven_kr/checkin/5180436ae4b098ea8af76e3a?s=9aAHdtIEpzZ-t1yziwX8ASs_81c&amp;ref=tw" hreflang="ko"/><link rel="alternate" href="https://ru.foursquare.com/sven_kr/checkin/5180436ae4b098ea8af76e3a?s=9aAHdtIEpzZ-t1yziwX8ASs_81c&amp;ref=tw" hreflang="ru"/><link rel="alternate" href="https://pt.foursquare.com/sven_kr/checkin/5180436ae4b098ea8af76e3a?s=9aAHdtIEpzZ-t1yziwX8ASs_81c&amp;ref=tw" hreflang="pt"/><link rel="alternate" href="https://id.foursquare.com/sven_kr/checkin/5180436ae4b098ea8af76e3a?s=9aAHdtIEpzZ-t1yziwX8ASs_81c&amp;ref=tw" hreflang="id"/><link rel="alternate" href="https://tr.foursquare.com/sven_kr/checkin/5180436ae4b098ea8af76e3a?s=9aAHdtIEpzZ-t1yziwX8ASs_81c&amp;ref=tw" hreflang="tr"/>^
+end
+
 def stub_eyeem
   Curl::Easy.any_instance.stub(:perform).and_return Curl::Easy.new
   Curl::Easy.any_instance.stub(:header_str).and_return "HTTP/1.1 200 OK\r\nServer: nginx/1.0.5\r\nDate: Sun, 15 Apr 2012 09:16:58 GMT\r\nContent-Type: text/html; charset=utf-8\r\nTransfer-Encoding: chunked\r\nConnection: keep-alive\r\nX-Powered-By: PHP/5.3.6-13ubuntu3.6\r\nSet-Cookie: symfony=bv8mdicp6ucb8jr9qt0o0r7qk2; path=/\r\nExpires: Thu, 19 Nov 1981 08:52:00 GMT\r\nCache-Control: no-store, no-cache, must-revalidate, post-check=0, pre-check=0\r\nPragma: no-cache\r\n\r\n"

data/tweetlr.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = "tweetlr"
-  s.version     = "0.1.22"
+  s.version     = "0.1.23"
   s.author      = "Sven Kraeuter"
   s.email       = "sven.kraeuter@gmail.com"
   s.homepage    = "http://tweetlr.5v3n.com"
@@ -21,6 +21,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rspec"
   s.add_development_dependency "rdoc"
   s.add_development_dependency "simplecov"
+  s.add_development_dependency "coveralls"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tweetlr
 version: !ruby/object:Gem::Version
-  version: 0.1.22
+  version: 0.1.23
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-28 00:00:00.000000000 Z
+date: 2013-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: daemons
@@ -171,6 +171,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 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