web_translate_it 2.7.5 → 2.8.0.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d28dda70be5e71eeb61a269cceedb3f1406640b4e5526bed6f33d239d1b8527
-  data.tar.gz: 670de23342b5adbbe052373c918a5b757438d42051c51bd9e7b2dc97c23e78bf
+  metadata.gz: 69b5c5aa701b8b255767bbc4fdff3cf1d502ee6c258a610269cc28f718380a28
+  data.tar.gz: c8e430b7c96f7a98cbd13a42826467c12e1a4ca523635c6b23f76666258ae6b5
 SHA512:
-  metadata.gz: 4a7cc04fe367c0b4541b48f1dc08ecda4deedc9891dd4f92f1622060aac4f46cbe6cd0867791f319893e69f2ad50c604684a70c1071168f6b28fbe7d99631315
-  data.tar.gz: 22800578ddbe6ccadd5231ede8fc6bdb9a743692eb17235eff3174c3c1d241a5cc1bcf7bf95096572ced08ac71308ed333625b08a700b657457380489b7f82ea
+  metadata.gz: 7ecdb51c0f2667cbbe0d83f185d3411196e6ade89e3d74cb283aa4cca6cf1c4c3946f90574b5e8498c51f29c72ce760d95751ff9c172d280678c4034e0702669
+  data.tar.gz: 52991c0930ec439e7bb9952f92821048878ad26ecae3274a1d9838515fa4c92adcf64129a6a48a716cf91d7a50afd890f3c977772e3c20925b5113e3cded6c60

data/generators/webtranslateit/webtranslateit_generator.rb

@@ -13,7 +13,7 @@ class WebtranslateitGenerator < Rails::Generator::Base
     end
     record do |m|
       if options[:api_key]
-        project_details = YAML.load WebTranslateIt::Project.fetch_info(options[:api_key])
+        project_details = YAML.safe_load WebTranslateIt::Project.fetch_info(options[:api_key])
         m.template '.wti', '.wti',
                    assigns: {api_key: options[:api_key], project: project_details['project']}
         m.append_to 'Rakefile', "require 'web_translate_it' rescue LoadError"

data/history.md

@@ -1,3 +1,12 @@
+## Version 2.8.0 / 2023-03-13
+
+* Replace YAML API calls with JSON API calls. (#242)
+
+## Version 2.7.6 / 2023-01-02
+
+* Add ruby 3.2 to CI matrix.
+* Dependencies upgrade and code refactoring.
+
 ## Version 2.7.5 / 2022-11-17
 
 * wti now works with `multipart_post = 2.0.0` AND `multipart_post >= 2.2.0`.

data/lib/web_translate_it/command_line.rb

@@ -57,7 +57,7 @@ module WebTranslateIt
         # Now actually pulling files
         time = Time.now
         threads = []
-        n_threads = (files.size.to_f / 3).ceil >= 10 ? 10 : (files.size.to_f / 3).ceil
+        n_threads = [(files.size.to_f / 3).ceil, 10].min
         ArrayUtil.chunk(files, n_threads).each do |file_array|
           next if file_array.empty?
 
@@ -148,7 +148,7 @@ module WebTranslateIt
       end
     end
 
-    def add # rubocop:todo Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/MethodLength, Metrics/PerceivedComplexity
+    def add # rubocop:todo Metrics/AbcSize, Metrics/MethodLength
       complete_success = true
       $stdout.sync = true
       if parameters == []
@@ -157,7 +157,7 @@ module WebTranslateIt
         exit
       end
       WebTranslateIt::Connection.new(configuration.api_key) do |http|
-        added = configuration.files.find_all { |file| file.locale == configuration.source_locale }.collect { |file| File.expand_path(file.file_path) }.to_set
+        added = configuration.files.find_all { |file| file.locale == configuration.source_locale }.to_set { |file| File.expand_path(file.file_path) }
         to_add = parameters.reject { |param| added.include?(File.expand_path(param)) }
         if to_add.any?
           to_add.each do |param|
@@ -295,11 +295,7 @@ module WebTranslateIt
         path = Util.ask(' Path to configuration file:', '.wti')
       end
       FileUtils.mkpath(path.split('/')[0..path.split('/').size - 2].join('/')) unless path.split('/').size == 1
-      project = if RUBY_VERSION >= '3.1'
-        YAML.safe_load WebTranslateIt::Project.fetch_info(api_key), permitted_classes: [Time]
-      else
-        YAML.load WebTranslateIt::Project.fetch_info(api_key)
-      end
+      project = JSON.parse WebTranslateIt::Project.fetch_info(api_key)
       project_info = project['project']
       if File.exist?(path) && !File.writable?(path)
         puts StringUtil.failure("Error: `#{path}` file is not writable.")
@@ -360,7 +356,7 @@ module WebTranslateIt
         file_id = file.master_id || file.id
         puts "Statistics for '#{parameters.first}':"
       end
-      stats = YAML.load(Project.fetch_stats(configuration.api_key, file_id))
+      stats = JSON.parse(Project.fetch_stats(configuration.api_key, file_id))
       completely_translated = true
       completely_proofread  = true
       stats.each do |locale, values|

data/lib/web_translate_it/configuration.rb

@@ -22,11 +22,7 @@ module WebTranslateIt
         self.before_push    = configuration['before_push']
         self.after_push     = configuration['after_push']
         self.ignore_files   = configuration['ignore_files']
-        project_info = if RUBY_VERSION >= '3.1.0'
-          YAML.safe_load WebTranslateIt::Project.fetch_info(api_key), permitted_classes: [Time]
-        else
-          YAML.load WebTranslateIt::Project.fetch_info(api_key)
-        end
+        project_info = JSON.parse WebTranslateIt::Project.fetch_info(api_key)
         self.ignore_locales = locales_to_ignore(configuration)
         self.needed_locales = locales_needed(configuration)
         self.files = files_from_project(project_info['project'])
@@ -42,7 +38,7 @@ module WebTranslateIt
     # Reload project data
     #
     def reload # rubocop:todo Metrics/AbcSize
-      project_info = YAML.load WebTranslateIt::Project.fetch_info(api_key)
+      project_info = JSON.parse WebTranslateIt::Project.fetch_info(api_key)
       self.ignore_locales = locales_to_ignore(configuration)
       self.needed_locales = locales_needed(configuration)
       self.files = files_from_project(project_info['project'])
@@ -97,7 +93,7 @@ module WebTranslateIt
 
     # Convenience method which returns the endpoint for fetching a list of locales for a project.
     def api_url
-      "/api/projects/#{api_key}.yaml"
+      "/api/projects/#{api_key}"
     end
 
     # Returns a logger. If RAILS_DEFAULT_LOGGER is defined, use it, else, define a new logger.
@@ -110,7 +106,7 @@ module WebTranslateIt
     end
 
     def configuration
-      @configuration ||= YAML.load(parse_erb_in_configuration)
+      @configuration ||= YAML.safe_load(parse_erb_in_configuration)
     end
 
     private

data/lib/web_translate_it/project.rb

@@ -7,7 +7,7 @@ module WebTranslateIt
       tries ||= 3
       begin
         WebTranslateIt::Connection.new(api_key) do |http|
-          request = Net::HTTP::Get.new("/api/projects/#{api_key}.yaml")
+          request = Net::HTTP::Get.new("/api/projects/#{api_key}")
           WebTranslateIt::Util.add_fields(request)
           response = http.request(request)
           return response.body if response.is_a?(Net::HTTPSuccess)
@@ -31,7 +31,7 @@ module WebTranslateIt
     end
 
     def self.fetch_stats(api_key, file_id = nil) # rubocop:todo Metrics/MethodLength
-      url = file_id.nil? ? "/api/projects/#{api_key}/stats.yaml" : "/api/projects/#{api_key}/stats.yaml?file=#{file_id}"
+      url = file_id.nil? ? "/api/projects/#{api_key}/stats" : "/api/projects/#{api_key}/stats?file=#{file_id}"
       success = true
       tries ||= 3
       begin

data/lib/web_translate_it/string.rb

@@ -53,7 +53,7 @@ module WebTranslateIt
       success = true
       tries ||= 3
       params.stringify_keys!
-      url = "/api/projects/#{Connection.api_key}/strings.yaml"
+      url = "/api/projects/#{Connection.api_key}/strings"
       url += "?#{HashUtil.to_params('filters' => params)}" unless params.empty?
 
       request = Net::HTTP::Get.new(url)
@@ -62,7 +62,7 @@ module WebTranslateIt
         strings = []
         while request
           response = Connection.http_connection.request(request)
-          YAML.load(response.body).each do |string_response|
+          JSON.parse(response.body).each do |string_response|
             string = WebTranslateIt::String.new(string_response)
             string.new_record = false
             strings.push(string)
@@ -105,13 +105,13 @@ module WebTranslateIt
     def self.find(id) # rubocop:todo Metrics/MethodLength, Metrics/AbcSize
       success = true
       tries ||= 3
-      request = Net::HTTP::Get.new("/api/projects/#{Connection.api_key}/strings/#{id}.yaml")
+      request = Net::HTTP::Get.new("/api/projects/#{Connection.api_key}/strings/#{id}")
       WebTranslateIt::Util.add_fields(request)
       begin
         response = Connection.http_connection.request(request)
         return nil if response.code.to_i == 404
 
-        string = WebTranslateIt::String.new(YAML.load(response.body))
+        string = WebTranslateIt::String.new(JSON.parse(response.body))
         string.new_record = false
         return string
       rescue Timeout::Error
@@ -187,11 +187,11 @@ module WebTranslateIt
       return translation if translation
       return nil if new_record
 
-      request = Net::HTTP::Get.new("/api/projects/#{Connection.api_key}/strings/#{id}/locales/#{locale}/translations.yaml")
+      request = Net::HTTP::Get.new("/api/projects/#{Connection.api_key}/strings/#{id}/locales/#{locale}/translations")
       WebTranslateIt::Util.add_fields(request)
       begin
         response = Util.handle_response(Connection.http_connection.request(request), true, true)
-        hash = YAML.load(response)
+        hash = JSON.parse(response)
         return nil if hash.empty?
 
         translation = WebTranslateIt::Translation.new(hash)
@@ -216,7 +216,7 @@ module WebTranslateIt
     def update # rubocop:todo Metrics/AbcSize, Metrics/MethodLength
       success = true
       tries ||= 3
-      request = Net::HTTP::Put.new("/api/projects/#{Connection.api_key}/strings/#{id}.yaml")
+      request = Net::HTTP::Put.new("/api/projects/#{Connection.api_key}/strings/#{id}")
       WebTranslateIt::Util.add_fields(request)
       request.body = to_json
 
@@ -249,7 +249,7 @@ module WebTranslateIt
       WebTranslateIt::Util.add_fields(request)
       request.body = to_json(true)
       begin
-        response = YAML.load(Util.handle_response(Connection.http_connection.request(request), true, true))
+        response = JSON.parse(Util.handle_response(Connection.http_connection.request(request), true, true))
         self.id = response['id']
         self.new_record = false
         return true

data/lib/web_translate_it/term.rb

@@ -43,7 +43,7 @@ module WebTranslateIt
       success = true
       tries ||= 3
       params.stringify_keys!
-      url = "/api/projects/#{Connection.api_key}/terms.yaml"
+      url = "/api/projects/#{Connection.api_key}/terms"
       url += "?#{HashUtil.to_params(params)}" unless params.empty?
 
       request = Net::HTTP::Get.new(url)
@@ -52,7 +52,7 @@ module WebTranslateIt
         terms = []
         while request
           response = Connection.http_connection.request(request)
-          YAML.load(response.body).each do |term_response|
+          JSON.parse(response.body).each do |term_response|
             term = WebTranslateIt::Term.new(term_response)
             term.new_record = false
             terms.push(term)
@@ -95,13 +95,13 @@ module WebTranslateIt
     def self.find(term_id) # rubocop:todo Metrics/MethodLength, Metrics/AbcSize
       success = true
       tries ||= 3
-      request = Net::HTTP::Get.new("/api/projects/#{Connection.api_key}/terms/#{term_id}.yaml")
+      request = Net::HTTP::Get.new("/api/projects/#{Connection.api_key}/terms/#{term_id}")
       WebTranslateIt::Util.add_fields(request)
       begin
         response = Connection.http_connection.request(request)
         return nil if response.code.to_i == 404
 
-        term = WebTranslateIt::Term.new(YAML.load(response.body))
+        term = WebTranslateIt::Term.new(JSON.parse(response.body))
         term.new_record = false
         return term
       rescue Timeout::Error
@@ -177,11 +177,11 @@ module WebTranslateIt
       return translation if translation
       return nil if new_record
 
-      request = Net::HTTP::Get.new("/api/projects/#{Connection.api_key}/terms/#{id}/locales/#{locale}/translations.yaml")
+      request = Net::HTTP::Get.new("/api/projects/#{Connection.api_key}/terms/#{id}/locales/#{locale}/translations")
       WebTranslateIt::Util.add_fields(request)
       begin
         response = Util.handle_response(Connection.http_connection.request(request), true, true)
-        array = YAML.load(response)
+        array = JSON.parse(response)
         return nil if array.empty?
 
         translations = []
@@ -207,7 +207,7 @@ module WebTranslateIt
     def update # rubocop:todo Metrics/AbcSize, Metrics/MethodLength
       success = true
       tries ||= 3
-      request = Net::HTTP::Put.new("/api/projects/#{Connection.api_key}/terms/#{id}.yaml")
+      request = Net::HTTP::Put.new("/api/projects/#{Connection.api_key}/terms/#{id}")
       WebTranslateIt::Util.add_fields(request)
       request.body = to_json
 
@@ -238,7 +238,7 @@ module WebTranslateIt
       request.body = to_json(true)
 
       begin
-        response = YAML.load(Util.handle_response(Connection.http_connection.request(request), true, true))
+        response = JSON.parse(Util.handle_response(Connection.http_connection.request(request), true, true))
         self.id = response['id']
         self.new_record = false
         return true

data/lib/web_translate_it/term_translation.rb

@@ -62,7 +62,7 @@ module WebTranslateIt
       request.body = to_json
 
       begin
-        response = YAML.load(Util.handle_response(Connection.http_connection.request(request), true, true))
+        response = JSON.parse(Util.handle_response(Connection.http_connection.request(request), true, true))
         self.id = response['id']
         self.new_record = false
         return true

data/lib/web_translate_it.rb

@@ -1,4 +1,5 @@
 require 'fileutils'
+require 'json'
 require 'yaml'
 require 'erb'
 require 'net/http'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: web_translate_it
 version: !ruby/object:Gem::Version
-  version: 2.7.5
+  version: 2.8.0.pre.1
 platform: ruby
 authors:
 - Edouard Briere
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-17 00:00:00.000000000 Z
+date: 2023-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -110,11 +110,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.3.21
+rubygems_version: 3.4.6
 signing_key:
 specification_version: 4
 summary: A CLI tool to sync locale files with WebTranslateIt.com.