docomo-nlu 0.2.7 → 0.3.0

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
@@ -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

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

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

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

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

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

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

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

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

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

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

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

data/lib/{docomo-nlu → docomo_nlu}/spontaneous.rb

@@ -16,11 +16,11 @@ module DocomoNlu
     def initialize
       super
       {
-        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"),
+        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"),
       }.each do |k, v|
         @attributes.store(k, v)
       end

data/lib/{docomo-nlu → docomo_nlu}/version.rb

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