shvets-google_translate 0.5.7 → 0.5.8

data/CHANGES

@@ -11,4 +11,9 @@
 
 == Version 0.5.7
 
-* Removing text duplication for help
+* Removing text duplication from help
+
+== Version 0.5.8
+
+* Merging changes from bragi: removing warnings, adding exceptions
+

data/Rakefile

@@ -39,7 +39,7 @@ end
 desc "Run gem code locally"
 task :"run:gem" do
   command = "bin/translate " + ENV['params']
-  puts ruby "#{command}"
+  puts ruby("#{command}")
 end
 
 desc "test gem compatibility with github"

data/google_translate.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{google_translate}
-  s.version = "0.5.7"
+  s.version = "0.5.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
  

data/lib/google_translate.rb

@@ -19,35 +19,41 @@ module Google
   end
 
   class Translator
+    class MissingFromLanguage < Exception; end
+    class MissingToLanguage < Exception; end
+    class MissingTextLanguage < Exception; end
+    class TranslateServerIsDown < Exception; end
+    class InvalidResponse < Exception; end
+    class MissingText < Exception; end
+    class MissingTestText < MissingText; end
+    
     URL_STRING = "http://ajax.googleapis.com/ajax/services/language/"
     URL2_STRING = "http://translate.google.com"
 
     def translate(from, to, from_text, options={})
-      raise Exception.new :missing_from_language if from.nil?
-      raise Exception.new :missing_to_language if to.nil?
-      raise Exception.new :missing_text if from_text.nil?
+      raise(MissingFromLanguage) if from.nil?
+      raise(MissingToLanguage) if to.nil?
+      raise(MissingTextLanguage) if from_text.nil?
 
       request = URL_STRING + "translate?v=1.0&langpair=#{from}%7C#{to}&q=" + CGI.escape(from_text) 
       
       begin
         response = call_service(request, [:response_status, :response_details, :response_data])
 
-        raise Exception.new :translate_server_is_down if response.empty?
+        raise(TranslateServerIsDown) if response.empty?
 
-        raise Exception.new response[:response_details] if response[:response_status] != 200 # success
+        raise(InvalidResponse, response[:response_details]) if response[:response_status] != 200 # success
 
         to_text = response[:response_data]['translatedText']
 
-#        to_text = encode_text(to_text) if to == :ru
-
         (options[:html]) ? CGI.unescapeHTML(to_text) : to_text
       rescue OpenURI::HTTPError
-        raise Exception.new :translate_server_is_down
+        raise(TranslateServerIsDown)
       end
     end
 
-    def detect_language test_text
-      raise Exception.new :missing_test_text if test_text.nil?
+    def detect_language(test_text)
+      raise(MissingTestText) if test_text.nil?
 
       request = URL_STRING + "detect?v=1.0&q=" + CGI.escape(test_text) 
 
@@ -55,13 +61,11 @@ module Google
         response = call_service(request, [:response_data]) 
         response_data = response[:response_data]
 
-        raise Exception.new :translate_server_is_down if response.empty?
-        #raise Exception.new :unreliable_detection if !response_data['isReliable']
+        raise(TranslateServerIsDown) if response.empty?
 
         response_data
-      #
       rescue OpenURI::HTTPError
-        raise Exception.new :translate_server_is_down
+        raise(TranslateServerIsDown)
       end
     end
   

data/spec/translate_spec.rb

@@ -44,7 +44,7 @@ module Google
     end
     
     it "should return unreliable flag if language is not recognized" do
-      @translator.detect_language("azafretmkldt")['isReliable'].should be false
+      @translator.detect_language("azafretmkldt")['isReliable'].should be_false
     end
 
     it "should return list of supportd languages" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: shvets-google_translate
 version: !ruby/object:Gem::Version 
-  version: 0.5.7
+  version: 0.5.8
 platform: ruby
 authors: 
 - Alexander Shvets