fy 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d40f45c8f927cbb0078290a7eb41ea0bf2fd306
-  data.tar.gz: 3cc54a73e13493f11ea20a7534221662ee67bf4a
+  metadata.gz: 29d895380f7026ce8bd9dec799ea3e0d4ffbd389
+  data.tar.gz: b71bdb07fcd3c0a648b2b3d5d6edf554ae769268
 SHA512:
-  metadata.gz: dccd1e49c411f805771a3843f69da9fe8e37a658997de3758bb763724dac17fa654c52d45e53534e2548962d996e2f99f0f4042944c44fe4f179fb68161fdd82
-  data.tar.gz: 20e8bd88579bb40c61091c2b6f3b3a75936a9ae13777bb29c099327861cd26bbe12aa579b4dcbb3d7bbd7d02719edfd5972fd8f4e74c85bf1d8caecb40a7010d
+  metadata.gz: 9b8b25be46fbae8520c177c8b33abb9a2f5aa5af82d5ae19c1c07249134a5c568555d63636e1af9eef2277875bcf23036030b9cfbc122944bec7ddc79178cefe
+  data.tar.gz: adabe549e5b662e314e9b89a256aeb8cd64856d13d3a008a93ab3feb493e7edc8ebcf59fa92c10cb90e2555abfe887077f5d9d7cdc818223760594e04c62fd57

data/README.md

@@ -43,6 +43,15 @@ More words.
 $ fy make love
 ```
 
+~~More more words.~~  Loop mode, CTRL+C to exit.
+```bash
+$ fy
+> words
+> to
+> translate
+```
+
+
 Support Chinese, even sentence.
 
 ```bash

data/Rakefile

@@ -1 +1,9 @@
 require "bundler/gem_tasks"
+require "rake/testtask"
+
+task :default => :test
+
+Rake::TestTask.new(:test) do |t|
+  t.libs << "test"
+  t.pattern = "test/**/test_*.rb"
+end

data/bin/fy

@@ -1,18 +1,30 @@
 #!/usr/bin/env ruby
 
-require_relative '../lib/fy/fanyi_result'
+require_relative '../lib/fy/fanyi'
 
 help = <<HELP
 fanyi.rb: Translate tools in the command line
   $ fy word
   $ fy world peace
   $ fy chinglish
+  $ fy 
+  > enter the loop mode, ctrl+c to exit
 HELP
 
 if ARGV.empty?
+  begin
+    loop do
+      print '> '
+      input = gets.chomp
+      # 输入为空时继续循环
+      next if input == ''
+      puts Fy::Fanyi.new(input).result
+    end
+  rescue Interrupt
+    puts 'bye~'
+  end
+elsif %w{-h --help}.any?{ |c| ARGV.include? c }
   puts help
-  exit 1
 else
-  fy_result = Fy::FanyiResult.new(ARGV)
-  fy_result.puts_result
+  puts Fy::Fanyi.new(ARGV.join(' ')).result
 end

data/fy.gemspec

@@ -20,5 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
+  # for rubymine
+  spec.add_development_dependency "minitest-reporters", ">=1.0.8"
   spec.add_runtime_dependency "rainbow", ">= 2.0.0"
 end

data/lib/fy/fanyi.rb

@@ -0,0 +1,73 @@
+require "uri"
+require "net/http"
+require "json"
+require "rainbow/ext/string"
+
+module Fy
+  class Fanyi
+
+    def initialize(input)
+      @words = input
+      query_for_hash
+    end
+
+    def api_url
+      "http://fanyi.youdao.com/openapi.do?keyfrom=JIANGDi&key=891853312&type=data&doctype=json&version=1.1&q="
+    end
+
+    def query_for_hash
+      query_url = api_url + URI.escape( @words.gsub(/ /, '+') )
+      result_json = Net::HTTP.get( URI(query_url) )
+      @result_hash = JSON.parse(result_json)
+    end
+
+    def translations
+      translations = @result_hash["translation"]
+      lines = translations.collect do |translation|
+        "  " + translation.color(:green)
+      end
+      lines << ""
+    end
+
+    def word_and_phonetic
+      line = " " + @words
+      phonetic = @result_hash["basic"]["phonetic"] if @result_hash["basic"]
+      line += " [ #{phonetic} ]".color(:magenta) if phonetic
+      [line, ""]
+    end
+
+    def dict_explains
+      dict_explains = @result_hash["basic"]["explains"] if @result_hash["basic"]
+      lines = dict_explains.collect do |explain|
+        " - " + explain.color(:green)
+      end
+      lines << ""
+    end
+
+    def web_results
+      return [] unless @result_hash["web"]
+      lines = []
+      web_results = @result_hash["web"]
+      web_results.each_with_index do |web_result, i|
+        web_result_key = web_result["key"].gsub(/#{@words}/i, @words.color(:yellow))
+        web_result_value = web_result["value"].join(', ').color(:cyan)
+        lines << " #{i+1}. #{web_result_key}"
+        lines << "    #{web_result_value}"
+      end
+      lines << ""
+    end
+
+    # 一般来说，有道词典解释的比较好
+    # 但是长一点的句子有道词典没有结果，需要用有道翻译
+    # 所以如果有道词典有结果就只用词典的结果，否则用有道翻译
+    def yd_result
+      @result_hash["basic"].nil? ? translations : dict_explains
+    end
+
+    def result
+      output = []
+      output << word_and_phonetic << yd_result << web_results
+      output.flatten
+    end
+  end
+end

data/lib/fy/version.rb

@@ -1,3 +1,3 @@
 module Fy
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fy
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - JIANG Di
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-04 00:00:00.000000000 Z
+date: 2014-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: minitest-reporters
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.8
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.8
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
@@ -68,7 +82,7 @@ files:
 - bin/fy
 - fy.gemspec
 - lib/fy.rb
-- lib/fy/fanyi_result.rb
+- lib/fy/fanyi.rb
 - lib/fy/version.rb
 homepage: https://github.com/dd1994/fy
 licenses:

data/lib/fy/fanyi_result.rb

@@ -1,133 +0,0 @@
-require "uri"
-require "net/http"
-require "json"
-require "rainbow/ext/string"
-
-module Fy
-  class FanyiResult
-
-    attr_reader :words_array
-
-    def initialize(words_array)
-      @words_array = words_array
-    end
-
-    def api_url
-      "http://fanyi.youdao.com/openapi.do?keyfrom=JIANGDi&key=891853312&type=data&doctype=json&version=1.1&q="
-    end
-
-    def query_words
-      words_array.join(" ")
-    end
-
-    def escape_words
-      URI.escape(words_array.join("+"))
-    end
-
-    def query_url
-      api_url + escape_words
-    end
-
-    def query_uri
-      URI(query_url)
-    end
-
-    def result_json
-      Net::HTTP.get(query_uri)
-    end
-
-    def result_hash
-      JSON.parse(result_json)
-    end
-
-    def yd_translations_array
-      result_hash["translation"]
-    end
-
-    def fancy_translation(yd_translation)
-      "  #{yd_translation}".color(:green)
-    end
-
-    def puts_yd_translations
-      yd_translations_array.each do |translation|
-        puts fancy_translation(translation)
-      end
-      puts
-    end
-
-    def dict_info
-      result_hash["basic"]
-    end
-
-    def phonetic
-      dict_info["phonetic"] if dict_info
-    end
-
-    def fancy_phonetic
-      " [ #{phonetic} ]".color(:magenta)
-    end
-
-    def puts_first_line
-      first_line = " "
-      first_line += query_words
-      first_line += fancy_phonetic if phonetic
-      puts first_line, ""
-    end
-
-    def dict_explains_array
-      dict_info["explains"] if dict_info
-    end
-
-    def fancy_dict_explain(explain)
-      " - " + "#{explain}".color(:green)
-    end
-
-    def puts_dict_explains
-      dict_explains_array.each do |explain|
-        puts fancy_dict_explain(explain)
-      end
-      puts
-    end
-
-    def web_result_array
-      result_hash["web"]
-    end
-
-    def fancy_web_result_value(web_result_value)
-      '    ' + web_result_value.join(', ').color(:cyan)
-    end
-
-    def highlight_words(sentence, words)
-      sentence.gsub(/#{words}/i, words.color(:yellow))
-    end
-
-    def fancy_web_result_key(web_result_key)
-      highlight_words(web_result_key, query_words)
-    end
-
-    def puts_web_result_array
-      web_result_array.each_with_index do |web_result_hash, i|
-        puts " #{i+1}. #{fancy_web_result_key(web_result_hash["key"])}"
-        puts fancy_web_result_value(web_result_hash["value"])
-      end
-      puts
-    end
-
-    # 一般来说，有道词典解释的比较好
-    # 但是长一点的句子有道词典没有结果，需要用有道翻译
-    # 所以如果有道词典有结果就只用词典的结果，否则用有道翻译
-    def puts_yd_result
-      if dict_info.nil?
-        puts_yd_translations
-      else
-        puts_dict_explains
-      end
-    end
-
-    def puts_result
-      puts_first_line
-      puts_yd_result
-      puts_web_result_array if web_result_array
-    end
-  end
-end