espeak-ruby 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 180cad066c032c06a849a41fc576ec2c92e7467a
-  data.tar.gz: 5a246834822ad4abd75c9b270ebd760e3330b263
+  metadata.gz: a8a84ef69d4f7376739a28bce0ab2395dfd9326d
+  data.tar.gz: a17f27305b06bfd175057ba77b3d2412af1137f5
 SHA512:
-  metadata.gz: 5d1fce395e5c3a91c84f4a6103f2582ade114792d21cff4128d237b3d07c7c98553b876c6eff0f88f024a877412fe5c1ec9f19a3bd35910318a2713b86f20e34
-  data.tar.gz: 00f1b281b7f5f5aa7851ecd98714136140a5541fe2d94290e8bc83904d11cca40a8bc4600fcbe998f25006be7daf72a4187d05a19dee4044b2984f279c9753c6
+  metadata.gz: 4468d9f4da47b19b93ce511f05b7873c4fc5a7115dc86ede1c02ce98736449a38509d6f4b34378ac01d5691a7119c5289b44e74e1e4ed2be62fd0a2233e101a5
+  data.tar.gz: 2a5679cedf2bf438148fee7cb4fc2c7d306cd0f96bbfe36b5f750a22bec8094714709cea1f6a588a265626f4334629638eee75b82ac4378cef31b493fd629f76

data/README.md

@@ -28,7 +28,7 @@ Then use it like this:
 # Speaks "YO!"
 speech = Speech.new("YO!")
 speech.speak # invokes espeak
-  
+
 # Creates hello-de.mp3 file
 speech = Speech.new("Hallo Welt", voice: "de")
 speech.save("hello-de.mp3") # invokes espeak + lame
@@ -36,19 +36,20 @@ speech.save("hello-de.mp3") # invokes espeak + lame
 # Lists voices
 Voice.all.map { |v| v.language } # ["af", "bs", "ca", "cs", "cy", "da", "de", "el", "en", "en-sc", "en-uk", "en-uk-north", "en-uk-rp", "en-uk-wmids", "en-us", "en-wi", "eo", "es", "es-la", "fi", "fr", "fr-be", "grc", "hi", "hr", "hu", "hy", "hy", "id", "is", "it", "jbo", "ka", "kn", "ku", "la", "lv", "mk", "ml", "nci", "nl", "no", "pap", "pl", "pt", "pt-pt", "ro", "ru", "sk", "sq", "sr", "sv", "sw", "ta", "tr", "vi", "zh", "zh-yue"]
 
-# Find particular voice 
+# Find particular voice
 Voice.find_by_language('en') #<ESpeak::Voice:0x007fe1d3806be8 @language="en", @name="default", @gender="M", @file="default">
 ```
 
 Features
 --------
 
-Currently only subset of espeak features is supported. 
+Currently only subset of espeak features is supported.
 
 ```ruby
-:voice => 'en'    # use voice file of this name from espeak-data/voices
-:pitch => 50      # pitch adjustment, 0 to 99
-:speed => 170     # speed in words per minute, 80 to 370
+:voice   => 'en'    # use voice file of this name from espeak-data/voices
+:pitch   => 50      # pitch adjustment, 0 to 99
+:speed   => 170     # speed in words per minute, 80 to 370
+:capital => 170     # increase emphasis (pitch) of capitalized words, 1 to 40 (for natural sound, can go higher)
 ```
 
 These are default values, and they can be easily overridden:

data/lib/espeak/speech.rb

@@ -1,55 +1,58 @@
-require 'open3.rb'
-
 module ESpeak
   class Speech
     attr_reader :options, :text
-  
+
     # filename - The file that will be generated
     # options  - Posible key, values
     #    :voice     - use voice file of this name from espeak-data/voices. ie 'en', 'de', ...
     #    :pitch     - pitch adjustment, 0 to 99
     #    :speed     - speed in words per minute, 80 to 370
-    #    :quiet     - remove printing to stdout. Affects only lame (default false) 
-    #    
+    #    :capital   - increase emphasis of capitalized letters by raising pitch by this amount
+    #                 no range given in man but good range is 10-40 to start
+    #    :quiet     - remove printing to stdout. Affects only lame (default false)
+    #
     def initialize(text, options={})
       @text = text
       @options = options
     end
 
-    # Speaks text 
-    # 
+    # Speaks text
+    #
     def speak
-      system(espeak_command(command_options))
+      IO.popen(espeak_command(command_options), 'r').read
     end
 
-    # Generates mp3 file as a result of 
-    # Text-To-Speech conversion. 
-    # 
+    # Generates mp3 file as a result of
+    # Text-To-Speech conversion.
+    #
     def save(filename)
-      system(espeak_command(command_options, "--stdout") + " | " + lame_command(filename, command_options))
+      speech = bytes_wav
+      res = IO.popen(lame_command(filename, command_options), 'r+') do |process|
+        process.write(speech)
+        process.close_write
+        process.read
+      end
+      res.to_s
     end
 
     # Returns mp3 file bytes as a result of
     # Text-To-Speech conversion.
     #
     def bytes()
-      stdout_str, stderr_str, process = Open3.capture3(espeak_command(command_options, "--stdout") + " | " + std_lame_command(command_options))
-      stdout_str
+      speech = bytes_wav
+      res = IO.popen(std_lame_command(command_options), 'r+') do |process|
+        process.write(speech)
+        process.close_write
+        process.read
+      end
+      res.to_s
     end
 
     # Returns wav file bytes as a result of
     # Text-To-Speech conversion.
     #
     def bytes_wav()
-      stdout_str, stderr_str, process = Open3.capture3(espeak_command(command_options, "--stdout"))
-      stdout_str
-    end
-
-    # espeak dies handling some chars
-    # this function sanitizes text
-    #
-    def sanitized_text
-      @text.gsub(/(!|\?|"|`|\\)/, ' ').strip
+      IO.popen(espeak_command(command_options, "--stdout"), 'r').read
     end
 
     private
@@ -58,7 +61,7 @@ module ESpeak
       default_options.merge(symbolize_keys(options))
     end
 
-    # Although espeak itself has default options 
+    # Although espeak itself has default options
     # I'm defining them here for easier generating
     # command (with simple hash.merge)
     #
@@ -66,11 +69,12 @@ module ESpeak
       { :voice => 'en',
         :pitch => 50,
         :speed => 170,
+        :capital => 1,
         :quiet => true }
     end
 
     def espeak_command(options, flags="")
-      %|espeak "#{sanitized_text}" #{flags} -v#{options[:voice]} -p#{options[:pitch]} -s#{options[:speed]}|
+      ['espeak', "#{@text}", "#{flags}", "-v#{options[:voice]}", "-p#{options[:pitch]}", "-k#{options[:capital]}", "-s#{options[:speed]}"]
     end
 
     def std_lame_command(options)
@@ -78,7 +82,7 @@ module ESpeak
     end
 
     def lame_command(filename, options)
-      "lame -V2 - #{filename} #{'--quiet' if options[:quiet] == true}"
+      ['lame', '-V2', '-', "#{filename}", "#{'--quiet' if options[:quiet] == true}"]
     end
 
     def symbolize_keys(hash)

data/test/cases/speech_test.rb

@@ -4,11 +4,6 @@ require 'fileutils'
 class SpeechTest < Test::Unit::TestCase
   include ESpeak
 
-  def test_sanitized_text
-    assert_equal "Hello", Speech.new("Hello!").sanitized_text
-    assert_equal "Hello World", Speech.new("Hello?World").sanitized_text
-  end
-
   def test_save
     FileUtils.rm_rf("test/tmp")
     FileUtils.mkdir_p("test/tmp")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: espeak-ruby
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Dejan Simic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-24 00:00:00.000000000 Z
+date: 2016-05-14 00:00:00.000000000 Z
 dependencies: []
 description: espeak-ruby is small Ruby API for utilizing ‘espeak’ and ‘lame’ to create
   Text-To-Speech mp3 files
@@ -52,3 +52,4 @@ specification_version: 4
 summary: espeak-ruby is small Ruby API for utilizing ‘espeak’ and ‘lame’ to create
   Text-To-Speech mp3 files
 test_files: []
+has_rdoc: