docomo-nlu 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6de79950035d20f4444b11463b7d359464d735c21acee112fcc52a52b8f49c15
-  data.tar.gz: f458aa38e36609e17a211b0be7cd6137795eaf3111530c5c3e1c10c0a6d953e0
+  metadata.gz: '08034a60bf16379d40abb5485451e3bf4d1a8d1e61deeeb68f3f3df71e7122c0'
+  data.tar.gz: cebeb6e745af177a7ab841d7cd83787c920e0c7e06a656e0aba8f1ff6199a8ca
 SHA512:
-  metadata.gz: cc3b6362a1e675319882d0d5751c8f60943f2a2a3d1dd127cb8a80a826bcdf9738e4bcc024a96ec55ffafa151259665cebcf1936a28286193be67dd2c244a525
-  data.tar.gz: 2a0a75c7ad270727c190a3044ddd09d781d36a3b44d92ea7a43851e02e716f14564b9dab6cc62c966884aca5352984677e438fd1348f373ea17cb614e3d6c131
+  metadata.gz: 19ac577b2c46521c6d325b9c463fb3ecb98119958c799960bca48105a397fcbc21b251a7e750d463a46ecc8464fbb9b9ae34aaee596b195f4578508cbbbad9ae
+  data.tar.gz: f6daa422c37239930ebd6dd3dc34ee7a56a8c05cc81ef182378f5821f6a64285c2b55f0f6ed69d964c6933ca9707c39f101a8aa8cf96aa5def69f541b0baf709

data/.rubocop.yml

@@ -9,7 +9,6 @@ AllCops:
   # If you use RuboCop with Ruby on Rails, specify TargetRailsVersion(default: 5.0).
   TargetRailsVersion: 5.1
 Rails:
-  # If you use RuboCop with Ruby on Rails, turn on this option.
   Enabled: true
 Naming/FileName:
   Exclude:
@@ -18,4 +17,12 @@ Naming/FileName:
 Rails/HasManyOrHasOneDependent:
   Enabled: false
 Rails/SaveBang:
-  Enabled: false
+  Enabled: false
+RSpec/EmptyExampleGroup:
+  Enabled: false
+Metrics/ClassLength:
+  Exclude:
+    - "lib/docomo-nlu/management/v23/aiml_base.rb"
+RSpec/FilePath:
+  CustomTransform:    
+    DocomoNlu: docomo-nlu

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    docomo-nlu (0.2.5)
+    docomo-nlu (0.2.6)
       activeresource (~> 5.0.0)
       bundler
       faraday
@@ -105,7 +105,7 @@ GEM
     mini_mime (1.0.1)
     mini_portile2 (2.3.0)
     minitest (5.11.3)
-    multipart-post (2.0.0)
+    multipart-post (2.1.1)
     nio4r (2.3.1)
     nokogiri (1.8.4)
       mini_portile2 (~> 2.3.0)
@@ -178,7 +178,7 @@ GEM
     rubocop-rspec (1.29.1)
       rubocop (>= 0.58.0)
     ruby-progressbar (1.10.0)
-    rubyzip (1.2.2)
+    rubyzip (1.2.3)
     safe_yaml (1.0.4)
     sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
@@ -222,4 +222,4 @@ DEPENDENCIES
   webmock (~> 3.4.2)
 
 BUNDLED WITH
-   1.16.3
+   2.0.1

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

@@ -24,8 +24,8 @@ module DocomoNlu
       self.format = :json
 
       ## Get NLPManagement's AccessToken.
-      def login(accountName, password)
-        request_body = { accountName: accountName, password: password }.to_json
+      def login(account_name, password)
+        request_body = { accountName: account_name, password: password }.to_json
         response_body = JSON.parse(connection.post("/management/v2.2/login", request_body, self.class.headers).body)
         self.access_token = response_body["accessToken"]
       end

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

@@ -43,7 +43,7 @@ module DocomoNlu
 
         private
 
-        def download(category = nil, prefix_options)
+        def download(category = nil, prefix_options = {})
           extention = category.blank? ? ".zip" : ".map"
 
           conn = Faraday.new(url: site.to_s, ssl: { verify: false }) do |builder|

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

@@ -7,7 +7,7 @@ module DocomoNlu
       self.prefix = "/management/v2.2/projects/:project_id/bots/:bot_id/"
 
       @permitted_root_param = [:userScenarios, :templateScenarios]
-      @permitted_userScenarios_param = [:scenarioId, :description, :compileFlag]
+      @permitted_user_scenarios_param = [:scenarioId, :description, :compileFlag]
 
       def save
         @attributes.select! {|a| a =~ /(userScenarios|templateScenarios)/ }

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

@@ -15,15 +15,15 @@ module DocomoNlu
       end
 
       def save
-        print "Method not used"
+        Rails.logger.debug "Method not used"
       end
 
       def destroy
-        print "Method not used"
+        Rails.logger.debug "Method not used"
       end
 
       def delete
-        print "Method not used"
+        Rails.logger.debug "Method not used"
       end
     end
   end

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

@@ -19,7 +19,6 @@ require "tempfile"
 module DocomoNlu
   module Management::V26
     class AIMLBase < Base
-
       def download(extra_path = "")
         prefix_options[:bot_id] ||= botId
         @attributes[:file] = self.class.download(prefix_options, extra_path).file
@@ -99,7 +98,6 @@ module DocomoNlu
           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)
           end
 
           # transfer and status check
@@ -108,15 +106,22 @@ module DocomoNlu
           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)
           end
           true
         end
 
         def check_status(method, path)
+          response = connection.get(path, headers)
+
           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
+            JSON.parse(response.body)["status"].tap do |status|
+              raise ActiveResource::ServerError.new(response) if %w[ErrorFinish NotCompiled].include?(status)
+            end
+          when :transfer
+            JSON.parse(response.body)["transferStatusResponses"][0]["status"].tap do |status|
+              raise ActiveResource::ServerError.new(response) if %w[ErrorFinish NotTransfered].include?(status)
+            end
           end
         end
       end

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

@@ -24,8 +24,8 @@ module DocomoNlu
       self.format = :json
 
       ## Get NLPManagement's AccessToken.
-      def login(accountName, password)
-        request_body = { accountName: accountName, password: password }.to_json
+      def login(account_name, password)
+        request_body = { accountName: account_name, password: password }.to_json
         response_body = JSON.parse(connection.post("/management/v2.6/login", request_body, self.class.headers).body)
         self.access_token = response_body["accessToken"]
       end

data/lib/docomo-nlu/management/V26/bot_log.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "zip"
 
 module DocomoNlu
@@ -8,29 +9,30 @@ module DocomoNlu
       self.prefix = "/management/v2.6/projects/:project_id/"
 
       def all
-        p "You shoud use 'download' method"
+        Rails.logger.debug "You shoud use 'download' method"
       end
 
       def find
-        p "You shoud use 'download' method"
+        Rails.logger.debug "You shoud use 'download' method"
       end
 
       def where
-        p "You shoud use 'download' method"
+        Rails.logger.debug "You shoud use 'download' method"
       end
 
       def download(bot_id, params = {})
         attributes[:file] = self.class.download(prefix_options, bot_id, params.slice(:start, :end))
-        return attributes[:file]
+        attributes[:file]
       end
 
       def extract_data
         return unless attributes[:file]
+
         logs = []
-        self.class.unzip(attributes[:file]) do |name, body|
-          logs = body.map{ |b| JSON.parse(b) }
+        self.class.unzip(attributes[:file]) do |_name, body|
+          logs = body.map {|b| JSON.parse(b) }
         end
-        return logs
+        logs
       end
 
       class << self
@@ -54,6 +56,7 @@ module DocomoNlu
           ::Zip::File.open(file.path) do |zf|
             zf.each do |entry|
               next unless entry.file?
+
               name = entry.name
               body = entry.get_input_stream.read.split(/\R/)
               yield name, body if block_given?

data/lib/docomo-nlu/management/V26/entry.rb

@@ -20,7 +20,6 @@ module DocomoNlu
       end
 
       class << self
-
         def check_status(prefix_options)
           JSON.parse(connection.get("#{collection_path(prefix_options)}/status", headers).body)
         end

data/lib/docomo-nlu/management/V26/log.rb

@@ -18,24 +18,24 @@ module DocomoNlu
       # => It is possible to ambiguous search using "*" in the following target ( input|output|startTopic|endTopic|userId|language|projectSpecific)
       # query: String search within 200 characters.
 
-      def download(params={})
-        return JSON.parse(connection.post(collection_path(prefix_options), params.to_json, self.class.headers).body)
+      def download(params = {})
+        JSON.parse(connection.post(collection_path(prefix_options), params.to_json, self.class.headers).body)
       end
 
-      def count(params={})
-        return JSON.parse(connection.post("#{collection_path(prefix_options)}/count", params.to_json, self.class.headers).body)["count"]
+      def count(params = {})
+        JSON.parse(connection.post("#{collection_path(prefix_options)}/count", params.to_json, self.class.headers).body)["count"]
       end
 
       def all
-        p "You shoud use 'download' or 'count' method"
+        Rails.logger.debug "You shoud use 'download' or 'count' method"
       end
 
       def find
-        p "You shoud use 'download' or 'count' method"
+        Rails.logger.debug "You shoud use 'download' or 'count' method"
       end
 
       def where
-        p "You shoud use 'download' or 'count' method"
+        Rails.logger.debug "You shoud use 'download' or 'count' method"
       end
     end
   end

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

@@ -43,7 +43,7 @@ module DocomoNlu
 
         private
 
-        def download(category = nil, prefix_options)
+        def download(category = nil, prefix_options = {})
           extention = category.blank? ? ".zip" : ".map"
 
           conn = Faraday.new(url: site.to_s, ssl: { verify: false }) do |builder|

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

@@ -7,7 +7,7 @@ module DocomoNlu
       self.prefix = "/management/v2.6/projects/:project_id/bots/:bot_id/"
 
       @permitted_root_param = [:userScenarios, :templateScenarios]
-      @permitted_userScenarios_param = [:scenarioId, :description, :compileFlag]
+      @permitted_user_scenarios_param = [:scenarioId, :description, :compileFlag]
 
       def save
         @attributes.select! {|a| a =~ /(userScenarios|templateScenarios)/ }

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

@@ -15,15 +15,15 @@ module DocomoNlu
       end
 
       def save
-        print "Method not used"
+        Rails.logger.debug "Method not used"
       end
 
       def destroy
-        print "Method not used"
+        Rails.logger.debug "Method not used"
       end
 
       def delete
-        print "Method not used"
+        Rails.logger.debug "Method not used"
       end
     end
   end

data/lib/docomo-nlu/management.rb

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
+
 module DocomoNlu
   module Management
-    NAMESPACE = (DocomoNlu.config.nlu_version == "v2.6" ? "V26" : "V23" ).freeze
+    NAMESPACE = ((DocomoNlu.config.nlu_version == "v2.6") ? "V26" : "V23").freeze
 
     module V23
       autoload :Account,            "docomo-nlu/management/V23/account"
@@ -83,6 +84,5 @@ module DocomoNlu
     Scenario = const_get "DocomoNlu::Management::#{NAMESPACE}::Scenario"
     Set = const_get "DocomoNlu::Management::#{NAMESPACE}::Set"
     TaskProject = const_get "DocomoNlu::Management::#{NAMESPACE}::TaskProject"
-
   end
 end

data/lib/docomo-nlu/spontaneous.rb

@@ -19,8 +19,8 @@ module DocomoNlu
         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"),
+        appRecvTime:  Time.current.strftime("%Y-%m-%d %H:%M:%S"),
+        appSendTime:  Time.current.strftime("%Y-%m-%d %H:%M:%S"),
       }.each do |k, v|
         @attributes.store(k, v)
       end
@@ -38,13 +38,13 @@ module DocomoNlu
       @attributes.store(:appId, JSON.parse(res.body)["app_id"])
     end
 
-    def dialogue(voiceText, **params)
-      @attributes[:voiceText] = voiceText
+    def dialogue(voice_text, **params)
+      @attributes[:voiceText] = voice_text
       params.each do |k, v|
         @attributes[k] ||= v
       end
       res = connection.post("/SpontaneousDialogueServer/dialogue", @attributes.to_json, self.class.headers)
-      return JSON.parse(res.body)
+      JSON.parse(res.body)
     end
 
     class << self

data/lib/docomo-nlu/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DocomoNlu
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 end

data/vcr/vcr_cassettes/V26/bot_log/all.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: "<Host>management/<Version>/projects/176/botlogs?botId=176_89_main"
+    uri: "<Host>/management/<Version>/projects/176/botlogs?botId=176_89_main"
     body:
       encoding: US-ASCII
       string: ''

data/vcr/vcr_cassettes/V26/bot_log/query.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: "<Host>management/<Version>/projects/176/botlogs?botId=176_89_main&end=20190313&start=20190312"
+    uri: "<Host>/management/<Version>/projects/176/botlogs?botId=176_89_main&end=20190313&start=20190312"
     body:
       encoding: US-ASCII
       string: ''

data/vcr/vcr_cassettes/V26/log/all.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: post
-    uri: "<Host>management/<Version>/projects/176/logs"
+    uri: "<Host>/management/<Version>/projects/176/logs"
     body:
       encoding: UTF-8
       string: "{}"

data/vcr/vcr_cassettes/V26/log/count/all.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: post
-    uri: "<Host>management/<Version>/projects/176/logs/count"
+    uri: "<Host>/management/<Version>/projects/176/logs/count"
     body:
       encoding: UTF-8
       string: "{}"

data/vcr/vcr_cassettes/V26/log/count/query.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: post
-    uri: "<Host>management/<Version>/projects/176/logs/count"
+    uri: "<Host>/management/<Version>/projects/176/logs/count"
     body:
       encoding: UTF-8
       string: '{"details":[{"operation":"","target":"input","query":"Hello"}]}'

data/vcr/vcr_cassettes/V26/log/count.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: post
-    uri: "<Host>management/<Version>/projects/176/logs/count"
+    uri: "<Host>/management/<Version>/projects/176/logs/count"
     body:
       encoding: UTF-8
       string: "{}"

data/vcr/vcr_cassettes/V26/log/query.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: post
-    uri: "<Host>management/<Version>/projects/176/logs"
+    uri: "<Host>/management/<Version>/projects/176/logs"
     body:
       encoding: UTF-8
       string: '{"details":[{"operation":"","target":"input","query":"Hello"}]}'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docomo-nlu
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Koji Yamazaki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-14 00:00:00.000000000 Z
+date: 2019-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeresource