Merge branch 'buybay-master'

lib/easy_translate/request.rb

@@ -42,15 +42,20 @@ def perform_raw
       request.body = body
       # Fire and return
       response = http.request(request)
-      unless response.code == '200'
-        err = JSON.parse(response.body)['error']['errors'].first['message']
-        raise EasyTranslateException.new(err)
-      end
+      raise_exception(response) unless response.code == '200'
       response.body
     end
 
     private
 
+    def raise_exception(response)
+      err = JSON.parse(response.body)['error']['errors'].first['message']
+    rescue JSON::ParserError => _e
+      err = "#{response.code} - #{response.message}"
+    ensure
+      raise EasyTranslateException.new(err)
+    end
+
     def uri
       @uri ||= URI.parse("https://translation.googleapis.com#{path}?#{param_s}")
     end

spec/examples/real_world_spec.rb

@@ -20,12 +20,12 @@
 
     it 'should be able to translate multiple' do
       res = EasyTranslate.translate ['hello world', 'i love you'], :to => :spanish
-      expect(res).to eq(['Hola Mundo', 'te amo'])
+      expect(res).to eq(['Hola Mundo', 'te quiero'])
     end
 
     it 'should work concurrently' do
       res = EasyTranslate.translate ['hello world', 'i love you', 'good morning'], :to => :spanish, :concurrency => 2, :batch_size => 1
-      expect(res).to eq(['Hola Mundo', 'te amo', 'Buenos días'])
+      expect(res).to eq(['Hola Mundo', 'te quiero', 'Buenos días'])
     end
   end
 

spec/examples/translation_spec.rb

@@ -29,13 +29,11 @@
     expect(trans).to eq(%{Hallo ' & " Welt})
   end
 
-  describe 'needs api key' do
+  context 'detecting availale language' do
     before :each do
-      if ENV['API_KEY']
-        EasyTranslate.api_key = ENV['API_KEY']
-      else
-        pending 'please provide an API_KEY for this suite'
-      end
+      pending 'please provide an API_KEY for this suite' if ENV['API_KEY'].nil?
+
+      EasyTranslate.api_key = ENV['API_KEY']
     end
 
     it 'should detect simplified chinese as zh-CN' do