voice_text_api 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b85509670c08ffcade0d1ef1f6268fdeee90816
-  data.tar.gz: 50564598e1d7b3b55d6175280c74e265806cd1c9
+  metadata.gz: 88b7d1c6fe2918713532506ea0153b1541ace307
+  data.tar.gz: 72f3b40b2f76ab6718dece8bebd10cf008a19d73
 SHA512:
-  metadata.gz: 28defe53bf374ee8fd2eeb581486144369768557bc8e889349684c396add72dd7bbb5064633d6f92fe80d19353d7747c3ed708987884dfd6920f69df36ab7d60
-  data.tar.gz: 497e9e45b93990c3f3945121f8620391a060e715ddc6e731f1cabed8ba6973eb15b709ceea87eb7cfc8f1e7d38f1a9bf82f62ddeeb1478c6886c9a14f7e46515
+  metadata.gz: 7128f6b5f893c22049252248d638707db7e52117a4d3a246f3cf15c4f5402cec5c58444de23f5e8d4442834480885bdc757c6312fe3e45c51d3aa023405ffd5b
+  data.tar.gz: 0321fe8aceb8b5c1e0d098391d2f7d68990802faeda2a4f03fc547cdf9a75f55e8549e7aabd753c62ee0123c5d529409a07d0635ae8a569150c93922909afe32

data/lib/voice_text_api.rb

@@ -6,16 +6,9 @@ class VoiceTextAPI
   class BadRequest < StandardError; end
   class Unauthoeized < StandardError; end
 
-  # speakers
-  SHOW   = :show
-  HARUKA = :haruka
-  HIKARI = :hikari
-  TAKERU = :takeru
-
-  # emotions
-  HAPPINESS = :happiness
-  ANGER     = :anger
-  SADNESS   = :sadness
+  ENDPOINT = URI('https://api.voicetext.jp/v1/tts')
+  SPEAKERS = %w(show haruka hikari takeru)
+  EMOTIONS = %w(happiness anger sadness)
 
   # emotion levels
   HIGHT     = 2
@@ -25,15 +18,14 @@ class VoiceTextAPI
     @api_key = api_key
   end
 
-  def tts(text, speaker = :show, emotion: nil, emotion_level: 1, pitch: 100, speed: 100, volume: 100)
+  def tts(text, speaker = :show, emotion: nil, emotion_level: NORMAL, pitch: 100, speed: 100, volume: 100)
+    validate_parameters(speaker, emotion, emotion_level, pitch, speed, volume)
+
     res = nil
-    uri = URI('https://api.voicetext.jp/v1/tts')
-    https = Net::HTTP.new(uri.host, 443)
+    https = Net::HTTP.new(ENDPOINT.host, 443)
     https.use_ssl = true
     https.start do |https|
-      req = Net::HTTP::Post.new(uri.path)
-      req.basic_auth(@api_key, '')
-      req.body = body(text, speaker, emotion, emotion_level, pitch, speed, volume)
+      req = create_request(https, text, speaker, emotion, emotion_level, pitch, speed, volume)
       res = https.request(req)
     end
 
@@ -50,14 +42,28 @@ class VoiceTextAPI
   end
 
 private
-  def body(text, speaker, emotion, emotion_level, pitch, speed, volume)
-    s = "text=#{ERB::Util.u(text)};speaker=#{ERB::Util.u(speaker)}"
+  def validate_parameters(speaker, emotion, emotion_level, pitch, speed, volume)
+    raise ArgumentError.new("wrong speaker: #{speaker}" ) unless SPEAKERS.index(speaker.to_s)
+	 if speaker != :show && emotion != nil
+    	raise ArgumentError.new("wrong emotion: #{emotion}" ) unless EMOTIONS.index(emotion.to_s)
+    end
+    raise ArgumentError.new("wrong emotion_level: #{emotion_level}" ) unless (1..2).include?(emotion_level)
+    raise ArgumentError.new("wrong pitch: #{pitch}" ) unless (50..200).include?(pitch)
+    raise ArgumentError.new("wrong speed: #{speed}" ) unless (50..200).include?(speed)
+    raise ArgumentError.new("wrong volume: #{volume}" ) unless (50..200).include?(volume)
+  end
+
+  def create_request(session, text, speaker, emotion, emotion_level, pitch, speed, volume)
+    req = Net::HTTP::Post.new(ENDPOINT.path)
+    req.basic_auth(@api_key, '')
+    s = "text=#{ERB::Util.u(text.encode('UTF-8'))};speaker=#{ERB::Util.u(speaker)}"
     s << ";emotion=#{ERB::Util.u(emotion)}" if emotion
     s << ";emotion_level=#{emotion_level.to_i}" unless emotion_level.to_i == 1
     s << ";pitch=#{pitch.to_i}" unless pitch.to_i == 100
     s << ";speed=#{speed.to_i}" unless speed.to_i == 100
     s << ";volume=#{volume.to_i}" unless volume.to_i == 100
+    req.body = s
 
-    return s
+    return req
   end
 end

data/lib/voice_text_api/version.rb

@@ -1,3 +1,3 @@
 class VoiceTextAPI
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: voice_text_api
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - TADA Tadashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-09 00:00:00.000000000 Z
+date: 2014-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler