iciba 0.0.17 → 0.0.18

data/iciba.gemspec

@@ -14,7 +14,8 @@ Gem::Specification.new do |gem|
   gem.name          = "iciba"
   gem.require_paths = ["lib"]
   gem.version       = Iciba::VERSION
-  gem.add_dependency(%q<curb>, [">= 0"])
+  # 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"])

data/lib/iciba/fanyi.rb

@@ -43,7 +43,7 @@ module Iciba
   
   
     def download_and_parse(words, dir, extended)
-      self.response = Iciba::Tools.parse(Iciba::Tools.post('http://fy.iciba.com/api.php', {:q => words, :type => dir}).body_str)
+      self.response = Iciba::Tools.parse(Iciba::Tools.post('http://fy.iciba.com/api.php', {:q => words, :type => dir}))
       self.html = self.response.ret.encode("UTF-8")
       self.result = (Iciba::Tools.doc(self.html)/'div.translate_result').text.strip if self.html.include?('translate_result')
       self.result = (Iciba::Tools.doc(self.html)/'span.dd').text.strip if !self.html.include?('translate_result')

data/lib/iciba/tools.rb

@@ -1,36 +1,15 @@
 # coding: utf-8
 require 'yajl'
 require 'hashie'
-require 'curb'
+require 'rest_client'
 require 'nokogiri'
 require 'hpricot'
 module Iciba
   module Tools
 
-    def self.download(url)
-      c = self.curb(url)
-      c.body_str
-    end
-
     def self.post(url, options)
-      Curl.post(url, options)
-    end
-
-    def self.last_effective_url(url)
-      c = self.curb(url)
-      c.last_effective_url
-    end
-
-    def self.curb(url)
-      c = Curl::Easy.new(url) do |curl| 
-        curl.headers["User-Agent"] = user_agent
-        # curl.verbose = true
-        curl.timeout = 120
-        curl.follow_location = true
-        curl.max_redirects = 20
-      end
-      c.perform
-      c
+      options = options.merge(:user_agent => user_agent)
+      RestClient.post url, options
     end
 
     def self.parse(data)

data/lib/iciba/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iciba
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.18
   prerelease: 
 platform: ruby
 authors:
@@ -9,10 +9,10 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-25 00:00:00.000000000 Z
+date: 2012-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: curb
+  name: rest-client
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -178,7 +178,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: iciba wrapper