twitter-photos 0.1.0 → 0.1.1

data/Rakefile

@@ -6,11 +6,10 @@ begin
   Jeweler::Tasks.new do |gem|
     gem.name = "twitter-photos"
     gem.summary = %Q{Put in your username, get a bunch of photos}
-    gem.description = %Q{This gem allows you to use any twitter username to return an array of photo urls, with corresponding tweets, dates and thumbnails}
+    gem.description = %Q{Allows you to use any twitter username to return a collection of objects of photo urls, with corresponding tweets, dates and thumbnails.}
     gem.email = "vegan.bookis@gmail.com"
     gem.homepage = "http://github.com/bookis/twitter-photos"
     gem.authors = ["bookis"]
-    gem.add_development_dependency "thoughtbot-shoulda"
     gem.add_dependency 'nokogiri'
     gem.add_dependency 'typhoeus'
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/lib/twitter-photos.rb

@@ -1,25 +1,55 @@
-module TwitterPhotos
-  require 'typhoeus'
-  require 'nokogiri'
-  def self.get_photos_by(username)
+require 'typhoeus'
+require 'nokogiri'
+
+class TwitterPhoto
+  attr_accessor :username, :thumb, :date, :tweet, :url
+  
+  TWITPIC_URL    = 'http://twitpic.com'
+  TWEETPHOTO_URL = 'http://tweetphotoapi.com/api/tpapi.svc/json/usernames/'
+  YFROG_URL      = 'http://yfrog.com/froggy.php'
+  TWITGOO_URL    = 'http://twitgoo.com/api/username/timeline/'
+  
+  
+  def initialize(thumb=nil, tweet='No tweet for this photo', date=nil, url=nil, username=nil)
+    date = date.strip
+    dmatch = date.match(/\sago\b/i)
+    @username  = username
+    @thumb = thumb
+    @tweet = tweet.strip
+    @date  = dmatch.nil? ?  DateTime.parse(date).to_s : DateTime.time_ago_to_date(date).to_s rescue @date = date
+    @url   = url
+    @tweet = "No tweet for this photo." if @tweet.blank?
+  end
+  
+  def self.find_by_username(username)
+    found = []
+    ObjectSpace.each_object(TwitterPhoto) { |o|
+      found << o if o.username == username
+    }
+    found.sort_by {|x| x.date}
+  end
+  
+  def self.get_photos_by(username, options={})
     @pix = []
     hydra = Typhoeus::Hydra.new
     
-    third_request  = Typhoeus::Request.new("http://twitpic.com/photos/#{username}", :timeout => 5000)
-    third_request.on_complete do |response|
+    twitpic_request  = Typhoeus::Request.new("#{TWITPIC_URL}/photos/#{username}", :timeout => 5000)
+    twitpic_request.on_complete do |response|
       twitpics = Nokogiri.parse(response.body)
       twitpics.xpath("//div[@class='profile-photo-img']/a").each do |row|
         url = row[:href]
-        twitpic_request = Typhoeus::Request.new("http://twitpic.com#{url}", :timeout => 5000)
+        twitpic_request = Typhoeus::Request.new("#{TWITPIC_URL}#{url}", :timeout => 5000)
         twitpic_request.on_complete do |twitpic|
           begin
             twitpic = Nokogiri.parse(twitpic.body)
-            pic = []
-            pic << "http://twitpic.com/show/thumb#{url}.jpg"
-            pic << twitpic.xpath("//div/div[@id='view-photo-caption']").text
-            pic << twitpic.xpath("//div/div[@id='photo-info']").text
-            pic << twitpic.at_xpath("//img[@class='photo']")[:src]
-            @pix << pic
+            # pic = []
+            TwitterPhoto.new(
+                             "#{TWITPIC_URL}/show/thumb#{url}.jpg",
+                             twitpic.xpath("//div/div[@id='view-photo-caption']").text,
+                             twitpic.xpath("//div/div[@id='photo-info']").text,
+                             twitpic.at_xpath("//img[@class='photo']")[:src],
+                             username
+                            )
           rescue
           end
         end
@@ -27,8 +57,8 @@ module TwitterPhotos
       end
     end
     
-    first_request  = Typhoeus::Request.new("http://yfrog.com/froggy.php", :params => {:username => username}, :timeout => 5000)
-    first_request.on_complete do |response|
+    yfrog_request  = Typhoeus::Request.new(YFROG_URL, :params => {:username => username}, :timeout => 5000)
+    yfrog_request.on_complete do |response|
       yfrogs = Nokogiri.parse(response.body)
       yfrogs.xpath("//div[@class='timeline_entry']").each do |row|
          url = row.at_xpath("div/div[@class='thumbtweet' ]/a")[:href]
@@ -36,12 +66,13 @@ module TwitterPhotos
          yfrog_request.on_complete do |yfrog|
            begin
               yfrog = Nokogiri.parse(yfrog.body)
-              pic = []
-              pic << yfrog.at_xpath("//meta[@property='og:title']").attributes['content'].to_s + '.th.jpg'
-              pic << yfrog.at_xpath("///div[@class='twittertweet']/div/div/div").text rescue pic << ''
-              pic << yfrog.at_xpath("///div[@class='twittertweet']/div/div/div/div").text rescue pic << ''
-              pic << yfrog.at_xpath("//img[@id='main_image']")[:src]
-              @pix << pic
+              TwitterPhoto.new(
+                              yfrog.at_xpath("//meta[@property='og:title']").attributes['content'].to_s + '.th.jpg',
+                              yfrog.at_xpath("///div[@class='twittertweet']/div/div/div").text, 
+                              yfrog.at_xpath("///div[@class='twittertweet']/div/div/div/div").text,
+                              yfrog.at_xpath("//img[@id='main_image']")[:src],
+                              username
+                              )
             rescue
             end
          end
@@ -49,47 +80,69 @@ module TwitterPhotos
        end
     end
     
-    second_request = Typhoeus::Request.new("http://tweetphotoapi.com/api/tpapi.svc/json/users/#{username}", :timeout => 5000)
-    second_request.on_complete do |response|
+    tweetphoto_request = Typhoeus::Request.new("#{TWEETPHOTO_URL}#{username}", :timeout => 5000)
+    tweetphoto_request.on_complete do |response|
       if response.code == 200
         tweetphoto_id = JSON.parse(response.body)["Id"]
-        tweetphoto_user_request = Typhoeus::Request.new("http://tweetphotoapi.com/api/tpapi.svc/json/users/#{tweetphoto_id}/photos", :timeout => 5000)
-        tweetphoto_user_request.on_complete do |tweetphoto_user|
-          tweetphotodata = JSON.parse(tweetphoto_user.body)
+        tweetphoto_username_request = Typhoeus::Request.new("#{TWEETPHOTO_URL}#{tweetphoto_id}/photos", :timeout => 5000)
+        tweetphoto_username_request.on_complete do |tweetphoto_username|
+          tweetphotodata = JSON.parse(tweetphoto_username.body)
           tweetphotodata['List'].each do |tweetphoto|
-            pic = []
-            pic << tweetphoto['ThumbnailUrl']
-            pic << tweetphoto['Message']
-            pic << tweetphoto['UploadDateString']
-            pic << tweetphoto['MediumImageUrl']
-            @pix << pic
+            TwitterPhoto.new(
+                             tweetphoto['ThumbnailUrl'],
+                             tweetphoto['Message'],
+                             tweetphoto['UploadDateString'],
+                             tweetphoto['MediumImageUrl'],
+                             username
+                            )
           end
         end
-        hydra.queue tweetphoto_user_request
+        hydra.queue tweetphoto_username_request
       end
     end
      
-    forth_request  = Typhoeus::Request.new("http://twitgoo.com/api/user/timeline/#{username}", :params => {:format => 'json'}, :timeout => 5000)
-    forth_request.on_complete do |response|
+    twitgoo_request  = Typhoeus::Request.new("#{TWITGOO_URL}#{username}", :params => {:format => 'json'}, :timeout => 5000)
+    twitgoo_request.on_complete do |response|
       if response.code == 200
         twitgoo = JSON.parse(response.body)
         twitgoo['media'].each do |twit|
-          pic = []
-          pic << twit['thumburl']
-          pic << twit['text']
-          pic << twit['created_at']
-          pic << twit['imageurl']
-          @pix << pic  
+          TwitterPhoto.new(
+                           twit['thumburl'],
+                           twit['text'],
+                           twit['created_at'],
+                           twit['imageurl'],
+                           username
+                          )
         end
       end
     end
     
-    hydra.queue first_request 
-    hydra.queue second_request
-    hydra.queue third_request 
-    hydra.queue forth_request 
+    hydra.queue yfrog_request unless options[:yfrog] == false
+    hydra.queue tweetphoto_request unless options[:tweetphoto] == false
+    hydra.queue twitpic_request unless options[:twitpic] == false
+    hydra.queue twitgoo_request unless options[:twitgoo] == false
     hydra.run
+    
+    TwitterPhoto.find_by_username(username)
       
-    return @pix
   end
+end
+
+module TimeMod
+  def time_ago_to_date(tweet_date)
+     date = DateTime.now
+     intervals = %w(year month week day hour min minute second)
+     intervals.each do |interval|
+       number = tweet_date.match(/([\d*]+)\s#{interval}/i)
+       if number
+         interval = 'minutes' if interval == 'min'
+         date = date - number[1].to_i.try(interval)
+       end
+     end
+     date
+   end
+end
+
+class DateTime
+  extend TimeMod
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - bookis
@@ -14,11 +14,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-21 00:00:00 -07:00
+date: 2010-05-23 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: thoughtbot-shoulda
+  name: nokogiri
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
@@ -27,10 +27,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
+  type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: nokogiri
+  name: typhoeus
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
@@ -41,19 +41,7 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: typhoeus
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id003
-description: This gem allows you to use any twitter username to return an array of photo urls, with corresponding tweets, dates and thumbnails
+description: Allows you to use any twitter username to return a collection of objects of photo urls, with corresponding tweets, dates and thumbnails.
 email: vegan.bookis@gmail.com
 executables: []