docomo-nlu 0.3.0 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a7160a35e83951bb8d620ba68f8ed6dac84aaf28717fdfe5b9ec94bd4472d5ae
-  data.tar.gz: e58737142a01788cc21ad87d4d5001a4030c071f990de402065602b4d4f4dd69
+  metadata.gz: 4b8be4d441eb05dc82ec2d8055752ce0f1d13ca6bfc561ffb3377b1c2e72b839
+  data.tar.gz: ef4b3d0b4ead8af82f02acf2038c7acf145a4296899d17e41aae8339aa6314cd
 SHA512:
-  metadata.gz: 1664eaa4599b346b9ce68e7a5c896d0f9c09bfb62f2e8984ddec6f1b4cbbe379fadaee107d5acf93bc4c526d56b25f59fcf5a73f31798a267e2b91b49d462ff8
-  data.tar.gz: 96c21acf02f8be39adfb14f01cc1c87e908503976a0b811cf26fdbb36aa5f232a9d2bf6ecfaba6350bab03af41437d8b465041195fcb4e5ecbbe07df0c8d13e8
+  metadata.gz: 2f91ab268d4dda942121bc3487bdca95c110f703b6f030f099947b40136a9b2e395b026c73bf59fc169b2ffe786d6058d6651b4e8344f6b514c4948c2f031689
+  data.tar.gz: 7dbfd55ec853ffdba9f1feb8a71e996805a9c3d07ee7f4daf3552690f40bc707fd5100bba9e9327522f26f48745a5965938dd857065c0d8814a5612843aa2fd2

data/.rubocop.rspec.yml

@@ -60,3 +60,8 @@ RSpec/NestedGroups:
 # ブロックの方が見た目がスッキリして見やすいので、どちらでもお好きにどうぞ。
 RSpec/ReturnFromStub:
   Enabled: false
+
+# 明示的なブロック構文の使用を推奨しているがsubjectの活用が減る可能性があるので
+# 暗黙的なブロック構文を許可する
+RSpec/ImplicitBlockExpectation:
+  Enabled: false 

data/.rubocop.ruby.yml

@@ -29,12 +29,12 @@ Layout/ExtraSpacing:
 # special_inside_parentheses (default) と比べて
 # * 横に長くなりづらい
 # * メソッド名の長さが変わったときに diff が少ない
-Layout/IndentFirstArrayElement:
+Layout/FirstArrayElementIndentation:
   EnforcedStyle: consistent
 
 # ({ と hash を開始した場合に ( の位置にインデントさせる
 # そもそも {} が必要ない可能性が高いが Style/BracesAroundHashParameters はチェックしないことにしたので
-Layout/IndentFirstHashElement:
+Layout/FirstHashElementIndentation:
   EnforcedStyle: consistent
 
 # private/protected は一段深くインデントする
@@ -129,7 +129,7 @@ Metrics/CyclomaticComplexity:
 # * 警告 120文字
 # * 禁止 160文字
 # のイメージ
-Metrics/LineLength:
+Layout/LineLength:
   Max: 160
   Exclude:
     - "db/migrate/*.rb"
@@ -149,7 +149,7 @@ Metrics/PerceivedComplexity:
 
 # has_ から始まるメソッドは許可する
 Naming/PredicateName:
-  NamePrefixBlacklist:
+  ForbiddenPrefixes:
     - "is_"
     - "have_"
   NamePrefix:
@@ -160,7 +160,7 @@ Naming/PredicateName:
 # n(umber) といった 1 文字変数は頻出するし、前置詞(by, to, ...)や
 # よく知られた省略語 (op: operator とか pk: primary key とか) も妥当。
 # 変数 s にどんな文字列かを形容したい場合と、不要な場合とがある＝無効
-Naming/UncommunicativeMethodParamName:
+Naming/MethodParameterName:
   Enabled: false
 
 #################### Performance ###########################
@@ -202,10 +202,6 @@ Style/BlockDelimiters:
   Exclude:
     - "spec/**/*_spec.rb"
 
-# option 等、明示的にハッシュにした方が分かりやすい場合もある
-Style/BracesAroundHashParameters:
-  Enabled: false
-
 # scope が違うとか親 module の存在確認が必要とかデメリットはあるが、
 # namespace 付きのクラスはかなり頻繁に作るので簡単に書きたい。
 Style/ClassAndModuleChildren:

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    docomo-nlu (0.3.0)
-      activeresource (~> 5.0.0)
+    docomo-nlu (0.3.6)
+      activeresource (>= 5.0, < 5.2)
       bundler
       faraday
       rake
@@ -11,201 +11,191 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.2.3)
-      actionpack (= 5.2.3)
+    actioncable (5.2.6)
+      actionpack (= 5.2.6)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailer (5.2.3)
-      actionpack (= 5.2.3)
-      actionview (= 5.2.3)
-      activejob (= 5.2.3)
+    actionmailer (5.2.6)
+      actionpack (= 5.2.6)
+      actionview (= 5.2.6)
+      activejob (= 5.2.6)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.2.3)
-      actionview (= 5.2.3)
-      activesupport (= 5.2.3)
-      rack (~> 2.0)
+    actionpack (5.2.6)
+      actionview (= 5.2.6)
+      activesupport (= 5.2.6)
+      rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.3)
-      activesupport (= 5.2.3)
+    actionview (5.2.6)
+      activesupport (= 5.2.6)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.2.3)
-      activesupport (= 5.2.3)
+    activejob (5.2.6)
+      activesupport (= 5.2.6)
       globalid (>= 0.3.6)
-    activemodel (5.2.3)
-      activesupport (= 5.2.3)
+    activemodel (5.2.6)
+      activesupport (= 5.2.6)
     activemodel-serializers-xml (1.0.2)
       activemodel (> 5.x)
       activesupport (> 5.x)
       builder (~> 3.1)
-    activerecord (5.2.3)
-      activemodel (= 5.2.3)
-      activesupport (= 5.2.3)
+    activerecord (5.2.6)
+      activemodel (= 5.2.6)
+      activesupport (= 5.2.6)
       arel (>= 9.0)
-    activeresource (5.0.0)
-      activemodel (>= 5.0, < 6)
+    activeresource (5.1.1)
+      activemodel (>= 5.0, < 7)
       activemodel-serializers-xml (~> 1.0)
-      activesupport (>= 5.0, < 6)
-    activestorage (5.2.3)
-      actionpack (= 5.2.3)
-      activerecord (= 5.2.3)
-      marcel (~> 0.3.1)
-    activesupport (5.2.3)
+      activesupport (>= 5.0, < 7)
+    activestorage (5.2.6)
+      actionpack (= 5.2.6)
+      activerecord (= 5.2.6)
+      marcel (~> 1.0.0)
+    activesupport (5.2.6)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    addressable (2.6.0)
-      public_suffix (>= 2.0.2, < 4.0)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
     arel (9.0.0)
     ast (2.4.0)
-    axiom-types (0.1.1)
-      descendants_tracker (~> 0.0.4)
-      ice_nine (~> 0.11.0)
-      thread_safe (~> 0.3, >= 0.3.1)
-    builder (3.2.3)
-    codeclimate-engine-rb (0.4.1)
-      virtus (~> 1.0)
+    builder (3.2.4)
     coderay (1.1.2)
-    coercible (1.0.0)
-      descendants_tracker (~> 0.0.1)
-    concurrent-ruby (1.1.5)
+    concurrent-ruby (1.1.8)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
-    crass (1.0.4)
-    descendants_tracker (0.0.4)
-      thread_safe (~> 0.3, >= 0.3.1)
+    crass (1.0.6)
     diff-lcs (1.3)
-    equalizer (0.0.11)
-    erubi (1.8.0)
-    faraday (0.15.4)
+    erubi (1.10.0)
+    faraday (1.4.1)
+      faraday-excon (~> 1.1)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.1)
       multipart-post (>= 1.2, < 3)
+      ruby2_keywords (>= 0.0.4)
+    faraday-excon (1.1.0)
+    faraday-net_http (1.0.1)
+    faraday-net_http_persistent (1.1.0)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
-    hashdiff (1.0.0)
-    i18n (1.6.0)
+    hashdiff (1.0.1)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
-    ice_nine (0.11.2)
-    jaro_winkler (1.5.3)
     kwalify (0.7.2)
-    loofah (2.2.3)
+    loofah (2.9.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
-    marcel (0.3.3)
-      mimemagic (~> 0.3.2)
+    marcel (1.0.1)
     method_source (0.9.2)
-    mimemagic (0.3.3)
-    mini_mime (1.0.2)
-    mini_portile2 (2.4.0)
-    minitest (5.11.3)
+    mini_mime (1.1.0)
+    mini_portile2 (2.5.1)
+    minitest (5.14.4)
     multipart-post (2.1.1)
-    nio4r (2.4.0)
-    nokogiri (1.10.4)
-      mini_portile2 (~> 2.4.0)
-    parallel (1.17.0)
-    parser (2.6.3.0)
+    nio4r (2.5.7)
+    nokogiri (1.11.4)
+      mini_portile2 (~> 2.5.0)
+      racc (~> 1.4)
+    parallel (1.19.1)
+    parser (2.7.1.2)
       ast (~> 2.4.0)
     pry (0.11.3)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
     psych (3.1.0)
-    public_suffix (3.1.1)
-    rack (2.0.7)
+    public_suffix (4.0.5)
+    racc (1.5.2)
+    rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (5.2.3)
-      actioncable (= 5.2.3)
-      actionmailer (= 5.2.3)
-      actionpack (= 5.2.3)
-      actionview (= 5.2.3)
-      activejob (= 5.2.3)
-      activemodel (= 5.2.3)
-      activerecord (= 5.2.3)
-      activestorage (= 5.2.3)
-      activesupport (= 5.2.3)
+    rails (5.2.6)
+      actioncable (= 5.2.6)
+      actionmailer (= 5.2.6)
+      actionpack (= 5.2.6)
+      actionview (= 5.2.6)
+      activejob (= 5.2.6)
+      activemodel (= 5.2.6)
+      activerecord (= 5.2.6)
+      activestorage (= 5.2.6)
+      activesupport (= 5.2.6)
       bundler (>= 1.3.0)
-      railties (= 5.2.3)
+      railties (= 5.2.6)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.2.0)
-      loofah (~> 2.2, >= 2.2.2)
-    railties (5.2.3)
-      actionpack (= 5.2.3)
-      activesupport (= 5.2.3)
+    rails-html-sanitizer (1.3.0)
+      loofah (~> 2.3)
+    railties (5.2.6)
+      actionpack (= 5.2.6)
+      activesupport (= 5.2.6)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.19.0, < 2.0)
     rainbow (3.0.0)
-    rake (12.3.3)
-    reek (5.4.0)
-      codeclimate-engine-rb (~> 0.4.0)
+    rake (13.0.3)
+    reek (6.0.0)
       kwalify (~> 0.7.0)
-      parser (>= 2.5.0.0, < 2.7, != 2.5.1.1)
+      parser (>= 2.5.0.0, < 2.8, != 2.5.1.1)
       psych (~> 3.1.0)
       rainbow (>= 2.0, < 4.0)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.2)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.4)
+    rexml (3.2.5)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.2)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.1)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.2)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.3)
     rspec_junit_formatter (0.4.1)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (0.74.0)
-      jaro_winkler (~> 1.5.1)
+    rubocop (0.83.0)
       parallel (~> 1.10)
-      parser (>= 2.6)
+      parser (>= 2.7.0.1)
       rainbow (>= 2.2.2, < 4.0)
+      rexml
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 1.7)
-    rubocop-performance (1.4.1)
+      unicode-display_width (>= 1.4.0, < 2.0)
+    rubocop-performance (1.5.2)
       rubocop (>= 0.71.0)
-    rubocop-rspec (1.34.1)
+    rubocop-rspec (1.35.0)
       rubocop (>= 0.60.0)
     ruby-progressbar (1.10.1)
-    rubyzip (1.2.3)
+    ruby2_keywords (0.0.4)
+    rubyzip (2.3.0)
     safe_yaml (1.0.5)
-    sprockets (3.7.2)
+    sprockets (4.0.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.2.1)
+    sprockets-rails (3.2.2)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    thor (0.20.3)
+    thor (1.1.0)
     thread_safe (0.3.6)
-    tzinfo (1.2.5)
+    tzinfo (1.2.9)
       thread_safe (~> 0.1)
-    unicode-display_width (1.6.0)
-    vcr (4.0.0)
-    virtus (1.0.5)
-      axiom-types (~> 0.1)
-      coercible (~> 1.0)
-      descendants_tracker (~> 0.0, >= 0.0.3)
-      equalizer (~> 0.0, >= 0.0.9)
-    webmock (3.4.2)
+    unicode-display_width (1.7.0)
+    vcr (5.1.0)
+    webmock (3.5.1)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
-    websocket-driver (0.7.1)
+    websocket-driver (0.7.3)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.4)
+    websocket-extensions (0.1.5)
 
 PLATFORMS
   ruby
@@ -213,15 +203,15 @@ PLATFORMS
 DEPENDENCIES
   docomo-nlu!
   pry (~> 0.11.3)
-  rails
+  rails (~> 5.2.5)
   reek
   rspec
   rspec_junit_formatter
   rubocop
   rubocop-performance
-  rubocop-rspec (~> 1.34.0)
-  vcr (~> 4.0.0)
-  webmock (~> 3.4.2)
+  rubocop-rspec (~> 1.35.0)
+  vcr (~> 5.1.0)
+  webmock (~> 3.5.0)
 
 BUNDLED WITH
-   2.0.2
+   2.1.4

data/docomo-nlu.gemspec

@@ -23,19 +23,19 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) {|f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "activeresource", "~> 5.0.0"
+  spec.add_dependency "activeresource", ">= 5.0", "< 5.2"
   spec.add_dependency "bundler"
   spec.add_dependency "faraday"
   spec.add_dependency "rake"
   spec.add_dependency "rubyzip"
   spec.add_development_dependency "pry", "~> 0.11.3"
-  spec.add_development_dependency "rails"
+  spec.add_development_dependency "rails", "~> 5.2.5"
   spec.add_development_dependency "reek"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "rspec_junit_formatter"
   spec.add_development_dependency "rubocop"
   spec.add_development_dependency "rubocop-performance"
-  spec.add_development_dependency "rubocop-rspec", "~> 1.34.0"
-  spec.add_development_dependency "vcr", "~> 4.0.0"
-  spec.add_development_dependency "webmock", "~> 3.4.2"
+  spec.add_development_dependency "rubocop-rspec", "~> 1.35.0"
+  spec.add_development_dependency "vcr", "~> 5.1.0"
+  spec.add_development_dependency "webmock", "~> 3.5.0"
 end

data/lib/docomo_nlu/management.rb

@@ -15,6 +15,7 @@ module DocomoNlu
     autoload :Map,                "docomo_nlu/management/map"
     autoload :NGWord,             "docomo_nlu/management/ng_word"
     autoload :OKWord,             "docomo_nlu/management/ok_word"
+    autoload :OKNGBase,           "docomo_nlu/management/ok_ng_base"
     autoload :OrganizationMember, "docomo_nlu/management/organization_member"
     autoload :Organization,       "docomo_nlu/management/organization"
     autoload :PredicateName,      "docomo_nlu/management/predicate_name"

data/lib/docomo_nlu/management/aiml_base.rb

@@ -37,7 +37,7 @@ module DocomoNlu
 
       def transfer
         prefix_options[:bot_id] ||= botId
-        self.class.deploy_request(prefix_options)
+        self.class.transfer(prefix_options)
       end
 
       def deploy