Merge pull request #25 from bcdice/api_v2

API v2

Author: ysakasin

.rubocop.yml

@@ -5,24 +5,11 @@ AllCops:
     - "vendor/**/*"
 
 Metrics:
-  Exclude:
-    - "lib/bcdice_wrap.rb"
-    - "lib/bcdice_api/app.rb"
-
-Metrics/ClassLength:
-  Exclude:
-    - "test/**/*"
-
-Metrics/AbcSize:
   Exclude:
     - "test/**/*"
     - "lib/bcdice_wrap.rb"
-    - "lib/bcdice_api/app.rb"
-
-Metrics/BlockLength:
-  Exclude:
-    - "test/**/*"
-    - "lib/bcdice_api/app.rb"
+    - "lib/bcdice_api/controller/v1.rb"
+    - "lib/bcdice_api/controller/v2.rb"
 
 Lint/RaiseException:
   Enabled: true

Gemfile

@@ -2,6 +2,8 @@
 
 source 'https://rubygems.org'
 
+gem 'bcdice', '~>3.0.0'
+
 gem 'sinatra', '~>2.0'
 gem 'sinatra-contrib', '~>2.0'
 gem 'sinatra-jsonp', '~>0.5.0'
@@ -13,4 +15,5 @@ group :development, :test do
   gem 'rake', '~>13.0'
   gem 'rubocop', '~> 0.81.0', require: false
   gem 'test-unit', '~>3.3'
+  gem 'tomlrb'
 end

Gemfile.lock

@@ -1,26 +1,30 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.4.0)
-    backports (3.16.1)
+    ast (2.4.1)
+    bcdice (3.0.0)
+      i18n (~> 1.8.5)
+    concurrent-ruby (1.1.8)
+    i18n (1.8.7)
+      concurrent-ruby (~> 1.0)
     jaro_winkler (1.5.4)
-    multi_json (1.14.1)
+    multi_json (1.15.0)
     mustermann (1.1.1)
       ruby2_keywords (~> 0.0.1)
-    nio4r (2.5.2)
-    parallel (1.19.1)
-    parser (2.7.1.0)
-      ast (~> 2.4.0)
-    power_assert (1.1.6)
-    puma (4.3.5)
+    nio4r (2.5.4)
+    parallel (1.20.1)
+    parser (3.0.0.0)
+      ast (~> 2.4.1)
+    power_assert (1.2.0)
+    puma (4.3.7)
       nio4r (~> 2.0)
     rack (2.2.3)
-    rack-protection (2.0.8.1)
+    rack-protection (2.1.0)
       rack
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rainbow (3.0.0)
-    rake (13.0.1)
+    rake (13.0.3)
     rexml (3.2.4)
     rubocop (0.81.0)
       jaro_winkler (~> 1.5.1)
@@ -30,32 +34,33 @@ GEM
       rexml
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
-    ruby-progressbar (1.10.1)
+    ruby-progressbar (1.11.0)
     ruby2_keywords (0.0.2)
-    sinatra (2.0.8.1)
+    sinatra (2.1.0)
       mustermann (~> 1.0)
-      rack (~> 2.0)
-      rack-protection (= 2.0.8.1)
+      rack (~> 2.2)
+      rack-protection (= 2.1.0)
       tilt (~> 2.0)
-    sinatra-contrib (2.0.8.1)
-      backports (>= 2.8.2)
+    sinatra-contrib (2.1.0)
       multi_json
       mustermann (~> 1.0)
-      rack-protection (= 2.0.8.1)
-      sinatra (= 2.0.8.1)
+      rack-protection (= 2.1.0)
+      sinatra (= 2.1.0)
       tilt (~> 2.0)
     sinatra-jsonp (0.5.0)
       multi_json (~> 1.8)
       sinatra (>= 1.0)
-    test-unit (3.3.5)
+    test-unit (3.3.9)
       power_assert
     tilt (2.0.10)
+    tomlrb (2.0.1)
     unicode-display_width (1.7.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  bcdice (~> 3.0.0)
   puma (~> 4.3)
   rack-test (~> 1.1)
   rake (~> 13.0)
@@ -64,6 +69,7 @@ DEPENDENCIES
   sinatra-contrib (~> 2.0)
   sinatra-jsonp (~> 0.5.0)
   test-unit (~> 3.3)
+  tomlrb
 
 BUNDLED WITH
    2.1.4

Rakefile

@@ -7,11 +7,19 @@ desc 'Run test-unit based test'
 Rake::TestTask.new do |t|
   # To run test for only one file (or file path pattern)
   #  $ bundle exec rake test TEST=test/test_specified_path.rb
-  t.libs += ['lib', 'bcdice/src']
+  t.libs += ['lib']
   t.test_files = Dir['test/test_*.rb']
   t.verbose = true
 end
 
+namespace :test do
+  Rake::TestTask.new(:v2) do |t|
+    t.libs += ['lib']
+    t.test_files = ['test/test_api_v2.rb', 'test/test_dicebot_v2.rb']
+    t.verbose = true
+  end
+end
+
 RuboCop::RakeTask.new
 
 Rake::Task[:test].enhance do

bcdice

@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
 $LOAD_PATH.unshift __dir__
-$LOAD_PATH.unshift File.join(__dir__, 'bcdice', 'src')
 $LOAD_PATH.unshift File.join(__dir__, 'lib')
 
 require 'bcdice_api'
 
-run BCDiceAPI::App
+run BCDiceAPI::APP