lyracyst 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1a39a5e35076704944c2c416590f37cc8fbb1d6
-  data.tar.gz: 805cdc6ff1c12124f80f507d50c8f78e02467b82
+  metadata.gz: 04aa0f88e802ebfc29567e7bd4c869217ecccc0b
+  data.tar.gz: ca44ce70517f1d47ba7a42ebdcc5c0b213362d04
 SHA512:
-  metadata.gz: b843b137ae4f55980784dbf89c2eb0812e6caa1f90915bea222d5ac6a100c1f8f957d9fa3a01af02eaf9c64540a35b5edf2f1baa7de993a77addb4cd46d54cf8
-  data.tar.gz: 8bfd0f6ef818b3e11e85c56bffb9a69bf8a097c7a2a8550c0f084230b625b3f4d53d0a97fce36a99cfbccd8d1775640cfef3959eea0ed5a7d11ba6a9410fe7c3
+  metadata.gz: 955927f012089dea86c66eceb908d42913955622a463ddef9b6d3e58741ec3eec287bf840ed13d4447decf93173f6c4e9b9b9764aa686263a9b640c07d0fb915
+  data.tar.gz: 9db35817730ca71a25601bee00fa94a731c19707bba84db06132ab6bc012dd56e9b303680e7b1228b1613c838af07ef712ce8db60b0c22a9c4fe7b424d3b19bb

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 Changelog
 ===
 
+Version 1.0.2 - Code climate & defaults
+- Methodized more code blocks to improve climate
+- Now using smart defaults for httpi, multi_json & multi_xml
+
 Version 1.0.1 - Output file improvements
 - Added search term to outfile
 - Removed unnecessary duplication

data/bin/lyracyst

@@ -67,24 +67,23 @@ program_desc 'A powerful word search tool that fetches definitions, related word
 config_file '.lyracyst.yml'
 version Lyracyst::VERSION
 
-flag [:f, :format], :default_value => nil, :arg_name => 'fmt', :desc => 'File format', :long_desc => 'json or xml'
-flag [:h, :http], :default_value => :net_http_persistent, :arg_name => 'http', :desc => 'HTTP adapter', :long_desc => 'httpclient, curb, em_http, net_http_persistent, excon, rack'
-flag [:j, :json], :default_value => :oj, :arg_name => 'json', :desc => 'JSON adapter', :long_desc => 'oj, yajl, json_gem, json_pure'
-flag [:o, :out], :default_value => nil, :arg_name => 'outfile', :desc => 'Output file', :long_desc => 'filename.json or filename.xml'
-flag [:x, :xml], :default_value => :rexml, :arg_name => 'xml', :desc => 'XML adapter', :long_desc => 'ox, libxml, nokogiri, rexml'
+flag [:f, :format], :default_value => nil, :arg_name => 'string', :desc => 'File format', :long_desc => 'json or xml'
+flag [:h, :http], :default_value => nil, :arg_name => 'string', :desc => 'HTTP adapter', :long_desc => 'httpclient, curb, em_http, net_http_persistent, excon, rack'
+flag [:j, :json], :default_value => nil, :arg_name => 'string', :desc => 'JSON adapter', :long_desc => 'oj, yajl, json_gem, json_pure'
+flag [:o, :out], :default_value => nil, :arg_name => 'filename', :desc => 'Output file', :long_desc => 'filename.json or filename.xml'
+flag [:x, :xml], :default_value => nil, :arg_name => 'string', :desc => 'XML adapter', :long_desc => 'ox, libxml, nokogiri, rexml'
 switch [:fo, :force], :default_value => false, :desc => 'Force overwrite', :long_desc => 'Overwrites existing JSON & XML files'
 switch [:v, :verbose], :default_value => false, :desc => 'Prints parameters and options'
 
 desc 'Wordnik operations'
-arg_name 'wordnik'
 command :wn do |nik|
   nik.switch :canon, :default_value => false, :desc => 'Use canonical', :long_desc => "If true will try to return the correct word root ('cats' -> 'cat'). If false returns exactly what was requested."
-  nik.flag :limit, :default_value => 5, :arg_name => 'limit', :desc => 'Maximum number of results to return'
+  nik.flag :limit, :default_value => 5, :arg_name => 'integer', :desc => 'Maximum number of results to return'
   nik.desc 'Fetch definitions from Wordnik'
-  nik.arg_name 'define'
+  nik.arg_name 'word'
   nik.command :def do |define|
-    define.flag :defdict, :default_value => 'all', :arg_name => 'defdict', :desc => "CSV list. Source dictionaries to return definitions from. If 'all' is received, results are returned from all sources. If multiple values are received (e.g. 'century,wiktionary'), results are returned from the first specified dictionary that has definitions. If left blank, results are returned from the first dictionary that has definitions. By default, dictionaries are searched in this order: ahd, wiktionary, webster, century, wordnet"
-    define.flag [:p, :part], :default_value => nil, :arg_name => 'part', :desc => 'Comma-separated list of parts of speech. See http://developer.wordnik.com/docs.html#!/word/getDefinitions_get_2 for list of parts.'
+    define.flag :defdict, :default_value => 'all', :arg_name => 'string', :desc => "CSV list. Source dictionaries to return definitions from. If 'all' is received, results are returned from all sources. If multiple values are received (e.g. 'century,wiktionary'), results are returned from the first specified dictionary that has definitions. If left blank, results are returned from the first dictionary that has definitions. By default, dictionaries are searched in this order: ahd, wiktionary, webster, century, wordnet"
+    define.flag [:p, :part], :default_value => nil, :arg_name => 'csv', :desc => 'Comma-separated list of parts of speech. See http://developer.wordnik.com/docs.html#!/word/getDefinitions_get_2 for list of parts.'
     define.action do |global_options, options, args|
       search = args[0]
       params = { canon: options[:canon], defdict: options[:defdict], increl: false, inctags: false, limit: options[:limit] }
@@ -93,9 +92,9 @@ command :wn do |nik|
     end
   end
   nik.desc 'Fetch examples from Wordnik'
-  nik.arg_name 'example'
+  nik.arg_name 'word'
   nik.command :ex do |example|
-    example.flag [:s, :skip], :default_value => 0, :arg_name => 'skip', :desc => 'Results to skip'
+    example.flag [:s, :skip], :default_value => 0, :arg_name => 'integer', :desc => 'Results to skip'
     example.switch :incdups, :default_value => false, :desc => 'Show duplicate examples from different sources'
     example.action do |global_options, options, args|
       search = args[0]
@@ -105,10 +104,10 @@ command :wn do |nik|
     end
   end
   nik.desc 'Fetches related words from Wordnik'
-  nik.arg_name 'relate'
+  nik.arg_name 'word'
   nik.command :rel do |relate|
-    relate.flag :relt, :default_value => nil, :arg_name => 'reltypes', :desc => 'Limits the total results per type of relationship type'
-    relate.flag :rell, :default_value => 10, :arg_name => 'rell', :desc => 'Restrict to the supplied relationship types'
+    relate.flag :relt, :default_value => nil, :arg_name => 'integer', :desc => 'Limits the total results per type of relationship type'
+    relate.flag :rell, :default_value => 10, :arg_name => 'integer', :desc => 'Restrict to the supplied relationship types'
     relate.action do |global_options, options, args|
       search = args[0]
       params = { canon: options[:canon], rellimit: options[:rell] }
@@ -117,10 +116,10 @@ command :wn do |nik|
     end
   end
   nik.desc 'Fetches pronunciations from Wordnik'
-  nik.arg_name 'pronounce'
+  nik.arg_name 'word'
   nik.command :pro do |pronounce|
-    pronounce.flag :src, :default_value => nil, :arg_name => 'source', :desc =>'Get from a single dictionary. Valid options: ahd, century, cmu, macmillan, wiktionary, webster, or wordnet'
-    pronounce.flag :pt, :default_value => nil, :arg_name => 'ptype', :desc => 'Text pronunciation type', :long_desc => 'ahd, arpabet, gcide-diacritical, IPA'
+    pronounce.flag :src, :default_value => nil, :arg_name => 'string', :desc =>'Get from a single dictionary. Valid options: ahd, century, cmu, macmillan, wiktionary, webster, or wordnet'
+    pronounce.flag :pt, :default_value => nil, :arg_name => 'string', :desc => 'Text pronunciation type', :long_desc => 'ahd, arpabet, gcide-diacritical, IPA'
     pronounce.action do |global_options, options, args|
       search = args[0]
       params = { canon: options[:canon], limit: options[:limit], source: options[:src] }
@@ -129,9 +128,9 @@ command :wn do |nik|
     end
   end
   nik.desc 'Fetches hyphenation and syllable stresses from Wordnik. Primary stress is red, secondary stress is bright white.'
-  nik.arg_name 'hyphen'
+  nik.arg_name 'word'
   nik.command :hyph do |hyphen|
-    hyphen.flag :source, :default_value => nil, :arg_name => 'source', :desc => "Get from a single dictionary. Valid options: ahd, century, wiktionary, webster, and wordnet."
+    hyphen.flag :source, :default_value => nil, :arg_name => 'string', :desc => "Get from a single dictionary. Valid options: ahd, century, wiktionary, webster, and wordnet."
     hyphen.action do |global_options, options, args|
       search = args[0]
       params = { canon: options[:canon], limit: options[:limit] }
@@ -141,9 +140,9 @@ command :wn do |nik|
     end
   end
   nik.desc 'Fetches bi-gram phrases from Wordnik'
-  nik.arg_name 'phrase'
+  nik.arg_name 'word'
   nik.command :phr do |phrase|
-    phrase.flag :wlmi, :default_value => 13, :arg_name => 'wlmi', :desc => 'Minimum WLMI(weighted mutual info) for the phrase.'
+    phrase.flag :wlmi, :default_value => 13, :arg_name => 'integer', :desc => 'Minimum WLMI(weighted mutual info) for the phrase.'
     phrase.action do |global_options, options, args|
       search = args[0]
       params = { canon: options[:canon], limit: options[:limit], wlmi: options[:wlmi] }
@@ -152,7 +151,7 @@ command :wn do |nik|
     end
   end
   nik.desc 'Fetches etymologies from Wordnik'
-  nik.arg_name 'origin'
+  nik.arg_name 'word'
   nik.command :ori do |origin|
     origin.action do |global_options, options, args|
       search = args[0]
@@ -164,12 +163,11 @@ command :wn do |nik|
 end
 
 desc 'Rhymebrain operations'
-arg_name 'rhymebrain'
 command :rb do |rb|
-  rb.flag :lang, :default_value => 'en', :arg_name => 'lang', :desc => 'ISO639-1 language code (optional). Eg. en, de, es, fr, ru'
-  rb.flag :max, :default_value => nil, :arg_name => 'max', :desc => '(optional) The number of results to return. If you do not include this parameter, RhymeBrain will choose how many words to show based on how many good sounding rhymes there are for the word.'
+  rb.flag :lang, :default_value => 'en', :arg_name => 'string', :desc => 'ISO639-1 language code (optional). Eg. en, de, es, fr, ru'
+  rb.flag :max, :default_value => nil, :arg_name => 'integer', :desc => '(optional) The number of results to return. If you do not include this parameter, RhymeBrain will choose how many words to show based on how many good sounding rhymes there are for the word.'
   rb.desc 'Fetches rhymes from Rhymebrain.com'
-  rb.arg_name 'rhyme'
+  rb.arg_name 'word'
   rb.command :rhy do |rhyme|
     rhyme.action do |global_options, options, args|
       search = args[0]
@@ -179,7 +177,7 @@ command :rb do |rb|
     end
   end
   rb.desc 'Fetches word info from Rhymebrain.com'
-  rb.arg_name 'info'
+  rb.arg_name 'word'
   rb.command :inf do |info|
     info.action do |global_options, options, args|
       search = args[0]
@@ -189,7 +187,7 @@ command :rb do |rb|
     end
   end
   rb.desc 'Fetches combined words (portmanteaus) from Rhymebrain.com'
-  rb.arg_name 'combine'
+  rb.arg_name 'word'
   rb.command :comb do |combine|
     combine.action do |global_options, options, args|
       search = args[0]
@@ -242,12 +240,18 @@ pre do |global, command, options, args|
   http = global[:h]
   json = global[:j]
   xml = global[:x]
-  if http.class != Symbol then http = http.to_sym; end
-  Lyracyst.http(http)
-  if json.class != Symbol then json = json.to_sym; end
-  Lyracyst.json(json)
-  if xml.class != Symbol then xml = xml.to_sym; end
-  Lyracyst.xml(xml)
+  if http != nil
+    if http.class != Symbol then http = http.to_sym; end
+    Lyracyst.http(http)
+  end
+  if json != nil
+    if json.class != Symbol then json = json.to_sym; end
+    Lyracyst.json(json)
+  end
+  if xml != nil
+    if xml.class != Symbol then xml = xml.to_sym; end
+    Lyracyst.xml(xml)
+  end
   if global[:v]
     Lyracyst.label('Global options')
     print "#{global}"

data/lib/lyracyst.rb

@@ -67,24 +67,23 @@ program_desc 'A powerful word search tool that fetches definitions, related word
 config_file '.lyracyst.yml'
 version Lyracyst::VERSION
 
-flag [:f, :format], :default_value => nil, :arg_name => 'fmt', :desc => 'File format', :long_desc => 'json or xml'
-flag [:h, :http], :default_value => :net_http_persistent, :arg_name => 'http', :desc => 'HTTP adapter', :long_desc => 'httpclient, curb, em_http, net_http_persistent, excon, rack'
-flag [:j, :json], :default_value => :oj, :arg_name => 'json', :desc => 'JSON adapter', :long_desc => 'oj, yajl, json_gem, json_pure'
-flag [:o, :out], :default_value => nil, :arg_name => 'outfile', :desc => 'Output file', :long_desc => 'filename.json or filename.xml'
-flag [:x, :xml], :default_value => :rexml, :arg_name => 'xml', :desc => 'XML adapter', :long_desc => 'ox, libxml, nokogiri, rexml'
+flag [:f, :format], :default_value => nil, :arg_name => 'string', :desc => 'File format', :long_desc => 'json or xml'
+flag [:h, :http], :default_value => nil, :arg_name => 'string', :desc => 'HTTP adapter', :long_desc => 'httpclient, curb, em_http, net_http_persistent, excon, rack'
+flag [:j, :json], :default_value => nil, :arg_name => 'string', :desc => 'JSON adapter', :long_desc => 'oj, yajl, json_gem, json_pure'
+flag [:o, :out], :default_value => nil, :arg_name => 'filename', :desc => 'Output file', :long_desc => 'filename.json or filename.xml'
+flag [:x, :xml], :default_value => nil, :arg_name => 'string', :desc => 'XML adapter', :long_desc => 'ox, libxml, nokogiri, rexml'
 switch [:fo, :force], :default_value => false, :desc => 'Force overwrite', :long_desc => 'Overwrites existing JSON & XML files'
 switch [:v, :verbose], :default_value => false, :desc => 'Prints parameters and options'
 
 desc 'Wordnik operations'
-arg_name 'wordnik'
 command :wn do |nik|
   nik.switch :canon, :default_value => false, :desc => 'Use canonical', :long_desc => "If true will try to return the correct word root ('cats' -> 'cat'). If false returns exactly what was requested."
-  nik.flag :limit, :default_value => 5, :arg_name => 'limit', :desc => 'Maximum number of results to return'
+  nik.flag :limit, :default_value => 5, :arg_name => 'integer', :desc => 'Maximum number of results to return'
   nik.desc 'Fetch definitions from Wordnik'
-  nik.arg_name 'define'
+  nik.arg_name 'word'
   nik.command :def do |define|
-    define.flag :defdict, :default_value => 'all', :arg_name => 'defdict', :desc => "CSV list. Source dictionaries to return definitions from. If 'all' is received, results are returned from all sources. If multiple values are received (e.g. 'century,wiktionary'), results are returned from the first specified dictionary that has definitions. If left blank, results are returned from the first dictionary that has definitions. By default, dictionaries are searched in this order: ahd, wiktionary, webster, century, wordnet"
-    define.flag [:p, :part], :default_value => nil, :arg_name => 'part', :desc => 'Comma-separated list of parts of speech. See http://developer.wordnik.com/docs.html#!/word/getDefinitions_get_2 for list of parts.'
+    define.flag :defdict, :default_value => 'all', :arg_name => 'string', :desc => "CSV list. Source dictionaries to return definitions from. If 'all' is received, results are returned from all sources. If multiple values are received (e.g. 'century,wiktionary'), results are returned from the first specified dictionary that has definitions. If left blank, results are returned from the first dictionary that has definitions. By default, dictionaries are searched in this order: ahd, wiktionary, webster, century, wordnet"
+    define.flag [:p, :part], :default_value => nil, :arg_name => 'csv', :desc => 'Comma-separated list of parts of speech. See http://developer.wordnik.com/docs.html#!/word/getDefinitions_get_2 for list of parts.'
     define.action do |global_options, options, args|
       search = args[0]
       params = { canon: options[:canon], defdict: options[:defdict], increl: false, inctags: false, limit: options[:limit] }
@@ -93,9 +92,9 @@ command :wn do |nik|
     end
   end
   nik.desc 'Fetch examples from Wordnik'
-  nik.arg_name 'example'
+  nik.arg_name 'word'
   nik.command :ex do |example|
-    example.flag [:s, :skip], :default_value => 0, :arg_name => 'skip', :desc => 'Results to skip'
+    example.flag [:s, :skip], :default_value => 0, :arg_name => 'integer', :desc => 'Results to skip'
     example.switch :incdups, :default_value => false, :desc => 'Show duplicate examples from different sources'
     example.action do |global_options, options, args|
       search = args[0]
@@ -105,10 +104,10 @@ command :wn do |nik|
     end
   end
   nik.desc 'Fetches related words from Wordnik'
-  nik.arg_name 'relate'
+  nik.arg_name 'word'
   nik.command :rel do |relate|
-    relate.flag :relt, :default_value => nil, :arg_name => 'reltypes', :desc => 'Limits the total results per type of relationship type'
-    relate.flag :rell, :default_value => 10, :arg_name => 'rell', :desc => 'Restrict to the supplied relationship types'
+    relate.flag :relt, :default_value => nil, :arg_name => 'integer', :desc => 'Limits the total results per type of relationship type'
+    relate.flag :rell, :default_value => 10, :arg_name => 'integer', :desc => 'Restrict to the supplied relationship types'
     relate.action do |global_options, options, args|
       search = args[0]
       params = { canon: options[:canon], rellimit: options[:rell] }
@@ -117,10 +116,10 @@ command :wn do |nik|
     end
   end
   nik.desc 'Fetches pronunciations from Wordnik'
-  nik.arg_name 'pronounce'
+  nik.arg_name 'word'
   nik.command :pro do |pronounce|
-    pronounce.flag :src, :default_value => nil, :arg_name => 'source', :desc =>'Get from a single dictionary. Valid options: ahd, century, cmu, macmillan, wiktionary, webster, or wordnet'
-    pronounce.flag :pt, :default_value => nil, :arg_name => 'ptype', :desc => 'Text pronunciation type', :long_desc => 'ahd, arpabet, gcide-diacritical, IPA'
+    pronounce.flag :src, :default_value => nil, :arg_name => 'string', :desc =>'Get from a single dictionary. Valid options: ahd, century, cmu, macmillan, wiktionary, webster, or wordnet'
+    pronounce.flag :pt, :default_value => nil, :arg_name => 'string', :desc => 'Text pronunciation type', :long_desc => 'ahd, arpabet, gcide-diacritical, IPA'
     pronounce.action do |global_options, options, args|
       search = args[0]
       params = { canon: options[:canon], limit: options[:limit], source: options[:src] }
@@ -129,9 +128,9 @@ command :wn do |nik|
     end
   end
   nik.desc 'Fetches hyphenation and syllable stresses from Wordnik. Primary stress is red, secondary stress is bright white.'
-  nik.arg_name 'hyphen'
+  nik.arg_name 'word'
   nik.command :hyph do |hyphen|
-    hyphen.flag :source, :default_value => nil, :arg_name => 'source', :desc => "Get from a single dictionary. Valid options: ahd, century, wiktionary, webster, and wordnet."
+    hyphen.flag :source, :default_value => nil, :arg_name => 'string', :desc => "Get from a single dictionary. Valid options: ahd, century, wiktionary, webster, and wordnet."
     hyphen.action do |global_options, options, args|
       search = args[0]
       params = { canon: options[:canon], limit: options[:limit] }
@@ -141,9 +140,9 @@ command :wn do |nik|
     end
   end
   nik.desc 'Fetches bi-gram phrases from Wordnik'
-  nik.arg_name 'phrase'
+  nik.arg_name 'word'
   nik.command :phr do |phrase|
-    phrase.flag :wlmi, :default_value => 13, :arg_name => 'wlmi', :desc => 'Minimum WLMI(weighted mutual info) for the phrase.'
+    phrase.flag :wlmi, :default_value => 13, :arg_name => 'integer', :desc => 'Minimum WLMI(weighted mutual info) for the phrase.'
     phrase.action do |global_options, options, args|
       search = args[0]
       params = { canon: options[:canon], limit: options[:limit], wlmi: options[:wlmi] }
@@ -152,7 +151,7 @@ command :wn do |nik|
     end
   end
   nik.desc 'Fetches etymologies from Wordnik'
-  nik.arg_name 'origin'
+  nik.arg_name 'word'
   nik.command :ori do |origin|
     origin.action do |global_options, options, args|
       search = args[0]
@@ -164,12 +163,11 @@ command :wn do |nik|
 end
 
 desc 'Rhymebrain operations'
-arg_name 'rhymebrain'
 command :rb do |rb|
-  rb.flag :lang, :default_value => 'en', :arg_name => 'lang', :desc => 'ISO639-1 language code (optional). Eg. en, de, es, fr, ru'
-  rb.flag :max, :default_value => nil, :arg_name => 'max', :desc => '(optional) The number of results to return. If you do not include this parameter, RhymeBrain will choose how many words to show based on how many good sounding rhymes there are for the word.'
+  rb.flag :lang, :default_value => 'en', :arg_name => 'string', :desc => 'ISO639-1 language code (optional). Eg. en, de, es, fr, ru'
+  rb.flag :max, :default_value => nil, :arg_name => 'integer', :desc => '(optional) The number of results to return. If you do not include this parameter, RhymeBrain will choose how many words to show based on how many good sounding rhymes there are for the word.'
   rb.desc 'Fetches rhymes from Rhymebrain.com'
-  rb.arg_name 'rhyme'
+  rb.arg_name 'word'
   rb.command :rhy do |rhyme|
     rhyme.action do |global_options, options, args|
       search = args[0]
@@ -179,7 +177,7 @@ command :rb do |rb|
     end
   end
   rb.desc 'Fetches word info from Rhymebrain.com'
-  rb.arg_name 'info'
+  rb.arg_name 'word'
   rb.command :inf do |info|
     info.action do |global_options, options, args|
       search = args[0]
@@ -189,7 +187,7 @@ command :rb do |rb|
     end
   end
   rb.desc 'Fetches combined words (portmanteaus) from Rhymebrain.com'
-  rb.arg_name 'combine'
+  rb.arg_name 'word'
   rb.command :comb do |combine|
     combine.action do |global_options, options, args|
       search = args[0]
@@ -242,12 +240,18 @@ pre do |global, command, options, args|
   http = global[:h]
   json = global[:j]
   xml = global[:x]
-  if http.class != Symbol then http = http.to_sym; end
-  Lyracyst.http(http)
-  if json.class != Symbol then json = json.to_sym; end
-  Lyracyst.json(json)
-  if xml.class != Symbol then xml = xml.to_sym; end
-  Lyracyst.xml(xml)
+  if http != nil
+    if http.class != Symbol then http = http.to_sym; end
+    Lyracyst.http(http)
+  end
+  if json != nil
+    if json.class != Symbol then json = json.to_sym; end
+    Lyracyst.json(json)
+  end
+  if xml != nil
+    if xml.class != Symbol then xml = xml.to_sym; end
+    Lyracyst.xml(xml)
+  end
   if global[:v]
     Lyracyst.label('Global options')
     print "#{global}"

data/lib/lyracyst/onelook.rb

@@ -1,9 +1,9 @@
 %w{httpi multi_xml rainbow}.map { |lib| require lib }
 module Lyracyst
-  # Fetches definitions, phrases, similar words, and resource links from Onelook
+  # Fetches definitions, phrases, similar words, and resource links from Onelook.
   class Onelook
-    # @param search [String] The term to search for
-    # @param search [String] The XML response
+    # @param search [String] The term to search for.
+    # @param search [String] The XML response.
     def get_word(search, result)
       prefix = 'http://www.onelook.com/?xml=1&w='
       url = "#{prefix}#{search}"
@@ -11,12 +11,12 @@ module Lyracyst
       getter = HTTPI.get(request)
       result = getter.body
     end
-    # Fetches and processes URL
+    # Fetches and processes URL.
     class Fetch
       # Main operations. Resource links are off by default.
       #
-      # @param search [String] The term to search for
-      # @param source [Boolean] Whether to print resource links (verbose)
+      # @param search [String] The term to search for.
+      # @param source [Boolean] Whether to print resource links (verbose).
       def fetch(search, source)
         label, result = 'Onelook', nil
         Lyracyst.label(label)
@@ -53,7 +53,7 @@ module Lyracyst
       end
       # Get resource links.
       #
-      # @param re [Array] Array of resource hashes
+      # @param re [Array] Array of resource hashes.
       def get_src(re)
         x, y = 0, re.length - 1
         while x <= y

data/lib/lyracyst/rhymebrain/combine.rb

@@ -8,32 +8,39 @@ module Lyracyst
       # @param search [String] The word or phrase to search for.
       # @param params [Hash] The search parameters to use.
       def get_port(search, params)
-        func, label, result = 'Portmanteaus', 'Portmanteaus', nil
+        func, result = 'Portmanteaus', nil
         pm = Lyracyst::Rhymebrain.new
         result = pm.get_word(search, func, params, result)
         result = MultiJson.load(result)
         if result != nil
-          a, b, pmcont = 0, result.length - 1, []
           type = { 'type' => 'portmanteau' }
           st = { 'searchterm' => search }
           Lyracyst.tofile(st)
           Lyracyst.tofile(type)
-          while a <= b
-            match = result[a]
-            roots = match['source']
-            combo = match['combined']
-            both = "#{Rainbow('Root words|').bright}#{roots}#{Rainbow('Combination|').bright}#{combo}"
-            roots = { 'roots' => roots }
-            combo = { 'combo' => combo }
-            Lyracyst.tofile(roots)
-            Lyracyst.tofile(combo)
-            pmcont.push both
-            a += 1
-          end
-          Lyracyst.label(label)
-          puts pmcont.join(Rainbow('|').bright)
+          e = Lyracyst::Rhymebrain::Combine.new
+          e.comb_extra(result)
         end
       end
+      # Extra repetitive tasks
+      #
+      # @param result [Array] List of hashes to process.
+      def comb_extra(result)
+        a, b, pmcont, label = 0, result.length - 1, [], 'Portmanteau'
+        while a <= b
+          match = result[a]
+          roots = match['source']
+          combo = match['combined']
+          both = "#{Rainbow('Root words|').bright}#{roots}#{Rainbow('Combination|').bright}#{combo}"
+          roots = { 'roots' => roots }
+          combo = { 'combo' => combo }
+          Lyracyst.tofile(roots)
+          Lyracyst.tofile(combo)
+          pmcont.push both
+          a += 1
+        end
+        Lyracyst.label(label)
+        puts pmcont.join(Rainbow('|').bright)
+      end
     end
   end
 end

data/lib/lyracyst/rhymebrain/info.rb

@@ -13,51 +13,65 @@ module Lyracyst
         result = wi.get_word(search, func, params, result)
         result = MultiJson.load(result)
         if result != nil
+          Lyracyst.label(label)
           type = { 'type' => 'word info' }
           st = { 'searchterm' => search }
           Lyracyst.tofile(st)
           Lyracyst.tofile(type)
-          word = result['word']
-          pron = result['pron']
-          ipa = result['ipa']
-          flags = result['flags']
-          syllables = result['syllables']
-          Lyracyst.label(label)
-          print Rainbow('Word|').bright
-          print "#{word}"
-          print Rainbow('|ARPABET|').bright
-          print "#{pron}"
-          print Rainbow('|IPA|').bright
-          print "#{ipa}"
-          print Rainbow('|Syllables|').bright
-          print "#{syllables}"
-          print Rainbow('|Flags|').bright
-          word = { 'word' => word }
-          pron = { 'ARPABET pronunciation' => pron }
-          ipa = { 'IPA pronunciation' => ipa }
-          syllables = { 'syllables' => syllables }
-          Lyracyst.tofile(word)
-          Lyracyst.tofile(pron)
-          Lyracyst.tofile(ipa)
-          Lyracyst.tofile(syllables)
-          fcont = []
-          if flags =~ /a/
-            fcont.push Rainbow('The word is offensive.').red.bright
-            flag = { 'aflag' => 'The word is offensive.' }
-            Lyracyst.tofile(flag)
-          end
-          if flags =~ /b/
-            fcont.push 'The word might be found in most dictionaries.'
-            flag = { 'bflag' => 'The word might be found in most dictionaries.' }
-            Lyracyst.tofile(flag)
-          end
-          if flags =~ /c/
-            fcont.push 'The pronunciation is known with confidence. It was not automatically generated.'
-            flag = { 'cflag' => 'The pronunciation is known with confidence. It was not automatically generated.' }
-            Lyracyst.tofile(flag)
-          end
-          puts "#{fcont.join(Rainbow('|').bright)}"
+          e = Lyracyst::Rhymebrain::Info.new
+          e.info_extra(result)
+        end
+      end
+      # Extra repetitive taks.
+      #
+      # @param result [Array] Hash to process.
+      def info_extra(result)
+        word = result['word']
+        pron = result['pron']
+        ipa = result['ipa']
+        flags = result['flags']
+        syllables = result['syllables']
+        print Rainbow('Word|').bright
+        print "#{word}"
+        print Rainbow('|ARPABET|').bright
+        print "#{pron}"
+        print Rainbow('|IPA|').bright
+        print "#{ipa}"
+        print Rainbow('|Syllables|').bright
+        print "#{syllables}"
+        print Rainbow('|Flags|').bright
+        word = { 'word' => word }
+        pron = { 'ARPABET pronunciation' => pron }
+        ipa = { 'IPA pronunciation' => ipa }
+        syllables = { 'syllables' => syllables }
+        Lyracyst.tofile(word)
+        Lyracyst.tofile(pron)
+        Lyracyst.tofile(ipa)
+        Lyracyst.tofile(syllables)
+        f = Lyracyst::Rhymebrain::Info.new
+        f.flag_extra(flags)
+      end
+      # Extra flag tasks.
+      #
+      # @param flags [String] ABC flags to process.
+      def flag_extra(flags)
+        fcont = []
+        if flags =~ /a/
+          flag = { 'aflag' => 'The word is offensive.' }
+          fcont.push Rainbow(flag['aflag']).red.bright
+          Lyracyst.tofile(flag)
+        end
+        if flags =~ /b/
+          flag = { 'bflag' => 'The word might be found in most dictionaries.' }
+          fcont.push flag['bflag']
+          Lyracyst.tofile(flag)
+        end
+        if flags =~ /c/
+          flag = { 'cflag' => 'The pronunciation is known with confidence. It was not automatically generated.' }
+          fcont.push flag['cflag']
+          Lyracyst.tofile(flag)
         end
+        puts "#{fcont.join(Rainbow('|').bright)}"
       end
     end
   end

data/lib/lyracyst/rhymebrain/rhyme.rb

@@ -13,23 +13,29 @@ module Lyracyst
         result = rh.get_word(search, func, params, result)
         result = MultiJson.load(result)
         if result != nil
-          a, b, rcont = 0, result.length - 1, []
+          Lyracyst.label(label)
           type = { 'type' => 'rhyme' }
           st = { 'searchterm' => search }
           Lyracyst.tofile(st)
           Lyracyst.tofile(type)
-          while a <= b
-            match = result[a]
-            rhyme = match['word']
-            rcont.push rhyme
-            rhyme = { 'rhyme' => rhyme }
-            Lyracyst.tofile(rhyme)
-            a += 1
-          end
-          Lyracyst.label(label)
-          print rcont.join(Rainbow('|').bright)
-          puts ''
+          e = Lyracyst::Rhymebrain::Rhyme.new
+          e.rhyme_extra(result)
+        end
+      end
+      # Extra repetitive tasks.
+      #
+      # @param result [Array] List of hashes to process.
+      def rhyme_extra(result)
+        a, b, rcont = 0, result.length - 1, []
+        while a <= b
+          match = result[a]
+          rhyme = match['word']
+          rcont.push rhyme
+          rhyme = { 'rhyme' => rhyme }
+          Lyracyst.tofile(rhyme)
+          a += 1
         end
+        puts rcont.join(Rainbow('|').bright)
       end
     end
   end

data/lib/lyracyst/urban.rb

@@ -26,7 +26,6 @@ module Lyracyst
         list = result['list']
         Lyracyst.label(label)
         print Rainbow("|Tags|#{tags}|Type|#{rtype}").bright
-        x, y, dcont = 0, list.length - 1, []
         st = { 'searchterm' => search }
         Lyracyst.tofile(st)
         type = { 'type' => 'urban' }
@@ -35,6 +34,14 @@ module Lyracyst
         Lyracyst.tofile(type)
         Lyracyst.tofile(tags)
         Lyracyst.tofile(rtype)
+        e = Lyracyst::Urban::Define.new
+        e.urban_extra(list)
+      end
+      # Extra reptitive tasks.
+      #
+      # @param list [Array] List of hashes to process.
+      def urban_extra(list)
+        x, y = 0, list.length - 1
         while x <= y
           obj = list[x]
           author = obj['author']

data/lib/lyracyst/version.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
 module Lyracyst
   # Semantic program version
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

data/lib/lyracyst/wordnik/define.rb

@@ -16,34 +16,41 @@ module Lyracyst
       # @param part [String] Comma-separated list of parts of speech.
       # @param params [Hash] The search parameters to use.
       def get_def(search, part, params)
-        func, label, result = 'definitions', 'Definition', nil
+        func, result = 'definitions', nil
         if part != nil then params[:part] = part; end
         defi = Lyracyst::Wordnik.new
         result = defi.get_word(search, func, params, result)
         result = MultiJson.load(result)
         if result != nil
-          x, y = 0, result.length - 1
           st = { 'searchterm' => search }
           type = { 'type' => 'definition' }
           Lyracyst.tofile(st)
           Lyracyst.tofile(type)
-          while x <= y
-            d = result[x]
-            text = d['text']
-            part = d['partOfSpeech']
-            Lyracyst.label(label)
-            print Rainbow("#{part}|").bright
-            puts "#{text}|"
-            part = { 'part' => part }
-            text = { 'text' => text }
-            Lyracyst.tofile(part)
-            Lyracyst.tofile(text)
-            x += 1
-          end
+          e = Lyracyst::Wordnik::Define.new
+          e.define_extra(result)
         else
           puts 'Wordnik returned an empty string.'
         end
       end
+      # Extra repetitive tasks.
+      #
+      # @param result [Array] List of hashes to process.
+      def define_extra(result)
+        x, y, label = 0, result.length - 1, 'Definition'
+        while x <= y
+          d = result[x]
+          text = d['text']
+          part = d['partOfSpeech']
+          Lyracyst.label(label)
+          print Rainbow("#{part}|").bright
+          puts "#{text}|"
+          part = { 'part' => part }
+          text = { 'text' => text }
+          Lyracyst.tofile(part)
+          Lyracyst.tofile(text)
+          x += 1
+        end
+      end
     end
   end
 end

data/lib/lyracyst/wordnik/example.rb

@@ -8,37 +8,44 @@ module Lyracyst
       # @param search [String] The word or phrase to search for.
       # @param params [Hash] The search parameters to use.
       def get_ex(search, params)
-        func, label, result = 'examples', 'Example', nil
+        func, result = 'examples', nil
         exam = Lyracyst::Wordnik.new
         result = exam.get_word(search, func, params, result)
         result = MultiJson.load(result)
         result = result['examples']
         if result != nil
-          x, y = 0, result.length - 1
           st = { 'searchterm' => search }
           ty = { 'type' => 'example' }
           Lyracyst.tofile(st)
           Lyracyst.tofile(ty)
-          while x <= y
-            ex = result[x]
-            title = ex['title']
-            text = ex['text']
-            url = ex['url']
-            Lyracyst.label(label)
-            print Rainbow("#{title}|").bright
-            puts "#{text}|#{url}|"
-            ti = { 'title' => title }
-            te = { 'text' => text }
-            u = { 'url' => url }
-            Lyracyst.tofile(ti)
-            Lyracyst.tofile(te)
-            Lyracyst.tofile(u)
-            x += 1
-          end
+          e = Lyracyst::Wordnik::Example.new
+          e.ex_extra(result)
         else
           puts 'Wordnik failed to fetch word info.'
         end
       end
+      # Extra repetitive tasks.
+      #
+      # @param result [Array] List of hashes to process.
+      def ex_extra(result)
+        x, y, label = 0, result.length - 1, 'Example'
+        while x <= y
+          ex = result[x]
+          title = ex['title']
+          text = ex['text']
+          url = ex['url']
+          Lyracyst.label(label)
+          print Rainbow("#{title}|").bright
+          puts "#{text}|#{url}|"
+          ti = { 'title' => title }
+          te = { 'text' => text }
+          u = { 'url' => url }
+          Lyracyst.tofile(ti)
+          Lyracyst.tofile(te)
+          Lyracyst.tofile(u)
+          x += 1
+        end
+      end
     end
   end
 end

data/lib/lyracyst/wordnik/hyphen.rb

@@ -13,39 +13,46 @@ module Lyracyst
         result = hyph.get_word(search, func, params, result)
         result = MultiJson.load(result)
         if result != nil
-          x, y, hcont = 0, result.length - 1, []
           Lyracyst.label(label)
           t = { 'type' => 'hyphenation' }
           st = { 'searchterm' => search }
           Lyracyst.tofile(st)
           Lyracyst.tofile(t)
-          while x <= y
-            hy = result[x]
-            ht = hy['text']
-            if hy['type'] == 'stress'
-              stress = 'primary'
-              sh = { ht => stress }
-              h = { 'syllable' => sh }
-              Lyracyst.tofile(h)
-              hcont.push Rainbow(ht).red.bright
-            elsif hy['type'] == 'secondary stress'
-              stress = 'secondary'
-              sh = { ht => stress }
-              h = { 'syllable' => sh }
-              Lyracyst.tofile(h)
-              hcont.push Rainbow(ht).bright
-            else
-              h = { 'syllable' => ht }
-              Lyracyst.tofile(h)
-              hcont.push ht
-            end
-            x += 1
-          end
-          puts hcont.join('-')
+          e = Lyracyst::Wordnik::Hyphen.new
+          e.hyphen_extra(result)
         else
           puts 'Wordnik failed to fetch word info.'
         end
       end
+      # Extra repetitive tasks.
+      #
+      # @param result [Array] List of hashes to process.
+      def hyphen_extra(result)
+        x, y, hcont = 0, result.length - 1, []
+        while x <= y
+          hy = result[x]
+          ht = hy['text']
+          if hy['type'] == 'stress'
+            stress = 'primary'
+            sh = { ht => stress }
+            h = { 'syllable' => sh }
+            Lyracyst.tofile(h)
+            hcont.push Rainbow(ht).red.bright
+          elsif hy['type'] == 'secondary stress'
+            stress = 'secondary'
+            sh = { ht => stress }
+            h = { 'syllable' => sh }
+            Lyracyst.tofile(h)
+            hcont.push Rainbow(ht).bright
+          else
+            h = { 'syllable' => ht }
+            Lyracyst.tofile(h)
+            hcont.push ht
+          end
+          x += 1
+        end
+        puts hcont.join('-')
+      end
     end
   end
 end

data/lib/lyracyst/wordnik/origin.rb

@@ -8,48 +8,55 @@ module Lyracyst
       # @param search [String] The word or phrase to search for.
       # @param params [Hash] The search parameters to use.
       def get_et(search, params)
-        func, label, result = 'etymologies', 'Etymology', nil
+        func, result = 'etymologies', nil
         etymology = Lyracyst::Wordnik.new
-        extra = Lyracyst::Wordnik::Origin.new
+        e = Lyracyst::Wordnik::Origin.new
         result = etymology.get_word(search, func, params, result)
         if result != nil && result != '[]'
           result = MultiJson.load(result)
-          a, b, cont = 0, result.length - 1, []
           type = { 'type' => 'etymology' }
           st = { 'searchterm' => search }
           Lyracyst.tofile(st)
           Lyracyst.tofile(type)
-          while a <= b
-            xml = result[a]
-            xml = MultiXml.parse(xml)
-            root = xml['ety']
-            content, ets, er = root['__content__'], root['ets'], root['er']
-            root = { 'root' => content }
-            Lyracyst.tofile(root)
-            Lyracyst.label(label)
-            print "#{content}|"
-            if ets != nil
-              extra.origin_extra(ets)
-            else
-              puts ''
-            end
-            if er != nil
-              print '|'
-              extra.origin_extra(er)
-            else
-              puts ''
-            end
-            a += 1
-            puts ''
-          end
+          e.origin_extra(result)
         else
           puts 'Wordnik failed to fetch word info.'
         end
       end
-      # Extra reptetive tasks
+      # Extra repetitive tasks.
+      #
+      # @param result [Array] List of hashes to process.
+      def origin_extra(result)
+        ee = Lyracyst::Wordnik::Origin.new
+        a, b, label = 0, result.length - 1, 'Etymology'
+        while a <= b
+          xml = result[a]
+          xml = MultiXml.parse(xml)
+          root = xml['ety']
+          content, ets, er = root['__content__'], root['ets'], root['er']
+          root = { 'root' => content }
+          Lyracyst.tofile(root)
+          Lyracyst.label(label)
+          print "#{content}|"
+          if ets != nil
+            ee.origin_extra2(ets)
+          else
+            puts ''
+          end
+          if er != nil
+            print '|'
+            ee.origin_extra2(er)
+          else
+            puts ''
+          end
+          a += 1
+          puts ''
+        end
+      end
+      # Extra repetitive tasks.
       #
-      # @param obj [Hash] Object hash to process
-      def origin_extra(obj)
+      # @param obj [Hash] Object hash to process.
+      def origin_extra2(obj)
         a, b, container = 0, obj.length - 1, []
         while a <= b
           if b == 0

data/lib/lyracyst/wordnik/phrase.rb

@@ -13,33 +13,41 @@ module Lyracyst
         result = phr.get_word(search, func, params, result)
         result = MultiJson.load(result)
         if result != nil
-          x, y, phcont = 0, result.length - 1, []
           Lyracyst.label(label)
           type = { 'type' => 'phrase' }
           st = { 'searchterm' => search }
           Lyracyst.tofile(st)
           Lyracyst.tofile(type)
-          while x <= y
-            ph = result[x]
-            one = ph['gram1']
-            two = ph['gram2']
-            g1 = { 'gram1' => one }
-            g2 = { 'gram2' => two }
-            Lyracyst.tofile(g1)
-            Lyracyst.tofile(g2)
-            if one == search
-              item = "#{Rainbow(one).bright}➜#{two}"
-            else
-              item = "#{one}➜#{Rainbow(two).bright}"
-            end
-            phcont.push item
-            x += 1
-          end
-          puts "#{phcont.join('➜')}"
+          e = Lyracyst::Wordnik::Phrase.new
+          e.phrase_extra(search, result)
         else
           puts 'Wordnik failed to fetch word info.'
         end
       end
+      # Extra repetitive tasks.
+      #
+      # @param search [String] The word or phrase to search for.
+      # @param result [Array] List of hashes to process.
+      def phrase_extra(search, result)
+        x, y, phcont = 0, result.length - 1, []
+        while x <= y
+          ph = result[x]
+          one = ph['gram1']
+          two = ph['gram2']
+          g1 = { 'gram1' => one }
+          g2 = { 'gram2' => two }
+          Lyracyst.tofile(g1)
+          Lyracyst.tofile(g2)
+          if one == search
+            item = "#{Rainbow(one).bright}➜#{two}"
+          else
+            item = "#{one}➜#{Rainbow(two).bright}"
+          end
+          phcont.push item
+          x += 1
+        end
+        puts "#{phcont.join('➜')}"
+      end
     end
   end
 end

data/lib/lyracyst/wordnik/pronounce.rb

@@ -10,33 +10,40 @@ module Lyracyst
       # @param params [Hash] The search parameters to use.
       # @param ptype [String] Pronunciation type.
       def get_pro(search, params, ptype)
-        func, label, result = 'pronunciations', 'Pronunciation', nil
+        func, result = 'pronunciations', nil
         if ptype != nil then params[:tformat] = ptype; end
         pron = Lyracyst::Wordnik.new
         result = pron.get_word(search, func, params, result)
         result = MultiJson.load(result)
         if result != nil
-          x, y = 0, result.length - 1
           type = { 'type' => 'pronunciation' }
           st = { 'searchterm' => search }
           Lyracyst.tofile(st)
           Lyracyst.tofile(type)
-          while x <= y
-            pro = result[x]
-            rawtype = pro['rawType']
-            raw = pro['raw']
-            Lyracyst.label(label)
-            puts "#{raw}|#{rawtype}|"
-            pronunciation = { 'pronunciation' => raw }
-            ptype = { 'ptype' => rawtype }
-            Lyracyst.tofile(pronunciation)
-            Lyracyst.tofile(ptype)
-            x += 1
-          end
+          e = Lyracyst::Wordnik::Pronounce.new
+          e.pro_extra(result)
         else
           puts 'Wordnik failed to fetch word info.'
         end
       end
+      # Extra repetitive tasks.
+      #
+      # @param result [Array] List of hashes to process.
+      def pro_extra(result)
+        x, y, label = 0, result.length - 1, 'Pronunciation'
+        while x <= y
+          pro = result[x]
+          rawtype = pro['rawType']
+          raw = pro['raw']
+          Lyracyst.label(label)
+          puts "#{raw}|#{rawtype}|"
+          pronunciation = { 'pronunciation' => raw }
+          ptype = { 'ptype' => rawtype }
+          Lyracyst.tofile(pronunciation)
+          Lyracyst.tofile(ptype)
+          x += 1
+        end
+      end
     end
   end
 end

data/lib/lyracyst/wordnik/relate.rb

@@ -13,33 +13,40 @@ module Lyracyst
       # @param params [Hash] The search parameters to use.
       # @param reltypes [String] Relationship type.
       def get_rel(search, params, reltypes)
-        func, label, result = 'relatedWords', 'Related words', nil
+        func, result = 'relatedWords', nil
         if reltypes != nil then params[:reltypes] = reltypes; end
         rel = Lyracyst::Wordnik.new
         result = rel.get_word(search, func, params, result)
         result = MultiJson.load(result)
         if result != nil
-          x, y = 0, result.length - 1
           type = { 'type' => 'related words' }
           st = { 'searchterm' => search }
           Lyracyst.tofile(st)
           Lyracyst.tofile(type)
-          while x <= y
-            re = result[x]
-            words, type = re['words'], re['relationshipType']
-            Lyracyst.label(label)
-            print Rainbow("#{type}|").bright
-            puts "#{words.join('|')}"
-            words = { 'words' => words }
-            rtype = { 'relationship type' => type }
-            Lyracyst.tofile(words)
-            Lyracyst.tofile(rtype)
-            x += 1
-          end
+          e = Lyracyst::Wordnik::Relate.new
+          e.rel_extra(result)
         else
           puts 'Wordnik failed to fetch word info.'
         end
       end
+      # Extra repetitive tasks.
+      #
+      # @param result [Array] List of hashes to process.
+      def rel_extra(result)
+        x, y, label = 0, result.length - 1, 'Related words'
+        while x <= y
+          re = result[x]
+          words, type = re['words'], re['relationshipType']
+          Lyracyst.label(label)
+          print Rainbow("#{type}|").bright
+          puts "#{words.join('|')}"
+          words = { 'words' => words }
+          rtype = { 'relationship type' => type }
+          Lyracyst.tofile(words)
+          Lyracyst.tofile(rtype)
+          x += 1
+        end
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lyracyst
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Drew Prentice
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-10 00:00:00.000000000 Z
+date: 2014-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli