easy_translate 0.3.2 → 0.3.3

data/lib/easy_translate/detection.rb

@@ -1,4 +1,5 @@
 require 'json'
+require 'cgi'
 require File.dirname(__FILE__) + '/request'
 
 module EasyTranslate
@@ -9,7 +10,7 @@ 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, http_options={})
+    def detect(texts, options = {}, http_options = {})
       request = DetectionRequest.new(texts, options, http_options)
       # Turn the response into an array of detections
       raw = request.perform_raw
@@ -51,7 +52,7 @@ module EasyTranslate
       # The body for the request
       # @return [String] the body for the request, URL escaped
       def body
-        @texts.map { |t| "q=#{URI.escape(t)}" }.join '&'
+        @texts.map { |t| "q=#{CGI::escape(t)}" }.join '&'
       end
 
       # Whether or not this was a request for multiple texts
@@ -71,7 +72,7 @@ module EasyTranslate
         else
           @multi = true
           @texts = texts
-        end 
+        end
       end
 
     end

data/lib/easy_translate/languages.rb

@@ -1,8 +1,8 @@
 module EasyTranslate
 
-  LANGUAGES = { 
+  LANGUAGES = {
     'af' => 'afrikaans',
-    'sq' => 'albanian', 
+    'sq' => 'albanian',
     'ar' => 'arabic',
     'be' => 'belarusian',
     'bg' => 'bulgarian',

data/lib/easy_translate/request.rb

@@ -7,7 +7,7 @@ module EasyTranslate
   class Request
     attr_accessor :http_options
 
-    def initialize(options={}, http_options={})
+    def initialize(options = {}, http_options = {})
       @options = options
       @http_options = http_options
     end

data/lib/easy_translate/translation.rb

@@ -1,4 +1,5 @@
 require 'json'
+require 'cgi'
 require File.dirname(__FILE__) + '/request'
 
 module EasyTranslate
@@ -11,9 +12,9 @@ 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 = {}, http_options={})
+    def translate(texts, options = {}, http_options = {})
       request = TranslationRequest.new(texts, options, http_options)
-      # Turn the response into an array of translations 
+      # Turn the response into an array of translations
       raw = request.perform_raw
       translations = JSON.parse(raw)['data']['translations'].map do |res|
         res['translatedText']
@@ -24,11 +25,11 @@ module EasyTranslate
 
     # A convenience class for wrapping a translation request
     class TranslationRequest < EasyTranslate::Request
-      
+
       # 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, http_options={})
+      def initialize(texts, options, http_options = {})
         self.texts = texts
         self.html = options.delete(:html)
         @source = options.delete(:from)
@@ -64,7 +65,7 @@ module EasyTranslate
       # The body for the request
       # @return [String] the body for the request, URL escaped
       def body
-        @texts.map { |t| "q=#{URI.escape(t)}" }.join '&'
+        @texts.map { |t| "q=#{CGI::escape(t)}" }.join '&'
       end
 
       # Whether or not this was a request for multiple texts

data/lib/easy_translate/translation_target.rb

@@ -20,9 +20,9 @@ module EasyTranslate
     class TranslationTargetRequest < EasyTranslate::Request
 
       def initialize(target = nil, options = nil)
+        super(options)
         @target = target
-        if options
-          @options = options
+        if @options
           if replacement_api_key = @options.delete(:api_key)
             @options[:key] = replacement_api_key
           end

data/lib/easy_translate/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: easy_translate
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-09 00:00:00.000000000 Z
+date: 2013-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -79,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Google Translate API Wrapper for Ruby