phrase 0.4.25 → 0.4.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d19161a8b74d93add452fa8141fd6a7c3218736c
-  data.tar.gz: ccc2ffadca6cac58332e772def7ccb8a00798a91
+  metadata.gz: b3c457a53ebdfab70d66596fe2bc8c390049198d
+  data.tar.gz: ddba48cccd66f4e762c8df3e0e39aa2f391bbdf8
 SHA512:
-  metadata.gz: 7743e6c862f1191d1dbc06b16aa95e982e9d84633bcbb61a1361c9fed8c8d9c9d84d6935b6f0319e702d939397d34c141cba6d526353cdfc5c577ef782d36a0b
-  data.tar.gz: e0ab46de6616360e7d31aec7a7e5d64d41024307c3638dce43b92c049a473cf9d8cff26340ba44021e41b40bb33a6f19c84c291b8a99f5319defff69cbb67a77
+  metadata.gz: a59b70a1f14401ee9b54ce7047c23447db205c3e5e8791ce30f9744b6fc755bcfaf1f2961a2267d3227477cda45c753c8810dc98008d3f2e78f0c91d0bf7d997
+  data.tar.gz: a98ce99ff00e6f44ce1a25517a7f49c93b4b5e5c96dd1571844d5959bf4634663a3b4d3820538b197e1996cb61bf2cf495820233ff47ee66a414be1ae4928500

data/lib/phrase/api/client.rb

@@ -6,9 +6,13 @@ require 'net/http'
 require 'net/https'
 require 'phrase'
 require 'phrase/api'
+require 'phrase/api/client/http'
 
 class Phrase::Api::Client
 
+  # Mixin Factory in order to recognize http_proxy settings in Ruby 1.9.X
+  include Phrase::Api::Client::Http
+
   METHOD_GET = :get
   METHOD_POST = :post
   METHOD_PUT = :put
@@ -262,14 +266,6 @@ private
     "#{Phrase::Api::Config.api_path_prefix}#{endpoint}"
   end
 
-  def http_client
-    client = Net::HTTP.new(Phrase::Api::Config.api_host, Phrase::Api::Config.api_port)
-    client.use_ssl = true if Phrase::Api::Config.api_use_ssl?
-    client.verify_mode = OpenSSL::SSL::VERIFY_NONE if Phrase::Api::Config.skip_ssl_validation?
-    client.ca_file = File.join(File.dirname(__FILE__), "..", "..", "..", "cacert.pem")
-    client
-  end
-
   # Support for arrays in POST data
   # http://blog.assimov.net/blog/2010/06/01/postput-arrays-with-ruby-nethttp-set_form_data/
   def set_form_data(request, params, separator='&')

data/lib/phrase/api/client/http.rb

@@ -0,0 +1,56 @@
+require 'net/http'
+require 'uri'
+
+module Phrase
+  module Api
+    class Client
+      module Http
+
+        # Mixin Factory
+        def self.included(base)
+          klass = RUBY_VERSION < "2.0" ? Http1X : Http2X
+          base.send :include, klass
+        end
+
+        def handle_ssl_cert(client)
+          client.use_ssl = true if Phrase::Api::Config.api_use_ssl?
+          client.verify_mode = OpenSSL::SSL::VERIFY_NONE if Phrase::Api::Config.skip_ssl_validation?
+          client.ca_file = File.join(File.dirname(__FILE__), "..", "..", "..", "..", "cacert.pem")
+          client
+        end
+
+        module Http2X
+          def http_client
+            client = Net::HTTP.new(Phrase::Api::Config.api_host, Phrase::Api::Config.api_port)
+            handle_ssl_cert(client)
+          end
+        end
+
+        module Http1X
+          class InvalidProxyError < StandardError; end
+
+          def http_client
+            proxy_user, proxy_pass, proxy_host, proxy_port = nil, nil, nil, nil
+            if Phrase::Api::Config.proxy.present?
+              begin
+                uri = URI.parse(Phrase::Api::Config.proxy)
+                proxy_user, proxy_pass = uri.userinfo.split(/:/) if uri.userinfo
+                proxy_host = uri.host
+                proxy_port = uri.port
+              rescue URI::InvalidURIError => e
+                raise InvalidProxyError.new(e)
+              end
+            end
+
+            client = Net::HTTP.new(
+              Phrase::Api::Config.api_host, Phrase::Api::Config.api_port,
+              proxy_host, proxy_port, proxy_user, proxy_pass
+            )
+            handle_ssl_cert(client)
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/phrase/api/config.rb

@@ -27,4 +27,8 @@ class Phrase::Api::Config
   def self.skip_ssl_validation?
     ENV.fetch("PHRASE_API_SKIP_SSL_VALIDATION", "0") == "1"
   end
+
+  def self.proxy
+    ENV.fetch("http_proxy", nil)
+  end
 end

data/lib/phrase/version.rb

@@ -1,3 +1,3 @@
 module Phrase
-  VERSION = "0.4.25"
+  VERSION = "0.4.26"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phrase
 version: !ruby/object:Gem::Version
-  version: 0.4.25
+  version: 0.4.26
 platform: ruby
 authors:
 - Dynport GmbH
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-26 00:00:00.000000000 Z
+date: 2014-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -181,6 +181,7 @@ files:
 - lib/phrase/adapters/i18n.rb
 - lib/phrase/api.rb
 - lib/phrase/api/client.rb
+- lib/phrase/api/client/http.rb
 - lib/phrase/api/config.rb
 - lib/phrase/api/exceptions.rb
 - lib/phrase/api/query_params.rb