bing_dictionary 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dbc50af5b5ddf83a0775fe03469d2fc42bc5d0df
-  data.tar.gz: 986b3a6e3b531094b82dfce73cdc9600932baad9
+  metadata.gz: 5f98c43922d4b8eb91fc37102a51a839a58532f2
+  data.tar.gz: 29562da51e61ee74c77ae6202905a0f4fdba8768
 SHA512:
-  metadata.gz: 295bcaed92324fc045cecc392cd9d8c2ed1fcd21d1e93118dbe7dbc9a5091db98989051e1e02f59602ee28e4f3e35edb576f13cd3de957ab901af93882ff313f
-  data.tar.gz: d32676c749a9f616ea190f15b6bb463fe380cd1ca145948dc67570eb70bd2ee8bfe4597c609c94ad5cd4b90e4a246032aca26dfe1450fa91c948bea2e4b784fc
+  metadata.gz: b0c7bfbd5134fe649a0be47bb50d29c39416b260ef3c48168e1a42d10c1b08964d9f22f9d4d733075b01d0f27f585c06738d745abc025d2e7dfe1b7fd01e53a7
+  data.tar.gz: 8f6a1f96a3afa854e01d581fb89287f777674c90d24c267b6e7f894eaa0718d3f3b609703c0a410ab0b315b6639cf97b09ef7f6082854cb17e57261fdb4cb7d4

data/README.md

@@ -49,12 +49,17 @@ Now long sentence is supported
     单片机发生的讲解，不懂得可以看看！
     ...
 
+## Local cache supported
+All queried word default cached to ~/.bing_dictionary.db.
+So it's much faster when you query the word again.
+
 ## More options
 
     $ dict --help
     Example: dict hello
         -p, --[no-]pronounce             Pronounce the word
-        -j, --[no-]jump                  Jump to web page
+        -c, --[no-]cache                 Use cache from ~/.bing_dictionary.db (Default on)
+        -j, --jump                       Jump to web page
         -v, --version                    Show the version
 
 ## Work with vim

data/bin/dict

@@ -1,6 +1,5 @@
 #!/usr/bin/env ruby
 
-require "bing_dictionary"
 require 'optparse'
 
 options = {}
@@ -9,7 +8,10 @@ option_parser = OptionParser.new do |opts|
   opts.on("-p", "--[no-]pronounce", "Pronounce the word") do |v|
     options[:pronounce] = v
   end
-  opts.on("-j", "--[no-]jump", "Jump to web page") do |v|
+  opts.on("-c", "--[no-]cache", "Use cache from ~/.bing_dictionary.db (Default on)") do |v|
+    options[:cache] = v
+  end
+  opts.on("-j", "--jump", "Jump to web page") do |v|
     options[:jump] = v
   end
   opts.on("-v", "--version", "Show the version") do |v|
@@ -21,11 +23,32 @@ if ARGV.empty?
   option_parser.parse('--help')
 else
   option_parser.parse!
+  word = ARGV.join(' ')
   if options[:version]
+    require "bing_dictionary"
     puts BingDictionary::VERSION
   elsif options[:jump]
-    `open http://cn.bing.com/dict/?q=#{CGI::escape(ARGV.join(' '))}`
+    `open http://cn.bing.com/dict/?q=#{CGI::escape(word)}`
   else
-    BingDictionary::Base.translate(ARGV.join(' '), options)
+    require 'dbm'
+    DBM.open(File.join(Dir.home, '.bing_dictionary')) do |cache|
+      if cache.key?(word) && options[:cache] != false
+        puts cache[word]
+      else
+        require "bing_dictionary"
+
+        backup = $stdout
+        $stdout = StringIO.new
+        BingDictionary::Base.translate(word, options)
+        out = $stdout.string
+        $stdout = backup
+
+        if out && out.length > 0
+          cache[word] = out
+          puts out
+        end
+      end
+    end
   end
 end
+

data/lib/bing_dictionary.rb

@@ -5,7 +5,7 @@ require "bing_dictionary/version"
 
 module BingDictionary
   class Base
-    attr_reader :doc
+    attr_accessor :doc, :options, :word
 
     def self.translate(word, options = {})
       self.new(word, options).translate
@@ -16,8 +16,9 @@ module BingDictionary
 
     def initialize(word, options = {})
       file = open("http://cn.bing.com/dict/?q=#{CGI::escape(word)}")
-      @doc = Nokogiri::HTML(file)
-      @options = options
+      self.word = word
+      self.doc = Nokogiri::HTML(file)
+      self.options = options
     end
 
     def translate
@@ -25,15 +26,15 @@ module BingDictionary
       machine if doc.at_css('.smt_hw')
       sentence if doc.at_css('#sentenceSeg .se_li')
       guess if doc.at_css('.dym_area')
-      pronounce if doc.at_css('#headword') && @options[:pronounce]
+      pronounce if doc.at_css('#headword') && options[:pronounce]
     end
 
     def head
       puts doc.at_css('#headword').text
-      puts doc.at_css('.hd_tf_lh').text.green
+      puts with_color(doc.at_css('.hd_tf_lh').text, :green)
       puts
       doc.at_css('.hd_area').next_sibling.css('li').each do |li|
-        puts li.at_css('.pos').text.fixed(5).blue + li.at_css('.def').text
+        puts with_color(with_fixed(li.at_css('.pos').text, 5), :blue) + li.at_css('.def').text
       end
     end
 
@@ -46,13 +47,13 @@ module BingDictionary
     def machine
       puts doc.at_css('.smt_hw').text
       puts doc.at_css('.p1-10').text
-      puts doc.at_css('.p1-11').text.green
+      puts with_color(doc.at_css('.p1-11').text, :green)
     end
 
     def sentence
       puts
       doc.css('#sentenceSeg .se_li').first(4).map do |li|
-        puts li.css('.sen_en').text
+        puts with_highlight(li.css('.sen_en').text, word)
         puts li.css('.sen_cn').text
         puts
       end
@@ -71,24 +72,18 @@ module BingDictionary
       end
     end
 
-  end
-
-end
-
-class String
-  COLORS = %w(black red green yellow blue magenta cyan white)
-  COLORS.each_with_index do |color, idx|
-    define_method color do
-      $stdout.tty? ? "\e[3#{idx}m" << self.to_s << "\e[0m" : self
+    COLORS = %i[ black red green yellow blue magenta cyan white ]
+    def with_color(str, color)
+      "\e[3#{COLORS.index(color)}m" << str.to_s << "\e[0m"
     end
 
-    define_method "#{color}_bg" do
-      $stdout.tty? ? "\e[4#{idx}m" << self.to_s << "\e[0m" : self
+    def with_fixed(str, width)
+      width = width - str.each_char.count { |c| c =~ /\p{Han}/ }
+      width > 0 ? ("%-#{width}s" % str) : str
     end
-  end
 
-  def fixed(width)
-    width = width - self.each_char.count { |c| c =~ /\p{Han}/ }
-    width > 0 ? ("%-#{width}s" % self) : self
+    def with_highlight(str, keyword)
+      str.gsub(/#{keyword}/i) { |s| with_color(s, :yellow) }
+    end
   end
 end

data/lib/bing_dictionary/version.rb

@@ -1,3 +1,3 @@
 module BingDictionary
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bing_dictionary
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - lingceng
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-14 00:00:00.000000000 Z
+date: 2017-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -106,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Command line dictionary grabing http://cn.bing.com/