rhymes 0.0.3 → 0.0.4

data/Gemfile

@@ -3,7 +3,6 @@ source :rubygems
 # Specify your gem's dependencies in rhymes.gemspec
 gemspec
 
-gem 'rake'
 group :test do
   gem 'rspec'
 end

data/lib/rhymes.rb

@@ -1,25 +1,15 @@
 require 'rhymes/version'
 
 module Rhymes
-  DEFAULTS = {:raw_dict => '/tmp/cmudict.0.7a', :compiled => '/tmp/rhymes.dat'}
+  @@options = {:raw_dict => '/tmp/cmudict.0.7a', :compiled => '/tmp/rhymes.dat'}
   
   class << self
-    ##
-    # Sets the raw dictionary location. Default: /tmp/cmudict.0.7a
-    attr_writer :raw_dict
-    
-    ##
-    # Sets the location to store/retrieve precompiled dictionary. Default: /tmp/rhymes.dat 
-    attr_writer :compiled
-    
     ##
     # Sets up options.
     # - :raw_dict - location of raw dictionary file. Default: /tmp/cmudict.0.7a
     # - :compiled - location to store/retrieve precompiled dictionary. Default: /tmp/rhymes.dat
-    def setup(options = DEFAULTS)
-      @raw_dict = options[:raw_dict] || @raw_dict || DEFAULTS[:raw_dict]
-      @compiled = options[:compiled] || @compiled || DEFAULTS[:compiled]
-      {:raw_dict => @raw_dict, :compiled => @compiled}
+    def setup(options)
+      @@options.merge!(options)
     end
     
     ##
@@ -48,12 +38,11 @@ module Rhymes
     end
 
     def init
-      setup unless @compiled && @raw_dict
-      if File.exists?(@compiled)
-        @words, @rhymes = Marshal.load(File.open(@compiled, 'rb'){|f| f.read })
-      elsif File.exists?(@raw_dict)
+      if File.exists?(@@options[:compiled])
+        @words, @rhymes = Marshal.load(File.open(@@options[:compiled], 'rb'){|f| f.read })
+      elsif File.exists?(@@options[:raw_dict])
         @words, @rhymes = {}, {}
-        File.open(@raw_dict) do |f| 
+        File.open(@@options[:raw_dict]) do |f| 
           while l = f.gets do
             next if l =~ /^[^A-Z]/ 
             word, *pron = l.strip.split(' ')
@@ -65,22 +54,15 @@ module Rhymes
           end
         end
         begin
-          File.open(@compiled, 'wb'){|f| f.write(Marshal.dump([@words, @rhymes]))}
+          File.open(@@options[:compiled], 'wb'){|f| f.write(Marshal.dump([@words, @rhymes]))}
         rescue
           # ????
         end
       else
-        raise "File #{@data_dir + RAW} does not exist. You can download latest dictionary " +
+        raise "File #{@@options[:raw_dict]} does not exist. You can download latest dictionary " +
               "from https://cmusphinx.svn.sourceforge.net/svnroot/cmusphinx/trunk/cmudict and provide "
               "file location with Rhymes.setup(:raw_dict => file_full_path) (/tmp/cmudict.0.7a by default)"
       end
     end
   end
 end
-
-
-if __FILE__ == $0
-  input = ARGV.empty? ? ['laughter', 'soaring', 'antelope'] : ARGV
-  input.each{|w| puts "# #{w} - #{Rhymes.rhyme(w).map(&:downcase).join(', ')}"}
-end
-

data/lib/rhymes/version.rb

@@ -1,3 +1,3 @@
 module Rhymes
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rhymes
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-18 00:00:00.000000000Z
+date: 2012-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &82209270 !ruby/object:Gem::Requirement
+  requirement: &79065380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *82209270
+  version_requirements: *79065380
 description: Lookup perfect and identical rhymes
 email:
 - rubify@softover.com
@@ -60,7 +60,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: rhymes
-rubygems_version: 1.8.11
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Lookup perfect and identical rhymes