Skip to content

Commit b4d2550

Browse files
authored
Merge pull request #23 from pepabo/fix-warning
fix "method redefined"
2 parents d29a06a + 31ca2cf commit b4d2550

File tree

3 files changed

+12
-10
lines changed

3 files changed

+12
-10
lines changed

lib/arisaid/configurable.rb

+4-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ module Configurable
66
OPTIONS_KEYS = %i(
77
debug
88
read_only
9-
slack_team
10-
slack_token
119
save_token
1210
conf_prefix
1311
exit_status
@@ -64,6 +62,10 @@ def slack_token
6462
ENV['SLACK_API_TOKEN'] ||= slack_token!
6563
end
6664

65+
def slack_token=(token)
66+
ENV['SLACK_API_TOKEN'] = token
67+
end
68+
6769
def slack_token!
6870
token = slack_token_by_pit
6971

lib/arisaid/core_ext/hash.rb

+2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
class Hash
2+
alias_method :original_slice, :slice
3+
24
def slice(*keys)
35
keys.each_with_object(self.class.new) { |k, hash| hash[k] = self[k] if has_key?(k) }
46
end

lib/arisaid/userable.rb

+6-8
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,31 @@
11
module Arisaid
22
module Userable
3-
attr_reader :users, :guests, :bots
4-
53
def users
6-
@users ||= users!
4+
@_users ||= users!
75
end
86

97
def users!
10-
@users = all_users.select { |u|
8+
@_users = all_users.select { |u|
119
u.deleted == false && u.is_bot == false && u.is_restricted == false
1210
}
1311
end
1412

1513
def guests
16-
@guests ||= guests!
14+
@_guests ||= guests!
1715
end
1816

1917
def guests!
20-
@guests = all_users.select { |u|
18+
@_guests = all_users.select { |u|
2119
u.deleted == false && u.is_bot == false && u.is_restricted == true
2220
}
2321
end
2422

2523
def bots
26-
@bots ||= bots!
24+
@_bots ||= bots!
2725
end
2826

2927
def bots!
30-
@bots = all_users.select { |u|
28+
@_bots = all_users.select { |u|
3129
u.deleted == false && u.is_bot == true && u.is_restricted == false
3230
}
3331
end

0 commit comments

Comments
 (0)