iciba 0.0.10 → 0.0.11

data/bin/fy

@@ -4,6 +4,7 @@ require 'iciba'
 require 'optparse'
 require 'readability'
 require 'fileutils'
+
 $links = false
 
 OptionParser.new do |opts|
@@ -26,7 +27,9 @@ OptionParser.new do |opts|
   end
 end
 
+
 def wrap_text(txt, col = 80)
+  txt = txt.encode('UTF-8')
   col = 40 if txt.contains_cjk?
   txt.gsub(/(.{1,#{col}})( +|$\n?)|(.{1,#{col}})/,
     "\\1\\3\n") 
@@ -54,5 +57,5 @@ end
 pinyin = ($pinyin ? true : false)
 extended = ($extended ? true : false)
 
-Iciba::Fanyi.new(ARGV.first, 'auto', true, extended, pinyin)
+Iciba::Fanyi.new(ARGV.first.dup.force_encoding("UTF-8"), 'auto', true, extended, pinyin)
 loop_through_links(links) if ($links && links.size > 0)

data/iciba.gemspec

@@ -18,7 +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<pinyin>, [">= 0"])
   gem.add_dependency(%q<ruby-readability>, [">= 0"])
   gem.add_dependency(%q<string_to_pinyin>, ['>= 0'])
+  gem.add_development_dependency(%q<pry>, ['>= 0'])
 end

data/lib/iciba.rb

@@ -2,8 +2,9 @@
 require "iciba/version"
 require 'iciba/tools'
 require 'iciba/fanyi'
+
 class String
   def contains_cjk?
-    !!(self =~ /\p{Han}|\p{Katakana}|\p{Hiragana}|\p{Hangul}/)
+    !!(self =~ /\p{Han}/)
   end
 end

data/lib/iciba/fanyi.rb

@@ -9,6 +9,7 @@ module Iciba
     def initialize(words, dir='auto', bin=false, extended=false, pinyin=false)
       puts '------------------------------------------------------------------------------------' if bin
       # 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 '------------------------------------------------------------------------------------' if words.contains_cjk? && bin && pinyin
@@ -23,11 +24,13 @@ module Iciba
     end
     
     def wrap_text(txt, col = 80)
+      txt = txt.dup.force_encoding("UTF-8")
       txt.gsub(/(.{1,#{col}})( +|$\n?)|(.{1,#{col}})/,
         "\\1\\3\n") 
     end
     
     def self.check_char(str)
+      str = str.dup.force_encoding("UTF-8")
       str.contains_cjk?
     end
     

data/lib/iciba/version.rb

@@ -1,3 +1,3 @@
 module Iciba
-  VERSION = "0.0.10"
+  VERSION = "0.0.11"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iciba
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
   prerelease: 
 platform: ruby
 authors:
@@ -107,6 +107,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: iciba wrapper
 email:
 - ussballantyne@gmail.com