arb-dict 0.1.6 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff8c1fa03b78d918c55d8b7192c73c0286d0d2e5
-  data.tar.gz: e3dea50d00516853f8ba872ee3236e49066651c0
+  metadata.gz: 28bf5030418631822dd0b9d744288a48247f5e86
+  data.tar.gz: 5e1482aa201e1b5347d5abbb72da90b932cb38a1
 SHA512:
-  metadata.gz: ca187d3e303a2a0c43118536ca449399b2a3dc7e48fbb6a89ba984ffc5b6c88a41b91b09f49d6a2f1c2069dc6135b4ed888aa998534d499a3621a2ac72ccf91f
-  data.tar.gz: 76e7ef3204cefee61be98a6880bf664d2a3a5bf48d4e6ed4d4ae36d960ea6e0b365c6c5025b347286e32f261598cb70dabcc9db3a5e5f8f230d230679e9b3187
+  metadata.gz: 3009afef1c314db9f1cc541e925b4da65aa76616c001ecef3c7a70ec3189db7a5283deb065c8c5ad56956ceba66581e60a2bc9228d212d0e3bc42050698c0b7d
+  data.tar.gz: fbc07b8a14f017ba5df83c4cd63071e22ae813d7e2d2c42cf150c35ba4bef353bc6db21d0ed84a53f57b80918fd5131b0c9d7391108c74e0ea182f590dc429ab

data/bin/arb-dict

@@ -10,14 +10,17 @@ define_method :fmt_json do |main_hash,*args|
 end
 
 define_method :fmt_csv do |main_hash,separator|
-  tmp_arr = [main_hash[:entity], main_hash[:phonetic_us], main_hash[:phonetic_uk],main_hash[:translation].join(separator)]
-  puts tmp_arr.to_csv
+  puts main_hash.values.map{|tmp| next tmp.join(separator) if tmp.is_a? Array;tmp}.to_csv
 end
 
 define_method :fmt_raw do |main_hash,*args|
   puts main_hash[:entity], ''
-  puts "US[#{main_hash[:phonetic_us]}]"
-  puts "UK[#{main_hash[:phonetic_uk]}]"
+  if main_hash[:entity].ascii_only?
+    puts "US[#{main_hash[:phonetic_us]}]"
+    puts "UK[#{main_hash[:phonetic_uk]}]"
+  else
+    puts "Phonetic[#{main_hash[:phonetic]}]"
+  end
   puts '' 
   puts main_hash[:translation]
 end
@@ -25,7 +28,7 @@ end
 begin
   opts = Slop.parse do |o|
     o.string *%w{-f --format}, 'available choices: json,csv,raw(default)', default: 'raw'
-    o.string *%w{-s --separator},'translations separator used in csv format(default: NEWLINE)',default: "\n"
+    o.string *%w{-s --separator},'separator used in array#join in csv format(default: NEWLINE)',default: "\n"
   end
 rescue Slop::MissingArgument
   puts 'Missing arguments!'
@@ -37,12 +40,14 @@ if opts
   entity = opts.args.first
   if entity
     tmp_hash = JSON.parse(open("http://dict.youdao.com/jsonresult?q=#{URI.encode(entity)}&type=1").read)
-    main_hash = {
-        entity: entity,
-        phonetic_us: (tmp_hash['sm'] || 'No US Phonetic'),
-        phonetic_uk: (tmp_hash['uksm'] || 'No UK Phonetic'),
-        translation: (tmp_hash['basic'] || 'No Translation')
-    }
+    main_hash = { entity: entity }
+    if entity.ascii_only?
+      main_hash[:phonetic_us]=(tmp_hash['sm'] || 'No US Phonetic')
+      main_hash[:phonetic_uk]=(tmp_hash['uksm'] || 'No UK Phonetic')
+    else
+      main_hash[:phonetic]=(tmp_hash['sm'] || 'No Phonetic')
+    end
+    main_hash[:translation]=(tmp_hash['basic'] || 'No Translation')
     send "fmt_#{opts[:format]}", main_hash,opts[:separator]
   else
     puts 'Missing target, please specify a word or phrase!'

data/lib/arb/dict/version.rb

@@ -1,5 +1,5 @@
 module Arb
   module Dict
-   VERSION = "0.1.6"
+   VERSION = "0.1.8"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arb-dict
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.8
 platform: ruby
 authors:
 - arybin