bing_translator 0.0.2 → 0.0.3

data/lib/bing_translator.rb

@@ -9,32 +9,49 @@ require 'nokogiri'
 
 class BingTranslator
   TRANSLATE_URI = 'http://api.microsofttranslator.com/V2/Http.svc/Translate'
+  DETECT_URI = 'http://api.microsofttranslator.com/V2/Http.svc/Detect'
   
   def initialize(api_key)
     @api_key = api_key
+    @translate_uri = URI.parse TRANSLATE_URI
+    @detect_uri = URI.parse DETECT_URI
   end
   
   def translate(text, params = {})
-    if params[:to].nil? or params[:from].nil?
-      raise "Must provide :to and :from."
-    else
-      to = CGI.escape params[:to].to_s
-      from = CGI.escape params[:from].to_s
-      text = CGI.escape text.to_s
-      uri = URI.parse(TRANSLATE_URI)
-      params = {
-        'to' => to,
-        'from' => from,
-        'text' => text,
-        'appId' => @api_key,
-        'category' => 'general',
-        'contentType' => 'text/plain'
-      }
-      params_s = params.map {|key, value| "#{key}=#{value}"}.join '&'
-      result = Net::HTTP.new(uri.host, uri.port)
-      result = result.get("#{uri.path}?#{params_s}")
-      noko = Nokogiri.parse(result.body)
-      noko.xpath("//xmlns:string")[0].content
-    end
+    raise "Must provide :to." if params[:to].nil?
+
+    from = CGI.escape params[:from].to_s
+    params = {
+      'to' => CGI.escape(params[:to].to_s),
+      'text' => CGI.escape(text.to_s),
+      'appId' => @api_key,
+      'category' => 'general',
+      'contentType' => 'text/plain'
+    }
+    params[:from] = from unless from.empty?
+    result = result @translate_uri, params
+
+    Nokogiri.parse(result.body).xpath("//xmlns:string")[0].content
+  end
+  
+  def detect(text)
+    params = {
+      'text' => CGI.escape(text.to_s),
+      'appId' => @api_key,
+      'category' => 'general',
+      'contentType' => 'text/plain'
+    }
+    result = result @detect_uri, params
+
+    Nokogiri.parse(result.body).xpath("//xmlns:string")[0].content.to_sym
+  end
+
+private
+  def prepare_param_string(params)
+    params.map {|key, value| "#{key}=#{value}"}.join '&'
+  end
+
+  def result(uri, params)
+    result = Net::HTTP.new(uri.host, uri.port).get("#{uri.path}?#{prepare_param_string(params)}")
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bing_translator
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Ricky Elrod
@@ -15,9 +15,24 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-18 00:00:00 Z
-dependencies: []
-
+date: 2011-12-07 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: nokogiri
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 1
+        - 5
+        - 0
+        version: 1.5.0
+  type: :runtime
+  version_requirements: *id001
 description: Translate strings using the Bing HTTP API. Requires that you have an API key. See http://www.microsoft.com/web/post/using-the-free-bing-translation-apis
 email: ricky@elrod.me
 executables: []
@@ -60,7 +75,7 @@ rubyforge_project:
 rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
-summary: Remove the need for some un-necessary, always-there keys.
+summary: Translate using the Bing HTTP API
 test_files: []
 
 has_rdoc: