yandex-translator 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5fc290d5bb7e60019840ed1ccf2bf3a9daee757c
-  data.tar.gz: 8449622d63f4b9224cb7895e4718efe272181e26
+SHA256:
+  metadata.gz: 33dd6ce30ad7100ad136fcf7f8f2e049a400c16cdd9da103079eb38f06a3cd0a
+  data.tar.gz: ee468daf5fd2cceee8df1a5321c01a4bd10ae756cc57a7c39d35591e41af57ff
 SHA512:
-  metadata.gz: 77bcd16a58d77a1d5236f6735a7bd410b576623c1308c1fb9638b22246f2acf394331b8d56adee4eae9038d55e0582b5b138b7d03785632911f6e4e16f6751af
-  data.tar.gz: 36b1d8f4951e47b9926fb3d8aef021208e8bbe5d63459116e32db2096f3781f4b75feb25ffef64dde114e270f2f4fe0ab5375ef00a3a7fe1304e9ef8600a6c98
+  metadata.gz: '09e0b903459da0b4e3874ea73aae1e7fab313a58a7e1762a03dfa8204de1b149d8707584d35c1097c2fe60a5d7c64fc0615e8b4c37d8d4e452560913f0444b9d'
+  data.tar.gz: 8dcf303d9806fee8b8605e54f0bb6f6930559faae150a895eb8d15e87c5d02d997a2e3b1e265f509362a32624e3cfad6fec93db237c3a79c84bb1a6879c39d5e

data/.gitignore

@@ -13,6 +13,7 @@ lib/bundler/man
 pkg
 rdoc
 spec/reports
+spec/secrets.yml
 test/tmp
 test/version_tmp
 tmp

data/lib/yandex/translator.rb

@@ -1,6 +1,15 @@
+
 module Yandex
+
+  class JsonParser < HTTParty::Parser
+    def json
+      ::JSON.parse(body)
+    end
+  end
+
   class Translator
     include HTTParty
+    parser JsonParser
     base_uri 'https://translate.yandex.net/api/v1.5/tr.json'
 
     attr_reader :api_key
@@ -17,8 +26,8 @@ module Yandex
         translator.get_langs
       end
 
-      def translate(text, *lang)
-        translator.translate(text, *lang)
+      def translate(text, from: nil, to: nil)
+        translator.translate(text, from: from, to: to)
       end
 
       def detect(text)
@@ -42,13 +51,10 @@ module Yandex
       lang == '' ? nil : lang
     end
 
-    def translate(text, *lang)
-      if lang.last.is_a?(Hash)
-        lang_options = lang.last
-        lang = [lang_options[:to], lang_options[:from]].compact
-      end
+    def translate(text, from: nil, to: nil, format: 'plain')
+      lang = (to.nil? && from.nil?) ? [] : [to, from].compact
 
-      options = { text: text, lang: lang.reverse.join('-') }
+      options = { text: text, lang: lang.reverse.join('-'), format: format }
 
       result = visit('/translate', options)['text']
 

data/lib/yandex/translator/version.rb

@@ -1,5 +1,5 @@
 module Yandex
   class Translator
-    VERSION = '0.3.2'
+    VERSION = '0.3.3'
   end
 end

data/spec/lib/yandex/translator_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'vcr'
 
 describe Yandex::Translator do
   let(:api_key) { 'secret' }

data/spec/lib/yandex/translator_vcr_spec.rb

@@ -0,0 +1,90 @@
+require 'spec_helper'
+require 'vcr'
+
+describe Yandex::Translator do
+  let(:api_key) { RSpec.configuration.yandex_api_key }
+  subject(:translator) { Yandex::Translator.new(api_key) }
+
+  describe '::translate' do
+    before do
+      expect_any_instance_of(Yandex::Translator).to receive(:translate)
+      Yandex::Translator.api_key = api_key
+    end
+  end
+
+  describe '#translate' do
+    it 'returns ru translalation ' do
+      VCR.use_cassette('get_translated_ru_text') do
+        response = translator.translate('Car', 'ru')
+        expect(response).to eq("Автомобиль")
+      end
+    end
+
+    it 'returns pl translalation' do
+      VCR.use_cassette('get_translated_pl_text') do
+        response = translator.translate('Car', 'pl')
+        expect(response).to eq("Samochód")
+      end
+    end
+
+    it 'accepts options' do
+      VCR.use_cassette('accepts options') do
+        response = translator.translate('Car', from: :ru)
+        expect(response).to eq("Автомобиль")
+      end
+    end
+
+    context 'with two languages' do
+      it 'accepts options' do
+        VCR.use_cassette('accepts options') do
+          response = translator.translate('Samochód', from: :pl, to: :ru)
+          expect(response).to eq("Автомобиль")
+        end
+      end
+
+      it 'accepts languages list' do
+        VCR.use_cassette('accepts options') do
+          response = translator.translate('Car', :ru, :en)
+          expect(response).to eq("Автомобиль")
+        end
+      end
+    end
+
+    context 'with wrong api key' do
+      let(:wrong_translator) { Yandex::Translator.new('wrong_api_key') }
+
+      it 'returns translation error' do
+        expect{
+          VCR.use_cassette('wrong_api_key') do
+            wrong_translator.translate('Car', :ru, :en)
+          end
+        }.to raise_error(Yandex::ApiError, "API key is invalid")
+      end
+    end
+  end
+
+  describe '#detect' do
+    let(:detected_translation) {
+      VCR.use_cassette('#detect') do
+        translator.detect('Car')
+      end
+    }
+
+    it 'returns detected language' do
+      expect(detected_translation).to eq 'en'
+    end
+  end
+
+  describe '#langs' do
+    let(:list_of_langs) {
+      VCR.use_cassette('#langs') do
+        translator.langs
+      end
+    }
+
+    it 'returns array of dirs' do
+      expect(list_of_langs).to include 'en-ru', 'uk-pl', 'pl-ru'
+    end
+
+  end
+end

data/spec/spec_helper.rb

@@ -1,8 +1,20 @@
 require 'rspec'
 require 'yandex-translator'
 require 'webmock/rspec'
-include WebMock
+require 'vcr'
+include WebMock::API
 
 RSpec.configure do |config|
+  if File.exists? ('spec/secrets.yml')
+    YANDEX_API_KEY = YAML.load_file('spec/secrets.yml')
+  else
+    YANDEX_API_KEY = {}
+  end
+  config.add_setting :yandex_api_key, :default => YANDEX_API_KEY['yandex_translator_api_key']
+end
 
+VCR.configure do |c|
+  c.cassette_library_dir = 'spec/vcr'
+  c.hook_into :webmock
+  c.filter_sensitive_data('<YANDEX_API_KEY>') { RSpec.configuration.yandex_api_key }
 end

data/spec/vcr/_detect.yml

@@ -0,0 +1,42 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: https://translate.yandex.net/api/v1.5/tr.json/detect
+    body:
+      encoding: UTF-8
+      string: text=Car&key=<YANDEX_API_KEY>
+    headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - nginx/1.6.2
+      Date:
+      - Fri, 19 May 2017 10:25:21 GMT
+      Content-Type:
+      - application/json; charset=utf-8
+      Content-Length:
+      - '24'
+      Connection:
+      - keep-alive
+      Keep-Alive:
+      - timeout=120
+      Cache-Control:
+      - no-store
+      X-Content-Type-Options:
+      - nosniff
+    body:
+      encoding: UTF-8
+      string: '{"code":200,"lang":"en"}'
+    http_version: 
+  recorded_at: Fri, 19 May 2017 10:25:21 GMT
+recorded_with: VCR 3.0.3

data/spec/vcr/_langs.yml

@@ -0,0 +1,40 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: https://translate.yandex.net/api/v1.5/tr.json/getLangs
+    body:
+      encoding: UTF-8
+      string: key=<YANDEX_API_KEY>
+    headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - nginx/1.6.2
+      Content-Type:
+      - application/json; charset=utf-8
+      Transfer-Encoding:
+      - chunked
+      Connection:
+      - keep-alive
+      Keep-Alive:
+      - timeout=120
+      Date:
+      - Fri, 19 May 2017 10:25:21 GMT
+      X-Content-Type-Options:
+      - nosniff
+    body:
+      encoding: ASCII-8BIT
+      string: '{"dirs":["az-ru","be-bg","be-cs","be-de","be-en","be-es","be-fr","be-it","be-pl","be-ro","be-ru","be-sr","be-tr","bg-be","bg-ru","bg-uk","ca-en","ca-ru","cs-be","cs-en","cs-ru","cs-uk","da-en","da-ru","de-be","de-en","de-es","de-fr","de-it","de-ru","de-tr","de-uk","el-en","el-ru","en-be","en-ca","en-cs","en-da","en-de","en-el","en-es","en-et","en-fi","en-fr","en-hu","en-it","en-lt","en-lv","en-mk","en-nl","en-no","en-pt","en-ru","en-sk","en-sl","en-sq","en-sv","en-tr","en-uk","es-be","es-de","es-en","es-ru","es-uk","et-en","et-ru","fi-en","fi-ru","fr-be","fr-de","fr-en","fr-ru","fr-uk","hr-ru","hu-en","hu-ru","hy-ru","it-be","it-de","it-en","it-ru","it-uk","lt-en","lt-ru","lv-en","lv-ru","mk-en","mk-ru","nl-en","nl-ru","no-en","no-ru","pl-be","pl-ru","pl-uk","pt-en","pt-ru","ro-be","ro-ru","ro-uk","ru-az","ru-be","ru-bg","ru-ca","ru-cs","ru-da","ru-de","ru-el","ru-en","ru-es","ru-et","ru-fi","ru-fr","ru-hr","ru-hu","ru-hy","ru-it","ru-lt","ru-lv","ru-mk","ru-nl","ru-no","ru-pl","ru-pt","ru-ro","ru-sk","ru-sl","ru-sq","ru-sr","ru-sv","ru-tr","ru-uk","sk-en","sk-ru","sl-en","sl-ru","sq-en","sq-ru","sr-be","sr-ru","sr-uk","sv-en","sv-ru","tr-be","tr-de","tr-en","tr-ru","tr-uk","uk-bg","uk-cs","uk-de","uk-en","uk-es","uk-fr","uk-it","uk-pl","uk-ro","uk-ru","uk-sr","uk-tr"]}'
+    http_version: 
+  recorded_at: Fri, 19 May 2017 10:25:21 GMT
+recorded_with: VCR 3.0.3

data/spec/vcr/accepts_options.yml

@@ -0,0 +1,43 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: https://translate.yandex.net/api/v1.5/tr.json/translate
+    body:
+      encoding: UTF-8
+      string: text=Car&lang=ru&key=<YANDEX_API_KEY>
+    headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - nginx/1.6.2
+      Date:
+      - Fri, 19 May 2017 10:25:20 GMT
+      Content-Type:
+      - application/json; charset=utf-8
+      Content-Length:
+      - '59'
+      Connection:
+      - keep-alive
+      Keep-Alive:
+      - timeout=120
+      X-Content-Type-Options:
+      - nosniff
+      Cache-Control:
+      - no-store
+    body:
+      encoding: ASCII-8BIT
+      string: !binary |-
+        eyJjb2RlIjoyMDAsImxhbmciOiJlbi1ydSIsInRleHQiOlsi0JDQstGC0L7QvNC+0LHQuNC70YwiXX0=
+    http_version: 
+  recorded_at: Fri, 19 May 2017 10:25:20 GMT
+recorded_with: VCR 3.0.3

data/spec/vcr/get_translated_pl_text.yml

@@ -0,0 +1,43 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: https://translate.yandex.net/api/v1.5/tr.json/translate
+    body:
+      encoding: UTF-8
+      string: text=Car&lang=pl&key=<YANDEX_API_KEY>
+    headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - nginx/1.6.2
+      Date:
+      - Fri, 19 May 2017 10:25:19 GMT
+      Content-Type:
+      - application/json; charset=utf-8
+      Content-Length:
+      - '48'
+      Connection:
+      - keep-alive
+      Keep-Alive:
+      - timeout=120
+      X-Content-Type-Options:
+      - nosniff
+      Cache-Control:
+      - no-store
+    body:
+      encoding: ASCII-8BIT
+      string: !binary |-
+        eyJjb2RlIjoyMDAsImxhbmciOiJlbi1wbCIsInRleHQiOlsiU2Ftb2Now7NkIl19
+    http_version: 
+  recorded_at: Fri, 19 May 2017 10:25:19 GMT
+recorded_with: VCR 3.0.3

data/spec/vcr/get_translated_ru_text.yml

@@ -0,0 +1,43 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: https://translate.yandex.net/api/v1.5/tr.json/translate
+    body:
+      encoding: UTF-8
+      string: text=Car&lang=ru&key=<YANDEX_API_KEY>
+    headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - nginx/1.6.2
+      Date:
+      - Fri, 19 May 2017 10:25:18 GMT
+      Content-Type:
+      - application/json; charset=utf-8
+      Content-Length:
+      - '59'
+      Connection:
+      - keep-alive
+      Keep-Alive:
+      - timeout=120
+      X-Content-Type-Options:
+      - nosniff
+      Cache-Control:
+      - no-store
+    body:
+      encoding: ASCII-8BIT
+      string: !binary |-
+        eyJjb2RlIjoyMDAsImxhbmciOiJlbi1ydSIsInRleHQiOlsi0JDQstGC0L7QvNC+0LHQuNC70YwiXX0=
+    http_version: 
+  recorded_at: Fri, 19 May 2017 10:25:18 GMT
+recorded_with: VCR 3.0.3

data/spec/vcr/wrong_api_key.yml

@@ -0,0 +1,42 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: https://translate.yandex.net/api/v1.5/tr.json/translate
+    body:
+      encoding: UTF-8
+      string: text=Car&lang=en-ru&key=wrong_api_key
+    headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 403
+      message: Forbidden
+    headers:
+      Server:
+      - nginx/1.6.2
+      Date:
+      - Fri, 19 May 2017 10:25:20 GMT
+      Content-Type:
+      - application/json; charset=utf-8
+      Content-Length:
+      - '43'
+      Connection:
+      - keep-alive
+      Keep-Alive:
+      - timeout=120
+      X-Content-Type-Options:
+      - nosniff
+      Cache-Control:
+      - no-store
+    body:
+      encoding: UTF-8
+      string: '{"code":401,"message":"API key is invalid"}'
+    http_version: 
+  recorded_at: Fri, 19 May 2017 10:25:20 GMT
+recorded_with: VCR 3.0.3

data/yandex-translator.gemspec

@@ -15,6 +15,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'httparty', '>= 0.13.4'
   gem.add_development_dependency 'rspec', '~> 3.1'
   gem.add_development_dependency 'webmock'
+  gem.add_development_dependency 'vcr'
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yandex-translator
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Artur Egorov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-21 00:00:00.000000000 Z
+date: 2020-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: vcr
+  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'
 description: Library for Yandex Translate API
 email:
 - artur@egorov.in
@@ -68,7 +82,14 @@ files:
 - lib/yandex/translator.rb
 - lib/yandex/translator/version.rb
 - spec/lib/yandex/translator_spec.rb
+- spec/lib/yandex/translator_vcr_spec.rb
 - spec/spec_helper.rb
+- spec/vcr/_detect.yml
+- spec/vcr/_langs.yml
+- spec/vcr/accepts_options.yml
+- spec/vcr/get_translated_pl_text.yml
+- spec/vcr/get_translated_ru_text.yml
+- spec/vcr/wrong_api_key.yml
 - yandex-translator.gemspec
 homepage: ''
 licenses: []
@@ -89,10 +110,17 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Yandex Translate API
 test_files:
 - spec/lib/yandex/translator_spec.rb
+- spec/lib/yandex/translator_vcr_spec.rb
 - spec/spec_helper.rb
+- spec/vcr/_detect.yml
+- spec/vcr/_langs.yml
+- spec/vcr/accepts_options.yml
+- spec/vcr/get_translated_pl_text.yml
+- spec/vcr/get_translated_ru_text.yml
+- spec/vcr/wrong_api_key.yml