gengo 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 060329412a1e9dace555866a5b2f35e61329999a
-  data.tar.gz: 0afdabf845206e0463196a5d653b2932f4e76ee2
+  metadata.gz: aaa10fb803c44eb7336b4bd11e36a5b745a28a77
+  data.tar.gz: 7d012f183a69e22553b08a60f640cb4029c14e95
 SHA512:
-  metadata.gz: 2a474922c04f70148fc9a8dc5060bb613eaf28a573426cdc9ab6d00a3e974f91bfaf284ba97897747b63f65fbd842cc9fc81dc4354d1848e9bc3f91825171905
-  data.tar.gz: d34d56cc6e154bb9e9d8dcfc7e5ab798cd08603ab417a95cc4becfa924b9f56c357df108f495adfbf4644f0ef5aead49191e8464b556a6893afaa4b0c1fda36d
+  metadata.gz: 61dfd9cbf2661e47012dfde5912fae162c9043489ffee899229588df305b58c1b882541e45bff1002f79a9f1de2347c2634e0b4d6e337754b0d73f4bf626c2b7
+  data.tar.gz: 0899fef6a4929acc7a897d1f42b27288229f36d8ce559081a916be22657cebd8768bda0de186a6b08d1d245cca4d407bb65fcb445100e22a2c32fdd0cf32a77e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gengo (0.1.0)
+    gengo (0.2.0)
       json
       mime-types
       multipart-post
@@ -9,43 +9,56 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    addressable (2.3.8)
-    crack (0.4.2)
+    addressable (2.4.0)
+    crack (0.4.3)
       safe_yaml (~> 1.0.0)
-    diff-lcs (1.2.5)
+    diff-lcs (1.3)
     docile (1.1.5)
-    json (1.8.2)
-    mime-types (2.6.1)
+    hashdiff (0.3.0)
+    json (2.0.2)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
     multipart-post (2.0.0)
-    rack (1.6.0)
+    rack (1.6.4)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rake (10.4.2)
-    rspec (2.99.0)
-      rspec-core (~> 2.99.0)
-      rspec-expectations (~> 2.99.0)
-      rspec-mocks (~> 2.99.0)
-    rspec-core (2.99.2)
-    rspec-expectations (2.99.2)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.99.3)
+    rake (11.3.0)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.4)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
     safe_yaml (1.0.4)
-    simplecov (0.10.0)
+    simplecov (0.12.0)
       docile (~> 1.1.0)
-      json (~> 1.8)
+      json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
-    webmock (1.21.0)
+    webmock (2.1.0)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
+      hashdiff
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   gengo!
+  rack (~> 1.6)
   rack-test
   rake
-  rspec (~> 2.7)
+  rspec (~> 3.5)
   simplecov
   webmock
+
+BUNDLED WITH
+   1.13.7

data/gengo-ruby.gemspec

@@ -23,7 +23,8 @@ Gem::Specification.new do |gs|
     gs.add_dependency('json')
     gs.add_dependency('multipart-post')
     gs.add_dependency('mime-types')
-    gs.add_development_dependency 'rspec', '~> 2.7'
+    gs.add_development_dependency 'rspec', '~> 3.5'
+    gs.add_development_dependency 'rack', '~> 1.6'
     gs.add_development_dependency 'rack-test'
     gs.add_development_dependency 'rake'
     gs.add_development_dependency 'simplecov'

data/lib/gengo-ruby/api_handler.rb

@@ -28,6 +28,7 @@ module Gengo
       @opts = {
         :public_key => '',
         :private_key => '',
+        :access_token => '',
         :api_version => '2',
         :sandbox => false,
         :user_agent => "Gengo Ruby Library; Version #{Gengo::Config::VERSION}; Ruby Version #{RUBY_DESCRIPTION}; http://gengo.com/;",
@@ -52,6 +53,14 @@ module Gengo
       OpenSSL::HMAC.hexdigest 'sha1', @opts[:private_key], ts
     end
 
+    def auth_by_access_token?
+      @opts[:access_token] != ''
+    end
+
+    def access_token_bearer
+      "Bearer #{@opts[:access_token]}"
+    end
+
     # The "GET" method; handles requesting basic data sets from Gengo and converting
     # the response to a Ruby hash/object.
     #
@@ -72,15 +81,20 @@ module Gengo
       query[:api_key] = @opts[:public_key]
       query[:ts] = Time.now.gmtime.to_i.to_s
 
-      endpoint << "?api_sig=" + signature_of(query[:ts])
-      endpoint << '&' + query.map { |k, v| "#{k}=#{urlencode(v)}" }.join('&')
-
-      uri = "/v#{@opts[:api_version]}/" + endpoint
       headers = {
         'Accept' => 'application/json',
         'User-Agent' => @opts[:user_agent]
       }
 
+      if auth_by_access_token?
+        headers.merge!('Authorization' => access_token_bearer)
+      end
+
+      endpoint << "?api_sig=" + signature_of(query[:ts])
+      endpoint << '&' + query.map { |k, v| "#{k}=#{urlencode(v)}" }.join('&')
+
+      uri = "/v#{@opts[:api_version]}/" + endpoint
+
       if is_delete
         req = Net::HTTP::Delete.new(uri, headers)
       else
@@ -144,6 +158,10 @@ module Gengo
       request.add_field('Accept', 'application/json')
       request.add_field('User-Agent', @opts[:user_agent])
 
+      if auth_by_access_token?
+        request.add_field('Authorization', access_token_bearer)
+      end
+
       request.content_type = 'application/x-www-form-urlencoded'
       request.body = {
         "api_sig" => signature_of(query[:ts]),
@@ -204,7 +222,12 @@ module Gengo
         "ts" => call_timestamp
       })
 
-      request = Net::HTTP::Post::Multipart.new(url.path, the_hash, {'Accept' => 'application/json', 'User-Agent' => @opts[:user_agent] })
+      headers = {'Accept' => 'application/json', 'User-Agent' => @opts[:user_agent] }
+      if auth_by_access_token?
+        headers.merge!('Authorization' => access_token_bearer)
+      end
+
+      request = Net::HTTP::Post::Multipart.new(url.path, the_hash, headers)
 
       if @debug
         http.set_debug_output($stdout)
@@ -227,6 +250,14 @@ module Gengo
       end
     end
 
+    # Returns a Ruby-hash of the current account. No arguments required!
+    #
+    # Options:
+    # <tt>None</tt> - N/A
+    def getAccountMe(params = {})
+      self.get_from_gengo('account/me', params)
+    end
+
     # Returns a Ruby-hash of the stats for the current account. No arguments required!
     #
     # Options:
@@ -283,7 +314,6 @@ module Gengo
     # Given an ID, pulls down information concerning that job from Gengo.
     #
     # <tt>id</tt> - The ID of a job to check.
-    # <tt>pre_mt</tt> - Optional, get a machine translation if the human translation is not done.
     def getTranslationJob(params = {})
       id = params.delete(:id).to_s
       self.get_from_gengo("translate/job/#{id}", params)

data/lib/gengo-ruby/version.rb

@@ -1,5 +1,5 @@
 module Gengo
   module Config
-    VERSION = '0.1.0'
+    VERSION = '0.2.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gengo
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Matthew Romaine
@@ -61,14 +61,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '3.5'
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
@@ -145,7 +159,6 @@ files:
 - lib/gengo-ruby/version.rb
 - lib/gengo.rb
 - licenses/LICENSE.txt
-- test.rb
 homepage: http://developers.gengo.com
 licenses:
 - New BSD
@@ -171,4 +184,3 @@ signing_key:
 specification_version: 4
 summary: A library for interfacing with the Gengo Translation API.
 test_files: []
-has_rdoc: true

data/test.rb

@@ -1,11 +0,0 @@
-# encoding: UTF-8
-require 'gengo'
-
-gengo = Gengo::API.new({
-  :public_key => 'cee8d849f2354e0a9ff62f19868194c1',
-  :private_key => 'd0895146e2d9459b908b2c31bab36f52',
-  :sandbox => false,
-})
-
-# Return the number of credits left on your account.
-puts gengo.getAccountBalance()