arb-dict 0.1.4 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b28cb79a15bc35691e1c293774b1ccb7293285e4
-  data.tar.gz: 6de408ae01406f25eb4e58782a46aa829e928ed6
+  metadata.gz: ff8c1fa03b78d918c55d8b7192c73c0286d0d2e5
+  data.tar.gz: e3dea50d00516853f8ba872ee3236e49066651c0
 SHA512:
-  metadata.gz: 7f7e2f0ab199aeecd2d1868de5587294aa0f17ace00dc47c45909749f0c62bca69e3a00081468e1f44d1442f40bfa2acbc2778b27ffa08e30b8b73f6af39a456
-  data.tar.gz: da3635de95e4461288273e5df82fd4b575cc34e4e1e591493568128b68e70dda16f9920374881a5a01b01b2494c168116fb7f8693659fdf698cca1db88d1eebc
+  metadata.gz: ca187d3e303a2a0c43118536ca449399b2a3dc7e48fbb6a89ba984ffc5b6c88a41b91b09f49d6a2f1c2069dc6135b4ed888aa998534d499a3621a2ac72ccf91f
+  data.tar.gz: 76e7ef3204cefee61be98a6880bf664d2a3a5bf48d4e6ed4d4ae36d960ea6e0b365c6c5025b347286e32f261598cb70dabcc9db3a5e5f8f230d230679e9b3187

data/bin/arb-dict

@@ -1,38 +1,31 @@
 #!/usr/bin/env ruby
+require 'uri'
 require 'csv'
 require 'slop'
 require 'json'
 require 'open-uri'
 
-
-define_method :fmt_json do |main_hash|
+define_method :fmt_json do |main_hash,*args|
   puts main_hash.to_json
 end
 
-define_method :fmt_csv do |main_hash|
-  tmp_arr = [main_hash[:entity], main_hash[:phonetic_us], main_hash[:phonetic_uk],main_hash[:translation],main_hash[:sentences]]
+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
 end
 
-define_method :fmt_raw do |main_hash|
+define_method :fmt_raw do |main_hash,*args|
   puts main_hash[:entity], ''
-  puts "US[#{main_hash[:phonetic_us]}]" if main_hash[:phonetic_us].size>0
-  puts "UK[#{main_hash[:phonetic_uk]}]" if main_hash[:phonetic_uk].size>0
-  puts '' if (main_hash[:phonetic_us].size>0 || main_hash[:phonetic_uk].size>0)
+  puts "US[#{main_hash[:phonetic_us]}]"
+  puts "UK[#{main_hash[:phonetic_uk]}]"
+  puts '' 
   puts main_hash[:translation]
-  if main_hash[:sentences].size>0
-    puts ''
-    main_hash[:sentences].each do |sentence|
-      puts sentence[:entity], sentence[:translation], ''
-    end
-  end
 end
 
-
 begin
   opts = Slop.parse do |o|
-    o.bool *%w{-s --sentence}, 'show sentences'
     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"
   end
 rescue Slop::MissingArgument
   puts 'Missing arguments!'
@@ -43,28 +36,16 @@ end
 if opts
   entity = opts.args.first
   if entity
-    tmp_hash = JSON.parse(open("http://dict.youdao.com/jsonresult?q=#{entity}&type=1").read)
+    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[:sentences]=[]
-    if opts.sentence?
-      JSON.parse(open("http://dict.youdao.com/jsonapi?q=#{entity}").read)['blng_sents_part']['sentence-pair'].each do |inner_hash|
-        main_hash[:sentences] << {
-            entity: inner_hash['sentence'],
-            translation: inner_hash['sentence-translation']
-        }
-      end
-    end
-    send "fmt_#{opts[:format]}", main_hash
+    send "fmt_#{opts[:format]}", main_hash,opts[:separator]
   else
     puts 'Missing target, please specify a word or phrase!'
     exit
   end
 end
-
-
-

data/lib/arb/dict/version.rb

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

metadata

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