twitter_with_auto_pagination 0.9.4 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 85b2134eb58d567fcbf7d1d5b73d47f7211a9609
-  data.tar.gz: 5aede29a942eeabbfe4c810782ef008ea66bf2b5
+  metadata.gz: adeef994e42b9c1f9918c03e3bbb9fc01bc9589b
+  data.tar.gz: 8632de6d1cb4862d10993a393e29a929ff4512ca
 SHA512:
-  metadata.gz: 71d2303c9bd1f795dcc9d5fc284345494a97a9024c9d39ee513adb8fc40b30cf163a078435ef03a2899a85f2f7a0899ab03970617431b418642162344bb59293
-  data.tar.gz: 588abe185579116532ada869ed9e04730091994d55ce74abafb96edce4d50dd4847301632851d85c5f8c84262b4486b979a3d860cd269e0fadbf607de22c0096
+  metadata.gz: e13248d55c2f853622545a24e49b8803f08d21cb8fb0dee51e82d84ba8c775519fd1e32b3f9b309b6ce453eee70bfa0d7dfdd7ba338e8cb7759be5b028aab11a
+  data.tar.gz: a894177e7ae82b9c4f808f5643a931553b0be253dcc33848f28ba4a906deece0aa388e4c741e04515ce226fb7bf1078578ea5e8a81f78918b4f499936a99f0ff

data/lib/twitter_with_auto_pagination/collector.rb

@@ -11,7 +11,9 @@ module TwitterWithAutoPagination
     def collect_with_cursor(collection = [], cursor = nil, &block)
       response = yield(cursor)
       return collection if response.nil?
-      collection += (response.attrs[:ids] || response.attrs[:users] || response.attrs[:lists]) # TODO to_a
+
+      # Notice: If you call response.to_a, it automatically fetch all results and the results are not cached.
+      collection += (response.attrs[:ids] || response.attrs[:users] || response.attrs[:lists])
       response.attrs[:next_cursor].zero? ? collection.flatten : collect_with_cursor(collection, response.attrs[:next_cursor], &block)
     end
   end

data/lib/twitter_with_auto_pagination/rest/friends_and_followers.rb

@@ -16,7 +16,7 @@ module TwitterWithAutoPagination
           options = {count: MAX_IDS_PER_REQUEST, cursor: -1}.merge(args.extract_options!)
 
           collect_with_cursor do |next_cursor|
-            options[:next_cursor] = next_cursor unless next_cursor.nil?
+            options[:cursor] = next_cursor unless next_cursor.nil?
             twitter.send(name, *args, options)
           end
         end

data/lib/twitter_with_auto_pagination/rest/lists.rb

@@ -10,7 +10,7 @@ module TwitterWithAutoPagination
         options = {count: 1000, cursor: -1}.merge(args.extract_options!)
 
         collect_with_cursor do |next_cursor|
-          options[:next_cursor] = next_cursor unless next_cursor.nil?
+          options[:cursor] = next_cursor unless next_cursor.nil?
           twitter.send(:memberships, *args, options)
         end
       end
@@ -20,7 +20,7 @@ module TwitterWithAutoPagination
         options = {count: 5000, skip_status: 1, cursor: -1}.merge(args.extract_options!)
 
         collect_with_cursor do |next_cursor|
-          options[:next_cursor] = next_cursor unless next_cursor.nil?
+          options[:cursor] = next_cursor unless next_cursor.nil?
           twitter.send(:list_members, *args, options)
         end
       end

data/spec/twitter_with_auto_pagination/rest/friends_and_followers_spec.rb

@@ -19,6 +19,15 @@ describe TwitterWithAutoPagination::REST::FriendsAndFollowers do
     }
   end
 
+  let(:config3) do
+    {
+      consumer_key: ENV['CK3'],
+      consumer_secret: ENV['CS3'],
+      access_token: ENV['AT3'],
+      access_token_secret: ENV['ATS3']
+    }
+  end
+
   let(:client) { TwitterWithAutoPagination::Client.new(config) }
   let(:client2) { TwitterWithAutoPagination::Client.new(config2) }
 
@@ -28,7 +37,7 @@ describe TwitterWithAutoPagination::REST::FriendsAndFollowers do
   before do
     client.cache.clear
     client.twitter.send(:user_id) # Call verify_credentials
-    client2.twitter.send(:user_id) # Call verify_credentials
+    client2.twitter.send(:user_id)
     $fetch_called = $request_called = false
     $fetch_count = $request_count = 0
   end
@@ -58,6 +67,10 @@ describe TwitterWithAutoPagination::REST::FriendsAndFollowers do
   describe '#friend_ids' do
     let(:name) { :friend_ids }
 
+    it 'matches original one' do
+      expect(client.friend_ids).to match_twitter(client.twitter.friend_ids.attrs[:ids])
+    end
+
     context 'with one param' do
       let(:params) { [id] }
       let(:params2) { [id2] }
@@ -88,6 +101,27 @@ describe TwitterWithAutoPagination::REST::FriendsAndFollowers do
   describe '#follower_ids' do
     let(:name) { :follower_ids }
 
+    it 'matches original one' do
+      expect(client.follower_ids).to match_twitter(client.twitter.follower_ids.attrs[:ids])
+    end
+
+    context 'a user who has too many followers is specified' do
+      let(:client) { TwitterWithAutoPagination::Client.new(config3) }
+      let(:id) { 187385226 }
+      let!(:followers_count) { client.user(id)[:followers_count] }
+
+      before do
+        client.twitter.send(:user_id)
+        $fetch_called = $request_called = false
+        $fetch_count = $request_count = 0
+      end
+
+      it 'automatically fetches all followers' do
+        request_count = followers_count / 5000 + (followers_count % 5000 == 0 ? 0 : 1)
+        expect { client.follower_ids(id) }.to fetch & request.exactly(request_count).times
+      end
+    end
+
     context 'with one param' do
       let(:params) { [id] }
       let(:params2) { [id2] }
@@ -149,13 +183,21 @@ describe TwitterWithAutoPagination::REST::FriendsAndFollowers do
     it 'calls #friend_ids_and_follower_ids with unique ids' do
       expect(client).to receive(:friend_ids_and_follower_ids).with(id, any_args).and_return([[id], [id]])
       allow(client).to receive(:users_internal).with([id], any_args).and_return([{id: id}])
-      client.friends_and_followers(id)
+
+      friends, followers = client.friends_and_followers(id)
+
+      expect(friends).to match_twitter([{id: id}])
+      expect(followers).to match_twitter([{id: id}])
     end
 
     it 'calls #users_internal with unique ids' do
       allow(client).to receive(:friend_ids_and_follower_ids).with(id, any_args).and_return([[id], [id]])
       expect(client).to receive(:users_internal).with([id], any_args).and_return([{id: id}])
-      client.friends_and_followers(id)
+
+      friends, followers = client.friends_and_followers(id)
+
+      expect(friends).to match_twitter([{id: id}])
+      expect(followers).to match_twitter([{id: id}])
     end
   end
 end

data/twitter_with_auto_pagination.gemspec

@@ -21,5 +21,5 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 2.3'
   spec.summary = spec.description
   spec.test_files = Dir.glob('spec/**/*')
-  spec.version = '0.9.4'
+  spec.version = '0.9.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: twitter_with_auto_pagination
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.5
 platform: ruby
 authors:
 - Shinohara Teruki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-27 00:00:00.000000000 Z
+date: 2017-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: twitter