bing_translator 1.1.0 → 2.0.0

data/lib/bing_translator.rb

@@ -6,20 +6,25 @@ require 'rubygems'
 require 'cgi'
 require 'uri'
 require 'net/http'
+require 'net/https'
 require 'nokogiri'
+require 'json'
 
 class BingTranslator
   TRANSLATE_URI = 'http://api.microsofttranslator.com/V2/Http.svc/Translate'
   DETECT_URI = 'http://api.microsofttranslator.com/V2/Http.svc/Detect'
   LANG_CODE_LIST_URI = 'http://api.microsofttranslator.com/V2/Http.svc/GetLanguagesForTranslate'
+  ACCESS_TOKEN_URI = 'https://datamarket.accesscontrol.windows.net/v2/OAuth2-13'
   
-  def initialize(api_key)
-    @api_key = api_key
+  def initialize(client_id, client_secret)
+    @client_id = client_id
+    @client_secret = client_secret
     @translate_uri = URI.parse TRANSLATE_URI
     @detect_uri = URI.parse DETECT_URI
     @list_codes_uri = URI.parse LANG_CODE_LIST_URI
+    @access_token_uri = URI.parse ACCESS_TOKEN_URI
   end
-  
+
   def translate(text, params = {})
     raise "Must provide :to." if params[:to].nil?
 
@@ -27,7 +32,6 @@ class BingTranslator
     params = {
       'to' => CGI.escape(params[:to].to_s),
       'text' => CGI.escape(text.to_s),
-      'appId' => @api_key,
       'category' => 'general',
       'contentType' => 'text/plain'
     }
@@ -40,7 +44,6 @@ class BingTranslator
   def detect(text)
     params = {
       'text' => CGI.escape(text.to_s),
-      'appId' => @api_key,
       'category' => 'general',
       'contentType' => 'text/plain'
     }
@@ -50,17 +53,47 @@ class BingTranslator
   end
 
   def supported_language_codes
-    params = {'appId' => @api_key}
-    result = result @list_codes_uri, params
+    result = result @list_codes_uri
     Nokogiri.parse(result.body).xpath("//xmlns:string").map(&:content)
   end
 
 private
   def prepare_param_string(params)
-    params.map {|key, value| "#{key}=#{value}"}.join '&'
+    params.map { |key, value| "#{key}=#{value}" }.join '&'
+  end
+
+  def result(uri, params={})
+    get_access_token
+    result = Net::HTTP.new(uri.host, uri.port).get(
+      "#{uri.path}?#{prepare_param_string(params)}",
+      { 'Authorization' => "Bearer #{@access_token['access_token']}" })
   end
 
-  def result(uri, params)
-    result = Net::HTTP.new(uri.host, uri.port).get("#{uri.path}?#{prepare_param_string(params)}")
+  # Private: Get a new access token
+  #
+  # Microsoft changed up how you get access to the Translate API.
+  # This gets a new token if it's required. We call this internally
+  # before any request we make to the Translate API.
+  #
+  # Returns nothing if we don't need a new token yet, or 
+  #   a Hash of information relating to the token if we obtained a new one.
+  #   Also sets @access_token internally.
+  def get_access_token
+    return @access_token if @access_token and
+      Time.now < @access_token['expires_at']
+
+    params = {
+      'client_id' => CGI.escape(@client_id),
+      'client_secret' => CGI.escape(@client_secret),
+      'scope' => CGI.escape('http://api.microsofttranslator.com'),
+      'grant_type' => 'client_credentials'
+    }
+
+    http = Net::HTTP.new(@access_token_uri.host, @access_token_uri.port)
+    http.use_ssl = true
+    response = http.post(@access_token_uri.path, prepare_param_string(params))
+    @access_token = JSON.parse(response.body)
+    @access_token['expires_at'] = Time.now + @access_token['expires_in'].to_i
+    @access_token
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bing_translator
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-21 00:00:00.000000000 Z
+date: 2012-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &9487740 !ruby/object:Gem::Requirement
+  requirement: &13280360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,9 +21,9 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *9487740
-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
+  version_requirements: *13280360
+description: Translate strings using the Bing HTTP API. Requires that you have a Client
+  ID and Secret. See README.md for information.
 email: ricky@elrod.me
 executables: []
 extensions: []
@@ -50,7 +50,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Translate using the Bing HTTP API