lyracyst 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7751d12d85b26befa84563c35152c9275f2603e3
-  data.tar.gz: 719eead3fb8cf83e71643931abf11155ab8d657b
+  metadata.gz: e1a39a5e35076704944c2c416590f37cc8fbb1d6
+  data.tar.gz: 805cdc6ff1c12124f80f507d50c8f78e02467b82
 SHA512:
-  metadata.gz: 27d43324ff46751095c76d121dfd47956659826c03bae613df1692cd5db92dd5f74a7a3efab892ffba905843999821b8e0f867f7d7a215fc92deaf7e32441e48
-  data.tar.gz: 4113d612eb6cb24ba000e0e23023b15956c46cfc2f059c7a0fa5ea2233e17c4ff27324f44395ab851159bf87d9e744e2f1d9d856aa1eba99fb7c0d99f7a2dd91
+  metadata.gz: b843b137ae4f55980784dbf89c2eb0812e6caa1f90915bea222d5ac6a100c1f8f957d9fa3a01af02eaf9c64540a35b5edf2f1baa7de993a77addb4cd46d54cf8
+  data.tar.gz: 8bfd0f6ef818b3e11e85c56bffb9a69bf8a097c7a2a8550c0f084230b625b3f4d53d0a97fce36a99cfbccd8d1775640cfef3959eea0ed5a7d11ba6a9410fe7c3

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 Changelog
 ===
 
+Version 1.0.1 - Output file improvements
+- Added search term to outfile
+- Removed unnecessary duplication
+- JSON files are pretty-generated.
+
 Version **1.0.0** - Subcommands, More options, Onelook
 - Added word info from [Onelook.com](http://www.onelook.com/?c=faq)
 - Added more CLI options

data/bin/lyracyst

@@ -4,12 +4,15 @@
 # %w(json/ext json/pure multi_json oj yajl).map { |lib| require lib }
 # %w(libxml multi_xml ox rexml/document).map { |lib| require lib }
 require 'gli'
+require 'httpi'
 require 'lyracyst/onelook'
 require 'lyracyst/rhymebrain'
 require 'lyracyst/urban'
 require 'lyracyst/version'
 require 'lyracyst/wordnik'
+require "rexml/document"
 require 'xml-fu'
+include REXML
 
 # The Lyracyst module handles base functionality.
 module Lyracyst
@@ -229,7 +232,7 @@ pre do |global, command, options, args|
     outfile = global[:o]
     if outfile =~ /\w*\.json/
       $fmt = :json
-    elsif outfile =~ /\w*.xml/
+    elsif outfile =~ /\w*\.xml/
       $fmt = :xml
     else
       puts 'Invalid file extension.'
@@ -269,17 +272,18 @@ post do |global, command, options, args|
     if File.exist?(outfile) && global[:f] == true
       if $fmt == :json
         fo = File.open(outfile, 'w+')
-        fo.print MultiJson.dump($tofile)
+        fo.print MultiJson.dump($tofile, :pretty => true)
         fo.close
+        puts Rainbow("Word search was written to #{outfile}.").bright
       elsif $fmt == :xml
         fo = File.open(outfile, 'w+')
         fo.print '<?xml version="1.0" encoding="utf-8"?>'
         fo.print XmlFu.xml($tofile)
         fo.close
+        puts Rainbow("Word search was written to #{outfile}.").bright
       else
         puts 'Invalid file extension.'
       end
-      puts Rainbow("Word search was written to #{outfile}.").bright
     end
     if File.exist?(outfile) && global[:f] == false
       puts Rainbow("#{outfile} exists. Overwrite? y/n ").bright
@@ -287,34 +291,36 @@ post do |global, command, options, args|
       if ans =~ /y/
         if $fmt == :json
           fo = File.open(outfile, 'w+')
-          fo.print MultiJson.dump($tofile)
+          fo.print MultiJson.dump($tofile, :pretty => true)
           fo.close
+          puts Rainbow("Word search was written to #{outfile}.").bright
         elsif $fmt == :xml
           fo = File.open(outfile, 'w+')
           fo.print '<?xml version="1.0" encoding="utf-8"?>'
           fo.print XmlFu.xml($tofile)
           fo.close
+          puts Rainbow("Word search was written to #{outfile}.").bright
         else
           puts 'Invalid file extension.'
         end
-        puts Rainbow("Word search was written to #{outfile}.").bright
       else
         puts 'Please try again with a different filename.'
       end
     else
       if $fmt == :json
         fo = File.open(outfile, 'w+')
-        fo.print MultiJson.dump($tofile)
+        fo.print MultiJson.dump($tofile, :pretty => true)
         fo.close
+        puts Rainbow("Word search was written to #{outfile}.").bright
       elsif $fmt == :xml
         fo = File.open(outfile, 'w+')
         fo.print '<?xml version="1.0" encoding="utf-8"?>'
         fo.print XmlFu.xml($tofile)
         fo.close
+        puts Rainbow("Word search was written to #{outfile}.").bright
       else
         puts 'Invalid file extension.'
       end
-      puts Rainbow("Word search was written to #{outfile}.").bright
     end
   end
   if global[:v]

data/lib/lyracyst.rb

@@ -4,12 +4,15 @@
 # %w(json/ext json/pure multi_json oj yajl).map { |lib| require lib }
 # %w(libxml multi_xml ox rexml/document).map { |lib| require lib }
 require 'gli'
+require 'httpi'
 require 'lyracyst/onelook'
 require 'lyracyst/rhymebrain'
 require 'lyracyst/urban'
 require 'lyracyst/version'
 require 'lyracyst/wordnik'
+require "rexml/document"
 require 'xml-fu'
+include REXML
 
 # The Lyracyst module handles base functionality.
 module Lyracyst
@@ -229,7 +232,7 @@ pre do |global, command, options, args|
     outfile = global[:o]
     if outfile =~ /\w*\.json/
       $fmt = :json
-    elsif outfile =~ /\w*.xml/
+    elsif outfile =~ /\w*\.xml/
       $fmt = :xml
     else
       puts 'Invalid file extension.'
@@ -269,17 +272,18 @@ post do |global, command, options, args|
     if File.exist?(outfile) && global[:f] == true
       if $fmt == :json
         fo = File.open(outfile, 'w+')
-        fo.print MultiJson.dump($tofile)
+        fo.print MultiJson.dump($tofile, :pretty => true)
         fo.close
+        puts Rainbow("Word search was written to #{outfile}.").bright
       elsif $fmt == :xml
         fo = File.open(outfile, 'w+')
         fo.print '<?xml version="1.0" encoding="utf-8"?>'
         fo.print XmlFu.xml($tofile)
         fo.close
+        puts Rainbow("Word search was written to #{outfile}.").bright
       else
         puts 'Invalid file extension.'
       end
-      puts Rainbow("Word search was written to #{outfile}.").bright
     end
     if File.exist?(outfile) && global[:f] == false
       puts Rainbow("#{outfile} exists. Overwrite? y/n ").bright
@@ -287,34 +291,36 @@ post do |global, command, options, args|
       if ans =~ /y/
         if $fmt == :json
           fo = File.open(outfile, 'w+')
-          fo.print MultiJson.dump($tofile)
+          fo.print MultiJson.dump($tofile, :pretty => true)
           fo.close
+          puts Rainbow("Word search was written to #{outfile}.").bright
         elsif $fmt == :xml
           fo = File.open(outfile, 'w+')
           fo.print '<?xml version="1.0" encoding="utf-8"?>'
           fo.print XmlFu.xml($tofile)
           fo.close
+          puts Rainbow("Word search was written to #{outfile}.").bright
         else
           puts 'Invalid file extension.'
         end
-        puts Rainbow("Word search was written to #{outfile}.").bright
       else
         puts 'Please try again with a different filename.'
       end
     else
       if $fmt == :json
         fo = File.open(outfile, 'w+')
-        fo.print MultiJson.dump($tofile)
+        fo.print MultiJson.dump($tofile, :pretty => true)
         fo.close
+        puts Rainbow("Word search was written to #{outfile}.").bright
       elsif $fmt == :xml
         fo = File.open(outfile, 'w+')
         fo.print '<?xml version="1.0" encoding="utf-8"?>'
         fo.print XmlFu.xml($tofile)
         fo.close
+        puts Rainbow("Word search was written to #{outfile}.").bright
       else
         puts 'Invalid file extension.'
       end
-      puts Rainbow("Word search was written to #{outfile}.").bright
     end
   end
   if global[:v]

data/lib/lyracyst/onelook.rb

@@ -24,18 +24,28 @@ module Lyracyst
         result = fe.get_word(search, result)
         result = MultiXml.parse(result)
         result = result['OLResponse']
+        st = { 'searchterm' => search }
+        Lyracyst.tofile(st)
+        t = { 'type' => 'look' }
+        Lyracyst.tofile(t)
         de, re, ph, si = result['OLQuickDef'], result['OLRes'], result['OLPhrases'].strip, result['OLSimilar'].strip
         de.map { |defi|
           Lyracyst.label('Definition')
           defi = defi.gsub(/<i>|<\/i>/, '')
+          d = { 'definition' => defi.strip }
+          Lyracyst.tofile(d)
           puts defi.strip
         }
         Lyracyst.label('Phrases')
         ph = ph.split(',')
         puts ph.join('|')
+        p = { 'phrases' => ph.join(',') }
+        Lyracyst.tofile(p)
         Lyracyst.label('Similar words')
         si = si.split(',')
         puts si.join('|')
+        s = { 'similar' => si.join(',') }
+        Lyracyst.tofile(s)
         if source
           fet = Lyracyst::Onelook::Fetch.new
           fet.get_src(re)
@@ -53,6 +63,12 @@ module Lyracyst
           hlink = res['OLResHomeLink'].strip
           Lyracyst.label('Resources')
           puts "#{name}|#{link}|#{hlink}"
+          n = { 'name' => name }
+          l = { 'link' => link }
+          hl = { 'hlink' => hlink }
+          Lyracyst.tofile(n)
+          Lyracyst.tofile(l)
+          Lyracyst.tofile(hl)
           x += 1
         end
       end

data/lib/lyracyst/rhymebrain/combine.rb

@@ -15,6 +15,8 @@ module Lyracyst
         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]

data/lib/lyracyst/rhymebrain/info.rb

@@ -14,6 +14,8 @@ module Lyracyst
         result = MultiJson.load(result)
         if result != nil
           type = { 'type' => 'word info' }
+          st = { 'searchterm' => search }
+          Lyracyst.tofile(st)
           Lyracyst.tofile(type)
           word = result['word']
           pron = result['pron']
@@ -23,7 +25,7 @@ module Lyracyst
           Lyracyst.label(label)
           print Rainbow('Word|').bright
           print "#{word}"
-          print Rainbow('|Pronunciation|').bright
+          print Rainbow('|ARPABET|').bright
           print "#{pron}"
           print Rainbow('|IPA|').bright
           print "#{ipa}"
@@ -31,7 +33,7 @@ module Lyracyst
           print "#{syllables}"
           print Rainbow('|Flags|').bright
           word = { 'word' => word }
-          pron = { 'pronunciation' => pron }
+          pron = { 'ARPABET pronunciation' => pron }
           ipa = { 'IPA pronunciation' => ipa }
           syllables = { 'syllables' => syllables }
           Lyracyst.tofile(word)

data/lib/lyracyst/rhymebrain/rhyme.rb

@@ -15,6 +15,8 @@ module Lyracyst
         if result != nil
           a, b, rcont = 0, result.length - 1, []
           type = { 'type' => 'rhyme' }
+          st = { 'searchterm' => search }
+          Lyracyst.tofile(st)
           Lyracyst.tofile(type)
           while a <= b
             match = result[a]

data/lib/lyracyst/urban.rb

@@ -27,6 +27,8 @@ module Lyracyst
         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' }
         tags = { 'tags' => tags }
         rtype = { 'result type' => rtype }

data/lib/lyracyst/version.rb

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

data/lib/lyracyst/wordnik/define.rb

@@ -23,6 +23,10 @@ module Lyracyst
         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']
@@ -30,10 +34,8 @@ module Lyracyst
             Lyracyst.label(label)
             print Rainbow("#{part}|").bright
             puts "#{text}|"
-            type = { 'type' => 'definition' }
             part = { 'part' => part }
             text = { 'text' => text }
-            Lyracyst.tofile(type)
             Lyracyst.tofile(part)
             Lyracyst.tofile(text)
             x += 1

data/lib/lyracyst/wordnik/example.rb

@@ -15,19 +15,21 @@ module Lyracyst
         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}➜"
-            ty = { 'type' => 'example' }
+            print Rainbow("#{title}|").bright
+            puts "#{text}|#{url}|"
             ti = { 'title' => title }
             te = { 'text' => text }
             u = { 'url' => url }
-            Lyracyst.tofile(ty)
             Lyracyst.tofile(ti)
             Lyracyst.tofile(te)
             Lyracyst.tofile(u)

data/lib/lyracyst/wordnik/hyphen.rb

@@ -15,11 +15,13 @@ module Lyracyst
         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']
-            t = { 'type' => 'hyphenation' }
-            Lyracyst.tofile(t)
             if hy['type'] == 'stress'
               stress = 'primary'
               sh = { ht => stress }

data/lib/lyracyst/wordnik/origin.rb

@@ -16,6 +16,8 @@ module Lyracyst
           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]
@@ -53,17 +55,15 @@ module Lyracyst
           if b == 0
             content = obj['__content__']
             container.push content
-            node = { 'node' => content }
-            Lyracyst.tofile(node)
           else
             content = obj[a]
             container.push content['__content__']
-            node = { 'node' => content }
-            Lyracyst.tofile(node)
           end
           a += 1
         end
         print "#{container.join('|')}"
+        node = { 'node' => container.join(',') }
+        Lyracyst.tofile(node)
       end
     end
   end

data/lib/lyracyst/wordnik/phrase.rb

@@ -16,6 +16,8 @@ module Lyracyst
           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]

data/lib/lyracyst/wordnik/pronounce.rb

@@ -18,6 +18,8 @@ module Lyracyst
         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]
@@ -26,7 +28,7 @@ module Lyracyst
             Lyracyst.label(label)
             puts "#{raw}|#{rawtype}|"
             pronunciation = { 'pronunciation' => raw }
-            ptype = { 'type' => rawtype }
+            ptype = { 'ptype' => rawtype }
             Lyracyst.tofile(pronunciation)
             Lyracyst.tofile(ptype)
             x += 1

data/lib/lyracyst/wordnik/relate.rb

@@ -21,6 +21,8 @@ module Lyracyst
         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]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lyracyst
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Drew Prentice
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-06 00:00:00.000000000 Z
+date: 2014-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.10'
+        version: '2.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.10'
+        version: '2.11'
 - !ruby/object:Gem::Dependency
   name: httpi
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '1.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '1.10'
 - !ruby/object:Gem::Dependency
   name: multi_xml
   requirement: !ruby/object:Gem::Requirement