docomo-nlu 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be0992dbc17ee8aa7bf5e318aaffc30fbf6c02a74532cfb95472024c02d05cad
-  data.tar.gz: 37f893a276fc8802179fb92a7185020383ff86b810e288e39fb413fce65939ca
+  metadata.gz: bfefc9978ca4f4524565449b0b6d0ce2d5b211c5e1ebe480551bd7f529a85d5b
+  data.tar.gz: b1c827c8eef22a4d2f7e3e71fa7abc52f9f964b993582b04ec0cd0f8433e0168
 SHA512:
-  metadata.gz: 71b3b71c5372a21f109159a0cd9b1d5479c9ed821a51631e95fed25859c2256594f4941ef687bb1f0b7468db811a993aa9e1fc7bf932705fd65058f5378b2c4c
-  data.tar.gz: 3217c40edc57be77eceebfed1a70c772ff05bbec494c32ff4424a8ee567fcc8f5f8e07b7061b8a2c7df25ef31c35f385f207c0f78fc9096b1a371596cb67a533
+  metadata.gz: 02b86bf251baacf2408efa3d22841a5e9f0daf79f78972f049360ea9e658cbfb1972181b5621cb360b5222569f2d0f547354461185bc7b9fb550f3c1afcc5066
+  data.tar.gz: c6cdfe584432532f26f08cf0f61c4576e2bdd56f7182e620b60128b817023d7f6563e79e2d850716e6850fe867eaf57678d0f1024d7d0eebd282fb0b35fe9cb7

data/.reek

@@ -0,0 +1,97 @@
+---
+### enabled rules
+TooManyInstanceVariables:
+  enabled: true
+  exclude: []
+  max_instance_variables: 50
+TooManyMethods:
+  enabled: true
+  exclude: []
+  max_methods: 30
+TooManyStatements:
+  enabled: true
+  exclude: []
+  max_statements: 80
+TooManyConstants:
+  enabled: true
+  exclude: []
+  max_constants: 50
+LongParameterList:
+  enabled: true
+  exclude: []
+  max_params: 8
+LongYieldList:
+  enabled: true
+  exclude: []
+  max_params: 8
+NestedIterators:
+  enabled: true
+  exclude: []
+  max_allowed_nesting: 5
+  ignore_iterators:
+  - tap
+ModuleInitialize:
+  enabled: true
+  exclude: []
+SubclassedFromCoreClass:
+  enabled: true
+  exclude: []
+
+### unanabled rules
+Attribute:
+  enabled: false
+  exclude: []
+BooleanParameter:
+  enabled: false
+  exclude: []
+ClassVariable:
+  enabled: false
+  exclude: []
+ControlParameter:
+  enabled: false
+  exclude: []
+DataClump:
+  enabled: false
+  exclude: []
+DuplicateMethodCall:
+  enabled: false
+  exclude: []
+FeatureEnvy:
+  enabled: false
+  exclude: []
+InstanceVariableAssumption:
+  enabled: false
+  exclude: []
+IrresponsibleModule:
+  enabled: false
+  exclude: []
+ManualDispatch:
+  enabled: false
+  exclude: []
+NilCheck:
+  enabled: false
+  exclude: []
+PrimaDonnaMethod:
+  enabled: false
+  exclude: []
+RepeatedConditional:
+  enabled: false
+  exclude: []
+UncommunicativeMethodName:
+  enabled: false
+  exclude: []
+UncommunicativeModuleName:
+  enabled: false
+  exclude: []
+UncommunicativeParameterName:
+  enabled: false
+  exclude: []
+UncommunicativeVariableName:
+  enabled: false
+  exclude: []
+UnusedParameters:
+  enabled: false
+  exclude: []
+UtilityFunction:
+  enabled: false
+  exclude: []

data/.rubocop.yml

@@ -8,8 +8,6 @@ AllCops:
   TargetRubyVersion: 2.5
   # If you use RuboCop with Ruby on Rails, specify TargetRailsVersion(default: 5.0).
   TargetRailsVersion: 5.1
-  Include:
-    - rubocop-rspec
 Rails:
   # If you use RuboCop with Ruby on Rails, turn on this option.
   Enabled: true
@@ -17,16 +15,7 @@ Naming/FileName:
   Exclude:
     - "Gemfile"
     - "Rakefile"
-    - "Guardfile"
 Rails/HasManyOrHasOneDependent:
   Enabled: false
-Rails/OutputSafety:
-  Exclude:
-    - "app/views/kaminari/**/*"
-    - "app/views/admin/kaminari/**/*"
 Rails/SaveBang:
-  Enabled: false
-
-Rails/LexicallyScopedActionFilter:
-  Exclude:
-    - "app/controllers/concerns/main_agent_instance.rb"
+  Enabled: false

data/Gemfile

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
+git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
 
 # Specify your gem's dependencies in docomo-nlu.gemspec
 gemspec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    docomo-nlu (0.1.2)
+    docomo-nlu (0.1.3)
       activeresource (~> 5.0.0)
       bundler
       faraday
@@ -63,22 +63,35 @@ GEM
       public_suffix (>= 2.0.2, < 4.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)
     coderay (1.1.2)
+    coercible (1.0.0)
+      descendants_tracker (~> 0.0.1)
     concurrent-ruby (1.0.5)
     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)
     diff-lcs (1.3)
+    equalizer (0.0.11)
     erubi (1.7.1)
-    faraday (0.15.2)
+    faraday (0.15.3)
       multipart-post (>= 1.2, < 3)
     globalid (0.4.1)
       activesupport (>= 4.2.0)
     hashdiff (0.3.7)
     i18n (1.1.0)
       concurrent-ruby (~> 1.0)
+    ice_nine (0.11.2)
     jaro_winkler (1.5.1)
+    kwalify (0.7.2)
     loofah (2.2.2)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
@@ -135,6 +148,11 @@ GEM
       thor (>= 0.19.0, < 2.0)
     rainbow (3.0.0)
     rake (12.3.1)
+    reek (5.0.2)
+      codeclimate-engine-rb (~> 0.4.0)
+      kwalify (~> 0.7.0)
+      parser (>= 2.5.0.0, < 2.6, != 2.5.1.1)
+      rainbow (>= 2.0, < 4.0)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
       rspec-expectations (~> 3.8.0)
@@ -173,6 +191,11 @@ GEM
       thread_safe (~> 0.1)
     unicode-display_width (1.4.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)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
@@ -189,6 +212,7 @@ DEPENDENCIES
   onkcop
   pry (~> 0.11.3)
   rails
+  reek
   rspec
   rubocop (~> 0.58.2)
   vcr (~> 4.0.0)

data/Rakefile

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'bundler/gem_tasks'
-require 'rspec/core/rake_task'
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
 
 RSpec::Core::RakeTask.new(:spec)
 

data/docomo-nlu.gemspec

@@ -1,37 +1,38 @@
 # frozen_string_literal: true
 
-lib = File.expand_path('lib', __dir__)
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'docomo-nlu/version'
+require "docomo-nlu/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = 'docomo-nlu'
+  spec.name          = "docomo-nlu"
   spec.version       = DocomoNlu::VERSION
-  spec.authors       = ['Koji Yamazaki']
-  spec.email         = ['kouji.yamazaki.cv@nttdocomo.com']
+  spec.authors       = ["Koji Yamazaki"]
+  spec.email         = ["kouji.yamazaki.cv@nttdocomo.com"]
 
-  spec.summary       = 'API Client of docomo NLPManagementAPI for ruby.'
-  spec.description   = 'API Client of docomo NLPManagementAPI for ruby.'
-  spec.homepage      = 'https://github.com/jagrament/docomo-nlu'
+  spec.summary       = "API Client of docomo NLPManagementAPI for ruby."
+  spec.description   = "API Client of docomo NLPManagementAPI for ruby."
+  spec.homepage      = "https://github.com/jagrament/docomo-nlu"
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
   spec.files = Dir.chdir(File.expand_path(__dir__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+    `git ls-files -z`.split("\x0").reject {|f| f.match(%r{^(test|spec|features)/}) }
   end
-  spec.bindir        = 'exe'
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ['lib']
+  spec.bindir        = "exe"
+  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 'bundler'
-  spec.add_dependency 'faraday'
-  spec.add_dependency 'rake'
-  spec.add_development_dependency 'rails'
-  spec.add_development_dependency 'rspec'
-  spec.add_development_dependency 'onkcop'
-  spec.add_development_dependency 'pry', '~> 0.11.3'
-  spec.add_development_dependency 'rubocop', '~> 0.58.2'
-  spec.add_development_dependency 'vcr', '~> 4.0.0'
-  spec.add_development_dependency 'webmock', '~> 3.4.2'
+  spec.add_dependency "activeresource", "~> 5.0.0"
+  spec.add_dependency "bundler"
+  spec.add_dependency "faraday"
+  spec.add_dependency "rake"
+  spec.add_development_dependency "onkcop"
+  spec.add_development_dependency "pry", "~> 0.11.3"
+  spec.add_development_dependency "rails"
+  spec.add_development_dependency "reek"
+  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "rubocop", "~> 0.58.2"
+  spec.add_development_dependency "vcr", "~> 4.0.0"
+  spec.add_development_dependency "webmock", "~> 3.4.2"
 end

data/lib/docomo-nlu/config.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'active_support/configurable'
+require "active_support/configurable"
 module DocomoNlu
   def self.configure
     yield @config ||= DocomoNlu::Configuration.new
@@ -18,8 +18,8 @@ module DocomoNlu
   end
 
   configure do |config|
-    config.nlu_host = ''
-    config.nlu_version = ''
-    config.admin_access_token = ''
+    config.nlu_host = ""
+    config.nlu_version = ""
+    config.admin_access_token = ""
   end
 end

data/lib/docomo-nlu/management/account.rb

@@ -3,7 +3,7 @@
 module DocomoNlu
   module Management
     class Account < Base
-      self.element_name = 'accounts'
+      self.element_name = "accounts"
       self.prefix = "/management/#{DocomoNlu.config.nlu_version}/"
 
       # Parameter for create
@@ -17,14 +17,14 @@ module DocomoNlu
 
       def self.count
         response_body = JSON.parse(connection.get("#{prefix}#{element_name}/count", headers).body)
-        response_body['count']
+        response_body["count"]
       end
 
       def to_json(options = {})
-        attributes.delete('accountId')
-        attributes.delete('createDate')
-        attributes.delete('loginDate')
-        attributes.delete('id')
+        attributes.delete("accountId")
+        attributes.delete("createDate")
+        attributes.delete("loginDate")
+        attributes.delete("id")
         super
       end
     end

data/lib/docomo-nlu/management/aiml_base.rb

@@ -13,17 +13,20 @@
 # Not supported
 # GET /{projectId}/bots/{botId}/archive/aiml
 
-require 'tempfile'
+require "tempfile"
 module DocomoNlu
   module Management
     class AIMLBase < Base
-      def download(extra_path = '')
+      ## For AIML
+
+      def download(extra_path = "")
         prefix_options[:bot_id] ||= botId
         @attributes[:file] = self.class.download(prefix_options, extra_path).file
       end
 
-      def upload(file)
+      def upload(file, type = :aiml)
         prefix_options[:bot_id] ||= botId
+        prefix_options[:method] ||= type
         self.class.upload(file, prefix_options)
       end
 
@@ -42,57 +45,101 @@ module DocomoNlu
         self.class.deploy(prefix_options)
       end
 
+      ## For FAQ
+
+      def upload_userdic(file)
+        prefix_options[:bot_id] ||= botId
+        prefix_options[:method] = "userDic"
+        self.class.upload(file, prefix_options, FAQModel)
+      end
+
+      def upload_stopkey(file)
+        prefix_options[:bot_id] ||= botId
+        prefix_options[:method] = "stopkey"
+        self.class.upload(file, prefix_options, FAQModel)
+      end
+
+      def download_stopkey
+        prefix_options[:bot_id] ||= botId
+        prefix_options[:method] = "stopkey"
+        @attributes[:stopkey] = self.class.download(prefix_options, FAQModel).file
+      end
+
+      def upload_truthlist(file)
+        prefix_options[:bot_id] ||= botId
+        prefix_options[:method] = "truthlist"
+        self.class.upload(file, prefix_options, FAQModel)
+      end
+
+      def download_truthlist
+        prefix_options[:bot_id] ||= botId
+        prefix_options[:method] = "truthlist"
+        @attributes[:truthlist] = self.class.download(prefix_options, FAQModel).file
+      end
+
+      def upload_entry(file)
+        prefix_options[:bot_id] ||= botId
+        prefix_options[:method] = "entry"
+        self.class.upload(file, prefix_options, FAQModel)
+      end
+
+      def check_faq_status(method)
+        prefix_options[:bot_id] ||= botId
+        prefix_options[:method] = method
+        self.class.check_status(:faq, "#{FileModel.collection_path(prefix_options)}/status")
+      end
+
       class << self
-        def download(prefix_options, extra_path = '')
+        def download(prefix_options, extra_path = "", model = FileModel)
           conn = Faraday.new(url: site.to_s, ssl: { verify: false }) do |builder|
             builder.adapter :net_http
           end
-          conn.headers['Authorization'] = access_token
-          response = conn.get("#{FileModel.collection_path(prefix_options)}/#{extra_path}")
+          conn.headers["Authorization"] = access_token
+          response = conn.get("#{model.collection_path(prefix_options)}/#{extra_path}")
 
           if check_response(response)
             instantiate_record({}, prefix_options).tap do |record|
-              record.file = Tempfile.open(['docomo-nlu', ".#{prefix_options[:method].to_s.gsub(/archive/, 'zip')}"]) do |f|
-                f.write response.body
+              record.file = Tempfile.open(["docomo-nlu", ".#{prefix_options[:method].to_s.gsub(/archive/, "zip")}"]) do |f|
+                f.write response.body.force_encoding("UTF-8")
                 f
               end
             end
           end
         end
 
-        def upload(file, prefix_options)
+        def upload(file, prefix_options, model = FileModel)
           conn = Faraday.new(url: site.to_s, ssl: { verify: false }) do |builder|
             builder.request :multipart # マルチパートでデータを送信
             builder.request :url_encoded
             builder.adapter :net_http
           end
-          conn.headers['Authorization'] = access_token
+          conn.headers["Authorization"] = access_token
           params = {
-            uploadFile: Faraday::UploadIO.new(file.path, 'text/plain')
+            uploadFile: Faraday::UploadIO.new(file.path, "text/plain"),
           }
-          response = conn.put FileModel.collection_path(prefix_options), params
+          response = conn.put model.collection_path(prefix_options), params
           check_response(response)
         end
 
         def compile(prefix_options)
-          return if deploy_request(:compile, prefix_options)  != ''
+          return if deploy_request(:compile, prefix_options)  != ""
         end
 
         def transfer(prefix_options)
-          return if deploy_request(:transfer, prefix_options) != ''
+          return if deploy_request(:transfer, prefix_options) != ""
         end
 
         def deploy_request(method, prefix_options)
-          response_body = JSON.parse(connection.post(Scenario.element_path(method, prefix_options), '', headers).body)
+          response_body = JSON.parse(connection.post(Scenario.element_path(method, prefix_options), "", headers).body)
           # Sometimes, API returns wrong url, replace correct path.
-          URI.parse(response_body['statusUri']).path.gsub!(/NLPManagementAPI/, "management/#{DocomoNlu.config.nlu_version}")
+          URI.parse(response_body["statusUri"]).path.gsub!(/NLPManagementAPI/, "management/#{DocomoNlu.config.nlu_version}")
         end
 
         def deploy(prefix_options)
           # compile and status check
           compile_status = false
           check_path = deploy_request(:compile, prefix_options)
-          while check_path && compile_status != 'Completed'
+          while check_path && compile_status != "Completed"
             sleep(0.2)
             compile_status = check_status(:compile, check_path)
             raise ActiveResource::ServerError if %w[ErrorFinish NotCompiled].include?(compile_status)
@@ -101,7 +148,7 @@ module DocomoNlu
           # transfer and status check
           transfer_status = false
           check_path = deploy_request(:transfer, prefix_options)
-          while check_path && transfer_status != 'Completed'
+          while check_path && transfer_status != "Completed"
             sleep(0.2)
             transfer_status = check_status(:transfer, check_path)
             raise ActiveResource::ServerError if %w[ErrorFinish NotTransfered].include?(transfer_status)
@@ -111,16 +158,21 @@ module DocomoNlu
 
         def check_status(method, path)
           case method
-          when :compile   then JSON.parse(connection.get(path, headers).body)['status']
-          when :transfer  then JSON.parse(connection.get(path, headers).body)['transferStatusResponses'][0]['status']
+          when :compile, :faq then JSON.parse(connection.get(path, headers).body)["status"]
+          when :transfer      then JSON.parse(connection.get(path, headers).body)["transferStatusResponses"][0]["status"]
           end
         end
       end
 
       class FileModel < Base
-        self.element_name = ''
+        self.element_name = ""
         self.prefix = "/management/#{DocomoNlu.config.nlu_version}/projects/:project_id/bots/:bot_id/:method"
       end
+
+      class FAQModel < Base
+        self.element_name = ""
+        self.prefix = "/faqmanagement/#{DocomoNlu.config.nlu_version}/projects/:project_id/bots/:bot_id/:method"
+      end
     end
   end
 end

data/lib/docomo-nlu/management/base.rb

@@ -26,13 +26,13 @@ module DocomoNlu
       def login(accountName, password)
         request_body = { accountName: accountName, password: password }.to_json
         response_body = JSON.parse(connection.post("/management/#{DocomoNlu.config.nlu_version}/login", request_body, self.class.headers).body)
-        self.access_token = response_body['accessToken']
+        self.access_token = response_body["accessToken"]
       end
 
       ## Delete NLPManagement's AccessToken.
       def logout
         res = connection.get("/management/#{DocomoNlu.config.nlu_version}/logout", self.class.headers) if access_token.present?
-        raise ActiveResource::BadRequest, 'Invalid access token' unless res
+        raise ActiveResource::BadRequest, "Invalid access token" unless res
 
         self.access_token = nil
         true
@@ -40,7 +40,7 @@ module DocomoNlu
 
       ## Override. Insert generated id to parameter 'id' after save or create
       def id_from_response(response)
-        ActiveSupport::JSON.decode(response.body)["#{self.class.to_s.split('::').last.downcase!}Id"] if response.body.present?
+        ActiveSupport::JSON.decode(response.body)["#{self.class.to_s.split("::").last.downcase!}Id"] if response.body.present?
       end
 
       class << self
@@ -59,14 +59,14 @@ module DocomoNlu
 
         def instantiate_record(record, prefix_options = {})
           record = record[0] if record.is_a?(Array)
-          resource_id = record["#{to_s.split('::').last.downcase!}Id"]
-          record['id'] = resource_id if resource_id
+          resource_id = record["#{to_s.split("::").last.downcase!}Id"]
+          record["id"] = resource_id if resource_id
           super
         end
 
         def headers
           new_headers = static_headers.clone
-          new_headers['Authorization'] = access_token
+          new_headers["Authorization"] = access_token
           new_headers
         end
 

data/lib/docomo-nlu/management/bot.rb

@@ -3,7 +3,7 @@
 module DocomoNlu
   module Management
     class Bot < AIMLBase
-      self.element_name = 'bots'
+      self.element_name = "bots"
       self.prefix = "/management/#{DocomoNlu.config.nlu_version}/projects/:project_id/"
 
       # Parameter for create

data/lib/docomo-nlu/management/config.rb

@@ -3,7 +3,7 @@
 module DocomoNlu
   module Management
     class Config < Base
-      self.element_name = 'configs'
+      self.element_name = "configs"
       self.prefix = "/management/#{DocomoNlu.config.nlu_version}/projects/:project_id/bots/:bot_id/"
 
       # {
@@ -17,7 +17,7 @@ module DocomoNlu
       # }
 
       def destroy(keys)
-        self.id = keys.join(',')
+        self.id = keys.join(",")
         super()
       end
     end

data/lib/docomo-nlu/management/default_predicate.rb

@@ -3,11 +3,11 @@
 module DocomoNlu
   module Management
     class DefaultPredicate < Base
-      self.element_name = 'defaultPredicates'
+      self.element_name = "defaultPredicates"
       self.prefix = "/management/#{DocomoNlu.config.nlu_version}/projects/:project_id/bots/:bot_id/"
 
       def destroy(keys)
-        self.id = keys.join(',')
+        self.id = keys.join(",")
         super()
       end
     end

data/lib/docomo-nlu/management/map.rb

@@ -3,7 +3,7 @@
 module DocomoNlu
   module Management
     class Map < MultipartBase
-      self.element_name = 'maps'
+      self.element_name = "maps"
       self.prefix = "/management/#{DocomoNlu.config.nlu_version}/projects/:project_id/bots/:bot_id/"
     end
   end

data/lib/docomo-nlu/management/multipart_base.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'tempfile'
+require "tempfile"
 module DocomoNlu
   module Management
     class MultipartBase < Base
@@ -16,7 +16,7 @@ module DocomoNlu
       class << self
         def create(file, prefix_options)
           check_prefix_options(prefix_options)
-          raise ActiveResource::BadRequest, '' unless file.instance_of?(File)
+          raise ActiveResource::BadRequest, "" unless file.instance_of?(File)
 
           upload(file, prefix_options)
         end
@@ -36,6 +36,7 @@ module DocomoNlu
 
         def where(clauses = {})
           raise ArgumentError, "expected a clauses Hash, got #{clauses.inspect}" unless clauses.is_a? Hash
+
           category = clauses[:category]
           find(category, params: clauses)
         end
@@ -43,19 +44,19 @@ module DocomoNlu
         private
 
         def download(category = nil, prefix_options)
-          extention = category.blank? ? '.zip' : '.map'
+          extention = category.blank? ? ".zip" : ".map"
 
           conn = Faraday.new(url: site.to_s, ssl: { verify: false }) do |builder|
             builder.adapter :net_http
           end
-          conn.headers['Authorization'] = access_token
+          conn.headers["Authorization"] = access_token
 
           response = conn.get(element_path(category, prefix_options))
 
           if check_response(response)
             instantiate_record({}, prefix_options).tap do |record|
-              record.file = Tempfile.open(['docomo-nlu', extention]) do |f|
-                f.write response.body
+              record.file = Tempfile.open(["docomo-nlu", extention]) do |f|
+                f.write response.body.force_encoding("UTF-8")
                 f
               end
               record.category = category
@@ -69,9 +70,9 @@ module DocomoNlu
             builder.request :url_encoded
             builder.adapter :net_http
           end
-          conn.headers['Authorization'] = access_token
+          conn.headers["Authorization"] = access_token
           params = {
-            uploadFile: Faraday::UploadIO.new(file.path, 'text/plain')
+            uploadFile: Faraday::UploadIO.new(file.path, "text/plain"),
           }
           response = conn.put collection_path(prefix_options), params
           check_response(response)

data/lib/docomo-nlu/management/ng_word.rb

@@ -3,7 +3,7 @@
 module DocomoNlu
   module Management
     class NGWord < Base
-      self.element_name = 'ngWords'
+      self.element_name = "ngWords"
       self.prefix = "/management/#{DocomoNlu.config.nlu_version}/projects/:project_id/bots/:bot_id/"
     end
   end

data/lib/docomo-nlu/management/ok_word.rb

@@ -3,7 +3,7 @@
 module DocomoNlu
   module Management
     class OKWord < Base
-      self.element_name = 'okWords'
+      self.element_name = "okWords"
       self.prefix = "/management/#{DocomoNlu.config.nlu_version}/projects/:project_id/bots/:bot_id/"
     end
   end

data/lib/docomo-nlu/management/organization.rb

@@ -3,7 +3,7 @@
 module DocomoNlu
   module Management
     class Organization < Base
-      self.element_name = 'organizations'
+      self.element_name = "organizations"
       self.prefix = "/management/#{DocomoNlu.config.nlu_version}/"
 
       # Parameter create
@@ -14,8 +14,8 @@ module DocomoNlu
       # }
 
       def to_json(options = {})
-        attributes.delete('organizationId')
-        attributes.delete('id')
+        attributes.delete("organizationId")
+        attributes.delete("id")
         super
       end
     end

data/lib/docomo-nlu/management/organization_member.rb

@@ -3,7 +3,7 @@
 module DocomoNlu
   module Management
     class OrganizationMember < Base
-      self.element_name = 'members'
+      self.element_name = "members"
       self.prefix = "/management/#{DocomoNlu.config.nlu_version}/organizations/:organization_id/"
 
       def destroy

data/lib/docomo-nlu/management/predicate_name.rb

@@ -3,11 +3,11 @@
 module DocomoNlu
   module Management
     class PredicateName < Base
-      self.element_name = 'predicateNames'
+      self.element_name = "predicateNames"
       self.prefix = "/management/#{DocomoNlu.config.nlu_version}/projects/:project_id/bots/:bot_id/"
 
       def destroy(keys)
-        self.id = keys.join(',')
+        self.id = keys.join(",")
         super()
       end
     end

data/lib/docomo-nlu/management/project.rb

@@ -3,7 +3,7 @@
 module DocomoNlu
   module Management
     class Project < Base
-      self.element_name = 'projects'
+      self.element_name = "projects"
       self.prefix = "/management/#{DocomoNlu.config.nlu_version}/"
 
       # Parameter for create

data/lib/docomo-nlu/management/project_member.rb

@@ -3,7 +3,7 @@
 module DocomoNlu
   module Management
     class ProjectMember < Base
-      self.element_name = 'members'
+      self.element_name = "members"
       self.prefix = "/management/#{DocomoNlu.config.nlu_version}/projects/:project_id/"
 
       def destroy

data/lib/docomo-nlu/management/property.rb

@@ -3,7 +3,7 @@
 module DocomoNlu
   module Management
     class Property < Base
-      self.element_name = 'properties'
+      self.element_name = "properties"
       self.prefix = "/management/#{DocomoNlu.config.nlu_version}/projects/:project_id/bots/:bot_id/"
     end
   end

data/lib/docomo-nlu/management/provider.rb

@@ -3,7 +3,7 @@
 module DocomoNlu
   module Management
     class Provider < Base
-      self.element_name = 'providers'
+      self.element_name = "providers"
       self.prefix = "/management/#{DocomoNlu.config.nlu_version}/"
 
       # Parameter for create

data/lib/docomo-nlu/management/scenario.rb

@@ -3,14 +3,25 @@
 module DocomoNlu
   module Management
     class Scenario < AIMLBase
-      self.element_name = 'scenarios'
+      self.element_name = "scenarios"
       self.prefix = "/management/#{DocomoNlu.config.nlu_version}/projects/:project_id/bots/:bot_id/"
 
-      def destroy
-        self.id = userScenarios.map(&:scenarioId).join(',')
+      @permitted_root_param = [:userScenarios,:templateScenarios]
+      @permitted_userScenarios_param = [:scenarioId, :description, :compileFlag]
+
+      def save
+        @attributes.select!{|a| a =~ /(userScenarios|templateScenarios)/}
+        userScenarios.each do |us|
+          us.attributes.select!{|a| a =~ /(scenarioId|description|compileFlag)/}
+        end
         super
       end
 
+      def destroy(scenario_id)
+        self.id = scenario_id
+        super()
+      end
+
       class UserScenarios < Base; end
       class TemplateScenarios < Base; end
     end

data/lib/docomo-nlu/management/scenario_project.rb

@@ -3,7 +3,7 @@
 module DocomoNlu
   module Management
     class ScenarioProject < Base
-      self.element_name = 'scenarioProjects'
+      self.element_name = "scenarioProjects"
       self.prefix = "/management/#{DocomoNlu.config.nlu_version}/"
     end
   end

data/lib/docomo-nlu/management/scenario_util.rb

@@ -3,7 +3,7 @@
 module DocomoNlu
   module Management
     class ScenarioUtil < Base
-      self.element_name = 'scenarioUtils'
+      self.element_name = "scenarioUtils"
       self.prefix = "/management/#{DocomoNlu.config.nlu_version}/"
 
       def normalize
@@ -15,15 +15,15 @@ module DocomoNlu
       end
 
       def save
-        print 'Method not used'
+        print "Method not used"
       end
 
       def destroy
-        print 'Method not used'
+        print "Method not used"
       end
 
       def delete
-        print 'Method not used'
+        print "Method not used"
       end
     end
   end

data/lib/docomo-nlu/management/set.rb

@@ -3,7 +3,7 @@
 module DocomoNlu
   module Management
     class Set < MultipartBase
-      self.element_name = 'sets'
+      self.element_name = "sets"
       self.prefix = "/management/#{DocomoNlu.config.nlu_version}/projects/:project_id/bots/:bot_id/"
     end
   end

data/lib/docomo-nlu/management/task_project.rb

@@ -3,7 +3,7 @@
 module DocomoNlu
   module Management
     class TaskProject < Base
-      self.element_name = 'taskProjects'
+      self.element_name = "taskProjects"
       self.prefix = "/management/#{DocomoNlu.config.nlu_version}/"
 
       # Parameter for create

data/lib/docomo-nlu/management.rb

@@ -2,27 +2,27 @@
 
 module DocomoNlu
   module Management
-    autoload :Account,            'docomo-nlu/management/account'
-    autoload :AIMLBase,           'docomo-nlu/management/aiml_base'
-    autoload :Base,               'docomo-nlu/management/base'
-    autoload :Bot,                'docomo-nlu/management/bot'
-    autoload :Config,             'docomo-nlu/management/config'
-    autoload :DefaultPredicate,   'docomo-nlu/management/default_predicate'
-    autoload :MultipartBase,      'docomo-nlu/management/multipart_base'
-    autoload :Map,                'docomo-nlu/management/map'
-    autoload :NGWord,             'docomo-nlu/management/ng_word'
-    autoload :OKWord,             'docomo-nlu/management/ok_word'
-    autoload :OrganizationMember, 'docomo-nlu/management/organization_member'
-    autoload :Organization,       'docomo-nlu/management/organization'
-    autoload :PredicateName,      'docomo-nlu/management/predicate_name'
-    autoload :ProjectMember,      'docomo-nlu/management/project_member'
-    autoload :Project,            'docomo-nlu/management/project'
-    autoload :Property,           'docomo-nlu/management/property'
-    autoload :Provider,           'docomo-nlu/management/provider'
-    autoload :ScenarioProject,    'docomo-nlu/management/scenario_project'
-    autoload :ScenarioUtil,       'docomo-nlu/management/scenario_util'
-    autoload :Scenario,           'docomo-nlu/management/scenario'
-    autoload :Set,                'docomo-nlu/management/set'
-    autoload :TaskProject,        'docomo-nlu/management/task_project'
+    autoload :Account,            "docomo-nlu/management/account"
+    autoload :AIMLBase,           "docomo-nlu/management/aiml_base"
+    autoload :Base,               "docomo-nlu/management/base"
+    autoload :Bot,                "docomo-nlu/management/bot"
+    autoload :Config,             "docomo-nlu/management/config"
+    autoload :DefaultPredicate,   "docomo-nlu/management/default_predicate"
+    autoload :MultipartBase,      "docomo-nlu/management/multipart_base"
+    autoload :Map,                "docomo-nlu/management/map"
+    autoload :NGWord,             "docomo-nlu/management/ng_word"
+    autoload :OKWord,             "docomo-nlu/management/ok_word"
+    autoload :OrganizationMember, "docomo-nlu/management/organization_member"
+    autoload :Organization,       "docomo-nlu/management/organization"
+    autoload :PredicateName,      "docomo-nlu/management/predicate_name"
+    autoload :ProjectMember,      "docomo-nlu/management/project_member"
+    autoload :Project,            "docomo-nlu/management/project"
+    autoload :Property,           "docomo-nlu/management/property"
+    autoload :Provider,           "docomo-nlu/management/provider"
+    autoload :ScenarioProject,    "docomo-nlu/management/scenario_project"
+    autoload :ScenarioUtil,       "docomo-nlu/management/scenario_util"
+    autoload :Scenario,           "docomo-nlu/management/scenario"
+    autoload :Set,                "docomo-nlu/management/set"
+    autoload :TaskProject,        "docomo-nlu/management/task_project"
   end
 end

data/lib/docomo-nlu/spontaneous.rb

@@ -1,8 +1,49 @@
 # frozen_string_literal: true
 
 module DocomoNlu
-  module Spontaneous
-    autoload :Dialogue,     'docomo-nlu/spontaneous/dialogue'
-    autoload :Registration, 'docomo-nlu/spontaneous/registration'
+  class Spontaneous < ActiveResource::Base
+    attr_reader :result
+    attr_reader :error
+    self.site = DocomoNlu.config.nlu_host
+
+    ## Remove format in path (remove .json)
+    self.include_format_in_path = false
+
+    ## Setting Format
+    self.format = :json
+
+    def initialize
+      super
+      {
+        clientVer:    "1.0.4",
+        language:     "ja-JP",
+        location:     { lat: "0", lon: "0" },
+        appRecvTime:  DateTime.now.strftime("%Y-%m-%d %H:%M:%S"),
+        appSendTime:  DateTime.now.strftime("%Y-%m-%d %H:%M:%S"),
+      }.each do |k, v|
+        @attributes.store(k, v)
+      end
+    end
+
+    def registration(app_kind = "docomo-nlu", app_id = "", registration_id = "", notification = false)
+      body = {
+        bot_id: @attributes[:botId],
+        app_id: app_id,
+        registration_id: registration_id,
+        app_kind: app_kind,
+        notification: notification,
+      }
+      res = connection.post("/UserRegistrationServer/users/applications", body.to_json, self.class.headers)
+      @attributes.store(:appId, JSON.parse(res.body)["app_id"])
+    end
+
+    def dialogue(voiceText, **params)
+      @attributes[:voiceText] = voiceText
+      params.each do |k, v|
+        @attributes[k] ||= v
+      end
+      res = connection.post("/SpontaneousDialogueServer/dialogue", @attributes.to_json, self.class.headers)
+      @result = JSON.parse(res.body)
+    end
   end
 end

data/lib/docomo-nlu/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DocomoNlu
-  VERSION = '0.1.2'
+  VERSION = "0.1.3"
 end

data/lib/docomo-nlu.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require 'docomo-nlu/version'
-require 'docomo-nlu/config'
-require 'activeresource'
-require 'faraday'
+require "docomo-nlu/version"
+require "docomo-nlu/config"
+require "activeresource"
+require "faraday"
 
 module DocomoNlu
-  autoload :Spontaneous,  'docomo-nlu/spontaneous'
-  autoload :Management,   'docomo-nlu/management'
+  autoload :Spontaneous,  "docomo-nlu/spontaneous"
+  autoload :Management,   "docomo-nlu/management"
 end

data/lib/generators/docomo_nlu/install/install_generator.rb

@@ -2,10 +2,10 @@
 
 module DocomoNlu
   class InstallGenerator < ::Rails::Generators::Base
-    source_root File.expand_path('../../templates', __dir__)
+    source_root File.expand_path("../../templates", __dir__)
 
     def copy_initializer
-      copy_file 'template.rb', 'config/initializers/docomo_nlu.rb'
+      copy_file "template.rb", "config/initializers/docomo_nlu.rb"
     end
   end
 end

data/lib/generators/templates/template.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 DocomoNlu.configure do |config|
-  config.nlu_host = 'Set your host'
-  config.nlu_version = 'Set version'
-  config.admin_access_token = 'Set token that able to create account'
+  config.nlu_host = "Set your host"
+  config.nlu_version = "Set version"
+  config.admin_access_token = "Set token that able to create account"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docomo-nlu
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Koji Yamazaki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-05 00:00:00.000000000 Z
+date: 2018-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeresource
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: onkcop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +81,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.11.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.11.3
+- !ruby/object:Gem::Dependency
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: onkcop
+  name: reek
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,19 +123,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.11.3
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.11.3
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -172,6 +186,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".reek"
 - ".rspec"
 - ".rubocop.yml"
 - ".ruby-version"
@@ -210,8 +225,6 @@ files:
 - lib/docomo-nlu/management/set.rb
 - lib/docomo-nlu/management/task_project.rb
 - lib/docomo-nlu/spontaneous.rb
-- lib/docomo-nlu/spontaneous/dialogue.rb
-- lib/docomo-nlu/spontaneous/registration.rb
 - lib/docomo-nlu/version.rb
 - lib/generators/docomo_nlu/install/install_generator.rb
 - lib/generators/templates/template.rb

data/lib/docomo-nlu/spontaneous/dialogue.rb

@@ -1,58 +0,0 @@
-# frozen_string_literal: true
-
-require 'securerandom'
-module DocomoNlu
-  module Spontaneous
-    class Dialogue < ActiveResource::Base
-      attr_accessor :result
-      self.site = "http://#{DocomoNlu.config.nlu_host}/"
-
-      ## Remove format in path (remove .json)
-      self.include_format_in_path = false
-
-      ## Setting Format
-      self.format = :json
-
-      # 対話サーバからのapp_Id払い出し処理
-      # Parameter
-      # {
-      #  "app_id"           : "sebastien-marketplace",
-      #  "bot_id"           : "botId",
-      #  "registration_id"  : "null",
-      #  "app_kind"         : "sebastien-marketplace",
-      #  "notification"     : false
-      # }
-      def registration(app_id, bot_id, app_kind = 'developer_dashboard')
-        request_body =
-          { 'app_id' => app_id, 'bot_id' => bot_id, 'registration_id' => nil, 'app_kind' => app_kind, 'notification' => false }.to_json
-        res = connection.post('/UserRegistrationServer/users/applications', request_body, self.class.headers)
-        if res.code == '200'
-          attributes.store('appId', app_id)
-        else
-          attributes.store('errors', res.body)
-        end
-      end
-
-      def execute(voiceText, initTopicId = nil)
-        self.voiceText = voiceText
-        self.initTopicId = initTopicId unless initTopicId.nil?
-        res = connection.post('/SpontaneousDialogueServer/dialogue', attributes.to_json, self.class.headers)
-        @result = res
-      end
-
-      class << self
-        def collection_path(prefix_options = {}, query_options = nil)
-          check_prefix_options(prefix_options)
-          prefix_options, query_options = split_options(prefix_options) if query_options.nil?
-          "#{prefix(prefix_options)}#{collection_name}#{format_extension}#{query_string(query_options)}"
-        end
-        # Override. Native code is here
-        # @collection_name ||= ActiveSupport::Inflector.pluralize(element_name)
-
-        def collection_name
-          @collection_name ||= element_name
-        end
-      end
-    end
-  end
-end

data/lib/docomo-nlu/spontaneous/registration.rb

@@ -1,58 +0,0 @@
-# frozen_string_literal: true
-
-require 'securerandom'
-module DocomoNlu
-  module Spontaneous
-    class Registration < ActiveResource::Base
-      attr_accessor :result
-      self.site = "http://#{DocomoNlu.config.nlu_host}/"
-
-      ## Remove format in path (remove .json)
-      self.include_format_in_path = false
-
-      ## Setting Format
-      self.format = :json
-
-      # 対話サーバからのapp_Id払い出し処理
-      # Parameter
-      # {
-      #  "app_id"           : "sebastien-marketplace",
-      #  "bot_id"           : "botId",
-      #  "registration_id"  : "null",
-      #  "app_kind"         : "sebastien-marketplace",
-      #  "notification"     : false
-      # }
-      def registration(app_id, bot_id, app_kind = 'developer_dashboard')
-        request_body =
-          { 'app_id' => app_id, 'bot_id' => bot_id, 'registration_id' => nil, 'app_kind' => app_kind, 'notification' => false }.to_json
-        res = connection.post('/UserRegistrationServer/users/applications', request_body, self.class.headers)
-        if res.code == '200'
-          attributes.store('appId', app_id)
-        else
-          attributes.store('errors', res.body)
-        end
-      end
-
-      def execute(voice_text, _init_topic_d = nil)
-        self.voiceText = voice_text
-        self.initTopicId = init_topic_id unless init_topic_id.nil?
-        res = connection.post('/SpontaneousDialogueServer/dialogue', attributes.to_json, self.class.headers)
-        @result = res
-      end
-
-      class << self
-        def collection_path(prefix_options = {}, query_options = nil)
-          check_prefix_options(prefix_options)
-          prefix_options, query_options = split_options(prefix_options) if query_options.nil?
-          "#{prefix(prefix_options)}#{collection_name}#{format_extension}#{query_string(query_options)}"
-        end
-        # Override. Native code is here
-        # @collection_name ||= ActiveSupport::Inflector.pluralize(element_name)
-
-        def collection_name
-          @collection_name ||= element_name
-        end
-      end
-    end
-  end
-end