freetts 0.2.1 → 0.2.2

data/bin/freetts

@@ -3,7 +3,7 @@
 USAGE_EXAMPLE = "Usage: freetts <MESSAGE>"
 
 if ARGV.length > 0
-  require "freetts"
+  require_relative "../lib/freetts"
   message = ARGV.join(" ")
   FreeTTS.speak(message)
 else

data/examples/hello_world.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env jruby
 
-require "freetts"
+require_relative "../lib/freetts"
 
 FreeTTS.speak("hello world")

data/examples/rss_reader.rb

@@ -2,7 +2,7 @@
 
 require "uri"
 require "rss"
-require "freetts"
+require_relative "../lib/freetts"
 
 
 feed_url = "http://feeds.feedburner.com/RubyInside"

data/examples/voice_play.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env jruby
 
-require "freetts"
+require_relative "../lib/freetts"
 
 
 # A summary of the available commands

data/lib/freetts.rb

@@ -1,8 +1,8 @@
 require "java"
-require "freetts.jar"
+require_relative "../vendor/freetts.jar"
 
-require "freetts/version"
-require "freetts/voice"
-require "freetts/freetts"
+require_relative "freetts/version"
+require_relative "freetts/voice"
+require_relative "freetts/freetts"
 
 

data/lib/freetts/freetts.rb

@@ -1,11 +1,13 @@
 module FreeTTS
   class << self
-    attr_accessor :current_voice
+    attr_writer :current_voice
+
+    def current_voice
+      @current_voice ||= Voice.for_name(Voice::DEFAULT_NAME)
+    end
 
     def speak(speakable)
-      @current_voice.speak(speakable)
+      current_voice.speak(speakable)
     end
   end
-
-  @current_voice = Voice.for_name(Voice::DEFAULT_NAME)
 end

data/lib/freetts/version.rb

@@ -1,3 +1,3 @@
 module FreeTTS
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/lib/freetts/voice.rb

@@ -30,14 +30,14 @@ module FreeTTS
     @voice_manager = com.sun.speech.freetts.VoiceManager.get_instance
 
     ACCESSIBLE_ATTRIBUTES.each do |attribute|
-      ruby_method = attribute.to_sym
-      java_method = "get_#{ attribute }".to_sym
+      ruby_method = attribute
+      java_method = "get_#{ attribute }"
       define_method(ruby_method) { @voice_impl.send(java_method) }
     end
 
     MODIFIABLE_ATTRIBUTES.each do |attribute|
-      ruby_method = "#{ attribute }=".to_sym
-      java_method = "set_#{ attribute }".to_sym
+      ruby_method = "#{ attribute }="
+      java_method = "set_#{ attribute }"
       define_method(ruby_method) { |value| @voice_impl.send(java_method, value) }
     end
 

data/test/freetts_test.rb

@@ -1,6 +1,4 @@
-$:.unshift File.join(File.dirname(__FILE__), "../lib")
-
-require "freetts"
+require_relative "../lib/freetts"
 require "test/unit"
 
 

data/test/voice_test.rb

@@ -1,6 +1,4 @@
-$:.unshift File.join(File.dirname(__FILE__), "../lib")
-
-require "freetts"
+require_relative "../lib/freetts.rb"
 require "test/unit"
 
 
@@ -14,7 +12,7 @@ class VoiceTest < Test::Unit::TestCase
     valid_accessors = %w( description gender locale pitch rate style )
     valid_accessors.each do |method|
       assert_nothing_raised do
-        valid_voice.send(method.to_sym)
+        valid_voice.send(method)
       end
     end
   end
@@ -24,7 +22,7 @@ class VoiceTest < Test::Unit::TestCase
     invalid_accessors = %w( something voice wallaby wombat parakeet )
     invalid_accessors.each do |method|
       assert_raises(NoMethodError) do
-        valid_voice.send(method.to_sym)
+        valid_voice.send(method)
       end
     end
   end

metadata

@@ -2,7 +2,7 @@
 name: freetts
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Chris kottom