twitter-photos 0.1.6 → 0.1.7

data/VERSION

@@ -1 +1 @@
-0.1.6
+0.1.7

data/lib/twitter-photos.rb

@@ -36,27 +36,8 @@ class TwitterPhoto
     ObjectSpace.each_object(TwitterPhoto) {|o| o = nil}
   end
   
-  # Fetch photos from Twitpic, yFrog, Twitgoo, and TweetPhoto.
-  # 
-  # @example Find photos by @bookis only from yfrog and twitpic
-  #   TwitterPhoto.get_photos_by('bookis', :page => 2, :tweetphoto => false, :yfrog => true, :twitpic => true, :twitgoo => false)
-  # 
-  # @option options [true, false] :tweetphoto
-  # @option options [true, false] :twitpic
-  # @option options [true, false] :yfrog
-  # @option options [true, false] :twitgoo
-  # @option options [Integer] :page
-  # 
-  # @return [TwitterPhoto] collection.
-  # @param [String] username
-    # Accepts any twitter username
-  # @param [Hash] options
-    # exclude photo services (optional)
-    # select number of pages to collect, defaults to 1
-  def self.get_photos_by(username, options={:twitpic => true, :yfrog => true, :tweetphoto => true, :twitgoo => true, :page => 1})
-    TwitterPhoto.delete_all
-    hydra = Typhoeus::Hydra.new
-    1.upto(options[:page]).each do |page_num|
+  def self.twitpic(username, hydra, options, page=1)
+    1.upto(page).each do |page_num|
       twitpic_request  = Typhoeus::Request.new("#{TWITPIC_URL}/photos/#{username}", :params => {:page => page_num}, :timeout => 5000)
       twitpic_request.on_complete do |response|
         twitpics = Nokogiri.parse(response.body)
@@ -82,7 +63,10 @@ class TwitterPhoto
       end
       hydra.queue twitpic_request unless options[:twitpic] == false
     end
-    1.upto(options[:page]).each do |page_num|
+  end
+  
+  def self.yfrog(username, hydra, options, page=1)
+    1.upto(page).each do |page_num|
       yfrog_request  = Typhoeus::Request.new(YFROG_URL, :params => {:page => page_num, :username => username}, :timeout => 5000)
       yfrog_request.on_complete do |response|
         yfrogs = Nokogiri.parse(response.body)
@@ -107,7 +91,9 @@ class TwitterPhoto
       end
       hydra.queue yfrog_request unless options[:yfrog] == false
     end
-    
+  end
+  
+  def self.tweetphoto(username, hydra, options, page=1)
     tweetphoto_request = Typhoeus::Request.new("#{TWEETPHOTO_URL}#{username}", :timeout => 5000)
     tweetphoto_request.on_complete do |response|
       if response.code == 200
@@ -128,8 +114,11 @@ class TwitterPhoto
         hydra.queue tweetphoto_username_request
       end
     end
-    
-    1.upto(options[:page]).each do |page_num|
+    hydra.queue tweetphoto_request unless options[:tweetphoto] == false
+  end
+  
+  def self.twitgoo(username, hydra, options, page=1)
+    1.upto(page).each do |page_num|
       twitgoo_request  = Typhoeus::Request.new("#{TWITGOO_URL}#{username}", :params => {:page => page_num, :format => 'json'}, :timeout => 5000)
       twitgoo_request.on_complete do |response|
         if response.code == 200
@@ -147,12 +136,34 @@ class TwitterPhoto
       end
       hydra.queue twitgoo_request unless options[:twitgoo] == false
     end
-    
-    hydra.queue tweetphoto_request unless options[:tweetphoto] == false
+  end
+  
+  # Fetch photos from Twitpic, yFrog, Twitgoo, and TweetPhoto.
+  # 
+  # @example Find photos by @bookis only from yfrog and twitpic
+  #   TwitterPhoto.get_photos_by('bookis', :page => 2, :tweetphoto => false, :yfrog => true, :twitpic => true, :twitgoo => false)
+  # 
+  # @option options [true, false] :tweetphoto
+  # @option options [true, false] :twitpic
+  # @option options [true, false] :yfrog
+  # @option options [true, false] :twitgoo
+  # @option options [Integer] :page
+  # 
+  # @return [TwitterPhoto] collection.
+  # @param [String] username
+    # Accepts any twitter username
+  # @param [Hash] options
+    # exclude photo services (optional)
+    # select number of pages to collect, defaults to 1
+  def self.get_photos_by(username, options={:twitpic => true, :yfrog => true, :tweetphoto => true, :twitgoo => true, :page => 1})
+    TwitterPhoto.delete_all
+    hydra = Typhoeus::Hydra.new
+    TwitterPhoto.twitpic(username, hydra, options) unless options[:twitpic => false]
+    TwitterPhoto.yfrog(username, hydra, options) unless options[:yfrog => false]
+    TwitterPhoto.tweetphoto(username, hydra, options) unless options[:tweetphoto => false]
+    TwitterPhoto.twitgoo(username, hydra, options) unless options[:twitgoo => false]
     hydra.run
-    
     TwitterPhoto.find_by_username(username)
-      
   end
 end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 6
-  version: 0.1.6
+  - 7
+  version: 0.1.7
 platform: ruby
 authors: 
 - bookis
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-02 00:00:00 -06:00
+date: 2010-06-08 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency