bing_dictionary 0.1.3 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8c815fd924860c6926cec410939ee4c1012a2698
-  data.tar.gz: 2a74d6e5d1bc2776ed51629feaf7f741d03a1e8c
+SHA256:
+  metadata.gz: 1cad16aa4d9efe86a2c0aadbdbf90132184b6ba5d63ba6f38f637ae2189591b2
+  data.tar.gz: 56b07543646bfd3535f50c3d25fd25377c66e46919ec6f4889c82e87ba4fe72c
 SHA512:
-  metadata.gz: c80f47b478f95e684a23cf71a25ce9fea3d2aa2d44cc41dd327dd6f815f0c2e9f50acb0333eb6b2d4ea12ba258e89c9f444f6bb64ac43f16f9c626852023ce3b
-  data.tar.gz: c07bcf66d85f0d60ae7487cae295df5e0dde29083550a21fe515fd685309519ee234014cb5b9d2f24b97aefd4054c9eb0f6d2b4b128e9476480a8d45b2cd1cff
+  metadata.gz: b96c361ef65d1d323b9a71ffd13d6eb22f5c7a5cd2c3f498f0ebcfce6ce9ca0ef2fe35957612602a47b53f8218ff3aa10b1acffbb690140fb7702d96dc7584a6
+  data.tar.gz: 41e6c58cf8de625c69c17fa1ac5dc69254606c37ee273c5e6db84b2943dd0923298ae853734cc20440d9ca8a810ba12b0ec0472e5049ffcc406ca1856eb33871

data/README.md

@@ -1,27 +1,13 @@
 # BingDictionary
 
-这是一个ruby脚本，用来在命令行中直接查询单词含义，免去打开软件或浏览器的麻烦。
-
 Here is a command line dictionary written with ruby that can
-translate English to Chinese.
+translate English to Chinese or vice versa.
 
 It uses http://cn.bing.com/dict/ to query.
 ![DEMO ](./dict.png)
 
 ## Installation
 
-Add this line to your application's Gemfile:
-
-```ruby
-gem 'bing_dictionary'
-```
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
     $ gem install bing_dictionary
 
 ## Usage
@@ -29,23 +15,18 @@ A `dict` runable bin file provided.
 
 DEMO：
 
-    dict cake
-    dict 蛋糕
-
-You can make it work tegother with Vim by add follows to $HOME/.vimrc
-
-    nnoremap <leader>d :!dict <cword><CR>
-    vnoremap <leader>d y:!dict <c-r>"<CR>
+    $ dict cake
+    $ dict 蛋糕
 
 ## Support long sentence
 Now long sentence is supported
 
-    dict 你好吗
-    dict How old are you
+    $ dict 你好吗
+    $ dict How old are you
 
 ## Support fuzzy query
 
-    dict hexxo
+    $ dict hexxo
 
     您要找的是不是
 
@@ -55,20 +36,51 @@ Now long sentence is supported
     hexode六极管
     ...
 
-## For Mac user
-You can open your local dictionary.app with `open dict://someword`. It may be faster.
-Add following to your vimrc to make it work in vim:
+## Support Chinese to English
+
+    $ dict 单片机
+    单片机
+
+    网络 MCU; Single Chip Microcomputer; Microcontroller
+
+    The monolithic integrated circuit occurs the explanation , did not understand may have a look !
+    单片机发生的讲解，不懂得可以看看！
+    ...
+
+## Local cache supported
+All queried word default cached to ~/.bing_dictionary.db.
+So it's much faster when you query the word again.
+
+[Here](https://github.com/first20hours/google-10000-english) have the most common English words.
+You can cache them all with following script:
+
+    curl https://raw.githubusercontent.com/first20hours/google-10000-english/master/google-10000-english-no-swears.txt | while read line; do dict $line; done
+
+## More options
+
+    $ dict --help
+    Example: dict hello
+        -p, --[no-]pronounce             Pronounce the word
+        -c, --[no-]cache                 Use cache from ~/.bing_dictionary.db (Default on)
+        -j, --jump                       Jump to web page
+        -v, --version                    Show the version
 
-    nnoremap <leader>dd :!open dic://<cword><CR>
+## Work with vim
+You can make it work tegother with Vim with [bing_dictionary.vim](https://github.com/lingceng/bing_dictionary.vim)
 
 ## Thanks
 Heavily borrowed from [Command-Line-Youdao-Dictionary](https://github.com/qhwa/Command-Line-Youdao-Dictionary)
 
 ## Development
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+    bundle exec ./bin/dict --no-cache hello
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+    // Install gem in local
+    rake install
+    // Build new version
+    rake build
+    // Build new gem and publish to https://rubygems.org
+    rake release
 
 ## Contributing
 

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/bing_dictionary.gemspec

@@ -8,9 +8,10 @@ Gem::Specification.new do |spec|
   spec.version       = BingDictionary::VERSION
   spec.authors       = ["lingceng"]
   spec.email         = ["lingceng2008@gmail.com"]
+  spec.licenses      = "MIT"
 
   spec.summary       = %q{Command line dictionary grabing http://cn.bing.com/}
-  spec.description   = %q{Command line dictionary grabing http://cn.bing.com/}
+  spec.description   = %q{With local cache and can work with vim}
   spec.homepage      = "https://github.com/lingceng/bing_dictionary"
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
@@ -18,8 +19,8 @@ Gem::Specification.new do |spec|
   spec.executables   = 'dict'
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.11"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler", ">= 2.2.10"
+  spec.add_development_dependency "rake", ">= 12.3.3"
   spec.add_development_dependency "minitest", "~> 5.0"
 
   spec.add_dependency "nokogiri", "~> 1.6"

data/lib/bing_dictionary.rb

@@ -2,10 +2,12 @@ require 'nokogiri'
 require 'open-uri'
 require 'cgi'
 require "bing_dictionary/version"
+require "uri"
+require "net/http"
 
 module BingDictionary
   class Base
-    attr_reader :doc
+    attr_accessor :doc, :options, :word
 
     def self.translate(word, options = {})
       self.new(word, options).translate
@@ -14,10 +16,23 @@ module BingDictionary
       exit 1
     end
 
+    def request(word)
+      url = URI("https://cn.bing.com/dict/search?q=#{CGI::escape(word)}")
+
+      https = Net::HTTP.new(url.host, url.port)
+      https.use_ssl = true
+      request = Net::HTTP::Get.new(url)
+      request["Cookie"] = "_EDGE_S=mkt=zh-cn;"
+
+      response = https.request(request)
+      return response.read_body
+    end
+
     def initialize(word, options = {})
-      file = open("http://cn.bing.com/dict/?q=#{CGI::escape(word)}")
-      @doc = Nokogiri::HTML(file)
-      @options = options
+      body = self.request(word)
+      self.word = word
+      self.doc = Nokogiri::HTML(body)
+      self.options = options
     end
 
     def translate
@@ -25,15 +40,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 +61,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 +86,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
-      "\e[3#{idx}m" << self.to_s << "\e[0m"
+    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
-      "\e[4#{idx}m" << self.to_s << "\e[0m"
+    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.3"
+  VERSION = "0.1.7"
 end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: bing_dictionary
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.7
 platform: ruby
 authors:
 - lingceng
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-14 00:00:00.000000000 Z
+date: 2021-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: 2.2.10
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: 2.2.10
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
-description: Command line dictionary grabing http://cn.bing.com/
+description: With local cache and can work with vim
 email:
 - lingceng2008@gmail.com
 executables:
@@ -88,7 +88,8 @@ files:
 - lib/bing_dictionary.rb
 - lib/bing_dictionary/version.rb
 homepage: https://github.com/lingceng/bing_dictionary
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -105,8 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Command line dictionary grabing http://cn.bing.com/