easy_translate 0.3.3 → 0.4.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 422e8ca1c75f8125002cba2383871ec8988d14c4
+  data.tar.gz: c9fca5ee01af683ea3d7d3decc7afd6423cc8909
+SHA512:
+  metadata.gz: 4e8ba638b958afb464830b30f4b558ccb61d1f7e7d951fcea48c5cf1fc58651878bd9d645de4937ada57ce4ebfcf8eaf0ca1b1b5fe343df16048d9cdb9a6096d
+  data.tar.gz: dc2254431130de0d5f30a4e5c85f0e29b7289ffb6b17cc2920fadf5ffbffc1b5b1d9bb9e7c5282315738f842bb3b1a6e5464a1a4b372d663b12bd9067544d1dc

data/lib/easy_translate.rb

@@ -1,14 +1,14 @@
-require File.dirname(__FILE__) + '/easy_translate/detection'
-require File.dirname(__FILE__) + '/easy_translate/translation'
-require File.dirname(__FILE__) + '/easy_translate/translation_target'
+require 'easy_translate/detection'
+require 'easy_translate/translation'
+require 'easy_translate/translation_target'
 
 module EasyTranslate
 
-  autoload :EasyTranslateException, File.dirname(__FILE__) + '/easy_translate/easy_translate_exception'
-  autoload :Request, File.dirname(__FILE__) + '/easy_translate/request'
+  autoload :EasyTranslateException, 'easy_translate/easy_translate_exception'
+  autoload :Request, 'easy_translate/request'
 
-  autoload :LANGUAGES, File.dirname(__FILE__) + '/easy_translate/languages'
-  autoload :VERSION, File.dirname(__FILE__) + '/easy_translate/version'
+  autoload :LANGUAGES, 'easy_translate/languages'
+  autoload :VERSION, 'easy_translate/version'
 
   extend Detection # Language Detection
   extend Translation # Language Translation

data/lib/easy_translate/detection.rb

@@ -1,6 +1,6 @@
 require 'json'
 require 'cgi'
-require File.dirname(__FILE__) + '/request'
+require 'easy_translate/request'
 
 module EasyTranslate
 

data/lib/easy_translate/translation.rb

@@ -1,6 +1,8 @@
 require 'json'
 require 'cgi'
-require File.dirname(__FILE__) + '/request'
+require 'thread/pool'
+require 'thread_safe'
+require 'easy_translate/request'
 
 module EasyTranslate
 
@@ -8,19 +10,49 @@ module EasyTranslate
 
     # Translate text
     # @param [String, Array] texts - A single string or set of strings to translate
+    # @option options [Fixnum] :batch_size - Maximum keys per request (optional, default 100)
+    # @option options [Fixnum] :concurrency - Maximum concurrent requests (optional, default 4)
     # @option options [String, Symbol] :source - The source language (optional)
     # @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 = {}, http_options = {})
+      options       = options.dup
+      batch_size    = options.delete(:batch_size) || 100
+      concurrency   = options.delete(:concurrency) || 4
+      batches       = Array(texts).each_slice(batch_size).to_a
+      if concurrency > 1 && batches.size > 1
+        pool          = Thread::Pool.new([concurrency, 1 + (texts.length - 1) / batch_size].min)
+        batch_results = ThreadSafe::Array.new
+        batches.each_with_index do |texts_batch, i|
+          pool.process { batch_results[i] = request_translations(texts_batch, options, http_options) }
+        end
+        pool.shutdown
+        results = batch_results.reduce(:+)
+      else
+        results = batches.map { |texts_batch| request_translations(texts_batch, options, http_options) }.reduce(:+)
+      end
+      # if they only asked for one, only give one back
+      texts.is_a?(String) ? results[0] : results
+    ensure
+      pool.shutdown! if pool && !pool.shutdown?
+    end
+
+    private
+
+    # Perform a single request to translate texts
+    # @param [Array] texts - Texts to translate
+    # @option options [String, Symbol] :source - The source language (optional)
+    # @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 request_translations(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|
+      JSON.parse(raw)['data']['translations'].map do |res|
         res['translatedText']
       end
-      # And then return, if they only asked for one, only give one back
-      request.multi? ? translations : translations.first
     end
 
     # A convenience class for wrapping a translation request
@@ -30,11 +62,12 @@ module EasyTranslate
       # @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, http_options = {})
+        options = options.dup
         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('No target language provided') unless @target
         raise ArgumentError.new('Support for multiple targets dropped in V2') if @target.is_a?(Array)
         @http_options = http_options
         if options
@@ -48,7 +81,7 @@ module EasyTranslate
       # The params for this request
       # @return [Hash] the params for the request
       def params
-        params = super || {}
+        params          = super || {}
         params[:source] = lang(@source) unless @source.nil?
         params[:target] = lang(@target) unless @target.nil?
         params[:format] = @format unless @format.nil?

data/lib/easy_translate/translation_target.rb

@@ -1,5 +1,5 @@
 require 'json'
-require File.dirname(__FILE__) + '/request'
+require 'easy_translate/request'
 
 module EasyTranslate
 

data/lib/easy_translate/version.rb

@@ -1,5 +1,5 @@
 module EasyTranslate
 
-  VERSION = '0.3.3'
+  VERSION = '0.4.0'
 
 end

data/spec/spec_helper.rb

@@ -7,5 +7,5 @@ rescue LoadError
 end
 
 # Require the actual project
-require 'ostruct'
-require File.dirname(__FILE__) + '/../lib/easy_translate'
+$: << File.expand_path('../lib', __FILE__)
+require 'easy_translate'

metadata

@@ -1,46 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: easy_translate
 version: !ruby/object:Gem::Version
-  version: 0.3.3
-  prerelease: 
+  version: 0.4.0
 platform: ruby
 authors:
 - John Crepezzi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-25 00:00:00.000000000 Z
+date: 2013-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   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: thread
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: thread_safe
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: easy_translate is a wrapper for the google translate API that makes sense
@@ -61,27 +84,26 @@ files:
 - spec/spec_helper.rb
 homepage: https://github.com/seejohnrun/easy_translate
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.6
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Google Translate API Wrapper for Ruby
 test_files:
 - spec/spec_helper.rb