yandex_translator 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 04c46dfbe913aab1a7edd0070f0d46b75aea367b
-  data.tar.gz: f875cbb63eb7e644180dfe8039512f31707882e3
+  metadata.gz: e414a4a08e40266e244f96d278d83b0871ab7f25
+  data.tar.gz: dbd4accc67d90d6f7cebd1acc9f8d00b0085bce9
 SHA512:
-  metadata.gz: ab3372192dbb9789370262fae69a9aa4d42473ca6db0752113f922d4907dc6b57104bac5d40b0871b27fd46d2df4f01ca0fac2579866dfd9690f04d75f549e0d
-  data.tar.gz: eda4d53de3c26023561f4a9aa56b0645fbf79f490f58bc69fdb0a823c301b130b097b3755749858d90a2c02578920cce3b061d7c43c14d17cb6e8474a59177d6
+  metadata.gz: 97e6465ddabeb5865383eea62eb840d9098b20d4d4f24f86096e31e169120e2fdb86e27ccf32cafa3d1bcca473df1aaacc00d92e2d34331aaab06e43bcfeb3f5
+  data.tar.gz: 94744c6cb5d494af41ec5e19e481eed443caa3e9f5c195df2ba43a67d8f56d62ffd19d866368dc714945d96b1607666c380af6e467091a8b3eace1f0b2da0b41

data/README.md

@@ -1,50 +1,50 @@
-# YandexTranslator::Translator
-
-A library for translating text using Yandex Translate API version 1.5 
-
-## Installation
-
-Add this line to your application's Gemfile:
-
-```ruby
-gem 'yandex_translator'
-```
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install yandex_translator
-
-## Usage
-
-1. Create translator object using your API key. You can obtain a key [here](https://tech.yandex.ru/keys/get/?service=trnsl).
-
-```ruby
-translator = YandexTranslator::Translator.new(key)
-```
-
-2. To get the list of available translation directions and transcriptions of languages abbreviations use method **lang_list**:
-
-```ruby
-translator.lang_list(text, hint=nil)
-```
-
-3. To get possible text languages use method **lang_detect**:
-
-```ruby
-translator.lang_detect(text, hint=nil)
-```
-
-4. To translate text use method **translate**:
-
-```ruby
-translator.translate(text, lang, format:plain, options:0)
-```
-
-## License
-
-The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
-
+# YandexTranslator::Translator
+
+A library for translating text using Yandex Translate API version 1.5 
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+```ruby
+gem 'yandex_translator'
+```
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install yandex_translator
+
+## Usage
+
+1. Create translator object using your API key. You can obtain a key [here](https://tech.yandex.ru/keys/get/?service=trnsl).
+
+```ruby
+translator = YandexTranslator::Translator.new(key)
+```
+
+2. To get the list of available translation directions and transcriptions of languages abbreviations use method **lang_list**:
+
+```ruby
+translator.lang_list(text, hint=nil)
+```
+
+3. To get possible text languages use method **lang_detect**:
+
+```ruby
+translator.lang_detect(text, hint=nil)
+```
+
+4. To translate text use method **translate**:
+
+```ruby
+translator.translate(text, lang, format:nil, options:nil)
+```
+
+## License
+
+The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
+

data/lib/yandex_translator/version.rb

@@ -1,3 +1,3 @@
-module YandexTranslator
-  VERSION = "0.1.6"
-end
+module YandexTranslator
+  VERSION = "0.1.7"
+end

data/lib/yandex_translator.rb

@@ -1,88 +1,107 @@
-require "yandex_translator/version"
-
-# A library for translating text using Yandex Translate API version 1.5
-#
-module YandexTranslator
-  require 'net/http'
-  require 'json'
-  require 'http'
-
-  class YandexError < StandardError; end
-
-  class WrongAPIKeyError < YandexError; end
-  class BlockedAPIKeyError < YandexError; end
-  class DaylyLimitExceededError < YandexError; end
-  class MaximumTextSizeExceededError < YandexError; end
-  class TextCannotBeTranslatedError < YandexError; end
-  class SelectedTranslationDirectionNotSupportedError < YandexError; end
-
-  # A Translator class
-  #
-  class Translator
-    attr_accessor :key, :detected
-    Url_base = 'https://translate.yandex.net/api/v1.5/tr.json/'
-
-    # Returns the Translator object
-    #
-    def initialize(key)
-      @key = key
-      @detected = nil
-    end
-
-    # Returns the hash with keys:
-    # * "dirs" with values of available translation pairs
-    # * "langs" with keys languages abbreviations transcriptions(if the _lang_ argument is set)
-    #
-    def lang_list(lang=nil)
-      requester(:lang_list, {:key => @key, :ui => lang}, nil)
-    end
-
-    # Returns possible text languages
-    # The _hint_ argument defaults to *nil*, should be a string of prefered languages, separator ","
-    #
-    def lang_detect(text, hint=nil)
-      requester(:lang_detect, {:key => @key, :hint => hint}, {:text => URI::encode(text)})
-    end
-
-    # Return the translation of the _text_ argument
-    # _lang_ argument can be 2 types:
-    # * The pair of the languages "from-to" ('en-ru')
-    # * One destination language ('en')
-    # _format_ argument defaults to *plain*. Can be "plain" for plain text or "html" for HTMl marked text
-    # _options_ argument defaults to *0*. Can be "1" to include to the response the autodetected language of the source text. You can obtain it by attribute *detected*
-    def translate(text, lang, format: :plain, options: 0)
-      requester(:translate, {:key => @key, :lang => lang, :format => format, :options => options},
-                {:text => text})
-    end
-
-    def requester(method, params, body)
-      url_method = case method
-                     when :lang_list then 'getLangs?'
-                     when :lang_detect then 'detect?'
-                     when :translate then 'translate?'
-                   end
-      res = HTTP.post(Url_base + url_method, :params => params, :form => body)
-      res = JSON.parse(res)
-
-      if res['code'] and res['code'] != 200
-        case res['code']
-          when 401 then raise(WrongAPIKeyError, res['message'])
-          when 402 then raise(BlockedAPIKeyError, res['message'])
-          when 404 then raise(DaylyLimitExceededError, res['message'])
-          when 413 then raise(MaximumTextSizeExceededError, res['message'])
-          when 422 then raise(TextCannotBeTranslatedError, res['message'])
-          when 501 then raise(SelectedTranslationDirectionNotSupportedError, res['message'])
-          else raise(YandexError , res['message'])
-        end
-      end
-
-      case method
-        when :lang_list then res
-        when :lang_detect then res['lang']
-        when :translate then
-          if params[:options] == 1 then @detected = res['detected']['lang'] else @detected = nil end
-          res['text'][0]
-      end
-    end
-  end
+require "yandex_translator/version"
+
+# A library for translating text using Yandex Translate API version 1.5
+#
+module YandexTranslator
+  require 'json'
+  require 'http'
+
+  class YandexError < StandardError; end
+
+  class WrongAPIKeyError < YandexError; end
+  class BlockedAPIKeyError < YandexError; end
+  class DaylyLimitExceededError < YandexError; end
+  class MaximumTextSizeExceededError < YandexError; end
+  class TextCannotBeTranslatedError < YandexError; end
+  class SelectedTranslationDirectionNotSupportedError < YandexError; end
+
+  # A Translator class
+  #
+  class Translator
+    attr_accessor :key, :detected
+    URL_BASE = 'https://translate.yandex.net/api/v1.5/tr.json/'
+
+    # Returns the Translator object
+    #
+    def initialize(key)
+      @key = key
+      @detected = nil
+    end
+
+    # Returns the hash with keys:
+    # * "dirs" with values of available translation pairs
+    # * "langs" with keys languages abbreviations transcriptions(if the _lang_ argument is set)
+    #
+    def lang_list(lang = nil)
+      requester(:lang_list, { key: @key, ui: lang }, nil)
+    end
+
+    # Returns possible text languages
+    # The _hint_ argument defaults to *nil*, should be a string of prefered languages, separator ","
+    #
+    def lang_detect(text, hint = nil)
+      requester(:lang_detect, { key: @key, hint: hint }, text)
+    end
+
+    # Return the translation of the _text_ argument
+    # _text_ argument can be a string or an array of strings.
+    # _lang_ argument can be 2 types:
+    # * The pair of the languages "from-to" ('en-ru')
+    # * One destination language ('en')
+    # _format_ argument defaults to *plain*. Can be "plain" for plain text or "html" for HTMl marked text
+    # _options_ argument defaults to *0*. Can be "1" to include to the response the autodetected language of the source text. You can obtain it by attribute *detected*
+    def translate(text, lang, format: :plain, options: 0)
+      requester(:translate, { key: @key, lang: lang, format: format, options: options },text)
+    end
+
+    def requester(method, params, body)
+      url_method = case method
+                     when :lang_list then 'getLangs?'
+                     when :lang_detect then 'detect?'
+                     when :translate then 'translate?'
+                   end
+      temp = ''
+      if body
+        if body.class == Array
+          body.each do |v|
+            temp += ('text=' + URI::encode(v.to_s) + '&')
+          end
+          body = temp[0..-2]
+        else
+          body = 'text=' + URI::encode(body.to_s)
+        end
+      end
+
+      res = HTTP.headers("content-type" => "application/x-www-form-urlencoded").post(URL_BASE + url_method, params: params, body: body)
+      res = JSON.parse(res)
+
+      if res['code'] and res['code'] != 200
+        case res['code']
+          when 401 then raise(WrongAPIKeyError, res['message'])
+          when 402 then raise(BlockedAPIKeyError, res['message'])
+          when 404 then raise(DaylyLimitExceededError, res['message'])
+          when 413 then raise(MaximumTextSizeExceededError, res['message'])
+          when 422 then raise(TextCannotBeTranslatedError, res['message'])
+          when 501 then raise(SelectedTranslationDirectionNotSupportedError, res['message'])
+          else raise(YandexError , res['message'])
+        end
+      end
+
+      case method
+        when :lang_list then res
+        when :lang_detect then res['lang']
+        when :translate then
+          if params[:options] == 1
+            @detected = res['detected']['lang']
+          else
+            @detected = nil
+          end
+          if res['text'].size > 1
+            res['text']
+          else
+            res['text'][0]
+          end
+      end
+    end
+  end
 end

data/yandex_translator.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.author        = "Kozlov_Evgeny"
   spec.email         = ["eeeeevgen@gmail.com"]
   spec.homepage      = 'https://github.com/Eeeeevgen/yandex_translator'
-  spec.date          = '2017-05-25'
+  spec.date          = '2017-07-26'
   spec.summary       = "A library for translating text using Yandex Translate API"
 
   spec.license       = "MIT"
@@ -21,7 +21,6 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = "~> 2.0"
   spec.add_dependency "http", "~> 2.2"
-  spec.add_dependency "yard", "~> 0.9.9"
   spec.add_development_dependency "bundler", "~> 1.14"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.6"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yandex_translator
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Kozlov_Evgeny
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-25 00:00:00.000000000 Z
+date: 2017-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
@@ -24,20 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.2'
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.9.9
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.9.9
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -131,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: A library for translating text using Yandex Translate API