twitter_friendly 1.2.3 → 2.0.0.pre.alpha

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3211d8ab10b2526b0ffcee549513f415670f741a7e9a131a6f1134ae3177e97
-  data.tar.gz: 40d6900e2723a7880dbca3ba09c028e96f17be9eadce2ffbe12952bc5bb65610
+  metadata.gz: 317720f96610724f2d1aaf2009fc7aab40edf8fd207a82601066dfd83541eab5
+  data.tar.gz: 0e055652b985fbf44344683e6b6dbdf2e823f9303e9a581faad23020a303f826
 SHA512:
-  metadata.gz: ea09e0f3a441d67077e6799a2b7c9a9728500b8d343a808e70f4348dd5b9b344353017b1d6891db9dfed2c24dc7683c9e9260e71fd56ac57ffbf61c8d0776591
-  data.tar.gz: 55f9920997f77570d6decf5ab4029700a47d83eaf71f4b42c6cf22184eb6eb6a15c993e6edef7d44e062bd884f1b9a9aa3deb25e55ddb168b0a8324f83d0373b
+  metadata.gz: 3b4ca53a272e37c0184b838660b8800ef31353757627d392a97c823bb477b58b7564dfa022af0a425dfb55dfe266c642680f604d6b5875a797362ecf4ac86ded
+  data.tar.gz: 2d54d1bd9019648b03ff517a65d43b1bae25c71c55ebf5694184eb890fb879ca717588cfe7de35fc107c83e9d88cba8dfe570205ad3fed1af344b21964a13230

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    twitter_friendly (1.2.3)
+    twitter_friendly (2.0.0.pre.alpha)
       activesupport (>= 4.2, < 6.0)
       oj (~> 3.7.6)
       parallel (~> 1.12.1)

data/bin/console

@@ -7,8 +7,8 @@ require "twitter_friendly"
 # with your gem easier. You can also use a different console, if you like.
 
 # (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
+require "pry"
+Pry.start
 
-require "irb"
-IRB.start(__FILE__)
+# require "irb"
+# IRB.start(__FILE__)

data/lib/twitter_friendly/rest/collector.rb

@@ -15,10 +15,15 @@ module TwitterFriendly
         end
       end
 
-      def fetch_resources_with_cursor(method_name, *args)
+      def fetch_resources_with_cursor(method_name, max_count, *args)
         options = args.dup.extract_options!
 
-        collect_with_cursor([], -1) do |next_cursor|
+        total_count = options.delete(:count) || max_count
+        call_count = total_count / max_count + (total_count % max_count == 0 ? 0 : 1)
+        options[:count] = [max_count, total_count].min
+        collect_options = {call_count: call_count, total_count: total_count}
+
+        collect_with_cursor([], -1, collect_options) do |next_cursor|
           options[:cursor] = next_cursor unless next_cursor.nil?
           send(method_name, *args)
         end
@@ -37,20 +42,27 @@ module TwitterFriendly
         end
       end
 
-      def collect_with_cursor(collection, cursor, &block)
+      def collect_with_cursor(collection, cursor, collect_options, &block)
         response = yield(cursor)
-        return collection if response.nil?
+        if response.nil?
+          logger.warn "#{__method__}: response is nil." if respond_to?(:logger)
+          return collection
+        end
 
         # Notice: If you call response.to_a, it automatically fetch all results and the results are not cached.
 
         # cursor でリクエストするメソッドは cursor ごとキャッシュに保存するので、このメソッドで
         # ids, users または lists でリソースを取得する必要がある。
-        collection.concat(response[:ids] || response[:users] || response[:lists])
+        fetched_resources = response[:ids] || response[:users] || response[:lists]
+        if fetched_resources.nil? || fetched_resources.empty?
+          logger.warn "#{__method__}: fetched_resources is nil or empty." if respond_to?(:logger)
+        end
+        collection.concat(fetched_resources)
 
-        if response[:next_cursor].zero?
+        if response[:next_cursor].zero? || (collect_options[:call_count] -= 1) < 1
           collection.flatten
         else
-          collect_with_cursor(collection, response[:next_cursor], &block)
+          collect_with_cursor(collection, response[:next_cursor], collect_options, &block)
         end
       end
     end

data/lib/twitter_friendly/rest/friends_and_followers.rb

@@ -24,7 +24,7 @@ module TwitterFriendly
         if options.has_key?(:cursor)
           @twitter.friend_ids(*args)&.attrs
         else
-          fetch_resources_with_cursor(__method__, *args)
+          fetch_resources_with_cursor(__method__, MAX_IDS_PER_REQUEST, *args)
         end
       end
 
@@ -35,7 +35,7 @@ module TwitterFriendly
         if options.has_key?(:cursor)
           @twitter.follower_ids(*args)&.attrs
         else
-          fetch_resources_with_cursor(__method__, *args)
+          fetch_resources_with_cursor(__method__, MAX_IDS_PER_REQUEST, *args)
         end
       end
 

data/lib/twitter_friendly/rest/lists.rb

@@ -23,7 +23,7 @@ module TwitterFriendly
         if options.has_key?(:cursor)
           @twitter.memberships(*args)&.attrs
         else
-          fetch_resources_with_cursor(__method__, *args)
+          fetch_resources_with_cursor(__method__, MAX_LISTS_PER_REQUEST, *args)
         end
       end
 
@@ -44,7 +44,7 @@ module TwitterFriendly
         if options.has_key?(:cursor)
           @twitter.list_members(*args)&.attrs
         else
-          fetch_resources_with_cursor(__method__, *args)
+          fetch_resources_with_cursor(__method__, MAX_MEMBERS_PER_REQUEST, *args)
         end
       end
     end

data/lib/twitter_friendly/version.rb

@@ -1,3 +1,3 @@
 module TwitterFriendly
-  VERSION = "1.2.3"
+  VERSION = "2.0.0-alpha"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: twitter_friendly
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 2.0.0.pre.alpha
 platform: ruby
 authors:
 - ts-3156
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-21 00:00:00.000000000 Z
+date: 2019-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport