smartling 2.0.1 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17b29c43e1f75b0cc74c0e6445e3e085f9bcda80
-  data.tar.gz: ce17a7a56792b0fce91742bb34f838f4d170ddf1
+  metadata.gz: 9dd1f6fbb39ef6828a38ac1837d08b4f40b4bba2
+  data.tar.gz: 0eadeae82917238c1646c112b58476a1fbf57333
 SHA512:
-  metadata.gz: 72ff5936615bd36fddfc77bf653c843558c25838bff9148cd53783de39461ef54760ef2f0eeef4e6da9fdc8f1d8c03c1ebaddabe6cbc5403f0cfa6b4b98994d6
-  data.tar.gz: 2d8ec564d206f8c72f9852e6caac474a739730dea453d9cd0a4a9dcca37a25b2310ecc5afa8df2f193ced159d272893e42b7fb05cc2a0475977bf468caa184b0
+  metadata.gz: 33d0bfd1ad76fce5d7b5fe54ff1701436886d57c5c6809f301d725dde72de87c4dc36ea2e33f642365c219fcf55b6820fb4e7429d746b2c4e3023f3fbca6e54c
+  data.tar.gz: 1a2d5d7250d7106a9f9d23869406a82c85d8e1957571a967b87a592e5abff6cf378ffd845fa95410101fd7d3d613a6f27a9f8f0c123e5df2fd33b2d79ba43a62

data/lib/smartling/api.rb

@@ -15,16 +15,16 @@
 require 'rest-client'
 require 'multi_json'
 require 'smartling/uri'
-require 'json'
+require 'oj'
 
 module Smartling
 
   module Endpoints
     CURRENT = 'https://api.smartling.com/'
-    SANDBOX = 'https://api.stg.smartling.net/'
   end
 
   class Api
+    EXPIRATION_OFFSET = 60
     attr_accessor :baseUrl, :prefix
 
     def initialize(args = {})
@@ -33,10 +33,6 @@ module Smartling
       @baseUrl = args[:baseUrl] || Endpoints::CURRENT
     end
 
-    def self.sandbox(args = {})
-      new(args.merge(:baseUrl => Endpoints::SANDBOX))
-    end
-
     def uri(path, params1 = nil, params2 = nil)
       uri = Uri.new(@baseUrl, path)
       params = {}
@@ -48,19 +44,19 @@ module Smartling
 
     def check_response(res)
       return if res.code == 200
-      format_api_error(res.body) 
+      format_api_error(res) 
       raise 'API_ERROR' 
     end
 
     def process(res)
       check_response(res)
-      body = MultiJson.decode(res.body)
+      body = MultiJson.load(res.body)
       if body['response']
         body = body['response']
         if body['code'] == 'SUCCESS'
           return body['data']
         else
-          format_api_error(res.body) 
+          format_api_error(res) 
           raise 'API_ERROR' 
         end
       end
@@ -70,7 +66,7 @@ module Smartling
 
     def format_api_error(res)
       begin
-        body = MultiJson.decode(res.body)
+        body = MultiJson.load(res.body)
       rescue
       end
 
@@ -110,7 +106,7 @@ module Smartling
       call(uri, :get, true, false, true)
     end
     def post(uri, params = nil)
-      call(uri, :post, true, false, false, params.to_json)
+      call(uri, :post, true, false, false, MultiJson.dump(params))
     end
     def post_file(uri, params = nil)
       call(uri, :post, true, true, false, params)
@@ -137,9 +133,9 @@ module Smartling
     def process_auth(response) 
       now = Time.new.to_i
       @token = response['accessToken']
-      @token_expiration = now + response['expiresIn'].to_i
+      @token_expiration = now + response['expiresIn'].to_i - EXPIRATION_OFFSET
       @refresh = response['refreshToken']
-      @refresh_expiration = now + response['refreshExpiresIn'].to_i
+      @refresh_expiration = now + response['refreshExpiresIn'].to_i - EXPIRATION_OFFSET
     end
 
     # Authenticate - /auth-api/v2/authenticate (POST)
@@ -156,7 +152,7 @@ module Smartling
 
       # Otherwise call authenticate endpoint
       uri = uri('auth-api/v2/authenticate', {}, {})
-      RestClient.post(uri.to_s, {:userIdentifier => @userId, :userSecret => @userSecret}.to_json, {:content_type => :json, :accept => :json}) {|res, _, _|
+      RestClient.post(uri.to_s, MultiJson.dump({:userIdentifier => @userId, :userSecret => @userSecret}), {:content_type => :json, :accept => :json}) {|res, _, _|
         process_auth(process(res))
         return @token
       }
@@ -165,7 +161,7 @@ module Smartling
     # Refresh Authentication - /auth-api/v2/authenticate/refresh (POST)
     def refresh()
       uri = uri('auth-api/v2/authenticate/refresh', {}, {})
-      RestClient.post(uri.to_s, {:refreshToken => @refreshToken}.to_json, {:content_type => :json, :accept => :json}) {|res, _, _|
+      RestClient.post(uri.to_s, MultiJson.dump({:refreshToken => @refresh}), {:content_type => :json, :accept => :json}) {|res, _, _|
         process_auth(process(res))
         return @token
       }

data/lib/smartling/version.rb

@@ -14,5 +14,5 @@
 
 module Smartling
   # This follows Semantic Versioning http://semver.org/
-  VERSION = '2.0.1'
+  VERSION = '2.0.3'
 end

data/samples/file_api.rb

@@ -30,129 +30,128 @@ print_msg "Smartling Ruby client #{Smartling::VERSION}"
 
 
 # Initialize client to use File API on Production
-# To test in a sandbox account, create a new Files SANDBOX project in the Smartling dashboard and use the API key and project ID from that.
-sl = Smartling::File.sandbox(:userId => USER_ID, :userSecret => USER_SECRET, :projectId => PROJECT_ID)
+sl = Smartling::File.new(:userId => USER_ID, :userSecret => USER_SECRET, :projectId => PROJECT_ID)
 
 # Basic usage
 
-begin
+# begin
 print_msg 'Listing all project files...'
 res = sl.list
 p res
-rescue
-end
+# rescue
+# end
 
 file = 'data.yaml' # your data file
 file_uri = 'my_files/data.yaml' # unique identifier given to the uploaded file
 file_type = 'YAML' # file type
 
-begin
+# begin
 print_msg "Uploading file '#{file}' using file URI '#{file_uri}' and file type '#{file_type}'..."
 res = sl.upload(file, file_uri, file_type)
 p res
-rescue
-end
+# rescue
+# end
 
-begin
+# begin
 print_msg 'Listing all project files...'
 res = sl.list
 p res
-rescue
-end
+# rescue
+# end
 
 lang = 'fr-FR' # any language that exists in your project
 state = 'PUBLISHED' # state at which imported strings are imported as
 
-begin
+# begin
 print_msg "Getting status for file URI '#{file_uri}' and language '#{lang}'..."
 res = sl.status(file_uri, lang)
 p res
-rescue
-end
+# rescue
+# end
 
-begin
+# begin
 print_msg "Importing translation file '#{file}' using file URI '#{file_uri}' and file type '#{file_type}' and language '#{lang}' as '#{state}'..." 
 res = sl.import(lang, file, file_uri, file_type, state)
-rescue
-end
+# rescue
+# end
 
-begin
+# begin
 print_msg "Downloading translations for file URI '#{file_uri}' and language '#{lang}'..."
 data = sl.download_translated(file_uri, lang)
 puts data
-rescue
-end
+# rescue
+# end
 
 new_file_uri = 'my_files/newdata.yaml' # new uri to uniquely identify the previously uploaded file
 
-begin
+# begin
 print_msg "Renaming file from '#{file_uri}' to '#{new_file_uri}'..."
 sl.rename(file_uri, new_file_uri)
-rescue
-end
+# rescue
+# end
 
-begin
+# begin
 print_msg "Deleting file '#{new_file_uri}'..."
 sl.delete(new_file_uri)
-rescue
-end
+# rescue
+# end
 
 # Extended parameters
-begin
+# begin
 print_msg 'Uploading file with callback URL provided...'
 res = sl.upload(file, 'name.yaml', 'YAML', :callbackUrl => 'http://yourdomain.com/someservice')
 p res
-rescue
-end
+# rescue
+# end
 
-begin
+# begin
 print_msg 'Uploading file with approved flag provided...'
 res = sl.upload(file, 'name.yaml', 'YAML', :authorize => true)
 p res
-rescue
-end
+# rescue
+# end
 
-begin
+# begin
 print_msg 'Listing files using URI mask filter...'
 res = sl.list(:uriMask => '%.yaml')
 p res
-rescue
-end
+# rescue
+# end
 
-begin
+# begin
 print_msg 'Listing files using file type filter...'
 res = sl.list(:fileTypes => ['yaml', 'ios'])
 p res
-rescue
-end
+# rescue
+# end
 
-begin
+# begin
 print_msg 'Listing paginated files...'
 page, size = 2, 10
 res = sl.list(:offset => (page - 1) * size, :limit => size)
 p res
-rescue
-end
+# rescue
+# end
 
-begin
+# begin
 print_msg 'Listing files uploaded after a certain date...'
 res = sl.list(:lastUploadedAfter => Time.utc(2016, 10, 30))
 p res
-rescue
-end
+# rescue
+# end
 
-begin
+# begin
 print_msg 'Listing files uploaded between a date range...'
 res = sl.list(:lastUploadedAfter => Time.utc(2016, 10, 30), :lastUploadedBefore => Time.utc(2016, 11, 10))
 p res
-rescue
-end
+# rescue
+# end
 
-begin
+# begin
 print_msg 'Listing files while combining multiple parameters...'
 res = sl.list(:uriMask => '%.yaml', :fileTypes => [:ios, :yaml],
               :lastUploadedAfter => Time.now - 3600, :lastUploadedBefore => Time.now + 24*3600,
               :offset => 0, :limit => 2)
 p res
-rescue
-end
+# rescue
+# end

data/tests/api_test.rb

@@ -32,7 +32,7 @@ module SmartlingTests
 
     def test_endpoints
       base = 'https://api.smartling.com/'
-      sb = 'https://api.stg.smartling.net/'
+      sb = 'https://api.test.smartling.net/'
 
       sl = Smartling::Api.new()
       assert_equal(base, sl.baseUrl)
@@ -43,9 +43,6 @@ module SmartlingTests
       sl = Smartling::Api.new(:baseUrl => sb)
       assert_equal(sb, sl.baseUrl)
 
-      sl = Smartling::Api.sandbox()
-      assert_equal(sb, sl.baseUrl)
-
       sl = Smartling::Api.new(:baseUrl => 'custom')
       assert_equal('custom', sl.baseUrl)
     end

data/tests/config.sample

@@ -1,6 +1,6 @@
 loglevel: 2  # DEBUG = 0, WARN = 2
 server:
-  baseUrl: https://sandbox-api.smartling.com/v1/
+  baseUrl: https://api.stg.smartling.net/
   apiKey: key
   projectId: id
 

data/tests/srv_fileapi_test.rb

@@ -141,8 +141,6 @@ we have: cookies
               :offset => 0, :limit => 2)
       end
       @log.debug res.inspect
-      # FIXME: when sandbox adds support for filter parameters
-      assert(res['fileCount'] <= 2) unless sl.baseUrl == Smartling::Endpoints::SANDBOX
     end
 
     def test_8_rename

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: smartling
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.3
 platform: ruby
 authors:
 - Emilien Huet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-23 00:00:00.000000000 Z
+date: 2017-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: json
+  name: oj
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -86,7 +86,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.1'
+      version: 2.1.9
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -94,13 +94,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Smartling SDK
 test_files:
 - tests/uri_test.rb
 - tests/config.sample
-- tests/api_test.rb
 - tests/test_helper.rb
 - tests/srv_fileapi_test.rb
+- tests/api_test.rb