Configurable によって外部から環境変数を注入可能にした

fjordllc · Feb 26, 2023 · ca54718 · ca54718
1 parent c0624a0
commit ca54718
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 34 deletions.
diff --git a/app/models/discord/server.rb b/app/models/discord/server.rb
@@ -2,11 +2,10 @@
 
 module Discord
   class Server
-    TOKEN_PREFIX_SIZE = 4
+    include ActiveSupport::Configurable
+    config_accessor :guild_id, :authorize_token, instance_accessor: false
 
     class << self
-      class_attribute :guild_id, :authorize_token, instance_reader: false
-
       def create_text_channel(name:, parent: nil)
         guild = Discord::Server.find_by(id: guild_id, token: authorize_token)
         return nil if guild.blank?
@@ -18,14 +17,6 @@ def create_text_channel(name:, parent: nil)
         nil
       end
 
-      def guild_id
-        @guild_id || ENV['DISCORD_GUILD_ID'].presence
-      end
-
-      def authorize_token
-        @authorize_token || "Bot #{ENV['DISCORD_BOT_TOKEN']}"
-      end
-
       def find_by(id:, token:)
         return nil unless enabled?
 
@@ -40,7 +31,7 @@ def find_by(id:, token:)
       end
 
       def enabled?
-        guild_id && authorize_token.size > TOKEN_PREFIX_SIZE
+        guild_id && authorize_token
       end
 
       private

diff --git a/app/models/discord/times_channel.rb b/app/models/discord/times_channel.rb
@@ -2,16 +2,13 @@
 
 module Discord
   class TimesChannel
-    class_attribute :category_id, instance_reader: false
+    include ActiveSupport::Configurable
+    config_accessor :category_id, instance_accessor: false
 
     class << self
       def to_channel_name(username)
         username.downcase
       end
-
-      def category_id
-        @category_id || ENV['DISCORD_TIMES_CHANNEL_CATEGORY_ID'].presence
-      end
     end
 
     def initialize(username)

diff --git a/config/initializers/discord.rb b/config/initializers/discord.rb
@@ -0,0 +1,9 @@
+Rails.application.reloader.to_prepare do
+  Discord::Server.configure do |config|
+    config.guild_id = ENV['DISCORD_GUILD_ID'].presence
+
+    bot_token = ENV['DISCORD_BOT_TOKEN'].presence
+    config.authorize_token = "Bot #{bot_token}" if bot_token
+  end
+  Discord::TimesChannel.config.category_id = ENV['DISCORD_TIMES_CHANNEL_CATEGORY_ID'].presence
+end
diff --git a/test/models/discord/server_test.rb b/test/models/discord/server_test.rb
@@ -99,26 +99,14 @@ class ServerTest < ActiveSupport::TestCase
     test '.enabled?' do
       Discord::Server.guild_id = '1234567890123456789'
       Discord::Server.authorize_token = 'Bot valid token'
-      ENV['DISCORD_GUILD_ID'] = nil
-      ENV['DISCORD_BOT_TOKEN'] = nil
       assert Discord::Server.enabled?
 
       Discord::Server.guild_id = nil
       Discord::Server.authorize_token = nil
-      ENV['DISCORD_GUILD_ID'] = '1234567890123456789'
-      ENV['DISCORD_BOT_TOKEN'] = 'Bot valid token'
-      assert Discord::Server.enabled?
-
-      Discord::Server.guild_id = nil
-      Discord::Server.authorize_token = nil
-      ENV['DISCORD_GUILD_ID'] = nil
-      ENV['DISCORD_BOT_TOKEN'] = nil
       assert_not Discord::Server.enabled?
 
       Discord::Server.guild_id = nil
       Discord::Server.authorize_token = 'skip'
-      ENV['DISCORD_GUILD_ID'] = nil
-      ENV['DISCORD_BOT_TOKEN'] = nil
       assert_not Discord::Server.enabled?
     end
   end

diff --git a/test/models/discord/times_channel_test.rb b/test/models/discord/times_channel_test.rb
@@ -5,8 +5,8 @@
 module Discord
   class TimesChannelTest < ActiveSupport::TestCase
     setup do
-      @category_id = ENV['DISCORD_TIMES_CHANNEL_CATEGORY_ID']
-      ENV['DISCORD_TIMES_CHANNEL_CATEGORY_ID'] = nil
+      @category_id = Discord::TimesChannel.category_id
+      Discord::TimesChannel.category_id = nil
 
       @stub_create_text_channel = lambda { |name:, parent:|
         Discordrb::Channel.new({
@@ -18,7 +18,7 @@ class TimesChannelTest < ActiveSupport::TestCase
     end
 
     teardown do
-      ENV['DISCORD_TIMES_CHANNEL_CATEGORY_ID'] = @category_id
+      Discord::TimesChannel.category_id = @category_id
     end
 
     test '#save return true' do

diff --git a/test/system/notification/signed_up_test.rb b/test/system/notification/signed_up_test.rb
@@ -8,7 +8,7 @@ class Notification::SignedUpTest < ApplicationSystemTestCase
     AbstractNotifier.delivery_mode = :normal
 
     @bot_token = Discord::Server.authorize_token
-    Discord::Server.authorize_token = 'skip'
+    Discord::Server.authorize_token = nil
   end
 
   teardown do

diff --git a/test/system/sign_up_test.rb b/test/system/sign_up_test.rb
@@ -5,7 +5,7 @@
 class SignUpTest < ApplicationSystemTestCase
   setup do
     @bot_token = Discord::Server.authorize_token
-    Discord::Server.authorize_token = 'skip'
+    Discord::Server.authorize_token = nil
   end
 
   teardown do