docomo-nlu 0.2.6 → 0.3.4

data/lib/docomo_nlu/management.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+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 :BotLog,             "docomo_nlu/management/bot_log"
+    autoload :Config,             "docomo_nlu/management/config"
+    autoload :DefaultPredicate,   "docomo_nlu/management/default_predicate"
+    autoload :Entry,              "docomo_nlu/management/entry"
+    autoload :Log,                "docomo_nlu/management/log"
+    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 :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"
+    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/management/V26 → docomo_nlu/management}/account.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module DocomoNlu
-  module Management::V26
+  module Management
     class Account < Base
       self.element_name = "accounts"
       self.prefix = "/management/v2.6/"

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

@@ -17,7 +17,7 @@
 
 require "tempfile"
 module DocomoNlu
-  module Management::V26
+  module Management
     class AIMLBase < Base
       def download(extra_path = "")
         prefix_options[:bot_id] ||= botId
@@ -37,7 +37,7 @@ module DocomoNlu
 
       def transfer
         prefix_options[:bot_id] ||= botId
-        self.class.deploy_request(prefix_options)
+        self.class.transfer(prefix_options)
       end
 
       def deploy
@@ -54,13 +54,14 @@ module DocomoNlu
           response = conn.get("#{FileModel.collection_path(prefix_options)}/#{extra_path}")
 
           if check_response(response)
-            instantiate_record({}, prefix_options).tap do |record|
+            return instantiate_record({}, prefix_options).tap do |record|
               record.file = Tempfile.open(["docomo-nlu", ".#{prefix_options[:method]}"]) do |f|
                 f.write response.body.force_encoding("UTF-8")
                 f
               end
             end
           end
+          nil
         end
 
         def upload(file, prefix_options)
@@ -116,11 +117,11 @@ module DocomoNlu
           case method
           when :compile
             JSON.parse(response.body)["status"].tap do |status|
-              raise ActiveResource::ServerError.new(response) if %w[ErrorFinish NotCompiled].include?(status)
+              raise ActiveResource::ServerError, 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)
+              raise ActiveResource::ServerError, response if %w[ErrorFinish NotTransfered].include?(status)
             end
           end
         end

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

@@ -3,7 +3,7 @@
 require "net/http"
 
 module DocomoNlu
-  module Management::V26
+  module Management
     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
@@ -47,7 +47,7 @@ module DocomoNlu
       class << self
         def instantiate_collection(collection, original_params = {}, prefix_options = {})
           if collection.is_a?(Hash)
-            collection = if collection.empty? || collection.first[1].nil?
+            collection = if collection.compact.empty?
                            []
                          else
                            [collection]

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module DocomoNlu
-  module Management::V26
+  module Management
     class Bot < AIMLBase
       self.element_name = "bots"
       self.prefix = "/management/v2.6/projects/:project_id/"

data/lib/{docomo-nlu/management/V26 → docomo_nlu/management}/bot_log.rb

@@ -3,7 +3,7 @@
 require "zip"
 
 module DocomoNlu
-  module Management::V26
+  module Management
     class BotLog < Base
       self.element_name = "botlogs"
       self.prefix = "/management/v2.6/projects/:project_id/"
@@ -44,12 +44,13 @@ module DocomoNlu
           response = conn.get("#{collection_path(prefix_options)}?botId=#{bot_id}&#{params.to_query}")
 
           if check_response(response)
-            Tempfile.open(["docomo-nlu", ".zip"]) do |f|
+            return Tempfile.open(["docomo-nlu", ".zip"]) do |f|
               f.binmode
               f.write response.body
               f
             end
           end
+          nil
         end
 
         def unzip(file)

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module DocomoNlu
-  module Management::V26
+  module Management
     class Config < Base
       self.element_name = "configs"
       self.prefix = "/management/v2.6/projects/:project_id/bots/:bot_id/"

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module DocomoNlu
-  module Management::V26
+  module Management
     class DefaultPredicate < Base
       self.element_name = "defaultPredicates"
       self.prefix = "/management/v2.6/projects/:project_id/bots/:bot_id/"

data/lib/{docomo-nlu/management/V26 → docomo_nlu/management}/entry.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module DocomoNlu
-  module Management::V26
+  module Management
     class Entry < Base
       self.element_name = ""
       self.prefix = "/management/v2.6/projects/:project_id/bots/:bot_id/:method"

data/lib/{docomo-nlu/management/V26 → docomo_nlu/management}/log.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module DocomoNlu
-  module Management::V26
+  module Management
     class Log < Base
       self.element_name = "logs"
       self.prefix = "/management/v2.6/projects/:project_id/"

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module DocomoNlu
-  module Management::V26
+  module Management
     class Map < MultipartBase
       self.element_name = "maps"
       self.prefix = "/management/v2.6/projects/:project_id/bots/:bot_id/"

data/lib/docomo_nlu/management/multipart_base.rb

@@ -0,0 +1,85 @@
+# frozen_string_literal: true
+
+require "tempfile"
+module DocomoNlu
+  module Management
+    class MultipartBase < Base
+      def save
+        self.class.create(attributes[:file], prefix_options)
+      end
+
+      def destroy
+        self.id = try(:category)
+        super
+      end
+
+      class << self
+        def create(file, prefix_options)
+          check_prefix_options(prefix_options)
+          raise ActiveResource::BadRequest, "" unless file.instance_of?(File)
+
+          upload(file, prefix_options)
+        end
+
+        def find(*arguments)
+          scope   = arguments.slice!(0)
+          options = arguments.slice!(0) || {}
+
+          prefix_options, = split_options(options[:params])
+          check_prefix_options(prefix_options)
+
+          case scope
+          when :all then download(nil, prefix_options)
+          else download(scope, prefix_options)
+          end
+        end
+
+        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
+
+        private
+
+          def download(category = nil, prefix_options = {})
+            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
+
+            response = conn.get(element_path(category, 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
+                record.category = category
+                record.categories = JSON.parse(response.body)["categories"] unless category
+              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/V26 → docomo_nlu/management}/ng_word.rb

@@ -1,10 +1,11 @@
 # frozen_string_literal: true
 
 module DocomoNlu
-  module Management::V26
-    class NGWord < Base
+  module Management
+    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/V23/multipart_base.rb → docomo_nlu/management/ok_ng_base.rb}

@@ -2,17 +2,22 @@
 
 require "tempfile"
 module DocomoNlu
-  module Management::V23
-    class MultipartBase < Base
+  module Management
+    class OKNGBase < Base
+      class_attribute :extention
+
       def save
         self.class.create(attributes[:file], prefix_options)
       end
 
       def destroy
-        self.id = try(:category)
         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)
@@ -21,52 +26,42 @@ module DocomoNlu
           upload(file, prefix_options)
         end
 
-        def find(*arguments)
-          scope   = arguments.slice!(0)
-          options = arguments.slice!(0) || {}
+        def all(options = {})
+          find(options)
+        end
 
+        def find(options)
           prefix_options, = split_options(options[:params])
           check_prefix_options(prefix_options)
-
-          case scope
-          when :all then download(nil, prefix_options)
-          else download(scope, prefix_options)
-          end
+          download(prefix_options)
         end
 
         def where(clauses = {})
-          raise ArgumentError, "expected a clauses Hash, got #{clauses.inspect}" unless clauses.is_a? Hash
-
-          category = clauses[:category]
-          find(category, params: clauses)
+          find(params: clauses)
         end
 
-        private
-
-        def download(category = nil, prefix_options = {})
-          extention = category.blank? ? ".zip" : ".map"
-
+        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(category, prefix_options))
+          response = conn.get(element_path(nil, prefix_options))
 
           if check_response(response)
-            instantiate_record({}, prefix_options).tap do |record|
+            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
-              record.category = category
             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 :multipart
             builder.request :url_encoded
             builder.adapter :net_http
           end

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

@@ -1,10 +1,11 @@
 # frozen_string_literal: true
 
 module DocomoNlu
-  module Management::V26
-    class OKWord < Base
+  module Management
+    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/management/V26 → docomo_nlu/management}/organization.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module DocomoNlu
-  module Management::V26
+  module Management
     class Organization < Base
       self.element_name = "organizations"
       self.prefix = "/management/v2.6/"

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module DocomoNlu
-  module Management::V26
+  module Management
     class OrganizationMember < Base
       self.element_name = "members"
       self.prefix = "/management/v2.6/organizations/:organization_id/"

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module DocomoNlu
-  module Management::V26
+  module Management
     class PredicateName < Base
       self.element_name = "predicateNames"
       self.prefix = "/management/v2.6/projects/:project_id/bots/:bot_id/"

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module DocomoNlu
-  module Management::V26
+  module Management
     class Project < Base
       self.element_name = "projects"
       self.prefix = "/management/v2.6/"

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module DocomoNlu
-  module Management::V26
+  module Management
     class ProjectMember < Base
       self.element_name = "members"
       self.prefix = "/management/v2.6/projects/:project_id/"

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module DocomoNlu
-  module Management::V26
+  module Management
     class Property < Base
       self.element_name = "properties"
       self.prefix = "/management/v2.6/projects/:project_id/bots/:bot_id/"