iciba 0.0.13 → 0.0.14

data/README.md

@@ -21,7 +21,7 @@ Or install it yourself as:
 Command-line usage:
 
     $ fy words to be translated
-    $ fy english -e #for complete definition if available
+    $ fy english -s #for first word to be returned
     $ fy You will need to have root access to do this. -p #to get pinyin for chinese characters, (hopefully fy.iciba.com is correct)
     $ fy http://www.chinadaily.com.cn/business/2012-09/07/content_15742188.htm -l #to download links
     

data/iciba.gemspec

@@ -18,6 +18,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency(%q<hashie>, [">= 0"])
   gem.add_dependency(%q<yajl-ruby>, [">= 0"])
   gem.add_dependency(%q<nokogiri>, [">= 0"])
+  gem.add_dependency(%q<hpricot>, [">= 0"])
   gem.add_dependency(%q<ruby-readability>, [">= 0"])
   gem.add_dependency(%q<string_to_pinyin>, ['>= 0'])
   gem.add_development_dependency(%q<pry>, ['>= 0'])

data/lib/iciba/fanyi.rb

@@ -1,25 +1,26 @@
 # coding: utf-8
 require 'string_to_pinyin'
+
 module Iciba
   class Fanyi
     attr_accessor :response, :html, :dir, :result
 
     
 
-    def initialize(words, dir='auto', bin=false, extended=false, pinyin=false)
-      puts '------------------------------------------------------------------------------------' if bin
+    def initialize(words, dir='auto', logs=false, extended=false, pinyin=false)
+      puts '------------------------------------------------------------------------------------' if logs
       # puts if bingit 
       words = words.dup.force_encoding("UTF-8")
-      puts wrap_text(words, 40) if words.contains_cjk? && bin
-      puts wrap_text(words) unless words.contains_cjk? && bin
+      puts wrap_text(words, 40) if words.contains_cjk? && logs
+      puts wrap_text(words) unless words.contains_cjk? && logs
       # puts '------------------------------------------------------------------------------------' if words.contains_cjk? && bin && pinyin
-      puts words.to_pinyin if words.contains_cjk? && bin && pinyin
-      puts '------------------------------------------------------------------------------------' if bin
+      puts words.to_pinyin if words.contains_cjk? && logs && pinyin
+      puts '------------------------------------------------------------------------------------' if logs
       download_and_parse(words, dir, extended)
-      puts wrap_text(self.result) if bin
-      puts if self.result.contains_cjk? && bin && pinyin
+      puts wrap_text(self.result) if logs
+      puts if self.result.contains_cjk? && logs && pinyin
       puts wrap_text(self.result.strip.gsub("\r\n", '|newline|').to_pinyin.gsub('|newline|', "\r\n\r\n"), 40) if self.result.contains_cjk? && pinyin && bin
-      puts '------------------------------------------------------------------------------------' if bin
+      puts '------------------------------------------------------------------------------------' if logs
       return self.result
     end
     

data/lib/iciba/tools.rb

@@ -3,6 +3,7 @@ require 'yajl'
 require 'hashie'
 require 'curb'
 require 'nokogiri'
+require 'hpricot'``
 module Iciba
   module Tools
 
@@ -68,7 +69,7 @@ module Iciba
     end
 
     def self.doc(html)
-      Nokogiri::HTML(html)
+      Hpricot(html)
     end
   end
 end

data/lib/iciba/version.rb

@@ -1,3 +1,3 @@
 module Iciba
-  VERSION = "0.0.13"
+  VERSION = "0.0.14"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iciba
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
   prerelease: 
 platform: ruby
 authors:
@@ -75,6 +75,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: hpricot
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ruby-readability
   requirement: !ruby/object:Gem::Requirement