yatc 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fdde419625a0f9898f99ad2f1d0f9be5426ad0ac
-  data.tar.gz: 17b81c837d586085388cdf83a3a97a6efef58c52
+  metadata.gz: d61ced35adbe95b56b233d432850d038a039de8a
+  data.tar.gz: 8e1b6ad6ad0d5193a881e78380ef1e4b3b0da5df
 SHA512:
-  metadata.gz: c715c88addf673087eb41951e642d4586f3c152c20256473686c9394b5f368efd6b30e580f904d4094b98180237386e9f57b76d73ed6cebe23ec633764dba12a
-  data.tar.gz: b689adc5683c4e60b1ac3c215b797973185c5cbcac42bfc5a62251f159d69cc277a828d79f2ac53b18d3514f7aaf4060bfc4fec2f33182e66b3b4e5356bc65cc
+  metadata.gz: 5d0927f46470f12604c590f2067a8d3be7cc42389f3cec2874f0d23669f52b77959d4c18788ee4b675a154b2db3353d1c68f819ab194847c278485f10aa216e4
+  data.tar.gz: 5cd2c262e9900126a2f0e6bd232ddfe38c3e3c9b3625cce6159dce763fd6cebc1011eb5d5d9195d462b937b11c99a98583795ed028598b235200f2389ccefe9a

data/lib/yatc.rb

@@ -14,12 +14,14 @@ class TwitterClient
   attr_accessor :should_wait
   attr_accessor :access_token
   attr_accessor :force_retrieval
+  attr_accessor :credentials
 
   def test_access(ck, cs)
     !request_access_token(ck, cs).empty?
   end
 
   def followers_ids(user, count = 5000)
+    retrieved = 0
     params = {}
     if user.class == Fixnum
       params[:user_id] = user
@@ -38,9 +40,10 @@ class TwitterClient
 
       encoded_params = encode_params(params)
       url = "#{BASE_URL}/followers/ids.json?#{encoded_params}"
-      data = JSON.parse(execute(:get, url, access_token))
+      data = JSON.parse(execute(:get, url))
       ids += data['ids']
       cursor = data['next_cursor']
+      retrieved += params[:count]
       break if cursor == 0
     end
     force_retrieval = false
@@ -65,7 +68,7 @@ class TwitterClient
 
       encoded_params = encode_params(params)
       url = "#{BASE_URL}/friends/ids.json?#{encoded_params}"
-      data = JSON.parse(execute(:get, url, access_token))
+      data = JSON.parse(execute(:get, url))
       ids += data['ids']
       cursor = data['next_cursor']
     end
@@ -81,7 +84,7 @@ class TwitterClient
     end
     params = encode_params(params)
     url = "#{BASE_URL}/users/show.json?#{params}"
-    JSON.parse(execute(:get, url, access_token))
+    JSON.parse(execute(:get, url))
   end
 
   def statuses_user_timeline(user, count = 200)
@@ -101,7 +104,7 @@ class TwitterClient
       end
       encoded_params = encode_params(params)
       url = "#{BASE_URL}/statuses/user_timeline.json?#{encoded_params}"
-      t = JSON.parse(execute(:get, url, access_token))
+      t = JSON.parse(execute(:get, url))
       unless t.empty?
         max_id = t.map{ |tweet| tweet['id'] }.min - 1
       end
@@ -110,12 +113,15 @@ class TwitterClient
     tweets
   end
 
-  def initialize(ck, cs, wait = false)
-    @consumer_key = ck
-    @consumer_secret = cs
-    @access_token = request_access_token(consumer_key, consumer_secret)
+
+  def initialize(credentials, wait = false, force_retrieval = false)
+    raise ArgumentError unless credentials.class == Array
+    raise 'Must provide at least one credential' if credentials.empty?
+    @credentials = credentials
+    @credential_index = 0
+    activate_next_credential
     @should_wait = wait
-    @force_retrieval = false
+    @force_retrieval = force_retrieval
   end
 
   def bearer_token(ck, cs)
@@ -150,7 +156,20 @@ class TwitterClient
     params.map { |k, v| "#{k}=#{v}" }.join('&')
   end
 
-  def execute(method, url, access_token)
+  def activate_next_credential
+    return false if @credential_index >= credentials.length
+    @consumer_key = credentials[@credential_index][:consumer_key]
+    @consumer_secret = credentials[@credential_index][:consumer_secret]
+    @credential_index += 1
+    begin
+      @access_token = request_access_token(consumer_key, consumer_secret)
+    rescue => e
+      return false
+    end
+    true
+  end
+
+  def execute(method, url)
     tries = 0
     begin
       RestClient::Request.execute(
@@ -163,6 +182,10 @@ class TwitterClient
         }
       )
     rescue RestClient::TooManyRequests => e
+      if activate_next_credential
+        retry
+      end
+
       limit_reset = e.response.headers[:x_rate_limit_reset]
       if should_wait && limit_reset && (tries == 0 || force_retrieval)
         tries += 1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yatc
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Rafael Rendón Pablo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-16 00:00:00.000000000 Z
+date: 2015-10-17 00:00:00.000000000 Z
 dependencies: []
 description: Twitter client.
 email: rafaelrendonpablo@gmail.com
@@ -39,7 +39,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Yet Another Twitter Client