easy_translate 0.3.1 → 0.3.2

data/lib/easy_translate/detection.rb

@@ -9,8 +9,8 @@ module EasyTranslate
     # @param [String, Array] texts - A single string or set of strings to detect for
     # @param [Hash] options - Extra options to pass along with the request
     # @return [String, Array] The resultant language or languages
-    def detect(texts, options = nil)
-      request = DetectionRequest.new(texts, options)
+    def detect(texts, options = nil, http_options={})
+      request = DetectionRequest.new(texts, options, http_options)
       # Turn the response into an array of detections
       raw = request.perform_raw
       detections = JSON.parse(raw)['data']['detections'].map do |res|
@@ -26,14 +26,12 @@ module EasyTranslate
       # Set the texts and options
       # @param [String, Array] texts - The text (or texts) to translate
       # @param [Hash] options - Options to override or pass along with the request
-      def initialize(texts, options = nil)
-        self.texts = texts
-        if options
-          @options = options
-          if replacement_api_key = @options.delete(:api_key)
-            @options[:key] = replacement_api_key
-          end
+      def initialize(texts, options = {}, http_options = {})
+        super(options, http_options)
+        if replacement_api_key = @options.delete(:api_key)
+          @options[:key] = replacement_api_key
         end
+        self.texts = texts
       end
 
       # The params for this request

data/lib/easy_translate/request.rb

@@ -5,6 +5,12 @@ require 'uri'
 module EasyTranslate
 
   class Request
+    attr_accessor :http_options
+
+    def initialize(options={}, http_options={})
+      @options = options
+      @http_options = http_options
+    end
 
     # Body, blank by default
     # @return [String] The body for this request
@@ -30,11 +36,6 @@ module EasyTranslate
     # Perform the given request
     # @return [String] The response String
     def perform_raw
-      # Get the URI
-      uri = URI.parse("https://www.googleapis.com#{path}?#{param_s}")
-      # Open the HTTP object
-      http = Net::HTTP.new(uri.host, uri.port)
-      http.use_ssl = true
       # Construct the request
       request = Net::HTTP::Post.new(uri.request_uri)
       request.add_field('X-HTTP-Method-Override', 'GET')
@@ -50,6 +51,47 @@ module EasyTranslate
 
     private
 
+    def uri
+      @uri ||= URI.parse("https://www.googleapis.com#{path}?#{param_s}")
+    end
+
+    def http
+      @http ||= Net::HTTP.new(uri.host, uri.port).tap do |http|
+        configure_timeouts(http)
+        configure_ssl(http)
+      end
+    end
+
+    def configure_timeouts(http)
+      http.read_timeout = http.open_timeout = http_options[:timeout] if http_options[:timeout]
+      http.open_timeout = http_options[:open_timeout]                if http_options[:open_timeout]
+    end
+
+    def configure_ssl(http)
+      http.use_ssl      = true
+      http.verify_mode  = OpenSSL::SSL::VERIFY_PEER
+      http.cert_store   = ssl_cert_store
+
+      http.cert         = ssl_options[:client_cert]  if ssl_options[:client_cert]
+      http.key          = ssl_options[:client_key]   if ssl_options[:client_key]
+      http.ca_file      = ssl_options[:ca_file]      if ssl_options[:ca_file]
+      http.ca_path      = ssl_options[:ca_path]      if ssl_options[:ca_path]
+      http.verify_depth = ssl_options[:verify_depth] if ssl_options[:verify_depth]
+      http.ssl_version  = ssl_options[:version]      if ssl_options[:version]
+    end
+
+    def ssl_cert_store
+      return ssl_options[:cert_store] if ssl_options[:cert_store]
+      # Use the default cert store by default, i.e. system ca certs
+      cert_store = OpenSSL::X509::Store.new
+      cert_store.set_default_paths
+      cert_store
+    end
+
+    def ssl_options
+      http_options[:ssl] || {}
+    end
+
     # Stringify the params
     # @return [String] The params as a string
     def param_s

data/lib/easy_translate/translation.rb

@@ -11,8 +11,8 @@ module EasyTranslate
     # @option options [String, Symbol] :target - The target language (required)
     # @option options [Boolean] :html - Whether or not the supplied string is HTML (optional)
     # @return [String, Array] Translated text or texts
-    def translate(texts, options = {})
-      request = TranslationRequest.new(texts, options)
+    def translate(texts, options = {}, http_options={})
+      request = TranslationRequest.new(texts, options, http_options)
       # Turn the response into an array of translations 
       raw = request.perform_raw
       translations = JSON.parse(raw)['data']['translations'].map do |res|
@@ -28,13 +28,14 @@ module EasyTranslate
       # Set the texts and options
       # @param [String, Array] texts - the text (or texts) to translate
       # @param [Hash] options - Options to override or pass along with the request
-      def initialize(texts, options)
+      def initialize(texts, options, http_options={})
         self.texts = texts
         self.html = options.delete(:html)
         @source = options.delete(:from)
         @target = options.delete(:to)
         raise ArgumentError.new('No target language provded') unless @target
         raise ArgumentError.new('Support for multiple targets dropped in V2') if @target.is_a?(Array)
+        @http_options = http_options
         if options
           @options = options
           if replacement_api_key = @options.delete(:api_key)

data/lib/easy_translate/version.rb

@@ -1,5 +1,5 @@
 module EasyTranslate
 
-  VERSION = '0.3.1'
+  VERSION = '0.3.2'
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: easy_translate
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-16 00:00:00.000000000Z
+date: 2013-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &18311100 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18311100
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &18310680 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +37,12 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *18310680
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: easy_translate is a wrapper for the google translate API that makes sense
   programatically, and implements API keys
 email: john.crepezzi@gmail.com
@@ -40,13 +50,13 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/easy_translate/detection.rb
+- lib/easy_translate/easy_translate_exception.rb
 - lib/easy_translate/languages.rb
 - lib/easy_translate/request.rb
+- lib/easy_translate/translation.rb
 - lib/easy_translate/translation_target.rb
 - lib/easy_translate/version.rb
-- lib/easy_translate/easy_translate_exception.rb
-- lib/easy_translate/translation.rb
-- lib/easy_translate/detection.rb
 - lib/easy_translate.rb
 - spec/spec_helper.rb
 homepage: https://github.com/seejohnrun/easy_translate
@@ -69,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Google Translate API Wrapper for Ruby