twitter_friendly 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 810019b532f5f365b544ca6e0a0066717794b8975b59ae0a840b74f44377bff6
-  data.tar.gz: 75f3b7052fa926da7457b53f71d0f2f6e08496efd02042750681678b53d351dd
+  metadata.gz: 6d4ae87e3b1ed7b257a212dae005fdf20a22809e067fda985c34799067afcf3a
+  data.tar.gz: 75a2a81a104a3a69dc6cb2a0fd46cf005501cca76955ff31b8c7681aea8c103f
 SHA512:
-  metadata.gz: '08a9a4ef337d993f1cb3bb6689df73d67b5adc74576214206774c5dc2b720e0ef66c30a376c2d122c4a70d7dc85661f6114508ad0e030819f52a0c65370a3033'
-  data.tar.gz: f26d6b48033db9dc96752a55c12a5e7ffe1c3610773f0014af8d1a69b4c84384de5eec858c204634212c1e205b2579ec6cf689a8dd0cdf634031a65510520ca4
+  metadata.gz: 3c1772f3b904c93a14871d4e59692c9f4465965f0007d08ebdde28fc368ca692af20d100046a7ae9f50f419f505a6836d03833930b1c94739255454b61bf57d9
+  data.tar.gz: 9153c013954336b682e82429049389e0f1c09f68fb6927cb40949ebcec5c80e816a48990c177cd7c94c61fa051d198eee5fe5ae87a29de864806ef169363d9e7

data/Gemfile.lock

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

data/Rakefile

@@ -1,2 +1,9 @@
 require "bundler/gem_tasks"
+
 task :default => :spec
+
+begin
+  require 'rspec/core/rake_task'
+  RSpec::Core::RakeTask.new(:spec)
+rescue LoadError
+end

data/lib/twitter_friendly/rest/collector.rb

@@ -11,24 +11,10 @@ module TwitterFriendly
 
         collect_with_max_id([], nil, collect_options) do |max_id|
           options[:max_id] = max_id unless max_id.nil?
-          result = send(method_name, *args)
-
-          if method_name == :search
-            result.attrs[:statuses]
-          else
-            if result.is_a?(Array) && result[0].respond_to?(:attrs)
-              result.map(&:attrs)
-            else
-              result
-            end
-          end
+          send(method_name, *args)
         end
       end
 
-      # @param method_name [Symbol]
-      # @param user [Integer, String, nil]
-      #
-      # @option options [Integer] :count
       def fetch_resources_with_cursor(method_name, *args)
         options = args.dup.extract_options!
 
@@ -38,30 +24,34 @@ module TwitterFriendly
         end
       end
 
+      private
+
       def collect_with_max_id(collection, max_id, collect_options, &block)
         tweets = yield(max_id)
-        return collection if tweets.nil?
 
-        collection.concat tweets
-        if tweets.empty? || (collect_options[:call_count] -= 1) < 1
+        if tweets.nil? || tweets.empty? || (collect_options[:call_count] -= 1) < 1
           collection.flatten
         else
+          collection.concat(tweets)
           collect_with_max_id(collection, tweets.last[:id] - 1, collect_options, &block)
         end
       end
 
-      # @param user [Integer, String, nil]
-      # @param collection [Array]
-      # @param cursor [Integer]
-      #
-      # @option options [Integer] :count
       def collect_with_cursor(collection, cursor, &block)
         response = yield(cursor)
         return collection if response.nil?
 
         # Notice: If you call response.to_a, it automatically fetch all results and the results are not cached.
-        collection.concat (response[:ids] || response[:users] || response[:lists])
-        response[:next_cursor].zero? ? collection.flatten : collect_with_cursor(collection, response[:next_cursor], &block)
+
+        # cursor でリクエストするメソッドは cursor ごとキャッシュに保存するので、このメソッドで
+        # ids, users または lists でリソースを取得する必要がある。
+        collection.concat(response[:ids] || response[:users] || response[:lists])
+
+        if response[:next_cursor].zero?
+          collection.flatten
+        else
+          collect_with_cursor(collection, response[:next_cursor], &block)
+        end
       end
     end
   end

data/lib/twitter_friendly/rest/search.rb

@@ -9,6 +9,8 @@ module TwitterFriendly
         options = {result_type: 'recent'}.merge(options)
 
         if options[:count] <= MAX_TWEETS_PER_REQUEST
+          # max_id で次のツイートを取得するので、このメソッドでは statuses を返してよい。
+          # 逆に、cursor で次のツイートを取得するメソッドでは、レスポンス全体を返す必要がある。
           @twitter.search(query, options)&.attrs&.fetch(:statuses)
         else
           fetch_tweets_with_max_id(__method__, MAX_TWEETS_PER_REQUEST, query, options)

data/lib/twitter_friendly/version.rb

@@ -1,3 +1,3 @@
 module TwitterFriendly
-  VERSION = "1.2.1"
+  VERSION = "1.2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: twitter_friendly
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - ts-3156
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-15 00:00:00.000000000 Z
+date: 2019-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport