docomo-nlu 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d5ed12b21cda6ecf562f293c3ca33ec2053200d910d4a26bf77f0ff29467fae
-  data.tar.gz: c81c539dbe8cf4e1ba20ddce48eb8ae80ac6006fb36be1e4edd05407ee334920
+  metadata.gz: 6ab47b65c9fe90df65d2f3564344818d937bc177b1d4f278850c0b5c475c32af
+  data.tar.gz: 0776ea66b71711e8e89b0c2eedd91570aa3a7b7946625c35c2808e95f337effa
 SHA512:
-  metadata.gz: da8d0a357eede445f3b172bf36ba69bddc5f98fafd138f027af20d12158994b3197f556262a2266ebb7415b365a881fbb8ddb8e845babdee91ff48c421482cd0
-  data.tar.gz: 8d85d2ae501e73379baf89cd783b7407f5063abfd016ee8766d09f343d4e20f48be045b788d4bf75570380a98d7411cb7752abedae19caabdb7d3982722beff9
+  metadata.gz: 6e8db54db4b0214cca95e255c35cdce111bd3fa85824b8231b7178c5d492dcbe5dbe97b6229f455d76f9e0f29745a95d3cc068b49c758544e1c163ae5a241e30
+  data.tar.gz: 2d8b95ed619ab0ff869e1bf3e0350c1e474e23c77dce81ee132957db2ae5e6fa97af6110426758bc3fd8a141c22360a2c32ed42236a10ffaa3316f665b4d6f1e

data/.gitignore

@@ -9,5 +9,3 @@
 
 # rspec failure tracking
 .rspec_status
-
-/vcr/

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    docomo-nlu (0.2.0)
+    docomo-nlu (0.2.1)
       activeresource (~> 5.0.0)
       bundler
       faraday

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

@@ -19,7 +19,6 @@ require "tempfile"
 module DocomoNlu
   module Management::V26
     class AIMLBase < Base
-      ## For AIML
 
       def download(extra_path = "")
         prefix_options[:bot_id] ||= botId
@@ -47,50 +46,6 @@ 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)
-      end
-
-      def upload_stopkey(file)
-        prefix_options[:bot_id] ||= botId
-        prefix_options[:method] = "stopkey"
-        self.class.upload(file, prefix_options)
-      end
-
-      def download_stopkey
-        prefix_options[:bot_id] ||= botId
-        prefix_options[:method] = "stopkey"
-        @attributes[:stopkey] = self.class.download(prefix_options).file
-      end
-
-      def upload_truthlist(file)
-        prefix_options[:bot_id] ||= botId
-        prefix_options[:method] = "truthlist"
-        self.class.upload(file, prefix_options)
-      end
-
-      def download_truthlist
-        prefix_options[:bot_id] ||= botId
-        prefix_options[:method] = "truthlist"
-        @attributes[:truthlist] = self.class.download(prefix_options).file
-      end
-
-      def upload_entry(file)
-        prefix_options[:bot_id] ||= botId
-        prefix_options[:method] = "entry"
-        self.class.upload(file, prefix_options)
-      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 = "")
           conn = Faraday.new(url: site.to_s, ssl: { verify: false }) do |builder|
@@ -160,39 +115,15 @@ module DocomoNlu
 
         def check_status(method, path)
           case method
-          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"]
+          when :compile  then JSON.parse(connection.get(path, headers).body)["status"]
+          when :transfer then JSON.parse(connection.get(path, headers).body)["transferStatusResponses"][0]["status"]
           end
         end
-
-        # def generate_file(response, method)
-        #   case method
-        #   when :aiml, :dat then
-        #     Tempfile.open(["docomo-nlu", ".#{prefix_options[:method].to_s}"]) do |f|
-        #       f.write response.body.force_encoding("UTF-8")
-        #       f
-        #     end
-        #   when :zip then
-        #     zip_file = Tempfile.new(["docomo-nlu", ".#{prefix_options[:method].to_s.gsub(/archive/, "zip")}"])
-        #     Zip::OutputStream.open(zip_file.path) do |zip|
-        #       @targets.each do |target|
-        #         zip.put_next_entry("#{target.filename}.pdf")
-        #         zip.print Net::HTTP.get URI.parse(target.url)
-        #       end
-        #     end
-        #     Zip::File.open_buffer(file.read) do |zf|
-        #       zf.each do |entry|
-        #         p entry.name # ファイル名
-        #         p entry.get_input_stream.read # ファイルの中身
-        #       end
-        #     end
-        #   end
-        # end
       end
 
       class FileModel < Base
         self.element_name = ""
-        self.prefix = "/management/v2.6/projects/:project_id/bots/:bot_id/:method"
+        self.prefix = "/management/#{DocomoNlu.config.nlu_version}/projects/:project_id/bots/:bot_id/:method"
       end
     end
   end

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

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+module DocomoNlu
+  module Management::V26
+    class Entry < Base
+      self.element_name = ""
+      self.prefix = "/management/v2.6/projects/:project_id/bots/:bot_id/:method"
+
+      def initialize(attributes = {}, persisted = false)
+        super(attributes, persisted)
+        prefix_options[:method] = "entry"
+      end
+
+      def save
+        self.class.upload(attributes[:file], prefix_options)
+      end
+
+      def status
+        self.class.check_status(prefix_options)
+      end
+
+      class << self
+
+        def check_status(prefix_options)
+          JSON.parse(connection.get("#{collection_path(prefix_options)}/status", headers).body)
+        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.post collection_path(prefix_options), params
+          check_response(response)
+        end
+      end
+    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
+
     module V23
       autoload :Account,            "docomo-nlu/management/V23/account"
       autoload :AIMLBase,           "docomo-nlu/management/V23/aiml_base"
@@ -33,6 +34,7 @@ module DocomoNlu
       autoload :Bot,                "docomo-nlu/management/V26/bot"
       autoload :Config,             "docomo-nlu/management/V26/config"
       autoload :DefaultPredicate,   "docomo-nlu/management/V26/default_predicate"
+      autoload :Entry,              "docomo-nlu/management/V26/entry"
       autoload :MultipartBase,      "docomo-nlu/management/V26/multipart_base"
       autoload :Map,                "docomo-nlu/management/V26/map"
       autoload :NGWord,             "docomo-nlu/management/V26/ng_word"
@@ -50,5 +52,30 @@ module DocomoNlu
       autoload :Set,                "docomo-nlu/management/V26/set"
       autoload :TaskProject,        "docomo-nlu/management/V26/task_project"
     end
+
+    Account = const_get "DocomoNlu::Management::#{NAMESPACE}::Account"
+    AIMLBase = const_get "DocomoNlu::Management::#{NAMESPACE}::Account"
+    Base = const_get "DocomoNlu::Management::#{NAMESPACE}::Base"
+    Bot = const_get "DocomoNlu::Management::#{NAMESPACE}::Bot"
+    Config = const_get "DocomoNlu::Management::#{NAMESPACE}::Config"
+    Entry = const_get "DocomoNlu::Management::#{NAMESPACE}::Entry"
+    DefaultPredicate = const_get "DocomoNlu::Management::#{NAMESPACE}::DefaultPredicate"
+    MultipartBase = const_get "DocomoNlu::Management::#{NAMESPACE}::MultipartBase"
+    Map = const_get "DocomoNlu::Management::#{NAMESPACE}::Map"
+    NGWord = const_get "DocomoNlu::Management::#{NAMESPACE}::NGWord"
+    OKWord = const_get "DocomoNlu::Management::#{NAMESPACE}::OKWord"
+    OrganizationMember = const_get "DocomoNlu::Management::#{NAMESPACE}::OrganizationMember"
+    Organization = const_get "DocomoNlu::Management::#{NAMESPACE}::Organization"
+    PredicateName = const_get "DocomoNlu::Management::#{NAMESPACE}::PredicateName"
+    ProjectMember = const_get "DocomoNlu::Management::#{NAMESPACE}::ProjectMember"
+    Project = const_get "DocomoNlu::Management::#{NAMESPACE}::Project"
+    Property = const_get "DocomoNlu::Management::#{NAMESPACE}::Property"
+    Provider = const_get "DocomoNlu::Management::#{NAMESPACE}::Provider"
+    ScenarioProject = const_get "DocomoNlu::Management::#{NAMESPACE}::ScenarioProject"
+    ScenarioUtil = const_get "DocomoNlu::Management::#{NAMESPACE}::ScenarioUtil"
+    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

@@ -4,6 +4,7 @@ module DocomoNlu
   class Spontaneous < ActiveResource::Base
     attr_reader :result
     attr_reader :error
+    cattr_accessor :static_headers
     self.site = DocomoNlu.config.nlu_host
 
     ## Remove format in path (remove .json)
@@ -12,6 +13,8 @@ module DocomoNlu
     ## Setting Format
     self.format = :json
 
+    self.static_headers = headers
+
     def initialize
       super
       {
@@ -25,7 +28,7 @@ module DocomoNlu
       end
     end
 
-    def registration(app_kind = "docomo-nlu", app_id = "", registration_id = "", notification = false)
+    def registration(app_id = "", registration_id = "docomo-nlu", app_kind = "docomo-nlu", notification = false)
       body = {
         bot_id: @attributes[:botId],
         app_id: app_id,
@@ -45,5 +48,13 @@ module DocomoNlu
       res = connection.post("/SpontaneousDialogueServer/dialogue", @attributes.to_json, self.class.headers)
       @result = JSON.parse(res.body)
     end
+
+    class << self
+      def headers
+        new_headers = static_headers.clone
+        new_headers["Content-Type"] = "application/json;charset=UTF-8"
+        new_headers
+      end
+    end
   end
 end

data/lib/docomo-nlu/version.rb

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

data/vcr/vcr_cassettes/V23/account/count.yml

@@ -0,0 +1,42 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: "<Host>/management/v2.2/accounts/count"
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - application/json
+      Authorization:
+      - "<AdminAccessToken>"
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Wed, 14 Nov 2018 03:58:13 GMT
+      Content-Type:
+      - application/json;charset=utf-8
+      Content-Length:
+      - '13'
+      Connection:
+      - keep-alive
+      Server:
+      - Apache
+      X-Content-Type-Options:
+      - nosniff
+      X-Frame-Options:
+      - SAMEORIGIN
+    body:
+      encoding: UTF-8
+      string: '{"count":454}'
+    http_version: 
+  recorded_at: Wed, 14 Nov 2018 03:58:13 GMT
+recorded_with: VCR 4.0.0

data/vcr/vcr_cassettes/V23/account/create.yml

@@ -0,0 +1,44 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: "<Host>/management/v2.2/accounts"
+    body:
+      encoding: UTF-8
+      string: '{"accountName":"test_account1","password":"testaccount20180821","authorization":2,"enable":true}'
+    headers:
+      Content-Type:
+      - application/json
+      Authorization:
+      - "<AdminAccessToken>"
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 201
+      message: Created
+    headers:
+      Date:
+      - Wed, 14 Nov 2018 03:58:03 GMT
+      Content-Type:
+      - application/json;charset=utf-8
+      Content-Length:
+      - '17'
+      Connection:
+      - keep-alive
+      Server:
+      - Apache
+      X-Content-Type-Options:
+      - nosniff
+      X-Frame-Options:
+      - SAMEORIGIN
+    body:
+      encoding: UTF-8
+      string: '{"accountId":606}'
+    http_version: 
+  recorded_at: Wed, 14 Nov 2018 03:58:04 GMT
+recorded_with: VCR 4.0.0

data/vcr/vcr_cassettes/V23/account/delete.yml

@@ -0,0 +1,38 @@
+---
+http_interactions:
+- request:
+    method: delete
+    uri: "<Host>/management/v2.2/accounts/237"
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - application/json
+      Authorization:
+      - "<AdminAccessToken>"
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 204
+      message: No Content
+    headers:
+      Date:
+      - Wed, 14 Nov 2018 03:58:09 GMT
+      Connection:
+      - keep-alive
+      Server:
+      - Apache
+      X-Content-Type-Options:
+      - nosniff
+      X-Frame-Options:
+      - SAMEORIGIN
+    body:
+      encoding: UTF-8
+      string: ''
+    http_version: 
+  recorded_at: Wed, 14 Nov 2018 03:58:12 GMT
+recorded_with: VCR 4.0.0