toptranslation_api 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c90725ea66e01f1d6fa6fb551da1460fa29b8c250e5c42bd959512b7b08509b9
-  data.tar.gz: 8f8420ffecc9e9fa6efb65f1aba26cf13fedcc0a81c93eb07dfcaf1b2029bc41
+  metadata.gz: 1c33323a6ceaeea5084a3bad1e038611b20986e2aa6fd79d1d5bf5b7cd38104b
+  data.tar.gz: ce619d7ceeb69ed269b56507e2fea4983a0862ac0bf42dabdc0a3a3908658ab9
 SHA512:
-  metadata.gz: 01e933d2d8295b0395a9455852ea8b3e2e678828b24d4190bb9233243cca2fedbf732dd9d91df7c419d4f3fecf02542f389ff39a8b86bb3291e05448f5bcb533
-  data.tar.gz: 3013cf1f325d7401b1e32e03a599c3ff828bcf8d5455729a902253161301ba568d469de410da604cc0ebd56b6afac4e82ed1d6d0be7443d8b19d2fe506a1fa81
+  metadata.gz: f580cf9866c741c75f747ef0274406a2662af88046914be4fcb6933e1ac80bb93248019e5ccdab5d508379a27ec18c94add07407ab127c73e997f4c8772dcff9
+  data.tar.gz: 8f0798de6ea5121d54df6b4acc2a98fba9993340d996e4d9de678d96b10bfe8675292656cd16c4bd4db30255dfab8ea9fb789aa4cb77af190e4d4e699d2d4e6f

data/lib/toptranslation/connection.rb

@@ -1,5 +1,5 @@
 module Toptranslation
-  class Connection
+  class Connection # rubocop:disable Metrics/ClassLength
     attr_accessor :upload_token, :verbose
 
     def initialize(options = {})
@@ -21,21 +21,16 @@ module Toptranslation
       transform_response(request(:patch, path, options), options)
     end
 
-    def download(url)
+    def download(url, path, &block)
       puts "# downloading #{url}" if @verbose
-      raw = RestClient::Request.execute(method: :get, url: url, raw_response: true)
-      raw.file
+      uri = URI.parse(url)
+      download_uri(uri, path, &block)
     end
 
-    def upload(filepath, type)
-      response = RestClient.post(
-        "#{@files_url}/documents",
-        file: File.new(filepath),
-        type: type,
-        token: upload_token
-      )
-
-      transform_response(response, version: 0)
+    def upload(filepath, type, &block)
+      uri = URI.parse("#{@files_url}/documents")
+      file = File.new(filepath)
+      upload_file(file, type, uri, &block)
     end
 
     private
@@ -103,5 +98,60 @@ module Toptranslation
       def auth_params
         { access_token: @access_token }
       end
+
+      def download_content_length(http, uri)
+        sleep_time = 0.5
+        attempts = 0
+        total = nil
+
+        loop do
+          raise 'File not available' if attempts >= 10
+
+          head_response = http.request_head(uri.request_uri)
+          total = head_response['content-length'].to_i
+          break if head_response.code == '200'
+
+          attempts += 1
+          sleep sleep_time
+          sleep_time += sleep_time * 0.5
+        end
+
+        total
+      end
+
+      def download_uri(uri, path)
+        Net::HTTP.start(uri.host, uri.port, use_ssl: uri.scheme == 'https') do |http|
+          total = download_content_length(http, uri)
+          yield nil, total if block_given?
+
+          FileUtils.mkpath(File.dirname(path))
+          file = File.open(path, 'w')
+          http.request_get(uri.request_uri) do |response|
+            response.read_body do |data|
+              file.write(data)
+              yield data.length, total if block_given?
+            end
+          end
+          file
+        end
+      end
+
+      def upload_file(file, type, uri)
+        last_upload_size = 0
+
+        response = Net::HTTP.start(uri.host, uri.port, use_ssl: uri.scheme == 'https') do |http|
+          request = Net::HTTP::Post.new(uri)
+          request.set_form({ 'file' => file, 'token' => upload_token, 'type' => type }, 'multipart/form-data')
+
+          Net::HTTP::UploadProgress.new(request) do |progress|
+            yield progress.upload_size - last_upload_size if block_given?
+            last_upload_size = progress.upload_size
+          end
+
+          http.request(request)
+        end
+
+        transform_response(response.body, version: 0)
+      end
   end
 end

data/lib/toptranslation/resource/document.rb

@@ -5,8 +5,6 @@ module Toptranslation::Resource
 
     def initialize(connection, options = {})
       @connection = connection
-      @options = options
-
       update_from_response(options)
     end
 
@@ -25,12 +23,20 @@ module Toptranslation::Resource
       @connection.get("/documents/#{@identifier}/download", params: params)['download_url']
     end
 
-    def download(locale_code, options = {})
-      @connection.download(download_url(locale_code, options))
+    def download(locale_code, options = {}, &block)
+      download_path = if options[:path]
+                        options[:path]
+                      else
+                        tempfile = Tempfile.new
+                        temp_path = tempfile.path
+                        tempfile.close
+                        temp_path
+                      end
+      @connection.download(download_url(locale_code, options), download_path, &block)
     end
 
     def save
-      response = @identifier ? update_remote_document : create_remote_document
+      response = @connection.patch("/documents/#{@identifier}", remote_hash)
       update_and_return_from_response(response)
     end
 
@@ -40,14 +46,6 @@ module Toptranslation::Resource
 
     private
 
-      def update_remote_document
-        @connection.patch("/documents/#{@identifier}", remote_hash)
-      end
-
-      def create_remote_document
-        @connection.post('/documents', remote_hash)
-      end
-
       def update_and_return_from_response(response)
         if response
           update_from_response(response)
@@ -62,8 +60,8 @@ module Toptranslation::Resource
         @string_count = response['string_count'] if response['string_count']
         @has_missing_strings = response['has_missing_strings'] if response['has_missing_strings']
         @sha1 = response['sha1'] if response['sha1']
-        @updated_at = DateTime.parse(response['updated_at']) if response['updated_at']
-        @created_at = DateTime.parse(response['created_at']) if response['created_at']
+        @updated_at = Time.parse(response['updated_at']) if response['updated_at']
+        @created_at = Time.parse(response['created_at']) if response['created_at']
         if response['translations']
           @translations = response['translations'].inject([]) do |accu, translation|
             accu << Translation.new(@connection, translation)

data/lib/toptranslation/resource/project.rb

@@ -10,8 +10,8 @@ module Toptranslation::Resource
       update_from_response(options)
     end
 
-    def upload_document(filepath, locale_code, options = {})
-      upload = Upload.new(@connection).upload(filepath)
+    def upload_document(filepath, locale_code, options = {}, &block)
+      upload = Upload.new(@connection).upload(filepath, &block)
 
       attr_hash = {
         document_store_id: upload.document_store_id,

data/lib/toptranslation/resource/reference_document.rb

@@ -8,8 +8,16 @@ module Toptranslation::Resource
       update_from_response(options)
     end
 
-    def download
-      @connection.download(download_url)
+    def download(options = {})
+      download_path = if options[:path]
+                        options[:path]
+                      else
+                        tempfile = Tempfile.new
+                        temp_path = tempfile.path
+                        tempfile.close
+                        temp_path
+                      end
+      @connection.download(download_url, download_path)
     end
 
     def download_url

data/lib/toptranslation/resource/upload.rb

@@ -7,9 +7,9 @@ module Toptranslation::Resource
       @options = options
     end
 
-    def upload(filepath, type = 'document')
+    def upload(filepath, type = 'document', &block)
       puts "# Uploading: #{filepath}" if @connection.verbose
-      response = @connection.upload(filepath, type)
+      response = @connection.upload(filepath, type, &block)
 
       @document_store_id = response['identifier']
       @document_token    = response['document_token']

data/lib/toptranslation/version.rb

@@ -1,3 +1,3 @@
 module Toptranslation
-  VERSION = '2.2.0'.freeze
+  VERSION = '2.3.0'.freeze
 end

data/lib/toptranslation_api.rb

@@ -1,5 +1,6 @@
 require 'json'
 require 'rest-client'
+require 'net/http/uploadprogress'
 require 'toptranslation/client'
 require 'toptranslation/connection'
 require 'toptranslation/resource/document'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: toptranslation_api
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Toptranslation GmbH
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-14 00:00:00.000000000 Z
+date: 2018-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: net-http-uploadprogress
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +122,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.25.1
+- !ruby/object:Gem::Dependency
+  name: vcr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement