bing_translator 4.6.0 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83055c8b2f4de7db9d0ce2d41f9a1b092290ff94
-  data.tar.gz: 62d0896420ce97c3afa5abdb079dd8d706e1e11a
+  metadata.gz: a4a89ca33b028fba8416d74bc1cde262de6e2f14
+  data.tar.gz: 5d8067fe8c7bd8af39de751c3eb04a70b8e0b120
 SHA512:
-  metadata.gz: 4f18af208585d0b875606628cdd0abff184312fad19f973d5fd0f7e47d7e95df19fe7f05c5d0b225257692c2c31948465165495a7928b4aef4a116fc7461e4d1
-  data.tar.gz: 12fc8ea90925e854acad94aee9a08b04b0506a5cd57c155815660c40a32800e36a11686f3cbda69f1f131fdeccfae8667c1bc23225d7cbee1c36efce1efddb2c
+  metadata.gz: eb7563e99e2252f49716087d03dd100c3e4dc680f9c244bc2c65c9a04fbb7bf8572450e011584eee32aeb51f929f4eb5bd2c6513a3c291dddb974d1d19e2765a
+  data.tar.gz: 5176196c0ff71f703a94148ae7bdddd81cb1a912631b93754641c42e347a2e0a80ac735d562f9154797e8909671e1a7288e966ab53414e1a9e8818533618a0f0

data/lib/bing_translator.rb

@@ -14,20 +14,13 @@ require 'savon'
 class BingTranslator
   WSDL_URI = 'http://api.microsofttranslator.com/V2/soap.svc?wsdl'
   NAMESPACE_URI = 'http://api.microsofttranslator.com/V2'
-  ACCESS_TOKEN_URI = 'https://datamarket.accesscontrol.windows.net/v2/OAuth2-13'
-  DATASETS_URI = "https://api.datamarket.azure.com/Services/My/Datasets?$format=json"
+  COGNITIVE_ACCESS_TOKEN_URI = URI.parse('https://api.cognitive.microsoft.com/sts/v1.0/issueToken').freeze
 
   class Exception < StandardError; end
-  class AuthenticationException < StandardError; end
 
-  def initialize(client_id, client_secret, skip_ssl_verify = false, account_key = nil)
-    @client_id = client_id
-    @client_secret = client_secret
-    @account_key = account_key
-    @skip_ssl_verify = skip_ssl_verify
-
-    @access_token_uri = URI.parse ACCESS_TOKEN_URI
-    @datasets_uri = URI.parse DATASETS_URI
+  def initialize(subscription_key, options = {})
+    @skip_ssl_verify = options.fetch(:skip_ssl_verify, false)
+    @subscription_key = subscription_key
   end
 
   def translate(text, params = {})
@@ -75,14 +68,15 @@ class BingTranslator
     array_wrap(result(:translate_array2, params)[:translate_array2_response]).map{|r| [r[:translated_text], r[:alignment]]}
   end
 
-
   def detect(text)
     params = {
       'text'     => text.to_s,
       'language' => '',
     }
 
-    result(:detect, params).to_sym
+    if lang = result(:detect, params)
+      lang.to_sym
+    end
   end
 
   # format:   'audio/wav' [default] or 'audio/mp3'
@@ -127,73 +121,42 @@ class BingTranslator
     response[:string]
   end
 
-  def balance
-    datasets["d"]["results"].each do |result|
-      return result["ResourceBalance"] if result["ProviderName"] == "Microsoft Translator"
-    end
-  end
+  private
 
   # Get a new access token and set it internally as @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.
-  #
   # @return {hash}
   # Returns existing @access_token if we don't need a new token yet,
   # or returns the one just obtained.
   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'
+    headers = {
+      'Ocp-Apim-Subscription-Key' => @subscription_key
     }
 
-    http = Net::HTTP.new(@access_token_uri.host, @access_token_uri.port)
+    http = Net::HTTP.new(COGNITIVE_ACCESS_TOKEN_URI.host, COGNITIVE_ACCESS_TOKEN_URI.port)
     http.use_ssl = true
     http.verify_mode = OpenSSL::SSL::VERIFY_NONE if @skip_ssl_verify
 
-    response = http.post(@access_token_uri.path, prepare_param_string(params))
-    @access_token = JSON.parse(response.body)
-    raise AuthenticationException, @access_token['error'] if @access_token["error"]
-    @access_token['expires_at'] = Time.now + @access_token['expires_in'].to_i
-    @access_token
-  end
-
-private
-  def datasets
-    raise AuthenticationException, "Must provide account key" if @account_key.nil?
-
-    http = Net::HTTP.new(@datasets_uri.host, @datasets_uri.port)
-    http.use_ssl = true
-    http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-    request = Net::HTTP::Get.new(@datasets_uri.request_uri)
-    request.basic_auth("", @account_key)
-    response = http.request(request)
+    response = http.post(COGNITIVE_ACCESS_TOKEN_URI.path, "", headers)
 
-    JSON.parse response.body
+    @access_token = {
+      'access_token' => response.body,
+      'expires_at' => Time.now + 480
+    }
   end
 
-  def prepare_param_string(params)
-    params.map { |key, value| "#{key}=#{value}" }.join '&'
+  # Performs actual request to Bing Translator SOAP API
+  def result(action, params = {}, &block)    
+    soap_client.call(action, message: build_soap_message(params), &block).body[:"#{action}_response"][:"#{action}_result"]
+  rescue Savon::SOAPFault => e
+    raise Exception, e.message
   end
 
-  # Public: performs actual request to Bing Translator SOAP API
-  def result(action, params = {}, &block)
-    # Specify SOAP namespace in tag names (see https://github.com/savonrb/savon/issues/340 )
-    params = Hash[params.map{|k,v| ["v2:#{k}", v]}]
-    begin
-      soap_client.call(action, message: params, &block).body[:"#{action}_response"][:"#{action}_result"]
-    rescue AuthenticationException
-      raise
-    rescue StandardError => e
-      # Keep old behaviour: raise only internal Exception class
-      raise Exception, e.message
-    end
+  # Specify SOAP namespace in tag names (see https://github.com/savonrb/savon/issues/340 )
+  #
+  # @return [Hash]
+  def build_soap_message(params)    
+    Hash[params.map{|k,v| ["v2:#{k}", v]}]
   end
 
   # Private: Constructs SOAP client
@@ -202,7 +165,7 @@ private
   # Return stored client while access token is fresh.
   # Construct and store new client when token have been expired.
   def soap_client
-    return @client if @client and @access_token and
+    return @client if @client and @access_token and @access_token['expires_at'] and
       Time.now < @access_token['expires_at']
 
     @client = Savon.client(

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bing_translator
 version: !ruby/object:Gem::Version
-  version: 4.6.0
+  version: 5.0.0
 platform: ruby
 authors:
 - Ricky Elrod
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-22 00:00:00.000000000 Z
+date: 2017-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -80,9 +80,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Translate using the Bing HTTP API
 test_files: []
-has_rdoc: