smartling 1.0.1 → 2.0.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NTU2OWEzZjAwZTc4ZTUzN2EzZWZkNTNjY2M5NzJlZWJhMGRiMWFhZg==
-  data.tar.gz: !binary |-
-    NDdmYzYwMDZmZjIyMTI1MWY4MjJkN2VkOThiODFjYjdjZTVhMmFjZQ==
+SHA1:
+  metadata.gz: 8eef838728d1e03aa7d98db81a5ea35742cea69d
+  data.tar.gz: 14e8bb96b9d86a81ae3dcc56c95d2f9f161fbf8b
 SHA512:
-  metadata.gz: !binary |-
-    ZmVhYjk2NjllZTBiMTRiYmRlMDczYTQ5OTE2MjM1NmZiZGIxNDQ1YzZhMjIy
-    NTgwOWFiNDI2OGNhNGExZjg1NzJmMjM2YzAxYjUyMTk4ZTU3MzNjNjcwNWRm
-    MWVlOTE4MGEyZGMwZDc1OGEwNGZjZTBjM2Q1ZmIyZDc2ZjZhZDE=
-  data.tar.gz: !binary |-
-    OGIzODdjYmMzZTZjNTAyYjkxOGNmOGRjNDIyMThjNWRkMTA5OTYzZGJjMTIz
-    OTZmYjg3ZjMxNDg0ZGI3NjFmNjg0NTZkOTNjZDA1ZmE2MzliYTJhODBhMTE1
-    Y2VjYzZiMjljYmZhNDNkZDM1OWRlYWJmMmFlYjA2M2JiMTAzZjQ=
+  metadata.gz: cfeaaeb1640b4c0710fbd7cb36032614802802f510ba971ef6546eb017dbb2d70d3ff053240ab844ed17b7193b287e68268ca4a65a3c0c597223b7a01f72af3c
+  data.tar.gz: 8d334b6681522832884c12328648afc9e262a8ae2ccdf67b2328b804bb6056b3829c841cd8078978b659b15438f14493e8e54dcc8804bc82c289596064e44e5e

data/README.md

@@ -44,12 +44,13 @@ Authors
 -------
 
 * [Pavel Ivashkov](https://github.com/paiv)
+* [Emilien Huet](https://github.com/emilienh)
 
 
 Copyright and license
 ---------------------
 
-Copyright 2012 Smartling, Inc.
+Copyright 2012 - 2016 Smartling, Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

data/lib/smartling.rb

@@ -14,4 +14,5 @@
 
 require 'smartling/version'
 require 'smartling/fileapi'
+require 'smartling/projectapi'
 

data/lib/smartling/api.rb

@@ -19,18 +19,16 @@ require 'smartling/uri'
 module Smartling
 
   module Endpoints
-    V1 = 'https://api.smartling.com/v1/'
-    SANDBOX_V1 = 'https://sandbox-api.smartling.com/v1/'
-    CURRENT = V1
-    SANDBOX = SANDBOX_V1
+    CURRENT = 'https://api.smartling.com/'
+    SANDBOX = 'https://api.stg.smartling.net/'
   end
 
   class Api
-    attr_accessor :apiKey, :projectId, :baseUrl
+    attr_accessor :baseUrl, :prefix
 
     def initialize(args = {})
-      @apiKey = args[:apiKey]
-      @projectId = args[:projectId]
+      @userId = args[:userId]
+      @userSecret = args[:userSecret]
       @baseUrl = args[:baseUrl] || Endpoints::CURRENT
     end
 
@@ -40,25 +38,33 @@ module Smartling
 
     def uri(path, params1 = nil, params2 = nil)
       uri = Uri.new(@baseUrl, path)
-      params = { :apiKey => @apiKey, :projectId => @projectId }
+      params = {}
       params.merge!(params1) if params1
       params.merge!(params2) if params2
       uri.params = params
-      uri.require(:apiKey, :projectId)
       return uri
     end
 
     def check_response(res)
       return if res.code == 200
-      raise format_api_error(res.body)
+      format_api_error(res.body) 
+      raise 'API_ERROR' 
     end
 
     def process(res)
       check_response(res)
       body = MultiJson.decode(res.body)
-      body = body['response']
-      raise format_api_error(res.body) unless body && body['code'] == 'SUCCESS'
-      return body['data']
+      if body['response']
+        body = body['response']
+        if body['code'] == 'SUCCESS'
+          return body['data']
+        else
+          format_api_error(res.body) 
+          raise 'API_ERROR' 
+        end
+      end
+      raise 'API_ERROR' 
+      return nil
     end
 
     def format_api_error(res)
@@ -66,34 +72,50 @@ module Smartling
         body = MultiJson.decode(res.body)
       rescue
       end
-      body = body['response'] if body
-      code = body['code'] if body
-      msg = body['messages'] if body
-      msg = msg.join(' -- ') if msg.is_a?(Array)
-      return "API error: #{code} #{msg}" if code
-      return res.description
+
+      if body && body['response']
+        body = body['response'] 
+        STDERR.puts "\e[31m#{body['code']}\e[0m"
+        if body['errors']
+          body['errors'].each do |e|
+            STDERR.puts "\e[31m#{e['message']}\e[0m"
+          end
+        end
+      end
     end
 
-    def get(uri)
-      RestClient.get(uri) {|res, _, _|
-        process(res)
+    def call(uri, method, auth, upload, download, params = nil)
+      headers = {}
+      headers[:Authorization] = token_header() if auth
+      headers[:content_type] = :json unless upload
+      headers[:accept] = :json unless download
+      RestClient::Request.execute(:method => method, 
+                                  :url => uri.to_s,
+                                  :payload => params,
+                                  :headers => headers)  {|res, _, _|
+        if download
+          check_response(res)
+          res.body  
+        else
+          process(res)
+        end
       }
     end
+
+    def get(uri)
+      call(uri, :get, true, false, false)
+    end
     def get_raw(uri)
-      RestClient.get(uri) {|res, _, _|
-        check_response(res)
-        res.body
-      }
+      call(uri, :get, true, false, true)
     end
     def post(uri, params = nil)
-      RestClient.post(uri, params) {|res, _, _|
-        process(res)
-      }
+      call(uri, :post, true, false, false, params.to_json)
     end
-    def delete(uri)
-      RestClient.delete(uri) {|res, _, _|
-        process(res)
-      }
+    def post_file(uri, params = nil)
+      call(uri, :post, true, true, false, params)
+    end
+    def post_file_raw(uri, params = nil)
+      call(uri, :post, true, true, true, params)
     end
 
     def log=(v)
@@ -102,6 +124,52 @@ module Smartling
     def proxy=(v)
       RestClient.proxy = v
     end
+
+    # auth
+
+    def token_header()
+      t = token()
+      raise 'AUTH_ERROR' if t.nil?
+      return "Bearer #{t}"
+    end
+
+    def process_auth(response) 
+      now = Time.new.to_i
+      @token = response['accessToken']
+      @token_expiration = now + response['expiresIn'].to_i
+      @refresh = response['refreshToken']
+      @refresh_expiration = now + response['refreshExpiresIn'].to_i
+    end
+
+    # Authenticate - /auth-api/v2/authenticate (POST)
+    def token()
+      # Check if current token is still valid
+      if @token
+        now = Time.new.to_i
+        if @token_expiration > now
+          return @token
+        elsif @refresh && @refresh_expiration > now
+          return refresh()
+        end
+      end
+
+      # 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, _, _|
+        process_auth(process(res))
+        return @token
+      }
+    end
+
+    # 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, _, _|
+        process_auth(process(res))
+        return @token
+      }
+    end
+
   end
 
 end

data/lib/smartling/fileapi.rb

@@ -16,60 +16,123 @@ require 'smartling/api'
 
 module Smartling
 
-  module Services
-    FILE_LIST = 'file/list'
-    FILE_STATUS = 'file/status'
-    FILE_GET = 'file/get'
-    FILE_UPLOAD = 'file/upload'
-    FILE_RENAME = 'file/rename'
-    FILE_DELETE = 'file/delete'
-    FILE_IMPORT = 'file/import'
-  end
-
   class File < Api
-    alias :api_delete :delete
 
+    def initialize(args = {})
+      super(args)
+      @projectId = args[:projectId]
+    end
+
+    # List Files - /files-api/v2/projects/{projectId}/files/list (GET)
     def list(params = nil)
-      uri = uri(Services::FILE_LIST, params)
-      return get(uri.to_s)
+      uri = uri("files-api/v2/projects/#{@projectId}/files/list", params)
+      return get(uri)
+    end
+
+    # List File Types - /files-api/v2/projects/{projectId}/file-types (GET)
+    def list_types(params = nil)
+      uri = uri("files-api/v2/projects/#{@projectId}/file-types", params)
+      return get(uri)
+    end
+
+    # Status - All Locales - /files-api/v2/projects/{projectId}/file/status (GET)
+    def status_all(name)
+      keys = { :fileUri => name }
+      uri = uri("files-api/v2/projects/#{@projectId}/file/status", keys, {}).require(:fileUri)
+      return get(uri)
     end
 
-    def status(name, params)
+    # Status - Single Locale / Extended Response - /files-api/v2/projects/{projectId}/locales/{localeId}/file/status (GET)
+    def status(name, locale)
       keys = { :fileUri => name }
-      uri = uri(Services::FILE_STATUS, keys, params).require(:fileUri, :locale)
-      return get(uri.to_s)
+      uri = uri("files-api/v2/projects/#{@projectId}/locales/#{locale}/file/status", keys, {}).require(:fileUri)
+      return get(uri)
     end
 
+    # Download Original File - /files-api/v2/projects/{projectId}/file (GET)
     def download(name, params = nil)
       keys = { :fileUri => name }
-      uri = uri(Services::FILE_GET, keys, params).require(:fileUri)
-      return get_raw(uri.to_s)
+      uri = uri("files-api/v2/projects/#{@projectId}/file", keys, params).require(:fileUri)
+      return get_raw(uri)
+    end
+
+    # Download Translated File - Single Locale - /files-api/v2/projects/{projectId}/locales/{localeId}/file (GET)
+    def download_translated(name, locale, params = nil)
+      keys = { :fileUri => name }
+      uri = uri("files-api/v2/projects/#{@projectId}/locales/#{locale}/file", keys, params).require(:fileUri)
+      return get_raw(uri)
+    end
+
+    # Download Translated Files - Multiple Locales as .ZIP - /files-api/v2/projects/{projectId}/files/zip (GET)
+    def download_translated_zip(names, params = nil)
+      keys = { :fileUris => names, :localeIds => locales }
+      uri = uri("files-api/v2/projects/#{@projectId}/files/zip", keys, params).require(:fileUris, :localeIds)
+      return get_raw(uri)
     end
 
+    # Download Translated File - All Locales as .ZIP - /files-api/v2/projects/{projectId}/locales/all/file/zip (GET)
+    def download_all_translated_zip(name, params = nil)
+      keys = { :fileUri => name }
+      uri = uri("files-api/v2/projects/#{@projectId}/locales/all/file/zip", keys, params).require(:fileUri)
+      return get_raw(uri)
+    end
+
+    # Download Translated File - All Locales in one File - CSV - /files-api/v2/projects/{projectId}/locales/all/file (GET)
+    def download_all_translated_csv(name, params = nil)
+      keys = { :fileUri => name }
+      uri = uri("files-api/v2/projects/#{@projectId}/locales/all/file", keys, params).require(:fileUri)
+      return get_raw(uri)
+    end
+
+    # Upload File - /files-api/v2/projects/{projectId}/file (POST)
     def upload(file, name, type, params = nil)
       keys = { :fileUri => name, :fileType => type }
-      uri = uri(Services::FILE_UPLOAD, keys, params).require(:fileUri, :fileType)
+      uri = uri("files-api/v2/projects/#{@projectId}/file", keys, params).require(:fileUri, :fileType)
       file = ::File.open(file, 'rb') if file.is_a?(String)
-      return post(uri.to_s, :file => file)
+      return post_file(uri, :file => file)
     end
 
+    # Rename - /files-api/v2/projects/{projectId}/file/rename (POST)
     def rename(name, newname, params = nil)
       keys = { :fileUri => name, :newFileUri => newname }
-      uri = uri(Services::FILE_RENAME, keys, params).require(:fileUri, :newFileUri)
-      return post(uri.to_s)
+      uri = uri("files-api/v2/projects/#{@projectId}/file/rename", keys, params).require(:fileUri, :newFileUri)
+      return post(uri)
     end
 
+    # Delete - /files-api/v2/projects/{projectId}/file/delete (POST)
     def delete(name, params = nil)
       keys = { :fileUri => name }
-      uri = uri(Services::FILE_DELETE, keys, params).require(:fileUri)
-      return api_delete(uri.to_s)
+      uri = uri("files-api/v2/projects/#{@projectId}/file/delete", keys, params).require(:fileUri)
+      return post(uri)
+    end
+
+    # Last Modified (by locale) - /files-api/v2/projects/{projectId}/locales/{localeId}/file/last-modified (GET)
+    def last_modified(name, locale, params = nil)
+      keys = { :fileUri => name }
+      uri = uri("files-api/v2/projects/#{@projectId}/locales/#{locale}/file/last-modified", keys, params).require(:fileUri)
+      return get(uri)
+    end
+
+    # Last Modified (all locales) - /files-api/v2/projects/{projectId}/file/last-modified (GET)
+    def last_modified_all(name, params = nil)
+      keys = { :fileUri => name }
+      uri = uri("files-api/v2/projects/#{@projectId}/file/last-modified", keys, params).require(:fileUri)
+      return get(uri)
+    end
+    
+    # Get Translations - /files-api/v2/projects/{projectId}/locales/{localeId}/file/get-translations (POST)
+    def translations(locale, file, fileUri, params = nil)
+      keys = { :fileUri => fileUri }
+      uri = uri("files-api/v2/projects/#{@projectId}/locales/#{locale}/file/get-translations", keys, params).require(:fileUri)
+      return post_file_raw(uri, :file => file)
     end
 
-    def import(file, name, type, state, params = nil)
+    # Import Translations - /files-api/v2/projects/{projectId}/locales/{localeId}/file/import (POST or PUT)
+    def import(locale, file, name, type, state, params = nil)
         keys = { :fileUri => name, :fileType => type, :translationState => state}
-        uri = uri(Services::FILE_IMPORT, keys, params).require(:fileUri, :fileType, :locale, :translationState)
+        uri = uri("files-api/v2/projects/#{@projectId}/locales/#{locale}/file/import", keys, params).require(:fileUri, :fileType, :translationState)
         file = ::File.open(file, 'rb') if file.is_a?(String)
-        return post(uri.to_s, :file => file)
+        return post_file(uri, :file => file)
     end
   end
 

data/lib/smartling/projectapi.rb

@@ -0,0 +1,35 @@
+# Copyright 2016 Smartling, Inc.
+# 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#    http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require 'smartling/api'
+
+module Smartling
+
+  class Project < Api
+    
+    # List Projects - /accounts-api/v2/accounts/{accountUid}/projects (GET)
+    def list(accountUid, params = nil)
+      uri = uri('accounts-api/v2/accounts/' + accountUid + '/projects', params)
+      return get(uri)
+    end
+
+    # Project Details - /projects-api/v2/projects/{projectId} (GET)
+    def details(projectId, params = nil)
+      uri = uri('projects-api/v2/projects/' + projectId, params)
+      return get(uri)
+    end
+    
+  end
+end
+

data/lib/smartling/uri.rb

@@ -52,7 +52,7 @@ module Smartling
       params.map {|k,v|
         if v.respond_to?(:to_ary)
           v.to_ary.map {|w|
-            k.to_s + '=' + format_value(w)
+            k.to_s + '[]=' + format_value(w)
           }.join('&')
         else
           k.to_s + '=' + format_value(v)
@@ -66,7 +66,7 @@ module Smartling
     end
 
     def format_time(t)
-      t.utc.strftime('%Y-%m-%dT%H:%M:%S')
+      t.utc.iso8601
     end
 
   end

data/lib/smartling/version.rb

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

data/samples/file_api.rb

@@ -21,92 +21,138 @@ def print_msg(msg)
   puts msg
 end
 
-API_KEY = 'YOUR_API_KEY' # change this value to use "Smartling API key" found on the Project Settings -> API page in dashboard
-PROJECT_ID = 'YOUR_PROJECT_ID' # change this value to use "Project Id" found on the Project Settings -> API page in dashboard
+# change these values to use those found on the Project Settings -> API page in dashboard
+USER_ID = 'USERID'
+USER_SECRET = 'USERSECRET'
+PROJECT_ID = 'PROJECTID' 
 
 print_msg "Smartling Ruby client #{Smartling::VERSION}"
 
-# Initialize client to use File API on Sandbox
-sl = Smartling::File.sandbox(:apiKey => API_KEY, :projectId => PROJECT_ID)
 
 # Initialize client to use File API on Production
-#sl = Smartling::File.new(:apiKey => API_KEY, :projectId => PROJECT_ID)
+# 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)
 
 # Basic usage
 
+begin
+print_msg 'Listing all project files...'
+res = sl.list
+p res
+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
 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
 
+begin
 print_msg 'Listing all project files...'
 res = sl.list
 p res
+rescue
+end
 
-lang = 'es-ES' # any language that exists in your project
+lang = 'fr-FR' # any language that exists in your project
 state = 'PUBLISHED' # state at which imported strings are imported as
 
+begin
 print_msg "Getting status for file URI '#{file_uri}' and language '#{lang}'..."
-res = sl.status(file_uri, :locale => lang)
+res = sl.status(file_uri, lang)
 p res
+rescue
+end
 
+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(file, file_uri, file_type, state, :locale => lang)
+res = sl.import(lang, file, file_uri, file_type, state)
+rescue
+end
 
+begin
 print_msg "Downloading translations for file URI '#{file_uri}' and language '#{lang}'..."
-data = sl.download(file_uri, :locale => lang)
+data = sl.download_translated(file_uri, lang)
 puts data
+rescue
+end
 
-new_file_uri = 'my_files/new_data.yaml' # new uri to uniquely identify the previously uploaded file
+new_file_uri = 'my_files/newdata.yaml' # new uri to uniquely identify the previously uploaded file
 
+begin
 print_msg "Renaming file from '#{file_uri}' to '#{new_file_uri}'..."
 sl.rename(file_uri, new_file_uri)
+rescue
+end
 
+begin
 print_msg "Deleting file '#{new_file_uri}'..."
 sl.delete(new_file_uri)
+rescue
+end
 
 # Extended parameters
-
+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
 
+begin
 print_msg 'Uploading file with approved flag provided...'
-res = sl.upload(file, 'name.yaml', 'YAML', :approved => true)
+res = sl.upload(file, 'name.yaml', 'YAML', :authorize => true)
 p res
+rescue
+end
 
+begin
 print_msg 'Listing files using URI mask filter...'
 res = sl.list(:uriMask => '%.yaml')
 p res
+rescue
+end
 
+begin
 print_msg 'Listing files using file type filter...'
 res = sl.list(:fileTypes => ['yaml', 'ios'])
 p res
+rescue
+end
 
-print_msg 'Listing files ordered by attributes...'
-res = sl.list(:orderBy => ['fileUri', 'wordCount_desc'])
-p res
-
+begin
 print_msg 'Listing paginated files...'
 page, size = 2, 10
 res = sl.list(:offset => (page - 1) * size, :limit => size)
 p res
+rescue
+end
 
+begin
 print_msg 'Listing files uploaded after a certain date...'
-res = sl.list(:lastUploadedAfter => Time.utc(2012, 04, 05))
+res = sl.list(:lastUploadedAfter => Time.utc(2016, 10, 30))
 p res
+rescue
+end
 
+begin
 print_msg 'Listing files uploaded between a date range...'
-res = sl.list(:lastUploadedAfter => Time.utc(2012, 04, 01), :lastUploadedBefore => Time.utc(2012, 05, 01))
-p res
-
-print_msg 'Listing files using translation status...'
-res = sl.list(:conditions => ['haveAllTranslated', 'haveAtLeastOneUnapproved'])
+res = sl.list(:lastUploadedAfter => Time.utc(2016, 10, 30), :lastUploadedBefore => Time.utc(2016, 11, 10))
 p res
+rescue
+end
 
+begin
 print_msg 'Listing files while combining multiple parameters...'
-res = sl.list(:fileTypes => 'yaml', :orderBy => 'fileUri', :offset => 20, :limit => 10)
+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

data/tests/api_test.rb

@@ -17,29 +17,34 @@ $:.unshift File.expand_path('../', __FILE__)
 require 'test_helper'
 
 module SmartlingTests
+  class StubResponse
+    attr_accessor :code, :body
+  end
+
   class SmartlingApiTest < Test::Unit::TestCase
 
     def stub_response(code, body)
-      status = Net::HTTPResponse.new('', code, '')
-      if RestClient::Response.method(:create).arity > 3
-          RestClient::Response.create(body, status, {}, nil)
-      else
-          RestClient::Response.create(body, status, {})
-      end
+      response = StubResponse.new()
+      response.code = code
+      response.body = body
+      return response
     end
 
     def test_endpoints
+      base = 'https://api.smartling.com/'
+      sb = 'https://api.stg.smartling.net/'
+
       sl = Smartling::Api.new()
-      assert_equal(Smartling::Endpoints::CURRENT, sl.baseUrl)
+      assert_equal(base, sl.baseUrl)
 
-      sl = Smartling::Api.new(:baseUrl => Smartling::Endpoints::V1)
-      assert_equal(Smartling::Endpoints::V1, sl.baseUrl)
+      sl = Smartling::Api.new(:baseUrl => base)
+      assert_equal(base, sl.baseUrl)
 
-      sl = Smartling::Api.new(:baseUrl => Smartling::Endpoints::SANDBOX)
-      assert_equal(Smartling::Endpoints::SANDBOX, sl.baseUrl)
+      sl = Smartling::Api.new(:baseUrl => sb)
+      assert_equal(sb, sl.baseUrl)
 
       sl = Smartling::Api.sandbox()
-      assert_equal(Smartling::Endpoints::SANDBOX, sl.baseUrl)
+      assert_equal(sb, sl.baseUrl)
 
       sl = Smartling::Api.new(:baseUrl => 'custom')
       assert_equal('custom', sl.baseUrl)
@@ -63,10 +68,10 @@ module SmartlingTests
       res = stub_response(200, '{"response":{"code":"SUCCESS", "data":"foo"}}')
       assert_equal('foo', sl.process(res))
 
-      res = stub_response(200, '{"response":{"code":"ERROR", "messages":[]}}')
+      res = stub_response(200, '{"response":{"code":"ERROR", "errors":[]}}')
       assert_raise RuntimeError do sl.process(res) end
 
-      res = stub_response(500, '{"response":{"code":"ERROR", "messages":[]}}')
+      res = stub_response(500, '{"response":{"code":"ERROR", "errors":[]}}')
       assert_raise RuntimeError do sl.process(res) end
 
       res = stub_response(500, '{"response":{"code":"ERROR"}}')

data/tests/srv_fileapi_test.rb

@@ -77,7 +77,7 @@ we have: cookies
       
       res = nil
       assert_nothing_raised do
-        res = sl.status(TEST_FILE_YAML, :locale => 'en-US')
+        res = sl.status_all(TEST_FILE_YAML)
       end
       @log.debug res.inspect
     end
@@ -88,18 +88,18 @@ we have: cookies
       
       res = nil
       assert_nothing_raised do
-        res = sl.download(TEST_FILE_YAML, :locale => 'en-US')
+        res = sl.download_translated(TEST_FILE_YAML, 'en-US')
       end
       @log.debug res.inspect
     end
 
     def test_5_download_ru
-      @log.debug '-> FileAPI:download RU'
+      @log.debug '-> FileAPI:download FR'
       sl = Smartling::File.new(@config)
       
       res = nil
       assert_nothing_raised do
-        res = sl.download(TEST_FILE_YAML, :locale => 'ru-RU')
+        res = sl.download_translated(TEST_FILE_YAML, 'fr-FR')
       end
       @log.debug res.inspect
     end
@@ -120,15 +120,13 @@ we have: cookies
 
       @log.debug '-> FileAPI UTF-16 download EN'
       assert_nothing_raised do
-        res = sl.download(TEST_FILE_UTF16, :locale => 'en-US')
+        res = sl.download(TEST_FILE_UTF16)
       end
       @log.debug res.inspect
 
-      assert_equal(YAML.load(data), YAML.load(res))
-
-      @log.debug '-> FileAPI UTF-16 download RU'
+      @log.debug '-> FileAPI UTF-16 download FR'
       assert_nothing_raised do
-        res = sl.download(TEST_FILE_UTF16, :locale => 'ru-RU')
+        res = sl.download_translated(TEST_FILE_UTF16, 'fr-FR')
       end
       @log.debug res.inspect
     end
@@ -138,7 +136,7 @@ we have: cookies
       sl = Smartling::File.new(@config)
       res = nil
       assert_nothing_raised do
-        res = sl.list(:locale => 'ru-RU', :uriMask => '%.yaml', :fileTypes => [:ios, :yaml],
+        res = sl.list(:uriMask => '%.yaml', :fileTypes => [:ios, :yaml],
               :lastUploadedAfter => Time.now - 3600, :lastUploadedBefore => Time.now + 24*3600,
               :offset => 0, :limit => 2)
       end

data/tests/test_helper.rb

@@ -18,6 +18,7 @@ require 'logger'
 require 'smartling'
 require 'test/unit'
 require 'yaml'
+require 'json'
 
 class Hash
   def keysym!

data/tests/uri_test.rb

@@ -42,23 +42,23 @@ module SmartlingTests
 
       uri = Smartling::Uri.new('http://hello.wo/')
       uri.params = {:foo => Time.utc(2012, 04, 05, 11, 19, 59)}
-      assert_equal('http://hello.wo/?foo=2012-04-05T11:19:59', uri.to_s)
+      assert_equal('http://hello.wo/?foo=2012-04-05T11:19:59Z', uri.to_s)
 
       uri = Smartling::Uri.new('http://hello.wo/')
       uri.params = {:foo => Time.utc(2012, 04, 05, 11, 49, 17).localtime}
-      assert_equal('http://hello.wo/?foo=2012-04-05T11:49:17', uri.to_s)
+      assert_equal('http://hello.wo/?foo=2012-04-05T11:49:17Z', uri.to_s)
 
       uri = Smartling::Uri.new('http://hello.wo/')
       uri.params = {:foo => ['hello']}
-      assert_equal('http://hello.wo/?foo=hello', uri.to_s)
+      assert_equal('http://hello.wo/?foo[]=hello', uri.to_s)
 
       uri = Smartling::Uri.new('http://hello.wo/')
       uri.params = {:foo => ['hello', 'world']}
-      assert_equal('http://hello.wo/?foo=hello&foo=world', uri.to_s)
+      assert_equal('http://hello.wo/?foo[]=hello&foo[]=world', uri.to_s)
 
       uri = Smartling::Uri.new('http://hello.wo/')
       uri.params = {:foo => ['hello', 'world', 'of', Time.utc(2012)]}
-      assert_equal('http://hello.wo/?foo=hello&foo=world&foo=of&foo=2012-01-01T00:00:00', uri.to_s)
+      assert_equal('http://hello.wo/?foo[]=hello&foo[]=world&foo[]=of&foo[]=2012-01-01T00:00:00Z', uri.to_s)
     end
 
     def test_require
@@ -90,7 +90,7 @@ module SmartlingTests
     def test_encode
         uri = Smartling::Uri.new('http://hello.wo/')
         uri.params = {:foo => ['hello & world!']}
-        assert_equal('http://hello.wo/?foo=hello%20%26%20world%21', uri.to_s)
+        assert_equal('http://hello.wo/?foo[]=hello%20%26%20world%21', uri.to_s)
     end
 
   end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: smartling
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 2.0.0
 platform: ruby
 authors:
-- Pavel Ivashkov
+- Emilien Huet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-02 00:00:00.000000000 Z
+date: 2016-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.0'
 description: A Ruby library to utilize Smartling services
 email:
 - hi@smartling.com
@@ -50,6 +50,7 @@ files:
 - lib/smartling.rb
 - lib/smartling/api.rb
 - lib/smartling/fileapi.rb
+- lib/smartling/projectapi.rb
 - lib/smartling/uri.rb
 - lib/smartling/version.rb
 - samples/data.yaml
@@ -69,23 +70,23 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.8.6
+      version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: Smartling SDK
 test_files:
-- tests/test_helper.rb
 - tests/uri_test.rb
-- tests/api_test.rb
 - tests/config.sample
+- tests/api_test.rb
+- tests/test_helper.rb
 - tests/srv_fileapi_test.rb