yandex-translator 0.0.2 → 0.0.3

data/README.md

@@ -19,7 +19,7 @@ Or install it yourself as:
 
 ## Usage
 
-To detect language text use detect method:
+To determine language text use detect method:
 
 ```ruby
   Yandex::Translator.detect('Hello, world!')
@@ -27,9 +27,15 @@ To detect language text use detect method:
 To translate text use translate method:
 
 ```ruby
-  Yandex::Translator.translate('ru', 'Car')
+  Yandex::Translator.translate('Car', 'ru')
 ```
 
+In this case Yandex automatically detect text language.
+If you want to set text language manually add third paramater
+
+```ruby
+  Yandex::Translator.translate('Car', 'ru', 'en')
+```
 
 ## Contributing
 

data/Rakefile

@@ -1 +1,3 @@
 require "bundler/gem_tasks"
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new('spec')

data/lib/yandex-translator.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 require "yandex-translator/version"
 require "httparty"
 
@@ -18,10 +20,12 @@ module Yandex
         language["DetectedLang"]["lang"]
       end
 
-      def translate(text, language)
+      def translate(text, to_language, from_language)
+        lang = from_language.nil? ? to_language : "#{from_language}-#{to_language}"
         options = {}
-        options[:query] = { :lang => language, :text => text }
+        options[:query] = { :lang => lang, :text => text }
         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
           when 200
             translation["Translation"]["text"]
@@ -30,7 +34,7 @@ module Yandex
           when 422
             raise TranslationError.new("Can't translate text")
           when 501
-            raise TranslationError.new("Can't translate to this language")
+            raise TranslationError.new("Can't translate text to #{to_language}")
           else
             raise TranslationError.new("Try again later")
         end
@@ -38,13 +42,12 @@ module Yandex
 
     end
 
-
     def self.detect(text = '')
       Translation.new.detect_lang(text)
     end
 
-    def self.translate(text = '', language)
-      Translation.new.translate(text,language)
+    def self.translate(text, to_language, from_language = nil)
+      Translation.new.translate(text, to_language, from_language)
     end
 
   end

data/lib/yandex-translator/version.rb

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

data/spec/spec_helper.rb

@@ -0,0 +1,9 @@
+require 'rspec'
+require 'yandex-translator'
+require 'webmock/rspec'
+include WebMock
+
+RSpec.configure do |config|
+  config.color_enabled = true
+  config.formatter     = 'documentation'
+end

data/spec/yandex-translator_spec.rb

@@ -0,0 +1,55 @@
+# encoding: UTF-8
+
+require 'spec_helper'
+
+describe Yandex::Translator do
+
+  it "shoud return right translation" do
+    stub_request(:get, "http://translate.yandex.net/api/v1/tr/translate?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").
+      to_return(:body => "TrService1: Invalid parameter 'lang'" )
+    expect{
+      Yandex::Translator.translate("Car", "ru", "ru")
+    }.to raise_error(Yandex::Translator::TranslationError, "Can't translate text to ru")
+  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").
+      to_return(:body => "TrService1: Invalid parameter 'lang'" )
+    expect{
+      Yandex::Translator.translate("Car", "ru", "unknown")
+    }.to raise_error(Yandex::Translator::TranslationError, "Can't translate text to ru")
+  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").
+      to_return(:body => "TrService1: Invalid parameter 'lang'" )
+    expect{
+      Yandex::Translator.translate("Car", "unknown", "ru")
+    }.to raise_error(Yandex::Translator::TranslationError, "Can't translate text to unknown")
+  end
+
+  it "shoud detect en language" do
+    stub_request(:get, "http://translate.yandex.net/api/v1/tr/detect?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=Автомобиль").
+      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Авто").
+      to_return(:body => "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<DetectedLang code=\"200\" lang=\"\"/>" )
+    Yandex::Translator.detect("CarАвто").should be_nil
+  end
+
+end

data/yandex-translator.gemspec

@@ -13,6 +13,8 @@ Gem::Specification.new do |gem|
   gem.homepage      = ""
 
   gem.add_dependency "httparty"
+  gem.add_development_dependency 'rspec'
+  gem.add_development_dependency 'webmock'
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yandex-translator
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-04 00:00:00.000000000 Z
+date: 2013-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &70105306721240 !ruby/object:Gem::Requirement
+  requirement: &70146220573360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,29 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70105306721240
+  version_requirements: *70146220573360
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70146220572580 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70146220572580
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: &70146220571560 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70146220571560
 description: Library for Yandex Translate API
 email:
 - artur@egorov.in
@@ -36,6 +58,8 @@ files:
 - Rakefile
 - lib/yandex-translator.rb
 - lib/yandex-translator/version.rb
+- spec/spec_helper.rb
+- spec/yandex-translator_spec.rb
 - yandex-translator.gemspec
 homepage: ''
 licenses: []
@@ -61,4 +85,7 @@ rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Yandex Translate API
-test_files: []
+test_files:
+- spec/spec_helper.rb
+- spec/yandex-translator_spec.rb
+has_rdoc: