docomo-nlu 0.3.2 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '07583dd9ac684183a196b0667f6130892a8d9956bb33e3fb0fdacd67f19c501c'
-  data.tar.gz: d9f60750e905e0a2dd99d3ee9ea4670aba63d98d6a870be2dc9dc4108bed823b
+  metadata.gz: d47523db1c4072b7ae33456b4a9c6dfb42794cad3f5cce027628ebbc677ed3e8
+  data.tar.gz: 882644849015a6f177bca7d8da3540f06dcd94b74bb59058c7f90f02a6cad7a7
 SHA512:
-  metadata.gz: b23af8c589ea601d7bb5b6cce933553560992c7efddfdf907286e512732e85a1432d3b966a55d51d336ae296fcf439ab7e3d0ef3c91277bc6ca72fb31d91fe39
-  data.tar.gz: 60401f8399e226a87770b72d6735a8b35966af39d1ce2925aa59aeb853fdcb3cacbb37462b586cebd8bb34baba8f9f1ecc7fda04f6892aa9529358e1e7ba00fc
+  metadata.gz: 33953e22ea5dc056262b65d99a49bfc3677f1d7cea1f985645ada6c8fa0eed46b62794ec12d3c64c48950aa1518e0ae8c529d74017649e8fba67c70b3d0d905f
+  data.tar.gz: a1af58b992bf5fb24c1339fd9c975e743c10e536befbb1f97ba059510b0d664c649e4624aa6f8977acaa80cda86175e3129d8fa6ce73a963ffcdc6665a0bc055

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    docomo-nlu (0.3.2)
+    docomo-nlu (0.3.8)
       activeresource (>= 5.0, < 5.2)
       bundler
       faraday
@@ -11,51 +11,51 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.2.4.3)
-      actionpack (= 5.2.4.3)
+    actioncable (5.2.6)
+      actionpack (= 5.2.6)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailer (5.2.4.3)
-      actionpack (= 5.2.4.3)
-      actionview (= 5.2.4.3)
-      activejob (= 5.2.4.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.4.3)
-      actionview (= 5.2.4.3)
-      activesupport (= 5.2.4.3)
+    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.4.3)
-      activesupport (= 5.2.4.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.4.3)
-      activesupport (= 5.2.4.3)
+    activejob (5.2.6)
+      activesupport (= 5.2.6)
       globalid (>= 0.3.6)
-    activemodel (5.2.4.3)
-      activesupport (= 5.2.4.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.4.3)
-      activemodel (= 5.2.4.3)
-      activesupport (= 5.2.4.3)
+    activerecord (5.2.6)
+      activemodel (= 5.2.6)
+      activesupport (= 5.2.6)
       arel (>= 9.0)
     activeresource (5.1.1)
       activemodel (>= 5.0, < 7)
       activemodel-serializers-xml (~> 1.0)
       activesupport (>= 5.0, < 7)
-    activestorage (5.2.4.3)
-      actionpack (= 5.2.4.3)
-      activerecord (= 5.2.4.3)
-      marcel (~> 0.3.1)
-    activesupport (5.2.4.3)
+    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)
@@ -66,36 +66,46 @@ GEM
     ast (2.4.0)
     builder (3.2.4)
     coderay (1.1.2)
-    concurrent-ruby (1.1.6)
+    concurrent-ruby (1.1.8)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     crass (1.0.6)
     diff-lcs (1.3)
-    erubi (1.9.0)
-    faraday (1.0.1)
+    erubi (1.10.0)
+    faraday (1.4.2)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      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-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
+    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.1)
-    i18n (1.8.2)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
     kwalify (0.7.2)
-    loofah (2.5.0)
+    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.5)
-    mini_mime (1.0.2)
-    mini_portile2 (2.4.0)
-    minitest (5.14.1)
+    mini_mime (1.1.0)
+    mini_portile2 (2.5.1)
+    minitest (5.14.4)
     multipart-post (2.1.1)
-    nio4r (2.5.2)
-    nokogiri (1.10.9)
-      mini_portile2 (~> 2.4.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)
@@ -104,41 +114,42 @@ GEM
       method_source (~> 0.9.0)
     psych (3.1.0)
     public_suffix (4.0.5)
-    rack (2.2.2)
+    racc (1.5.2)
+    rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (5.2.4.3)
-      actioncable (= 5.2.4.3)
-      actionmailer (= 5.2.4.3)
-      actionpack (= 5.2.4.3)
-      actionview (= 5.2.4.3)
-      activejob (= 5.2.4.3)
-      activemodel (= 5.2.4.3)
-      activerecord (= 5.2.4.3)
-      activestorage (= 5.2.4.3)
-      activesupport (= 5.2.4.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.4.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.3.0)
       loofah (~> 2.3)
-    railties (5.2.4.3)
-      actionpack (= 5.2.4.3)
-      activesupport (= 5.2.4.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 (13.0.1)
+    rake (13.0.3)
     reek (6.0.0)
       kwalify (~> 0.7.0)
       parser (>= 2.5.0.0, < 2.8, != 2.5.1.1)
       psych (~> 3.1.0)
       rainbow (>= 2.0, < 4.0)
-    rexml (3.2.4)
+    rexml (3.2.5)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
@@ -166,18 +177,19 @@ GEM
     rubocop-rspec (1.35.0)
       rubocop (>= 0.60.0)
     ruby-progressbar (1.10.1)
+    ruby2_keywords (0.0.4)
     rubyzip (2.3.0)
     safe_yaml (1.0.5)
-    sprockets (4.0.0)
+    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 (1.0.1)
+    thor (1.1.0)
     thread_safe (0.3.6)
-    tzinfo (1.2.7)
+    tzinfo (1.2.9)
       thread_safe (~> 0.1)
     unicode-display_width (1.7.0)
     vcr (5.1.0)
@@ -185,7 +197,7 @@ GEM
       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.5)
 
@@ -195,7 +207,7 @@ PLATFORMS
 DEPENDENCIES
   docomo-nlu!
   pry (~> 0.11.3)
-  rails
+  rails (~> 5.2.5)
   reek
   rspec
   rspec_junit_formatter

data/docomo-nlu.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   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"

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/ng_word.rb

@@ -2,9 +2,10 @@
 
 module DocomoNlu
   module Management
-    class NGWord < Base
+    class NGWord < OKNGBase
       self.element_name = "ngWords"
       self.prefix = "/management/v2.6/projects/:project_id/bots/:bot_id/"
+      self.extention = ".ng"
     end
   end
 end

data/lib/docomo_nlu/management/ok_ng_base.rb

@@ -0,0 +1,76 @@
+# frozen_string_literal: true
+
+require "tempfile"
+module DocomoNlu
+  module Management
+    class OKNGBase < Base
+      class_attribute :extention
+
+      def save
+        self.class.create(attributes[:file], prefix_options)
+      end
+
+      def destroy
+        super
+      end
+
+      def download
+        self.file = self.class.download(prefix_options).file
+      end
+
+      class << self
+        def create(file, prefix_options)
+          check_prefix_options(prefix_options)
+          upload(file, prefix_options)
+        end
+
+        def all(options = {})
+          find(options)
+        end
+
+        def find(options)
+          prefix_options, = split_options(options[:params])
+          check_prefix_options(prefix_options)
+          download(prefix_options)
+        end
+
+        def where(clauses = {})
+          find(params: clauses)
+        end
+
+        def download(prefix_options = {})
+          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(element_path(nil, prefix_options))
+
+          if check_response(response)
+            return instantiate_record({}, prefix_options).tap do |record|
+              record.file = Tempfile.open(["docomo-nlu", extention]) do |f|
+                f.write response.body.force_encoding("UTF-8")
+                f
+              end
+            end
+          end
+          nil
+        end
+
+        def upload(file, prefix_options)
+          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
+          params = {
+            uploadFile: Faraday::UploadIO.new(file.path, "text/plain"),
+          }
+          response = conn.put collection_path(prefix_options), params
+          check_response(response)
+        end
+      end
+    end
+  end
+end

data/lib/docomo_nlu/management/ok_word.rb

@@ -2,9 +2,10 @@
 
 module DocomoNlu
   module Management
-    class OKWord < Base
+    class OKWord < OKNGBase
       self.element_name = "okWords"
       self.prefix = "/management/v2.6/projects/:project_id/bots/:bot_id/"
+      self.extention = ".ans"
     end
   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: Time.current.strftime("%Y-%m-%d %H:%M:%S"),
-        appSendTime: Time.current.strftime("%Y-%m-%d %H:%M:%S"),
+        appRecvTime: Time.now.strftime("%Y-%m-%d %H:%M:%S"),
+        appSendTime: Time.now.strftime("%Y-%m-%d %H:%M:%S"),
       }.each do |k, v|
         @attributes.store(k, v)
       end
@@ -38,7 +38,7 @@ module DocomoNlu
       @attributes.store(:appId, JSON.parse(res.body)["app_id"])
     end
 
-    def dialogue(voice_text, **params)
+    def dialogue(voice_text, params = {})
       @attributes[:voiceText] = voice_text
       params.each do |k, v|
         @attributes[k] ||= v

data/lib/docomo_nlu/version.rb

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

data/vcr/vcr_cassettes/management/ng_word/create.yml

@@ -0,0 +1,46 @@
+---
+http_interactions:
+- request:
+    method: put
+    uri: "<Host>/management/<Version>/projects/48/bots/test_bot/ngWords"
+    body:
+      encoding: UTF-8
+      string: "-------------RubyMultipartPost-dca8336190defd6700cdd232ce51c186\r\nContent-Disposition:
+        form-data; name=\"uploadFile\"; filename=\"test.ng\"\r\nContent-Length: 6\r\nContent-Type:
+        text/plain\r\nContent-Transfer-Encoding: binary\r\n\r\nNG  OK\r\n-------------RubyMultipartPost-dca8336190defd6700cdd232ce51c186--\r\n"
+    headers:
+      User-Agent:
+      - Faraday v1.0.1
+      Authorization:
+      - "<AdminAccessToken>"
+      Content-Type:
+      - multipart/form-data; boundary=-----------RubyMultipartPost-dca8336190defd6700cdd232ce51c186
+      Content-Length:
+      - '293'
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+  response:
+    status:
+      code: 201
+      message: '201'
+    headers:
+      Date:
+      - Sun, 25 Oct 2020 14:04:22 GMT
+      Content-Length:
+      - '0'
+      Connection:
+      - keep-alive
+      Server:
+      - Apache
+      X-Content-Type-Options:
+      - nosniff
+      X-Frame-Options:
+      - SAMEORIGIN
+    body:
+      encoding: UTF-8
+      string: ''
+    http_version: null
+  recorded_at: Sun, 25 Oct 2020 14:04:22 GMT
+recorded_with: VCR 5.1.0