iciba 0.0.18 → 0.0.19

data/bin/fy

@@ -2,7 +2,6 @@
 
 require 'iciba'
 require 'optparse'
-require 'readability'
 require 'fileutils'
 
 $links = false
@@ -46,17 +45,8 @@ end
 regex = /https?:\/\/[\S]+/
 links = ARGV.first.scan(regex)
 
-def loop_through_links(links)
-  puts links.inspect
-  links.each do |l|
-    text = Readability::Document.new(Iciba::Tools.download(l).force_encoding("UTF-8")).content.gsub('<p>', '').gsub('</p>', "\r\n").gsub('</div>', '').gsub('<div>', '')
-    puts wrap_text(text) unless text == ''
-    puts '------------------------------------------------------------------------------------' unless text == ''
-  end
-end
 # puts ARGV.join(' ')
 pinyin = ($pinyin ? true : false)
 extended = ($extended ? true : false)
 input_text = ARGV.join(' ').dup.encode("UTF-8")
-Iciba::Fanyi.new(input_text, 'auto', true, extended, pinyin)
-loop_through_links(links) if ($links && links.size > 0)
+Iciba::Fanyi.new(input_text, 'auto', true, extended, pinyin)

data/iciba.gemspec

@@ -17,10 +17,8 @@ Gem::Specification.new do |gem|
   # gem.add_dependency(%q<curb>, [">= 0"])
   gem.add_dependency('rest-client')
   gem.add_dependency(%q<hashie>, [">= 0"])
-  gem.add_dependency(%q<yajl-ruby>, [">= 0"])
-  gem.add_dependency(%q<nokogiri>, [">= 0"])
+  gem.add_dependency(%q<multi_json>, [">= 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'])
 end

data/lib/iciba/tools.rb

@@ -1,8 +1,7 @@
 # coding: utf-8
-require 'yajl'
+require 'multi_json'
 require 'hashie'
 require 'rest_client'
-require 'nokogiri'
 require 'hpricot'
 module Iciba
   module Tools
@@ -13,11 +12,11 @@ module Iciba
     end
 
     def self.parse(data)
-      Hashie::Mash.new Yajl::Parser.new.parse(data)
+      Hashie::Mash.new MultiJson.load(data)
     end
 
     def self.encode(data)
-      Yajl::Encoder.encode(data)
+      MultiJson.dump(data)
     end
 
 

data/lib/iciba/version.rb

@@ -1,3 +1,3 @@
 module Iciba
-  VERSION = "0.0.18"
+  VERSION = "0.0.19"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iciba
 version: !ruby/object:Gem::Version
-  version: 0.0.18
+  version: 0.0.19
   prerelease: 
 platform: ruby
 authors:
@@ -44,23 +44,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: yajl-ruby
-  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: nokogiri
+  name: multi_json
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -91,22 +75,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: ruby-readability
-  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: string_to_pinyin
   requirement: !ruby/object:Gem::Requirement