noahru 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 34a1c26941d0a97a9ba767f69b1989d4af0bd5ab
-  data.tar.gz: 1e94543b91d29318982331c184a10114f6e689ba
+  metadata.gz: 02aeef81fe886995679275f4fedfd7f26c1ea2a1
+  data.tar.gz: 05514a259b22e38380ef35c37b217956a67fdb7d
 SHA512:
-  metadata.gz: 8be361f0d13e007ddc191e7c7715cba0aaca88df287f9d2e4713a7a366342785b58dd9c38539a90f2085d70945b964d8efa49b4eb2c243e0fda673795b2e8a7d
-  data.tar.gz: ce73fa387eb3417c9bd68777f9331d65c4e1a8c0d9be754af628def7b140d5f692777cd6486b079d95e9a7f12a3ad8830f4f7934d819885f246f8e51c69d5073
+  metadata.gz: 65cbcb0f7bf8fb163e1bbe86e6b673accc0fcba753047140eba920cd2df8fbd4d7911b883ce06e93d6bb052d7f532d6a181ac674dea9c81fc0a7c036cefc8aba
+  data.tar.gz: dc5db48928ed87379c3b5903c6b3452f521d6de5a284fdd33e34f944db8d63d44b28e24e7a40fb7133c83633d1bc100dd130e307d44d1b4977f92f00720a8c04

data/example/noahru.rb

@@ -16,39 +16,8 @@ api_key = ""
 
 ###dialogue
 dialogue = Noahru::Dialogue.new(api_key)
-dialogue.configure config = {
-  :sister => "sarasty_noah",
-  :user_id => "flum_",
-  :mode => "markov",
+puts dialogue.create_dialogue "おはよう", {
+  sister: :sarasty_noah,
+  mode: :api
 }
-puts dialogue.create_dialogue "たおの事どう思う？" #=>その内ヤバイ罪犯しそう
-puts dialogue.get_current_data
-###ここまで
-
-###command
-command = Noahru::Command.new(api_key)
-command.configure config = {
-  :sister => "sarasty_noah",
-  :user_id => "flum_",
-}
-puts command.send_command "learn"
-puts command.get_current_data
-###ここまで
-
-###get_talk
-get_talk = Noahru::Get_talk.new(api_key)
-get_talk.configure config = {
-  :context => "ABCDEFGH",
-}
-puts get_talk.get_talk
-puts get_talk.get_current_data
-###ここまで
-
-###get_user_recent
-get_user_recent = Noahru::Get_user_recent.new(api_key)
-get_user_recent.configure config = {
-  :user_id => "flum_",
-}
-puts get_user_recent.get_user_recent
-puts get_user_recent.get_current_data
-###ここまで
+###ここまで

data/lib/noahru/client.rb

@@ -1,16 +1,13 @@
 module Noahru
   class NoahruError < Exception; end
     
+  BaseURL = 'http://api.sarasty.flum.pw'
   class Client
-    attr_accessor :api_key, :base_url
+    attr_reader :api_key, :base_url
     
-    def initialize(api_key)
-      self.api_key = api_key
-      self.base_url = 'http://api.sarasty.flum.pw'
-    end
-    
-    def get_api_key
-      return self.api_key
+    def initialize(api_key, base_url = BaseURL)
+      @api_key = api_key
+      @base_url = base_url
     end
   end
 end

data/lib/noahru/dialogue.rb

@@ -1,47 +1,28 @@
 require 'open-uri'
 require 'json'
+require 'uri'
+require 'active_support'
+require 'active_support/core_ext'
 
 module Noahru
   class Dialogue
-    attr_accessor :sister, :user_id, :mode, :context
+    attr_accessor :request_params, :response_params
     
     def initialize(api_key)
       @client = Client.new(api_key)
     end
     
     def configure(options = {})
-      options.each do |key, value|
-        instance_variable_set("@#{key}", value)
-      end
-    end
-        
-    def get_current_data
-      return data = {
-        :sister => self.sister,
-        :user_id => self.user_id,
-        :mode => self.mode,
-        :context => self.context,
-      }
-    end
-    
-    def build_url(talk)
-      base_url = "#{@client.base_url}/apis/dialogue?api_key=#{@client.get_api_key}"
-      base_url << "&sister=#{self.sister}" unless self.sister.nil?
-      base_url << "&user_id=#{self.user_id}" unless self.user_id.nil?
-      base_url << "&mode=#{self.mode}" unless self.mode.nil?
-      base_url << "&context=#{self.context}" unless self.context.nil?
-      base_url << "&utt=#{talk}" unless talk.nil?
-      return URI.escape(base_url)
+      @request_params = options.to_param
     end
     
-    def create_dialogue talk
-      response = open(build_url(talk))
+    def create_dialogue talk, options = {}
+      uri = URI(File.join(@client.base_url, 'apis/dialogue'))
+      uri.query = options.merge(api_key: @client.api_key).to_param
+      response = open(uri)
       result = JSON.parse(response.read)
       raise NoahruError, result['error']['message'] unless result['error'].nil?
-      self.context = result['context']
-      self.mode = result['mode']
-      self.user_id = result['user_id']
-      self.sister = result['sister']
+      @response_params = result
       return result['utt']
     end
   end

data/lib/noahru/version.rb

@@ -1,3 +1,3 @@
 module Noahru
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: noahru
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - flum1025
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-18 00:00:00.000000000 Z
+date: 2016-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -70,10 +70,7 @@ files:
 - example/noahru.rb
 - lib/noahru.rb
 - lib/noahru/client.rb
-- lib/noahru/command.rb
 - lib/noahru/dialogue.rb
-- lib/noahru/get_talk.rb
-- lib/noahru/get_user_recent.rb
 - lib/noahru/version.rb
 - noahru.gemspec
 homepage: https://github.com/flum1025/Noahru

data/lib/noahru/command.rb

@@ -1,39 +0,0 @@
-module Noahru
-  class Command
-    attr_accessor :sister, :user_id
-    
-    def initialize(api_key)
-      @client = Client.new(api_key)
-    end
-    
-    def configure(options = {})
-      options.each do |key, value|
-        instance_variable_set("@#{key}", value)
-      end
-    end
-    
-    def get_current_data
-      return data = {
-        :sister => self.sister,
-        :user_id => self.user_id,
-      }
-    end
-    
-    def build_url(talk)
-      base_url = "#{@client.base_url}/apis/command?api_key=#{@client.get_api_key}"
-      base_url << "&sister=#{self.sister}" unless self.sister.nil?
-      base_url << "&user_id=#{self.user_id}" unless self.user_id.nil?
-      base_url << "&command=#{talk}"
-      return URI.escape(base_url)
-    end
-    
-    def send_command talk
-      response = open(build_url(talk))
-      result = JSON.parse(response.read)
-      raise NoahruError, result['error']['message'] unless result['error'].nil?
-      self.user_id = result['user_id']
-      self.sister = result['sister']
-      return result['response']
-    end
-  end
-end

data/lib/noahru/get_talk.rb

@@ -1,34 +0,0 @@
-module Noahru
-  class Get_talk
-    attr_accessor :context
-    
-    def initialize(api_key)
-      @client = Client.new(api_key)
-    end
-    
-    def configure(options = {})
-      options.each do |key, value|
-        instance_variable_set("@#{key}", value)
-      end
-    end
-    
-    def get_current_data
-      return data = {
-        :context => self.context,
-      }
-    end
-    
-    def build_url
-      base_url = "#{@client.base_url}/apis/get_talk?api_key=#{@client.get_api_key}"
-      base_url << "&context=#{self.context}" unless self.context.nil?
-      return URI.escape(base_url)
-    end
-    
-    def get_talk
-      response = open(build_url)
-      result = JSON.parse(response.read)
-      raise NoahruError, result['error']['message'] unless result['error'].nil?
-      return result
-    end
-  end
-end

data/lib/noahru/get_user_recent.rb

@@ -1,35 +0,0 @@
-module Noahru
-  class Get_user_recent
-    attr_accessor :user_id
-    
-    def initialize(api_key)
-      @client = Client.new(api_key)
-    end
-    
-    def configure(options = {})
-      options.each do |key, value|
-        instance_variable_set("@#{key}", value)
-      end
-    end
-    
-    def get_current_data
-      return data = {
-        :user_id => self.user_id,
-      }
-    end
-    
-    def build_url
-      base_url = "#{@client.base_url}/apis/get_user_recent?api_key=#{@client.get_api_key}"
-      base_url << "&user_id=#{self.user_id}" unless self.user_id.nil?
-      return URI.escape(base_url)
-    end
-    
-    def get_user_recent
-      response = open(build_url)
-      result = JSON.parse(response.read)
-      raise NoahruError, result['error']['message'] unless result['error'].nil?
-      return result
-    end
-
-  end
-end