docomo-nlu 0.2.5 → 0.3.2

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,9 +17,8 @@
 
 require "tempfile"
 module DocomoNlu
-  module Management::V26
+  module Management
     class AIMLBase < Base
-
       def download(extra_path = "")
         prefix_options[:bot_id] ||= botId
         @attributes[:file] = self.class.download(prefix_options, extra_path).file
@@ -38,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
@@ -55,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)
@@ -99,7 +99,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 +107,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, response if %w[ErrorFinish NotCompiled].include?(status)
+            end
+          when :transfer
+            JSON.parse(response.body)["transferStatusResponses"][0]["status"].tap do |status|
+              raise ActiveResource::ServerError, response if %w[ErrorFinish NotTransfered].include?(status)
+            end
           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
@@ -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
@@ -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

@@ -1,36 +1,38 @@
 # frozen_string_literal: true
+
 require "zip"
 
 module DocomoNlu
-  module Management::V26
+  module Management
     class BotLog < Base
       self.element_name = "botlogs"
       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
@@ -42,18 +44,20 @@ 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)
           ::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 → 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"
@@ -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 → 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/"
@@ -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 → 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,7 +1,7 @@
 # frozen_string_literal: true
 
 module DocomoNlu
-  module Management::V26
+  module Management
     class NGWord < Base
       self.element_name = "ngWords"
       self.prefix = "/management/v2.6/projects/:project_id/bots/:bot_id/"

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

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

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/"

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

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