crowdin-api 1.2.1 → 1.3.0

data/lib/crowdin-api/{api-resources → api_resources}/webhooks.rb

@@ -7,26 +7,24 @@ module Crowdin
         project_id || raise_project_id_is_required_error
 
         request = Web::Request.new(
-          self,
+          connection,
           :get,
-          "/projects/#{project_id}/webhooks",
-          query
+          "#{config.target_api_url}/projects/#{project_id}/webhooks",
+          { params: query }
         )
-
-        request.perform
+        Web::SendRequest.new(request).perform
       end
 
       def add_webhook(query = {}, project_id = config.project_id)
         project_id || raise_project_id_is_required_error
 
         request = Web::Request.new(
-          self,
+          connection,
           :post,
-          "/projects/#{project_id}/webhooks",
-          query
+          "#{config.target_api_url}/projects/#{project_id}/webhooks",
+          { params: query }
         )
-
-        request.perform
+        Web::SendRequest.new(request).perform
       end
 
       def get_webhook(webhook_id = nil, project_id = config.project_id)
@@ -34,12 +32,11 @@ module Crowdin
         project_id || raise_project_id_is_required_error
 
         request = Web::Request.new(
-          self,
+          connection,
           :get,
-          "/projects/#{project_id}/webhooks/#{webhook_id}"
+          "#{config.target_api_url}/projects/#{project_id}/webhooks/#{webhook_id}"
         )
-
-        request.perform
+        Web::SendRequest.new(request).perform
       end
 
       def delete_webhook(webhook_id = nil, project_id = config.project_id)
@@ -47,26 +44,24 @@ module Crowdin
         project_id || raise_project_id_is_required_error
 
         request = Web::Request.new(
-          self,
+          connection,
           :delete,
-          "/projects/#{project_id}/webhooks/#{webhook_id}"
+          "#{config.target_api_url}/projects/#{project_id}/webhooks/#{webhook_id}"
         )
-
-        request.perform
+        Web::SendRequest.new(request).perform
       end
 
-      def edit_screenshot(webhook_id = nil, query = {}, project_id = config.project_id)
+      def edit_webhook(webhook_id = nil, query = {}, project_id = config.project_id)
         webhook_id || raise_parameter_is_required_error(:webhook_id)
         project_id || raise_project_id_is_required_error
 
         request = Web::Request.new(
-          self,
+          connection,
           :patch,
-          "/projects/#{project_id}/webhooks/#{webhook_id}",
-          query
+          "#{config.target_api_url}/projects/#{project_id}/webhooks/#{webhook_id}",
+          { params: query }
         )
-
-        request.perform
+        Web::SendRequest.new(request).perform
       end
     end
   end

data/lib/crowdin-api/api_resources/workflows.rb

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+module Crowdin
+  module ApiResources
+    module Workflows
+      # -- For Enterprise mode only --
+
+      def list_workflow_steps(query = {}, project_id = config.project_id)
+        enterprise_mode? || raise_only_for_enterprise_mode_error
+        project_id       || raise_project_id_is_required_error
+
+        request = Web::Request.new(
+          connection,
+          :get,
+          "#{config.target_api_url}/projects/#{project_id}/workflow-steps",
+          { params: query }
+        )
+        Web::SendRequest.new(request).perform
+      end
+
+      def get_workflow_step(step_id = nil, project_id = config.project_id)
+        enterprise_mode? || raise_only_for_enterprise_mode_error
+        step_id          || raise_parameter_is_required_error(:step_id)
+        project_id       || raise_project_id_is_required_error
+
+        request = Web::Request.new(
+          connection,
+          :get,
+          "#{config.target_api_url}/projects/#{project_id}/workflow-steps/#{step_id}"
+        )
+        Web::SendRequest.new(request).perform
+      end
+
+      def list_workflow_templates(query = {})
+        enterprise_mode? || raise_only_for_enterprise_mode_error
+
+        request = Web::Request.new(
+          connection,
+          :get,
+          "#{config.target_api_url}/workflow-templates",
+          { params: query }
+        )
+        Web::SendRequest.new(request).perform
+      end
+
+      def get_workflow_template(template_id = nil)
+        enterprise_mode? || raise_only_for_enterprise_mode_error
+        template_id      || raise_parameter_is_required_error(:template_id)
+
+        request = Web::Request.new(
+          connection,
+          :get,
+          "#{config.target_api_url}/workflow-templates/#{template_id}"
+        )
+        Web::SendRequest.new(request).perform
+      end
+    end
+  end
+end

data/lib/crowdin-api/client/client.rb

@@ -20,76 +20,85 @@ module Crowdin
   #  crowdin.list_projects
   #
   class Client
-    extend Utils
-
-    # API Resources modules
-    API_RESOURCES_MODULES = %i[Storages Languages Projects Workflows SourceFiles Translations SourceStrings
-                               StringTranslations StringComments Screenshots Glossaries TranslationMemory
-                               MachineTranslationEngines Reports Tasks Users Teams Vendors Webhooks
-                               Dictionaries Distributions Labels TranslationStatus].freeze
-
-    # Error Raisers modules
-    ERROR_RAISERS_MODULES = %i[ApiErrorsRaiser ClientErrorsRaiser].freeze
-
-    # Processing all API Resources modules to include them to the Client
+    # Processing API Resources modules to include them to the Client
     API_RESOURCES_MODULES.each do |module_name|
-      Client.send(:include, fetch_module_full_name_from_string("Crowdin::ApiResources::#{module_name}"))
+      Client.send(:include, Object.const_get("Crowdin::ApiResources::#{module_name}"))
     end
 
-    # Processing all Error Raisers modules to include them to the Client
+    # Processing Error Raisers modules to include them to the Client
     ERROR_RAISERS_MODULES.each do |module_name|
-      Client.send(:include, fetch_module_full_name_from_string("Crowdin::Errors::#{module_name}"))
+      Client.send(:include, Object.const_get("Crowdin::Errors::#{module_name}"))
     end
 
+    # Config instance that includes configuration options for the Client
     attr_reader :config
+    # Instance with established connection through RestClient to the Crowdin API
     attr_reader :connection
+    # Instance with options and headers for RestClient connection
     attr_reader :options
+    # Logger instance
     attr_reader :logger
 
     def initialize(&block)
       build_configuration(&block)
 
-      check_logger
-      check_rest_client_proxy
+      update_logger
+      update_rest_client_proxy
 
       build_connection
     end
 
-    def log!(message)
-      !config.logger_enabled? || logger.debug(message)
+    def log(message)
+      !logger_enabled? || logger.debug(message)
     end
 
     def logger=(logger)
-      raise_logger_are_not_enabled_error unless config.logger_enabled?
-      @logger = logger
-    end
-
-    private
+      raise_logger_are_not_enabled_error unless logger_enabled?
 
-    def build_configuration
-      @config = Crowdin::Configuration.new
-      yield config if block_given?
-    end
-
-    def build_connection
-      @connection ||= ::RestClient::Resource.new(config.base_url, build_options)
+      @logger = logger
+      update_rest_client_logger
     end
 
-    def build_options
-      @options ||= config.options.merge(headers: config.headers)
+    def enterprise_mode?
+      !!config.organization_domain
     end
 
-    def set_default_logger
-      require 'logger'
-      @logger ||= Logger.new($stderr)
+    def logger_enabled?
+      config.logger_enabled?
     end
 
-    def check_rest_client_proxy
-      ENV['http_proxy'] ? ::RestClient.proxy = ENV['http_proxy'] : false
-    end
+    private
 
-    def check_logger
-      config.logger_enabled? ? set_default_logger : config.enable_logger = false
-    end
+      def build_configuration
+        @config = Crowdin::Configuration.new
+        yield config if block_given?
+      end
+
+      def build_connection
+        build_options
+        @connection ||= ::RestClient::Resource.new(config.base_url, options)
+      end
+
+      def build_options
+        @options ||= config.options.merge(headers: config.headers)
+      end
+
+      def set_default_logger
+        require 'logger'
+        @logger ||= Logger.new($stdout)
+        update_rest_client_logger
+      end
+
+      def update_rest_client_logger
+        ::RestClient.log = @logger
+      end
+
+      def update_rest_client_proxy
+        ENV['http_proxy'] ? ::RestClient.proxy = ENV.fetch('http_proxy') : false
+      end
+
+      def update_logger
+        config.logger_enabled? ? set_default_logger : config.enable_logger = false
+      end
   end
 end

data/lib/crowdin-api/client/configuration.rb

@@ -5,12 +5,12 @@ module Crowdin
     attr_accessor :api_token
     attr_accessor :project_id
     attr_accessor :organization_domain
+
     attr_accessor :enable_logger
+    alias logger_enabled? enable_logger
 
     attr_reader :target_api_url
 
-    alias logger_enabled? enable_logger
-
     def initialize
       @target_api_url = '/api/v2'
     end
@@ -33,16 +33,16 @@ module Crowdin
     end
 
     def base_url
-      if enterprise_mode?
-        organization_domain.include?('.com') ? organization_domain : "https://#{organization_domain}.api.crowdin.com"
-      else
-        'https://api.crowdin.com'
-      end
-    end
-
-    def organization_domain?
-      !!organization_domain
+      @base_url ||=
+        if !!organization_domain
+          if organization_domain.include?('.com')
+            "https://#{organization_domain}"
+          else
+            "https://#{organization_domain}.api.crowdin.com"
+          end
+        else
+          'https://api.crowdin.com'
+        end
     end
-    alias enterprise_mode? organization_domain?
   end
 end

data/lib/crowdin-api/client/version.rb

@@ -2,6 +2,6 @@
 
 module Crowdin
   class Client
-    VERSION = '1.2.1'
+    VERSION = '1.3.0'
   end
 end

data/lib/crowdin-api/core/errors_raisers.rb

@@ -6,7 +6,7 @@ module Crowdin
     module ClientErrorsRaiser
       def raise_logger_are_not_enabled_error
         raise(LoggerAreNotEnabledError, 'Logger are not enabled in your Client configuration, enable it ' \
-                                        'before setting your own logger')
+                                        'before setting your logger')
       end
     end
 

data/lib/crowdin-api/core/request.rb

@@ -3,116 +3,81 @@
 module Crowdin
   module Web
     class Request
-      attr_reader :client
-
-      def initialize(client, method, path, query = {}, headers = {}, destination = nil)
-        @client      = client
-        @method      = method
-        @full_path   = client.config.target_api_url + path
-        @payload     = perform_payload(query)
-        @headers     = headers
-        @destination = destination
-        @errors      = []
+      attr_reader :connection
+      attr_reader :method
+      attr_reader :payload
+
+      def initialize(connection, method, url, payload = {})
+        @connection = connection[url]
+        @method     = method
+        @payload    = build_payload(payload)
       end
 
-      def perform
-        process_request!
-        process_response!
+      def get?
+        method.eql?(:get)
       end
 
-      private
-
-      def process_request!
-        return @response = client.connection[@full_path].delete        if delete_request?
-        return @response = client.connection[@full_path].get(@payload) if get_request?
-
-        client.connection[@full_path].send(@method, @payload, @headers) { |response, _, _| @response = response }
-      rescue StandardError => error
-        client.log! error
-
-        @errors << "Something went wrong while request proccessing. Details - #{error.class}"
+      def get
+        connection.get(prepare_payload(payload[:params]))
       end
 
-      def process_response!
-        return fetch_errors if @errors.any?
-
-        begin
-          if @response
-            client.log! "args: #{@response.request.args}"
-
-            if @response.body.empty?
-              @response.code
-            else
-              doc = JSON.parse(@response.body)
-
-              client.log! "body: #{doc}"
-
-              data = fetch_response_data(doc)
-
-              @errors.any? ? fetch_errors : data
-            end
-          end
-        rescue StandardError => error
-          client.log! error
-
-          @errors << "Something went wrong while response proccessing. Details - #{error.class}"
-
-          fetch_errors
-        end
+      def delete?
+        method.eql?(:delete)
       end
 
-      def perform_payload(query)
-        return query if query.is_a?(File)
-
-        get_request? ? { params: fetch_cleared_query(query) } : fetch_cleared_query(query).to_json
+      def delete
+        connection.delete
       end
 
-      def download_file(url)
-        download    = URI.parse(url).open
-        destination = @destination || download.meta['content-disposition']
-                                              .match(/filename=("?)(.+)\1/)[2]
+      def patch?
+        method.eql?(:patch)
+      end
 
-        IO.copy_stream(download, destination)
+      def patch
+        connection.patch(prepare_payload(payload[:params]), payload[:headers]) { |response, _, _| response }
+      end
 
-        destination
-      rescue StandardError => error
-        client.log! error
+      def post?
+        method.eql?(:post)
+      end
 
-        @errors << "Something went wrong while downloading file. Details - #{error.class}"
+      def post
+        connection.post(prepare_payload(payload[:params]), payload[:headers]) { |response, _, _| response }
       end
 
-      def fetch_errors
-        @errors.join(';')
+      def put?
+        method.eql?(:put)
       end
 
-      def fetch_response_data(doc)
-        if doc['data'].is_a?(Hash) && doc['data']['url'] && doc['data']['url'].include?('response-content-disposition')
-          download_file(doc['data']['url'])
-        else
-          doc
-        end
+      def put
+        connection.put(prepare_payload(payload[:params]), payload[:headers]) { |response, _, _| response }
       end
 
-      def fetch_cleared_query(query)
-        case query
-        when Array
-          query.map do |el|
-            el.reject { |_, value| value.nil? }
-          end.reject(&:empty?)
-        when Hash
-          query.reject { |_, value| value.nil? }
-        else
-          query
+      private
+
+        def build_payload(payload)
+          %i[params headers].each do |key|
+            payload[key] ||= {}
+          end
+          payload
         end
-      end
 
-      def get_request?
-        @method.eql?(:get)
-      end
+        def prepare_payload(params)
+          return params if params.is_a?(File)
 
-      def delete_request?
-        @method.eql?(:delete)
-      end
+          get? ? { params: fetch_cleared_params(params) } : fetch_cleared_params(params).to_json
+        end
+
+        def fetch_cleared_params(params)
+          case params
+          when Array
+            params.map { |el| el.reject { |_, value| value.nil? } }.reject(&:empty?)
+          when Hash
+            params.reject { |_, value| value.nil? }
+          else
+            params
+          end
+        end
     end
   end
 end

data/lib/crowdin-api/core/send_request.rb

@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+module Crowdin
+  module Web
+    class SendRequest
+      attr_reader :request
+
+      def initialize(request, file_destination = nil)
+        @request          = request
+        @file_destination = file_destination
+        @errors           = []
+      end
+
+      def perform
+        parse_response(process_request)
+      end
+
+      private
+
+        def process_request
+          request.send(request.method)
+        rescue StandardError => e
+          @errors << "Something went wrong while request processing. Details - #{e.message}"
+        end
+
+        def parse_response(response)
+          return @errors.join('; ') if @errors.any?
+
+          begin
+            if response
+              if response.body.empty?
+                response.code
+              else
+                parsed_body = JSON.parse(response.body)
+                parsed_response = fetch_response_data(parsed_body)
+
+                @errors.any? ? @errors.join('; ') : parsed_response
+              end
+            end
+          rescue StandardError => e
+            @errors << "Something went wrong while response processing. Details - #{e.message}"
+            @errors.join('; ')
+          end
+        end
+
+        def fetch_response_data(doc)
+          if doc['data'].is_a?(Hash) && doc['data']['url'] && doc['data']['url'].include?('response-content-disposition')
+            download_file(doc['data']['url'])
+          else
+            doc
+          end
+        end
+
+        def download_file(url)
+          download    = URI.parse(url).open
+          destination = @file_destination || download.meta['content-disposition']
+                                                     .match(/filename=("?)(.+)\1/)[2]
+
+          IO.copy_stream(download, destination)
+
+          destination
+        rescue StandardError => e
+          @errors << "Something went wrong while downloading file. Details - #{e.message}"
+        end
+    end
+  end
+end

data/lib/crowdin-api.rb

@@ -1,5 +1,16 @@
 # frozen_string_literal: true
 
+module Crowdin
+  # API Resources modules
+  API_RESOURCES_MODULES = %i[Storages Languages Projects Workflows SourceFiles Translations SourceStrings
+                             StringTranslations StringComments Screenshots Glossaries TranslationMemory
+                             MachineTranslationEngines Reports Tasks Users Teams Vendors Webhooks
+                             Dictionaries Distributions Labels TranslationStatus].freeze
+
+  # Error Raisers modules
+  ERROR_RAISERS_MODULES = %i[ApiErrorsRaiser ClientErrorsRaiser].freeze
+end
+
 # Libs
 require 'json'
 require 'open-uri'
@@ -9,32 +20,14 @@ require 'rest-client'
 require 'crowdin-api/core/errors'
 require 'crowdin-api/core/errors_raisers'
 require 'crowdin-api/core/request'
-require 'crowdin-api/core/utils'
+require 'crowdin-api/core/send_request'
 
 # API modules
-require 'crowdin-api/api-resources/storages'
-require 'crowdin-api/api-resources/languages'
-require 'crowdin-api/api-resources/projects'
-require 'crowdin-api/api-resources/workflows'
-require 'crowdin-api/api-resources/source_files'
-require 'crowdin-api/api-resources/translations'
-require 'crowdin-api/api-resources/source_strings'
-require 'crowdin-api/api-resources/string_translations'
-require 'crowdin-api/api-resources/string_comments'
-require 'crowdin-api/api-resources/screenshots'
-require 'crowdin-api/api-resources/glossaries'
-require 'crowdin-api/api-resources/translation_memory'
-require 'crowdin-api/api-resources/machine_translation_engines'
-require 'crowdin-api/api-resources/reports'
-require 'crowdin-api/api-resources/tasks'
-require 'crowdin-api/api-resources/users'
-require 'crowdin-api/api-resources/teams'
-require 'crowdin-api/api-resources/vendors'
-require 'crowdin-api/api-resources/webhooks'
-require 'crowdin-api/api-resources/dictionaries'
-require 'crowdin-api/api-resources/distributions'
-require 'crowdin-api/api-resources/labels'
-require 'crowdin-api/api-resources/translation_status'
+Crowdin::API_RESOURCES_MODULES.each do |api_resource|
+  require "crowdin-api/api_resources/#{api_resource.to_s.gsub(/([a-z\d])([A-Z])/, '\1_\2').downcase}"
+rescue LoadError
+  # Ignored
+end
 
 # Client modules
 require 'crowdin-api/client/version'

data/spec/api_resources/dictionaries_spec.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+describe Crowdin::ApiResources::Dictionaries do
+  describe 'Default endpoints' do
+    describe '#list_dictionaries' do
+      it 'when request are valid', :default do
+        stub_request(:get, "https://api.crowdin.com/#{target_api_url}/projects/#{project_id}/dictionaries")
+        list_dictionaries = @crowdin.list_dictionaries({}, project_id)
+        expect(list_dictionaries).to eq(200)
+      end
+    end
+
+    describe '#edit_dictionary' do
+      let(:language_id) { 1 }
+
+      it 'when request are valid', :default do
+        stub_request(:patch, "https://api.crowdin.com/#{target_api_url}/projects/#{project_id}/dictionaries/#{language_id}")
+        edit_dictionary = @crowdin.edit_dictionary(language_id, {}, project_id)
+        expect(edit_dictionary).to eq(200)
+      end
+    end
+  end
+end