BCDice 3.0.0-alpha.2に対応

Author: ysakasin

Gemfile

@@ -2,7 +2,7 @@
 
 source 'https://rubygems.org'
 
-gem 'bcdice', '3.0.0.pre.alpha.1'
+gem 'bcdice', '3.0.0.pre.alpha.2'
 
 gem 'sinatra', '~>2.0'
 gem 'sinatra-contrib', '~>2.0'

Gemfile.lock

@@ -3,7 +3,11 @@ GEM
   specs:
     ast (2.4.0)
     backports (3.16.1)
-    bcdice (3.0.0.pre.alpha.1)
+    bcdice (3.0.0.pre.alpha.2)
+      i18n (~> 1.8.5)
+    concurrent-ruby (1.1.7)
+    i18n (1.8.5)
+      concurrent-ruby (~> 1.0)
     jaro_winkler (1.5.4)
     multi_json (1.14.1)
     mustermann (1.1.1)
@@ -58,7 +62,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bcdice (= 3.0.0.pre.alpha.1)
+  bcdice (= 3.0.0.pre.alpha.2)
   puma (~> 4.3)
   rack-test (~> 1.1)
   rake (~> 13.0)

bcdice

@@ -35,13 +35,13 @@ def diceroll(system, command)
 
         raise CommandError if result.nil?
 
-        dices = dicebot.randomizer.rand_results.map { |dice| { faces: dice[1], value: dice[0] } }
-        detailed_rands = dicebot.randomizer.detailed_rand_results.map(&:to_h)
+        dices = result.rands.map { |dice| { faces: dice[1], value: dice[0] } }
+        detailed_rands = result.detailed_rands.map(&:to_h)
 
         {
           ok: true,
-          result: ": #{result}",
-          secret: dicebot.secret?,
+          result: ": #{result.text}",
+          secret: result.secret?,
           dices: dices,
           detailed_rands: detailed_rands
         }

lib/bcdice_api/app.rb

@@ -18,18 +18,13 @@ def app
     data_set = {}
     files = Dir.glob('bcdice/test/data/*.toml')
 
-    class_name_to_id = BCDice.all_game_systems.map do |k|
-      name = k.name.split('::').last
-      [name, k::ID]
-    end.to_h
-
     files.each do |filename|
       filename_base = File.basename(filename, '.toml')
       data = Tomlrb.load_file(filename, symbolize_keys: true)
 
       data[:test].each.with_index(1) do |test_case, index|
         test_case[:filename] = filename
-        test_case[:game_system] = class_name_to_id[test_case[:game_system]]
+        test_case[:game_system] = test_case[:game_system]
         test_case[:output] = ": #{test_case[:output]}" unless test_case[:output].empty?
         test_case[:output] = nil if test_case[:output].empty? # TOMLではnilを表現できないので空文字で代用
         test_case[:secret] ||= false