yandex-translator 0.0.3 → 0.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 1de77f641e2fa9133334e7e60841e6af74c22153
+  data.tar.gz: 996c9c7c4195d9f40ea4f77c36407b684a3f4a63
+SHA512:
+  metadata.gz: 206cd4c86dc0c21ee5d03cdae3506c97daeb22ff92c05c536cae6b0b7051db7c7f929bfa8ea654914858496207c50153f1ada8571fa87e84beceafe2ec997d16
+  data.tar.gz: 1ec94ecd1aa8ee8f838f43a6cf35a2354a798ca3adbb206fdc2236ed28b7edaef41825f9b10f4c998486fb56aa9b16e25047cefdba10daa006d81a7ebc76e7e2

data/README.md

@@ -19,6 +19,12 @@ Or install it yourself as:
 
 ## Usage
 
+First, set your api key:
+
+```ruby
+  Yandex::Translator.set_api_key('API_KEY')
+```
+
 To determine language text use detect method:
 
 ```ruby
@@ -31,7 +37,7 @@ To translate text use translate method:
 ```
 
 In this case Yandex automatically detect text language.
-If you want to set text language manually add third paramater
+If you want to set text language manually add third parameter
 
 ```ruby
   Yandex::Translator.translate('Car', 'ru', 'en')

data/lib/yandex-translator.rb

@@ -6,24 +6,33 @@ require "httparty"
 module Yandex
   module Translator
 
-    class TranslationError < StandardError
-    end
+    class TranslationError < StandardError; end
+    class ApiError < StandardError; end
 
     class Translation
       include HTTParty
-      base_uri 'http://translate.yandex.net/api/v1/tr/'
+      base_uri 'https://translate.yandex.net/api/v1.5/tr'
+
+
+      def self.api_key=(key)
+        @@api_key = key
+      end
 
       def detect_lang(text)
         options = {}
-        options[:query] = { :text => text }
+        options[:query] = { :text => text, :key => @@api_key }
         language = self.class.get("/detect", options)
-        language["DetectedLang"]["lang"]
+        if language["DetectedLang"]
+          language["DetectedLang"]["lang"]
+        else
+          check_api_errors(language)
+        end
       end
 
       def translate(text, to_language, from_language)
         lang = from_language.nil? ? to_language : "#{from_language}-#{to_language}"
         options = {}
-        options[:query] = { :lang => lang, :text => text }
+        options[:query] = { :lang => lang, :text => text, :key => @@api_key }
         translation = self.class.get("/translate", options)
         raise TranslationError.new("Can't translate text to #{to_language}") if translation["Translation"].nil?
         case translation["Translation"]["code"].to_i
@@ -35,6 +44,23 @@ module Yandex
             raise TranslationError.new("Can't translate text")
           when 501
             raise TranslationError.new("Can't translate text to #{to_language}")
+          else
+            check_api_errors(translation)
+        end
+      end
+
+      private
+
+      def check_api_errors(responce)
+        case responce["Translation"]["code"].to_i
+          when 401
+            ApiError.new("Invalid api key")
+          when 402
+            ApiError.new("Api key blocked")
+          when 403
+            ApiError.new("Daily request limit exceeded")
+          when 404
+            ApiError.new("Daily char limit exceeded")
           else
             raise TranslationError.new("Try again later")
         end
@@ -42,6 +68,10 @@ module Yandex
 
     end
 
+    def self.set_api_key(key)
+      Translation.api_key = key
+    end
+
     def self.detect(text = '')
       Translation.new.detect_lang(text)
     end

data/lib/yandex-translator/version.rb

@@ -1,5 +1,5 @@
 module Yandex
   module Translator
-    VERSION = "0.0.3"
+    VERSION = "0.1.0"
   end
 end

data/spec/yandex-translator_spec.rb

@@ -4,14 +4,18 @@ require 'spec_helper'
 
 describe Yandex::Translator do
 
+  before do
+    Yandex::Translator.set_api_key(ENV['API_KEY'])
+  end
+
   it "shoud return right translation" do
-    stub_request(:get, "http://translate.yandex.net/api/v1/tr/translate?lang=ru&text=Car").
+    stub_request(:get, "https://translate.yandex.net/api/v1.5/tr/translate?key=#{ENV['API_KEY']}&lang=ru&text=Car").
       to_return(:body => "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<Translation code=\"200\" lang=\"en-ru\"><text>Автомобиль</text></Translation>")
     Yandex::Translator.translate("Car", "ru").should == "Автомобиль"
   end
 
   it "should return translation error when translate to the same language" do
-    stub_request(:get, "http://translate.yandex.net/api/v1/tr/translate?lang=ru-ru&text=Car").
+    stub_request(:get, "https://translate.yandex.net/api/v1.5/tr/translate?key=#{ENV['API_KEY']}&lang=ru-ru&text=Car").
       to_return(:body => "TrService1: Invalid parameter 'lang'" )
     expect{
       Yandex::Translator.translate("Car", "ru", "ru")
@@ -19,7 +23,7 @@ describe Yandex::Translator do
   end
 
   it "should return translation error when translate from unknown language" do
-    stub_request(:get, "http://translate.yandex.net/api/v1/tr/translate?lang=unknown-ru&text=Car").
+    stub_request(:get, "https://translate.yandex.net/api/v1.5/tr/translate?key=#{ENV['API_KEY']}&lang=unknown-ru&text=Car").
       to_return(:body => "TrService1: Invalid parameter 'lang'" )
     expect{
       Yandex::Translator.translate("Car", "ru", "unknown")
@@ -27,7 +31,7 @@ describe Yandex::Translator do
   end
 
   it "should return translation error when translate to unknown language" do
-    stub_request(:get, "http://translate.yandex.net/api/v1/tr/translate?lang=ru-unknown&text=Car").
+    stub_request(:get, "https://translate.yandex.net/api/v1.5/tr/translate?key=#{ENV['API_KEY']}&lang=ru-unknown&text=Car").
       to_return(:body => "TrService1: Invalid parameter 'lang'" )
     expect{
       Yandex::Translator.translate("Car", "unknown", "ru")
@@ -35,19 +39,19 @@ describe Yandex::Translator do
   end
 
   it "shoud detect en language" do
-    stub_request(:get, "http://translate.yandex.net/api/v1/tr/detect?text=Car").
+    stub_request(:get, "https://translate.yandex.net/api/v1.5/tr/detect?key=#{ENV['API_KEY']}&text=Car").
       to_return(:body => "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<DetectedLang code=\"200\" lang=\"en\"/>" )
     Yandex::Translator.detect("Car").should == "en"
   end
 
   it "shoud detect ru language" do
-    stub_request(:get, "http://translate.yandex.net/api/v1/tr/detect?text=Автомобиль").
+    stub_request(:get, "https://translate.yandex.net/api/v1.5/tr/detect?key=#{ENV['API_KEY']}&text=Автомобиль").
       to_return(:body => "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<DetectedLang code=\"200\" lang=\"ru\"/>" )
     Yandex::Translator.detect("Автомобиль").should == "ru"
   end
 
   it "shoud not detect any language" do
-    stub_request(:get, "http://translate.yandex.net/api/v1/tr/detect?text=CarАвто").
+    stub_request(:get, "https://translate.yandex.net/api/v1.5/tr/detect?key=#{ENV['API_KEY']}&text=CarАвто").
       to_return(:body => "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<DetectedLang code=\"200\" lang=\"\"/>" )
     Yandex::Translator.detect("CarАвто").should be_nil
   end

metadata

@@ -1,49 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: yandex-translator
 version: !ruby/object:Gem::Version
-  version: 0.0.3
-  prerelease: 
+  version: 0.1.0
 platform: ruby
 authors:
 - Artur Egorov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-10 00:00:00.000000000 Z
+date: 2013-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &70146220573360 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70146220573360
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70146220572580 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70146220572580
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70146220571560 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70146220571560
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Library for Yandex Translate API
 email:
 - artur@egorov.in
@@ -63,27 +71,26 @@ files:
 - yandex-translator.gemspec
 homepage: ''
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 2.0.0.rc.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Yandex Translate API
 test_files:
 - spec/spec_helper.rb