web_translate_it 1.7.0.7.pre → 1.7.0.7.pre2

data/history.md

@@ -1,6 +1,7 @@
-## Version 1.7.0.7.pre / 2010-10-12
+## Version 1.7.0.7.pre (pre-release)
 
-* Fix so wti can connect through a proxy.
+* Fix connection problems through a proxy (1.7.0.7.pre)
+* Fix eventual problems connecting through an authenticated proxy (1.7.0.7.pre2)
 
 ## Version 1.7.0.6 / 2010-09-23
 

data/lib/web_translate_it/util.rb

@@ -3,6 +3,7 @@ module WebTranslateIt
   require 'net/http'
   require 'net/https'
   require 'uri'
+  require 'ostruct'
   
   # A few useful functions
   class Util
@@ -26,23 +27,14 @@ module WebTranslateIt
     # This method will try to connect through a proxy if `http_proxy` is set.
     #
     def self.http_connection
-      proxy = Util.get_proxy
-      if proxy
-        http = Net::HTTP::Proxy(proxy.host, proxy.port).new('webtranslateit.com', 443)
-      else
-        http = Net::HTTP.new('webtranslateit.com', 443)
-      end
+      proxy = ENV['http_proxy'] ? URI.parse(ENV['http_proxy']) : OpenStruct.new
+      http = Net::HTTP::Proxy(proxy.host, proxy.port, proxy.user, proxy.password).new('webtranslateit.com', 443)
       http.use_ssl      = true
       http.verify_mode  = OpenSSL::SSL::VERIFY_NONE
       http.open_timeout = http.read_timeout = 20
       yield http
     end
-    
-    def self.get_proxy
-      http_proxy = ENV["http_proxy"]
-      URI.parse(http_proxy) rescue nil
-    end
-    
+        
     def self.calculate_percentage(processed, total)
       return 0 if total == 0
       ((processed*10)/total).to_f.ceil*10

data/version.yml

@@ -2,4 +2,4 @@
 :major: 1
 :minor: 7
 :tiny: 0
-:patch: 7.pre
+:patch: 7.pre2

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: web_translate_it
 version: !ruby/object:Gem::Version 
-  hash: 961916152
+  hash: -1876988323
   prerelease: true
   segments: 
   - 1
   - 7
   - 0
   - 7
-  - pre
-  version: 1.7.0.7.pre
+  - pre2
+  version: 1.7.0.7.pre2
 platform: ruby
 authors: 
 - "\xC3\x89douard Bri\xC3\xA8re"
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-12 00:00:00 +02:00
+date: 2010-10-15 00:00:00 +02:00
 default_executable: wti
 dependencies: 
 - !ruby/object:Gem::Dependency