docomo-nlu 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bfefc9978ca4f4524565449b0b6d0ce2d5b211c5e1ebe480551bd7f529a85d5b
-  data.tar.gz: b1c827c8eef22a4d2f7e3e71fa7abc52f9f964b993582b04ec0cd0f8433e0168
+  metadata.gz: 8d5ed12b21cda6ecf562f293c3ca33ec2053200d910d4a26bf77f0ff29467fae
+  data.tar.gz: c81c539dbe8cf4e1ba20ddce48eb8ae80ac6006fb36be1e4edd05407ee334920
 SHA512:
-  metadata.gz: 02b86bf251baacf2408efa3d22841a5e9f0daf79f78972f049360ea9e658cbfb1972181b5621cb360b5222569f2d0f547354461185bc7b9fb550f3c1afcc5066
-  data.tar.gz: c6cdfe584432532f26f08cf0f61c4576e2bdd56f7182e620b60128b817023d7f6563e79e2d850716e6850fe867eaf57678d0f1024d7d0eebd282fb0b35fe9cb7
+  metadata.gz: da8d0a357eede445f3b172bf36ba69bddc5f98fafd138f027af20d12158994b3197f556262a2266ebb7415b365a881fbb8ddb8e845babdee91ff48c421482cd0
+  data.tar.gz: 8d85d2ae501e73379baf89cd783b7407f5063abfd016ee8766d09f343d4e20f48be045b788d4bf75570380a98d7411cb7752abedae19caabdb7d3982722beff9

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    docomo-nlu (0.1.3)
+    docomo-nlu (0.2.0)
       activeresource (~> 5.0.0)
       bundler
       faraday
@@ -215,6 +215,7 @@ DEPENDENCIES
   reek
   rspec
   rubocop (~> 0.58.2)
+  rubocop-rspec
   vcr (~> 4.0.0)
   webmock (~> 3.4.2)
 

data/docomo-nlu.gemspec

@@ -33,6 +33,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "reek"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "rubocop", "~> 0.58.2"
+  spec.add_development_dependency "rubocop-rspec"
   spec.add_development_dependency "vcr", "~> 4.0.0"
   spec.add_development_dependency "webmock", "~> 3.4.2"
 end

data/lib/docomo-nlu/management/{account.rb → V23/account.rb}

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 module DocomoNlu
-  module Management
+  module Management::V23
     class Account < Base
       self.element_name = "accounts"
-      self.prefix = "/management/#{DocomoNlu.config.nlu_version}/"
+      self.prefix = "/management/v2.2/"
 
       # Parameter for create
       # {
@@ -21,10 +21,8 @@ module DocomoNlu
       end
 
       def to_json(options = {})
-        attributes.delete("accountId")
-        attributes.delete("createDate")
-        attributes.delete("loginDate")
-        attributes.delete("id")
+        enable_params = ["accountName", "password", "description", "authorization", "enable"]
+        attributes.select! {|a| enable_params.include?(a) }
         super
       end
     end

data/lib/docomo-nlu/management/{aiml_base.rb → V23/aiml_base.rb}

@@ -13,9 +13,11 @@
 # Not supported
 # GET /{projectId}/bots/{botId}/archive/aiml
 
+# require 'rubyzip'
+
 require "tempfile"
 module DocomoNlu
-  module Management
+  module Management::V23
     class AIMLBase < Base
       ## For AIML
 
@@ -99,7 +101,7 @@ module DocomoNlu
 
           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|
+              record.file = Tempfile.open(["docomo-nlu", ".#{prefix_options[:method]}"]) do |f|
                 f.write response.body.force_encoding("UTF-8")
                 f
               end
@@ -132,7 +134,7 @@ module DocomoNlu
         def deploy_request(method, prefix_options)
           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/v2.2")
         end
 
         def deploy(prefix_options)
@@ -162,16 +164,40 @@ module DocomoNlu
           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/#{DocomoNlu.config.nlu_version}/projects/:project_id/bots/:bot_id/:method"
+        self.prefix = "/management/v2.2/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"
+        self.prefix = "/faqmanagement/v2.2/projects/:project_id/bots/:bot_id/:method"
       end
     end
   end

data/lib/docomo-nlu/management/{base.rb → V23/base.rb}

@@ -1,7 +1,9 @@
 # frozen_string_literal: true
 
+require "net/http"
+
 module DocomoNlu
-  module Management
+  module Management::V23
     class Base < ActiveResource::Base
       ## For Dynamically generated headers via http://rmosolgo.github.io/blog/2014/02/05/dynamically-generated-headers-for-activeresource-requests/
       cattr_accessor :static_headers
@@ -19,19 +21,18 @@ module DocomoNlu
       ## Remove format in path (remove .json)
       self.include_format_in_path = false
 
-      ## Setting Format
       self.format = :json
 
       ## Get NLPManagement's AccessToken.
       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)
+        response_body = JSON.parse(connection.post("/management/v2.2/login", request_body, self.class.headers).body)
         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?
+        res = connection.get("/management/v2.2/logout", self.class.headers) if access_token.present?
         raise ActiveResource::BadRequest, "Invalid access token" unless res
 
         self.access_token = nil

data/lib/docomo-nlu/management/{bot.rb → V23/bot.rb}

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 module DocomoNlu
-  module Management
+  module Management::V23
     class Bot < AIMLBase
       self.element_name = "bots"
-      self.prefix = "/management/#{DocomoNlu.config.nlu_version}/projects/:project_id/"
+      self.prefix = "/management/v2.2/projects/:project_id/"
 
       # Parameter for create
       # {

data/lib/docomo-nlu/management/{config.rb → V23/config.rb}

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 module DocomoNlu
-  module Management
+  module Management::V23
     class Config < Base
       self.element_name = "configs"
-      self.prefix = "/management/#{DocomoNlu.config.nlu_version}/projects/:project_id/bots/:bot_id/"
+      self.prefix = "/management/v2.2/projects/:project_id/bots/:bot_id/"
 
       # {
       #   "dialogTimeout": 300,

data/lib/docomo-nlu/management/{default_predicate.rb → V23/default_predicate.rb}

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 module DocomoNlu
-  module Management
+  module Management::V23
     class DefaultPredicate < Base
       self.element_name = "defaultPredicates"
-      self.prefix = "/management/#{DocomoNlu.config.nlu_version}/projects/:project_id/bots/:bot_id/"
+      self.prefix = "/management/v2.2/projects/:project_id/bots/:bot_id/"
 
       def destroy(keys)
         self.id = keys.join(",")

data/lib/docomo-nlu/management/{map.rb → V23/map.rb}

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 module DocomoNlu
-  module Management
+  module Management::V23
     class Map < MultipartBase
       self.element_name = "maps"
-      self.prefix = "/management/#{DocomoNlu.config.nlu_version}/projects/:project_id/bots/:bot_id/"
+      self.prefix = "/management/v2.2/projects/:project_id/bots/:bot_id/"
     end
   end
 end

data/lib/docomo-nlu/management/{multipart_base.rb → V23/multipart_base.rb}

@@ -2,7 +2,7 @@
 
 require "tempfile"
 module DocomoNlu
-  module Management
+  module Management::V23
     class MultipartBase < Base
       def save
         self.class.create(attributes[:file], prefix_options)

data/lib/docomo-nlu/management/{ng_word.rb → V23/ng_word.rb}

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 module DocomoNlu
-  module Management
+  module Management::V23
     class NGWord < Base
       self.element_name = "ngWords"
-      self.prefix = "/management/#{DocomoNlu.config.nlu_version}/projects/:project_id/bots/:bot_id/"
+      self.prefix = "/management/v2.2/projects/:project_id/bots/:bot_id/"
     end
   end
 end

data/lib/docomo-nlu/management/{ok_word.rb → V23/ok_word.rb}

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 module DocomoNlu
-  module Management
+  module Management::V23
     class OKWord < Base
       self.element_name = "okWords"
-      self.prefix = "/management/#{DocomoNlu.config.nlu_version}/projects/:project_id/bots/:bot_id/"
+      self.prefix = "/management/v2.2/projects/:project_id/bots/:bot_id/"
     end
   end
 end

data/lib/docomo-nlu/management/{organization.rb → V23/organization.rb}

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 module DocomoNlu
-  module Management
+  module Management::V23
     class Organization < Base
       self.element_name = "organizations"
-      self.prefix = "/management/#{DocomoNlu.config.nlu_version}/"
+      self.prefix = "/management/v2.2/"
 
       # Parameter create
       # {

data/lib/docomo-nlu/management/{organization_member.rb → V23/organization_member.rb}

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 module DocomoNlu
-  module Management
+  module Management::V23
     class OrganizationMember < Base
       self.element_name = "members"
-      self.prefix = "/management/#{DocomoNlu.config.nlu_version}/organizations/:organization_id/"
+      self.prefix = "/management/v2.2/organizations/:organization_id/"
 
       def destroy
         self.id = accountId

data/lib/docomo-nlu/management/{predicate_name.rb → V23/predicate_name.rb}

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 module DocomoNlu
-  module Management
+  module Management::V23
     class PredicateName < Base
       self.element_name = "predicateNames"
-      self.prefix = "/management/#{DocomoNlu.config.nlu_version}/projects/:project_id/bots/:bot_id/"
+      self.prefix = "/management/v2.2/projects/:project_id/bots/:bot_id/"
 
       def destroy(keys)
         self.id = keys.join(",")

data/lib/docomo-nlu/management/{project.rb → V23/project.rb}

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 module DocomoNlu
-  module Management
+  module Management::V23
     class Project < Base
       self.element_name = "projects"
-      self.prefix = "/management/#{DocomoNlu.config.nlu_version}/"
+      self.prefix = "/management/v2.2/"
 
       # Parameter for create
       # {

data/lib/docomo-nlu/management/{project_member.rb → V23/project_member.rb}

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 module DocomoNlu
-  module Management
+  module Management::V23
     class ProjectMember < Base
       self.element_name = "members"
-      self.prefix = "/management/#{DocomoNlu.config.nlu_version}/projects/:project_id/"
+      self.prefix = "/management/v2.2/projects/:project_id/"
 
       def destroy
         self.id = accountId

data/lib/docomo-nlu/management/{property.rb → V23/property.rb}

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 module DocomoNlu
-  module Management
+  module Management::V23
     class Property < Base
       self.element_name = "properties"
-      self.prefix = "/management/#{DocomoNlu.config.nlu_version}/projects/:project_id/bots/:bot_id/"
+      self.prefix = "/management/v2.2/projects/:project_id/bots/:bot_id/"
     end
   end
 end

data/lib/docomo-nlu/management/{provider.rb → V23/provider.rb}

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 module DocomoNlu
-  module Management
+  module Management::V23
     class Provider < Base
       self.element_name = "providers"
-      self.prefix = "/management/#{DocomoNlu.config.nlu_version}/"
+      self.prefix = "/management/v2.2/"
 
       # Parameter for create
       # {

data/lib/docomo-nlu/management/{scenario.rb → V23/scenario.rb}

@@ -1,18 +1,18 @@
 # frozen_string_literal: true
 
 module DocomoNlu
-  module Management
+  module Management::V23
     class Scenario < AIMLBase
       self.element_name = "scenarios"
-      self.prefix = "/management/#{DocomoNlu.config.nlu_version}/projects/:project_id/bots/:bot_id/"
+      self.prefix = "/management/v2.2/projects/:project_id/bots/:bot_id/"
 
-      @permitted_root_param = [:userScenarios,:templateScenarios]
+      @permitted_root_param = [:userScenarios, :templateScenarios]
       @permitted_userScenarios_param = [:scenarioId, :description, :compileFlag]
 
       def save
-        @attributes.select!{|a| a =~ /(userScenarios|templateScenarios)/}
+        @attributes.select! {|a| a =~ /(userScenarios|templateScenarios)/ }
         userScenarios.each do |us|
-          us.attributes.select!{|a| a =~ /(scenarioId|description|compileFlag)/}
+          us.attributes.select! {|a| a =~ /(scenarioId|description|compileFlag)/ }
         end
         super
       end

data/lib/docomo-nlu/management/{scenario_project.rb → V23/scenario_project.rb}

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 module DocomoNlu
-  module Management
+  module Management::V23
     class ScenarioProject < Base
       self.element_name = "scenarioProjects"
-      self.prefix = "/management/#{DocomoNlu.config.nlu_version}/"
+      self.prefix = "/management/v2.2/"
     end
   end
 end

data/lib/docomo-nlu/management/{scenario_util.rb → V23/scenario_util.rb}

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 module DocomoNlu
-  module Management
+  module Management::V23
     class ScenarioUtil < Base
       self.element_name = "scenarioUtils"
-      self.prefix = "/management/#{DocomoNlu.config.nlu_version}/"
+      self.prefix = "/management/v2.2/"
 
       def normalize
         # TODO

data/lib/docomo-nlu/management/{set.rb → V23/set.rb}

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 module DocomoNlu
-  module Management
+  module Management::V23
     class Set < MultipartBase
       self.element_name = "sets"
-      self.prefix = "/management/#{DocomoNlu.config.nlu_version}/projects/:project_id/bots/:bot_id/"
+      self.prefix = "/management/v2.2/projects/:project_id/bots/:bot_id/"
     end
   end
 end

data/lib/docomo-nlu/management/{task_project.rb → V23/task_project.rb}

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 module DocomoNlu
-  module Management
+  module Management::V23
     class TaskProject < Base
       self.element_name = "taskProjects"
-      self.prefix = "/management/#{DocomoNlu.config.nlu_version}/"
+      self.prefix = "/management/v2.2/"
 
       # Parameter for create
       # {

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

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module DocomoNlu
+  module Management::V26
+    class Account < Base
+      self.element_name = "accounts"
+      self.prefix = "/management/v2.6/"
+
+      # Parameter for create
+      # {
+      #     "accountName": "your account name",
+      #     "password": "your account password",
+      #     "description": "account description",
+      #     "authorization": 2,
+      #     "enable": true
+      #     "eternity": true
+      # }
+
+      def self.count
+        response_body = JSON.parse(connection.get("#{prefix}#{element_name}/count", headers).body)
+        response_body["count"]
+      end
+
+      def to_json(options = {})
+        enable_params = ["accountName", "password", "description", "authorization", "enable", "eternity"]
+        attributes.select! {|a| enable_params.include?(a) }
+        super
+      end
+    end
+  end
+end