easy_translate 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 422e8ca1c75f8125002cba2383871ec8988d14c4
-  data.tar.gz: c9fca5ee01af683ea3d7d3decc7afd6423cc8909
+  metadata.gz: a65f5b6c50442857f3f8de4d618cd0d3311a78af
+  data.tar.gz: a74abf1852057b9dbb787d2e2a8df4c53da5e0f6
 SHA512:
-  metadata.gz: 4e8ba638b958afb464830b30f4b558ccb61d1f7e7d951fcea48c5cf1fc58651878bd9d645de4937ada57ce4ebfcf8eaf0ca1b1b5fe343df16048d9cdb9a6096d
-  data.tar.gz: dc2254431130de0d5f30a4e5c85f0e29b7289ffb6b17cc2920fadf5ffbffc1b5b1d9bb9e7c5282315738f842bb3b1a6e5464a1a4b372d663b12bd9067544d1dc
+  metadata.gz: 064111bf0a3becf0ef54ed54e49452c6d1ce14929b0c5f51a929bef71d68d4983b5b83cb7d1232599f5e3c799031f4b1d13159766219d5196454bd113fc05267
+  data.tar.gz: 95b03df27f5e80405e17000f30a68c9370ac0204840d18690a594f75266dc874c0eea21837faa5041c48395ec9fb471faec69df5af7ec236ad2feedfe80a10e6

data/lib/easy_translate/detection.rb

@@ -1,24 +1,30 @@
 require 'json'
 require 'cgi'
 require 'easy_translate/request'
+require 'easy_translate/threadable'
 
 module EasyTranslate
 
   module Detection
+    include Threadable
 
     # Detect language
     # @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 = {}, http_options = {})
+      threaded_process(:request_detection, texts, options, http_options)
+    end
+
+    private
+    def request_detection(texts, options, 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|
-        res.empty? ? nil : res.first['language']
+        res.empty? ? nil : 
+          options[:confidence] ? 
+            { :language => res.first['language'], :confidence => res.first['confidence'] } : res.first['language']
       end
-      # And then return, if they only asked for one, only give one back
-      request.multi? ? detections : detections.first
     end
 
     # A convenience class for wrapping a detection request

data/lib/easy_translate/languages.rb

@@ -30,6 +30,7 @@ module EasyTranslate
     'it' => 'italian',
     'ja' => 'japanese',
     'ko' => 'korean',
+    'la' => 'latin',
     'lv' => 'latvian',
     'lt' => 'lithuanian',
     'mk' => 'macedonian',

data/lib/easy_translate/threadable.rb

@@ -0,0 +1,33 @@
+require 'thread/pool'
+require 'thread_safe'
+
+module EasyTranslate
+
+  module Threadable
+    def threaded_process(method, *args)
+      texts = args[0]
+      options = args[1]
+      http_options = args[2]
+      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] = self.send(method, texts_batch, options, http_options) }
+        end
+        pool.shutdown
+        results = batch_results.reduce(:+)
+      else
+        results = batches.map { |texts_batch| self.send(method, 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
+  end
+
+end

data/lib/easy_translate/translation.rb

@@ -1,12 +1,12 @@
 require 'json'
 require 'cgi'
-require 'thread/pool'
-require 'thread_safe'
 require 'easy_translate/request'
+require 'easy_translate/threadable'
 
 module EasyTranslate
 
   module Translation
+    include Threadable
 
     # Translate text
     # @param [String, Array] texts - A single string or set of strings to translate
@@ -17,25 +17,7 @@ module EasyTranslate
     # @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?
+      threaded_process(:request_translations, texts, options, http_options)
     end
 
     private
@@ -51,7 +33,8 @@ module EasyTranslate
       # Turn the response into an array of translations
       raw = request.perform_raw
       JSON.parse(raw)['data']['translations'].map do |res|
-        res['translatedText']
+        raw_translation = res['translatedText']
+        CGI.unescapeHTML(raw_translation)
       end
     end
 

data/lib/easy_translate/version.rb

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

data/spec/spec_helper.rb

@@ -1,11 +1,14 @@
 # Start SimpleCov
 begin
+  require 'ostruct'
   require 'simplecov'
   SimpleCov.start
 rescue LoadError
   puts 'for coverage please install SimpleCov'
 end
 
+require 'ostruct'
+
 # Require the actual project
 $: << File.expand_path('../lib', __FILE__)
 require 'easy_translate'

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: easy_translate
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - John Crepezzi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-17 00:00:00.000000000 Z
+date: 2014-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   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
   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
@@ -73,14 +73,15 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/easy_translate.rb
 - 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/threadable.rb
 - lib/easy_translate/translation.rb
 - lib/easy_translate/translation_target.rb
 - lib/easy_translate/version.rb
-- lib/easy_translate.rb
 - spec/spec_helper.rb
 homepage: https://github.com/seejohnrun/easy_translate
 licenses: []
@@ -91,17 +92,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Google Translate API Wrapper for Ruby