ispeech 1.0.1 → 1.0.2

data/lib/ispeech/constants.rb

@@ -2,7 +2,7 @@ require 'uri'
 
 module Ispeech
 
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 
   class Voice
     QUALITY_LOW = 8000

data/lib/ispeech/voice.rb

@@ -4,6 +4,9 @@ module Ispeech
   class Voice
     attr_reader :languages, :speaker, :gender, :quality
 
+    ERROR_VOICE_DOES_NOT_EXIST = Error.new("Voice does not exist.")
+    ERROR_NO_VOICE_FOR_OPTIONS = Error.new("No voice exists for the options requested.")
+
     def initialize(speaker, gender, *languages)
       @speaker = speaker
       @gender = gender
@@ -72,23 +75,26 @@ module Ispeech
         named_voice(speaker)
       else
         language = options[:language] || :en
-        gender = options[:gender]
-        speakers_for_language = self.map[language]
-
-        speakers = case gender
-        when GENDER_FEMALE
-          speakers_for_language[GENDER_FEMALE]
-        when GENDER_MALE
-          speakers_for_language[GENDER_MALE]
+        gender = options[:gender].nil? ? nil : options[:gender].to_sym
+        speakers_for_language = self.map[language.to_sym]
+
+        if speakers_for_language.nil?
+          raise ERROR_NO_VOICE_FOR_OPTIONS
         else
-          speakers_for_language[GENDER_FEMALE] +
+          speakers = case gender
+          when GENDER_FEMALE
+            speakers_for_language[GENDER_FEMALE]
+          when GENDER_MALE
             speakers_for_language[GENDER_MALE]
-        end
+          else
+            speakers_for_language[GENDER_FEMALE] + speakers_for_language[GENDER_MALE]
+          end
 
-        if speakers.empty?
-          nil
-        else
-          named_voice(speakers.sample)
+          if speakers.empty?
+            raise ERROR_NO_VOICE_FOR_OPTIONS
+          else
+            named_voice(speakers.sample)
+          end
         end
       end
     end
@@ -113,7 +119,7 @@ module Ispeech
       if info = @@voices[speaker.to_s.downcase.to_sym]
         info
       else
-        raise Error.new("Voice does not exist.")
+        raise ERROR_VOICE_DOES_NOT_EXIST
       end
     end
 

data/lib/ispeech/voice_service.rb

@@ -6,6 +6,7 @@ module Ispeech
     CLIENT_ENVIRONMENT = "RUBY_#{RUBY_VERSION}"
 
     ERROR_MISSING_CONFIG = Error.new("VoiceService requires configuration.")
+    ERROR_MISSING_VOICE = Error.new("Voice generation requires a voice.")
 
     attr_reader :config
 
@@ -31,6 +32,8 @@ module Ispeech
     end
 
     def generate_with_voice(text, voice)
+      raise ERROR_MISSING_VOICE unless voice.is_a?(Ispeech::Voice)
+
       params = {
         # API Defaults:
         # :bitrate => 48,

data/spec/ispeech/voice_service_spec.rb

@@ -63,6 +63,12 @@ describe Ispeech::VoiceService do
         pending("Without mock, the returned file quality needs to be confirmed")
       end
     end
+
+    it 'should throw an error if no custom voice is given' do
+       expect do
+        service.generate_with_voice(text_string, nil)
+       end.to raise_error(Ispeech::Error, Ispeech::VoiceService::ERROR_MISSING_VOICE.message)
+    end
   end
 
 end

data/spec/ispeech/voice_spec.rb

@@ -28,7 +28,7 @@ describe Ispeech::Voice do
     it 'should throw an error if the voice does not exist' do
       expect do
         Ispeech::Voice.named_voice('Birkir')
-      end.to raise_error(Ispeech::Error, "Voice does not exist.")
+      end.to raise_error(Ispeech::Voice::ERROR_VOICE_DOES_NOT_EXIST)
     end
 
     it 'should return the active voice map' do
@@ -66,6 +66,12 @@ describe Ispeech::Voice do
         (DEFAULT_ENGLISH_FEMALE_TEST_VOICES + DEFAULT_ENGLISH_MALE_TEST_VOICES).should include(voice.speaker)
       end
 
+      it 'throws error, with non existing speaker' do
+        expect do
+          Ispeech::Voice.extract_from_options(:speaker => 'Zorg')
+        end.to raise_error(Ispeech::Voice::ERROR_VOICE_DOES_NOT_EXIST)
+      end
+
       it 'specifies a speaker' do
         voice = Ispeech::Voice.extract_from_options(:speaker => 'antoine')
         voice.speaker.should == 'Antoine'
@@ -78,6 +84,12 @@ describe Ispeech::Voice do
         voice.speaker.should == 'Rosa'
       end
 
+      it 'throws error, with non existing language' do
+        expect do
+          Ispeech::Voice.extract_from_options(:language => :vorgon)
+        end.to raise_error(Ispeech::Voice::ERROR_NO_VOICE_FOR_OPTIONS)
+      end
+
       it 'specifies a language and no gender' do
         voice = Ispeech::Voice.extract_from_options(:language => :fr)
         voice.should_not be_nil
@@ -87,10 +99,14 @@ describe Ispeech::Voice do
       it 'specifies a language and gender' do
         voice = Ispeech::Voice.extract_from_options(:language => :es, :gender => Ispeech::Voice::GENDER_FEMALE)
         voice.speaker.should == 'Rosa'
+      end
 
-        voice = Ispeech::Voice.extract_from_options(:language => :es, :gender => Ispeech::Voice::GENDER_MALE)
-        voice.should be_nil
+      it 'throws error, with non existing language gender' do
+        expect do
+          puts Ispeech::Voice.extract_from_options(:language => :es, :gender => :male)
+        end.to raise_error(Ispeech::Voice::ERROR_NO_VOICE_FOR_OPTIONS)
       end
+
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ispeech
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-24 00:00:00.000000000 Z
+date: 2012-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backports