Merge pull request #339 from dblock/paginated-ids

Fix #337: channel_not_found error resolving channel IDs with 100+ channels

Author: dblock

.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2020-06-29 08:44:31 -0400 using RuboCop version 0.82.0.
+# on 2020-08-24 10:08:11 -0400 using RuboCop version 0.82.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -40,6 +40,11 @@ Metrics/CyclomaticComplexity:
 Metrics/MethodLength:
   Max: 32
 
+# Offense count: 1
+# Configuration parameters: CountKeywordArgs.
+Metrics/ParameterLists:
+  Max: 6
+
 # Offense count: 1
 # Configuration parameters: IgnoredMethods.
 Metrics/PerceivedComplexity:
@@ -65,13 +70,13 @@ RSpec/ContextMethod:
     - 'spec/slack/web/api/mixins/groups_spec.rb'
     - 'spec/slack/web/api/mixins/users_spec.rb'
 
-# Offense count: 71
+# Offense count: 72
 # Configuration parameters: Prefixes.
 # Prefixes: when, with, without
 RSpec/ContextWording:
   Enabled: false
 
-# Offense count: 129
+# Offense count: 131
 # Cop supports --auto-correct.
 # Configuration parameters: AllowConsecutiveOneLiners.
 RSpec/EmptyLineAfterExample:
@@ -82,12 +87,12 @@ RSpec/EmptyLineAfterExample:
 RSpec/ExampleLength:
   Enabled: false
 
-# Offense count: 17
+# Offense count: 18
 # Configuration parameters: CustomTransform, IgnoreMethods.
 RSpec/FilePath:
   Enabled: false
 
-# Offense count: 13
+# Offense count: 14
 # Configuration parameters: AssignmentOnly.
 RSpec/InstanceVariable:
   Exclude:
@@ -105,14 +110,21 @@ RSpec/MessageSpies:
 RSpec/MultipleExpectations:
   Max: 5
 
-# Offense count: 35
+# Offense count: 2
+# Configuration parameters: IgnoreSharedExamples.
+RSpec/NamedSubject:
+  Exclude:
+    - 'spec/slack/web/api/mixins/conversations_list_spec.rb'
+
+# Offense count: 37
 RSpec/NestedGroups:
   Max: 6
 
-# Offense count: 3
+# Offense count: 4
 RSpec/SubjectStub:
   Exclude:
     - 'spec/slack/web/api/mixins/channels_spec.rb'
+    - 'spec/slack/web/api/mixins/conversations_spec.rb'
     - 'spec/slack/web/api/mixins/groups_spec.rb'
     - 'spec/slack/web/api/mixins/users_spec.rb'
 

CHANGELOG.md

@@ -1,7 +1,8 @@
 ### 0.15.1 (Next)
 
-* Your contribution here.
 * [#336](https://github.com/slack-ruby/slack-ruby-client/pull/336): Fix: handle nil events - [@pyama86](https://github.com/pyama86).
+* [#339](https://github.com/slack-ruby/slack-ruby-client/pull/339): Fix: `channel_not_found` resolving channel IDs with 100+ channels - [@dblock](https://github.com/dblock).
+* Your contribution here.
 
 ### 0.15.0 (2020/7/26)
 

lib/slack/web/api/mixins/channels.id.rb

@@ -16,9 +16,7 @@ def channels_id(options = {})
             name = options[:channel]
             throw ArgumentError.new('Required arguments :channel missing') if name.nil?
 
-            id_for(:channel, name, '#', :channels, 'channel_not_found') do
-              channels_list
-            end
+            id_for :channel, name, '#', :channels_list, :channels, 'channel_not_found'
           end
         end
       end

lib/slack/web/api/mixins/conversations.id.rb

@@ -16,9 +16,7 @@ def conversations_id(options = {})
             name = options[:channel]
             throw ArgumentError.new('Required arguments :channel missing') if name.nil?
 
-            id_for(:channel, name, '#', :channels, 'channel_not_found') do
-              conversations_list
-            end
+            id_for :channel, name, '#', :conversations_list, :channels, 'channel_not_found'
           end
         end
       end

lib/slack/web/api/mixins/groups.id.rb

@@ -16,9 +16,7 @@ def groups_id(options = {})
             name = options[:channel]
             throw ArgumentError.new('Required arguments :channel missing') if name.nil?
 
-            id_for(:group, name, '#', :groups, 'channel_not_found') do
-              groups_list
-            end
+            id_for :group, name, '#', :groups_list, :groups, 'channel_not_found'
           end
         end
       end

lib/slack/web/api/mixins/ids.id.rb

@@ -6,10 +6,10 @@ module Mixins
         module Ids
           private
 
-          def id_for(key, name, prefix, list_method, not_found_error)
+          def id_for(key, name, prefix, enum_method, list_method, not_found_error)
             return { 'ok' => true, key.to_s => { 'id' => name } } unless name[0] == prefix
 
-            yield.tap do |list|
+            public_send enum_method do |list|
               list.public_send(list_method).each do |li|
                 return Slack::Messages::Message.new('ok' => true, key.to_s => { 'id' => li.id }) if li.name == name[1..-1]
               end

lib/slack/web/api/mixins/users.id.rb

@@ -16,9 +16,7 @@ def users_id(options = {})
             name = options[:user]
             throw ArgumentError.new('Required arguments :user missing') if name.nil?
 
-            id_for(:user, name, '@', :members, 'user_not_found') do
-              users_list
-            end
+            id_for :user, name, '@', :users_list, :members, 'user_not_found'
           end
         end
       end