to_lang 0.2.0 → 0.2.1

data/README.textile

@@ -14,6 +14,8 @@ Google Translate attempts to detect the source language, but you can specify it
 
 The dynamic methods are simply syntactic sugar for @String#translate@, which you can use directly as well.
 
+Google Translate currently has a limit of 5,000 characters on input, so any strings longer than that will raise an exception.
+
 h2. Examples
 
 Load and initialize *to_lang*:

data/lib/to_lang/connector.rb

@@ -5,10 +5,16 @@ module ToLang
   # Responsible for making the actual HTTP request to the Google Translate API.
   #
   class Connector
+    include HTTParty
+
     # The base URL for all requests to the Google Translate API.
     #
     API_URL = "https://www.googleapis.com/language/translate/v2"
 
+    # The maximum number of characters the string to translate can be.
+    #
+    MAX_STRING_LENGTH = 5000
+
     # The Google Translate API key to use when making API calls.
     #
     # @return [String] The Google Translate API key.
@@ -20,6 +26,7 @@ module ToLang
     # @return [ToLang::Connector] The new {ToLang::Connector} instance.
     def initialize(key)
       @key = key
+      self.class.headers "X-HTTP-Method-Override" => "GET"
     end
 
     # Makes a request to the Google Translate API.
@@ -30,37 +37,22 @@ module ToLang
     # @option options [String] :from The language code for the language of @q@.
     # @option options [Symbol] :debug Debug output to return instead of the translated string. Must be one of @:request@, @:response@, or @:all@.
     #
-    # @raise [RuntimeError] Raises an exception for any errors returned by Google Translate.
+    # @raise [RuntimeError] If the string is too long or if Google Translate returns any errors.
     # @return [String, Hash] The translated string or debugging output, as requested.
     #
     def request(q, target, options = {})
-      request = request_url(q, target, options)
-      return request if options[:debug] == :request
+      raise "The string to translate cannot be greater than #{MAX_STRING_LENGTH} characters" if q.size > MAX_STRING_LENGTH
+
+      request_hash = { :key => @key, :q => q, :target => target }
+      request_hash[:source] = options[:from] if options[:from]
+      return request_hash if options[:debug] == :request
 
-      response = HTTParty.get(request)
-      return { :request => request, :response => response.parsed_response } if options[:debug] == :all
+      response = self.class.post(API_URL, { :body => request_hash })
       return response.parsed_response if options[:debug] == :response
+      return { :request => request_hash, :response => response.parsed_response } if options[:debug] == :all
 
       raise response.parsed_response["error"]["message"] if response.parsed_response["error"] && response.parsed_response["error"]["message"]
       CGI.unescapeHTML(response.parsed_response["data"]["translations"][0]["translatedText"])
     end
-
-    private
-
-    # Constructs the URL that will be used by {#request}.
-    #
-    # @param [String] q The string to translate.
-    # @param [String] target The language code for the language to translate to.
-    # @param [Hash] options A hash of options.
-    # @option options [String] :from The language code for the language of @q@.
-    #
-    # @return [String] The URL to request for the API call.
-    #
-    def request_url(q, target, options)
-      source = options[:from]
-      url = "#{API_URL}?key=#{@key}&q=#{CGI.escape(q)}&target=#{target}"
-      url += "&source=#{source}" if source
-      url
-    end
   end
 end

data/lib/to_lang/version.rb

@@ -1,5 +1,5 @@
 module ToLang
   # The current version of the Ruby gem.
   #
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/spec/to_lang/connector_spec.rb

@@ -12,7 +12,7 @@ describe ToLang::Connector do
   describe "#request" do
     def stub_response(parsed_response)
       mock_response = mock('HTTParty::Response', :parsed_response => parsed_response)
-      HTTParty.stub(:get).and_return(mock_response)
+      ToLang::Connector.stub(:post).and_return(mock_response)
     end
 
     def stub_good_response(translated_text)
@@ -59,8 +59,7 @@ describe ToLang::Connector do
 
     context "when debugging the request" do
       it "returns the request URL" do
-        HTTParty.stub(:get)
-        @connector.request("hello world", "es", :from => "en", :debug => :request).should == "https://www.googleapis.com/language/translate/v2?key=apikey&q=hello+world&target=es&source=en"
+        @connector.request("hello world", "es", :from => "en", :debug => :request).should == { :key=> "apikey", :q => "hello world", :target => "es", :source => "en" }
       end
     end
 
@@ -75,8 +74,13 @@ describe ToLang::Connector do
       it "returns a hash with the request URL and the full parsed response" do
         expected_response = stub_good_response("hola mundo")
         output = @connector.request("hello world", "es", :from => "en", :debug => :all)
-        output.should == { :request => "https://www.googleapis.com/language/translate/v2?key=apikey&q=hello+world&target=es&source=en", :response => expected_response }
+        output.should == { :request => { :key=> "apikey", :q => "hello world", :target => "es", :source => "en" }, :response => expected_response }
       end
     end
+
+    it "raises an exception if the encoding string is longer than the maximum allowed characters" do
+      str = 'x' * (ToLang::Connector::MAX_STRING_LENGTH + 1)
+      expect { @connector.request(str, "en", :from => "ja")}.to raise_error(RuntimeError, "The string to translate cannot be greater than #{ToLang::Connector::MAX_STRING_LENGTH} characters")
+    end
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Jimmy Cuadra