ruby-lokalise-api 6.1.0 → 7.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83ba3c3b7e6b33c712f31ef3e1d66daaed33604fd227b2fcef1cb8ed71fddd1c
-  data.tar.gz: 78b7decbd94a6bdd45c5b684cb07a0ee50a21045a757b3b7e61ab5c10c8618c6
+  metadata.gz: a0df97ee1958c45138da225b66c6cc99797a9cf77c3f84435b3fff41e86317c9
+  data.tar.gz: a98e58642231426d959a49299d47154c1883d1fa89214693bf062642a89c4581
 SHA512:
-  metadata.gz: a8cd7b58cf1c83534cc2faad45fd998ba200102db25a6a191483dd6d4ecb15809ca4563bd9965f052082fac93257daf53e4668fae7d3696bf90a886dd5fe1c11
-  data.tar.gz: '008fe8a740c7a1d3d53229367df62082b83b1a5665f97b6a6d03ac29fe863b8b970c5fb77eb7196c26690234ff07e62abb58e7f014a85ec1fde78ca32adb51ea'
+  metadata.gz: 3b1760ad8acee33810dc905ceb9fe8ff3791b8ac42cda5affb031112c53b0981dc5a2ad714d5ee04352fd5c50856ec695c45abf1c3765e939ab8230f1ed78ff1
+  data.tar.gz: 947b22b36b74ebde8abeeb8edde48b701e9b4cfd2f4f7bbf5f1c2e35aa94408c1b4deb60b56ab03c65ae1f0f5405c0aef0a9a5cdbf15d0e8e094060d75aeea34

data/LICENSE

@@ -1,6 +1,6 @@
 BSD 3 Clause
 
-Copyright 2021 Lokalise Group, Ilya Bodrov
+Copyright 2021 Lokalise Group, Ilya Krukowski
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
 

data/README.md

@@ -5,7 +5,7 @@
 [![Test Coverage](https://codecov.io/gh/lokalise/ruby-lokalise-api/graph/badge.svg)](https://codecov.io/gh/lokalise/ruby-lokalise-api)
 ![Downloads total](https://img.shields.io/gem/dt/ruby-lokalise-api)
 
-Official opinionated Ruby interface for the [Lokalise API](https://app.lokalise.com/api2docs/curl/) that represents returned data as Ruby objects.
+Official opinionated Ruby interface for the [Lokalise API](https://developers.lokalise.com/reference/lokalise-rest-api) that represents returned data as Ruby objects.
 
 Looking for a Rails integration? Try the [lokalise_rails gem](https://github.com/bodrovis/lokalise_rails). Also you can use a [lokalise_manager gem](https://github.com/bodrovis/lokalise_manager) which allows to exchange translation files between Lokalise and *any* Ruby script.
 
@@ -57,4 +57,4 @@ You can also check [this repo containing some usage examples](https://github.com
 
 This gem is licensed under the [BSD 3 Clause license](https://github.com/lokalise/ruby-lokalise-api/blob/master/LICENSE). Prior to version 4 the license type was MIT.
 
-Copyright (c) [Lokalise team](http://lokalise.co) and [Ilya Bodrov](http://bodrovis.tech)
+Copyright (c) [Lokalise team](http://lokalise.co) and [Ilya Krukowski](http://bodrovis.tech)

data/Rakefile

@@ -1,6 +1,9 @@
 # frozen_string_literal: true
 
 require 'rake'
+require 'rake/clean'
+require 'rspec/core/rake_task'
+require 'rubocop/rake_task'
 
 begin
   require 'bundler/setup'
@@ -9,13 +12,33 @@ rescue LoadError
   puts 'although not required, bundler is recommened for running the tests'
 end
 
-task default: :spec
-
-require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec)
 
-require 'rubocop/rake_task'
 RuboCop::RakeTask.new do |task|
   task.requires << 'rubocop-performance'
   task.requires << 'rubocop-rspec'
+  task.requires << 'rubocop-rake'
+end
+
+CLOBBER.include(FileList['./*.gem'])
+
+namespace :lokalise do
+  desc 'Updates RubyGems, installs dependencies'
+  task :install do
+    puts 'Running bundle install'
+    sh 'gem update --system'
+    sh 'bundle'
+  end
+
+  desc 'Builds the gem'
+  task :build do
+    puts 'Building'
+    sh 'gem build ruby-lokalise-api.gemspec'
+  end
 end
+
+task rubospec: %w[rubocop spec]
+
+task full_build: %w[clobber lokalise:install lokalise:build]
+
+task default: :full_build

data/lib/ruby_lokalise_api/base_request.rb

@@ -3,6 +3,47 @@
 module RubyLokaliseApi
   module BaseRequest
     include RubyLokaliseApi::JsonHandler
+    include RubyLokaliseApi::Connection
+
+    def get(path, client, params = {})
+      respond_with(
+        connection(client).get(prepare(path), params),
+        client
+      )
+    end
+
+    def post(path, client, params = {})
+      respond_with(
+        connection(client).post(prepare(path), custom_dump(params)),
+        client
+      )
+    end
+
+    def put(path, client, params = {})
+      respond_with(
+        connection(client).put(prepare(path), custom_dump(params)),
+        client
+      )
+    end
+
+    def patch(path, client, params = {})
+      respond_with(
+        connection(client).patch(prepare(path), params.any? ? custom_dump(params) : nil),
+        client
+      )
+    end
+
+    def delete(path, client, params = {})
+      respond_with(
+        # Rubocop tries to replace `delete` with `gsub` but that's a different method here!
+        # rubocop:disable Style/CollectionMethods
+        connection(client).delete(prepare(path)) do |req|
+          # rubocop:enable Style/CollectionMethods
+          req.body = custom_dump params
+        end,
+        client
+      )
+    end
 
     private
 
@@ -11,8 +52,16 @@ module RubyLokaliseApi
       path.delete_prefix('/').gsub(%r{//}, '/').gsub(%r{/+\z}, '')
     end
 
-    def raise_on_error!(status, body)
-      respond_with_error(status, body) if status.between?(400, 599) || (body.respond_to?(:has_key?) && body.key?('error'))
+    def raise_on_error!(response, body)
+      return unless !response.success? || (body.respond_to?(:has_key?) && body.key?('error'))
+
+      respond_with_error(response.status, body)
+    end
+
+    def respond_with(response, _client)
+      body = custom_load response.body
+      raise_on_error! response, body
+      body
     end
 
     def respond_with_error(code, body)

data/lib/ruby_lokalise_api/client.rb

@@ -42,7 +42,8 @@ module RubyLokaliseApi
     # @param endpoint_ids [Array, Hash] IDs that are used to generate the proper path to the endpoint
     # @param params [Array, Hash] Request parameters
     # @param object_key [String, Symbol] Key that should be used to wrap parameters into
-    # @param initial_ids [Array] IDs that should be used to generate base endpoint path. The base path is used for method chaining
+    # @param initial_ids [Array] IDs that should be used to generate base endpoint path.
+    # The base path is used for method chaining
     def construct_request(klass, method, endpoint_ids, params = {}, object_key = nil, initial_ids = nil)
       path = klass.endpoint(*endpoint_ids)
       formatted_params = format_params(params, object_key)
@@ -62,6 +63,14 @@ module RubyLokaliseApi
       {object_key => params}
     end
 
+    def base_url
+      'https://api.lokalise.com/api2/'
+    end
+
+    def compression?
+      true
+    end
+
     alias c_r construct_request
   end
 end

data/lib/ruby_lokalise_api/connection.rb

@@ -2,26 +2,33 @@
 
 module RubyLokaliseApi
   module Connection
-    BASE_URL = 'https://api.lokalise.com/api2/'
-
     def connection(client)
       Faraday.new(options(client), request_params_for(client)) do |faraday|
         faraday.adapter Faraday.default_adapter
-        faraday.request :gzip
+        faraday.request(:gzip) if client.compression?
       end
     end
 
     private
 
     def options(client)
+      params = __base_options(client)
+
+      if client.respond_to?(:token) && client.respond_to?(:token_header)
+        params[:headers][client.token_header] = client.token
+      end
+      params[:headers][:accept_encoding] = 'gzip,deflate,br' if client.compression?
+
+      params
+    end
+
+    def __base_options(client)
       {
         headers: {
           accept: 'application/json',
-          user_agent: "ruby-lokalise-api gem/#{RubyLokaliseApi::VERSION}",
-          accept_encoding: 'gzip,deflate,br',
-          client.token_header => client.token
+          user_agent: "ruby-lokalise-api gem/#{RubyLokaliseApi::VERSION}"
         },
-        url: BASE_URL
+        url: client.base_url
       }
     end
 

data/lib/ruby_lokalise_api/oauth2/auth.rb

@@ -3,13 +3,19 @@
 module RubyLokaliseApi
   module OAuth2
     class Auth
-      include RubyLokaliseApi::OAuth2::Request
+      include RubyLokaliseApi::BaseRequest
 
-      attr_reader :client_id, :client_secret
+      attr_reader :client_id, :client_secret, :timeout, :open_timeout
 
-      def initialize(client_id, client_secret)
+      def initialize(client_id, client_secret, params = {})
         @client_id = client_id
         @client_secret = client_secret
+        @timeout = params[:timeout]
+        @open_timeout = params[:open_timeout]
+      end
+
+      def base_url
+        URI('https://app.lokalise.com/oauth2/')
       end
 
       def auth(scope:, redirect_uri: nil, state: nil)
@@ -30,7 +36,8 @@ module RubyLokaliseApi
                                      code: code,
                                      grant_type: 'authorization_code'
                                    })
-        post 'token', params
+
+        RubyLokaliseApi::OAuth2::Token.new post('token', self, params)
       end
 
       def refresh(token)
@@ -38,7 +45,12 @@ module RubyLokaliseApi
                                      refresh_token: token,
                                      grant_type: 'refresh_token'
                                    })
-        post 'token', params
+
+        RubyLokaliseApi::OAuth2::Refresh.new post('token', self, params)
+      end
+
+      def compression?
+        false
       end
 
       private
@@ -52,8 +64,8 @@ module RubyLokaliseApi
 
       def _build_url_from(params)
         URI::HTTPS.build(
-          host: BASE_URL.host,
-          path: "#{BASE_URL.path}auth",
+          host: base_url.host,
+          path: "#{base_url.path}auth",
           query: URI.encode_www_form(params)
         ).to_s
       end

data/lib/ruby_lokalise_api/oauth2/refresh.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module RubyLokaliseApi
+  module OAuth2
+    class Refresh
+      attr_reader :access_token, :expires_in, :scope, :token_type
+
+      def initialize(raw_params)
+        @access_token = raw_params['access_token']
+        @expires_in = raw_params['expires_in']
+        @scope = raw_params['scope']
+        @token_type = raw_params['token_type']
+      end
+    end
+  end
+end

data/lib/ruby_lokalise_api/oauth2/token.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module RubyLokaliseApi
+  module OAuth2
+    class Token
+      attr_reader :access_token, :refresh_token, :expires_in, :token_type
+
+      def initialize(raw_params)
+        @access_token = raw_params['access_token']
+        @refresh_token = raw_params['refresh_token']
+        @expires_in = raw_params['expires_in']
+        @token_type = raw_params['token_type']
+      end
+    end
+  end
+end

data/lib/ruby_lokalise_api/request.rb

@@ -3,58 +3,17 @@
 module RubyLokaliseApi
   module Request
     include RubyLokaliseApi::BaseRequest
-    include RubyLokaliseApi::Connection
 
     # Lokalise returns pagination info in special headers
-    PAGINATION_HEADERS = %w[x-pagination-total-count x-pagination-page-count x-pagination-limit x-pagination-page].freeze
-
-    def get(path, client, params = {})
-      respond_with(
-        connection(client).get(prepare(path), params),
-        client
-      )
-    end
-
-    def post(path, client, params = {})
-      respond_with(
-        connection(client).post(prepare(path), custom_dump(params)),
-        client
-      )
-    end
-
-    def put(path, client, params = {})
-      respond_with(
-        connection(client).put(prepare(path), custom_dump(params)),
-        client
-      )
-    end
-
-    def patch(path, client, params = {})
-      respond_with(
-        connection(client).patch(prepare(path), params.any? ? custom_dump(params) : nil),
-        client
-      )
-    end
-
-    def delete(path, client, params = {})
-      respond_with(
-        # Rubocop tries to replace `delete` with `gsub` but that's a different method here!
-        # rubocop:disable Style/CollectionMethods
-        connection(client).delete(prepare(path)) do |req|
-          # rubocop:enable Style/CollectionMethods
-          req.body = custom_dump params
-        end,
-        client
-      )
-    end
+    PAGINATION_HEADERS = %w[x-pagination-total-count x-pagination-page-count x-pagination-limit
+                            x-pagination-page].freeze
 
     private
 
     def respond_with(response, client)
       body = custom_load response.body
       uri = Addressable::URI.parse response.env.url
-      status = response.status
-      raise_on_error! status, body
+      raise_on_error! response, body
       extract_headers_from(response).
         merge('content' => body,
               'client' => client,

data/lib/ruby_lokalise_api/resources/base.rb

@@ -27,6 +27,19 @@ module RubyLokaliseApi
         @path = infer_path_from response, endpoint_generator
       end
 
+      # Returns object attribute with [] notation by calling
+      # the corresponding method on the object if the
+      # instance variable named after the requested key exists
+      #
+      # @param raw_key_attr [String or Hash]
+      def [](raw_key_attr)
+        key_attr = raw_key_attr.to_s.to_sym
+
+        return nil unless instance_variables.include?(:"@#{key_attr}")
+
+        send key_attr
+      end
+
       class << self
         # Dynamically adds attribute readers for each inherited class.
         # Attributes are defined in the `data/attributes.json` file.

data/lib/ruby_lokalise_api/rest/branches.rb

@@ -5,7 +5,7 @@ module RubyLokaliseApi
     module Branches
       # Returns all branches for the given project
       #
-      # @see https://lokalise.com/api2docs/curl/#transition-list-all-branches-get
+      # @see https://developers.lokalise.com/reference/list-all-branches
       # @return [RubyLokaliseApi::Collection::Branch<RubyLokaliseApi::Resources::Branch>]
       # @param project_id [String]
       # @param params [Hash]
@@ -15,7 +15,7 @@ module RubyLokaliseApi
 
       # Creates a new branch inside the given project
       #
-      # @see https://lokalise.com/api2docs/curl/#transition-create-a-branch-post
+      # @see https://developers.lokalise.com/reference/create-a-branch
       # @return [RubyLokaliseApi::Resources::Branch]
       # @param project_id [String]
       # @param params [Hash]
@@ -25,7 +25,7 @@ module RubyLokaliseApi
 
       # Returns a single branch for the given project
       #
-      # @see https://lokalise.com/api2docs/curl/#transition-retrieve-a-branch-get
+      # @see https://developers.lokalise.com/reference/retrieve-a-branch
       # @return [RubyLokaliseApi::Resources::Branch]
       # @param project_id [String]
       # @param branch_id [String, Integer]
@@ -35,7 +35,7 @@ module RubyLokaliseApi
 
       # Updates the given branch inside the given project
       #
-      # @see https://lokalise.com/api2docs/curl/#transition-update-a-branch-put
+      # @see https://developers.lokalise.com/reference/update-a-branch
       # @return [RubyLokaliseApi::Resources::Branch]
       # @param project_id [String]
       # @param branch_id [String, Integer]
@@ -46,7 +46,7 @@ module RubyLokaliseApi
 
       # Deletes branch inside the given project
       #
-      # @see https://lokalise.com/api2docs/curl/#transition-delete-a-branch-delete
+      # @see https://developers.lokalise.com/reference/delete-a-branch
       # @return [Hash]
       # @param project_id [String]
       # @param branch_id [String, Integer]
@@ -56,7 +56,7 @@ module RubyLokaliseApi
 
       # Merges a branch in the project
       #
-      # @see https://lokalise.com/api2docs/curl/#transition-merge-a-branch-post
+      # @see https://developers.lokalise.com/reference/merge-a-branch
       # @return [Hash]
       # @param project_id [String]
       # @param branch_id [String, Integer]

data/lib/ruby_lokalise_api/rest/custom_translation_statuses.rb

@@ -6,7 +6,8 @@ module RubyLokaliseApi
       # Returns all translation statuses for the given project
       #
       # @see https://developers.lokalise.com/reference/list-all-custom-translation-statuses
-      # @return [RubyLokaliseApi::Collection::CustomTranslationStatus<RubyLokaliseApi::Resources::CustomTranslationStatus>]
+      # @return [RubyLokaliseApi::Collection::CustomTranslationStatus
+      # <RubyLokaliseApi::Resources::CustomTranslationStatus>]
       # @param project_id [String]
       # @param params [Hash]
       def translation_statuses(project_id, params = {})

data/lib/ruby_lokalise_api/rest/files.rb

@@ -13,7 +13,8 @@ module RubyLokaliseApi
         c_r RubyLokaliseApi::Collections::File, :all, project_id, params
       end
 
-      # Exports translation files as .zip bundle, uploads them to Amazon S3 and returns a URL to the generated bundle. The URL is valid for a year
+      # Exports translation files as .zip bundle, uploads them to Amazon S3 and
+      # returns a URL to the generated bundle. The URL is valid for a year
       #
       # @see https://developers.lokalise.com/reference/download-files
       # @return [Hash]

data/lib/ruby_lokalise_api/rest/orders.rb

@@ -5,7 +5,7 @@ module RubyLokaliseApi
     module Orders
       # Returns all orders for the given team
       #
-      # @see https://lokalise.co/api2docs/curl/#transition-list-all-orders-get
+      # @see https://developers.lokalise.com/reference/list-all-orders
       # @return [RubyLokaliseApi::Collection::Order<RubyLokaliseApi::Resources::Order>]
       # @param team_id [String]
       # @param params [Hash]
@@ -15,7 +15,7 @@ module RubyLokaliseApi
 
       # Returns a single order for the given team
       #
-      # @see https://lokalise.co/api2docs/curl/#transition-retrieve-an-order-get
+      # @see https://developers.lokalise.com/reference/retrieve-an-order
       # @return [RubyLokaliseApi::Resources::Order]
       # @param team_id [String]
       # @param order_id [String, Integer]
@@ -25,7 +25,7 @@ module RubyLokaliseApi
 
       # Creates an order for the given team
       #
-      # @see https://lokalise.co/api2docs/curl/#transition-create-an-order-post
+      # @see https://developers.lokalise.com/reference/create-an-order
       # @return [RubyLokaliseApi::Resources::Order]
       # @param team_id [String]
       # @param params [Hash]

data/lib/ruby_lokalise_api/rest/payment_cards.rb

@@ -23,7 +23,7 @@ module RubyLokaliseApi
 
       # Creates a payment card
       #
-      # @see https://lokalise.co/api2docs/curl/#transition-create-a-card-post
+      # @see https://developers.lokalise.com/reference/create-a-card
       # @return [RubyLokaliseApi::Resources::PaymentCard]
       # @param params [Hash]
       def create_payment_card(params)

data/lib/ruby_lokalise_api/rest/team_user_groups.rb

@@ -5,7 +5,7 @@ module RubyLokaliseApi
     module TeamUserGroups
       # Returns all team user groups for the given team
       #
-      # @see https://lokalise.co/api2docs/curl/#transition-list-all-groups-get
+      # @see https://developers.lokalise.com/reference/list-all-team-users
       # @return [RubyLokaliseApi::Collection::TeamUserGroup<RubyLokaliseApi::Resources::TeamUserGroup>]
       # @param team_id [String]
       # @param params [Hash]
@@ -15,7 +15,7 @@ module RubyLokaliseApi
 
       # Returns team user from the given team
       #
-      # @see https://lokalise.co/api2docs/curl/#transition-retrieve-a-group-get
+      # @see https://developers.lokalise.com/reference/retrieve-a-team-user
       # @return [RubyLokaliseApi::Resources::TeamUserGroup]
       # @param team_id [String]
       # @param group_id [String, Integer]
@@ -25,7 +25,7 @@ module RubyLokaliseApi
 
       # Creates team user group
       #
-      # @see https://lokalise.co/api2docs/curl/#resource-team-user-groups
+      # @see https://developers.lokalise.com/reference/create-a-group
       # @return [RubyLokaliseApi::Resources::TeamUserGroup]
       # @param params [Hash]
       def create_team_user_group(team_id, params)
@@ -34,7 +34,7 @@ module RubyLokaliseApi
 
       # Updates team user group for the given team
       #
-      # @see https://lokalise.co/api2docs/curl/#transition-update-a-group-put
+      # @see https://developers.lokalise.com/reference/update-a-group
       # @return [RubyLokaliseApi::Resources::TeamUserGroup]
       # @param team_id [String]
       # @param group_id [String, Integer]
@@ -45,7 +45,7 @@ module RubyLokaliseApi
 
       # Deletes team user group from the given team
       #
-      # @see https://lokalise.co/api2docs/curl/#transition-delete-a-group-delete
+      # @see https://developers.lokalise.com/reference/delete-a-group
       # @return [RubyLokaliseApi::Resources::TeamUserGroup]
       # @param team_id [String]
       # @param group_id [String, Integer]
@@ -55,7 +55,7 @@ module RubyLokaliseApi
 
       # Adds projects to the given group
       #
-      # @see https://lokalise.co/api2docs/curl/#transition-add-projects-to-group-put
+      # @see https://developers.lokalise.com/reference/add-projects-to-group
       # @return [RubyLokaliseApi::Resources::TeamUserGroup]
       # @param team_id [String]
       # @param group_id [String, Integer]
@@ -68,7 +68,7 @@ module RubyLokaliseApi
 
       # Removes projects from the given group
       #
-      # @see https://lokalise.co/api2docs/curl/#transition-remove-projects-from-group-put
+      # @see https://developers.lokalise.com/reference/remove-projects-from-group
       # @return [RubyLokaliseApi::Resources::TeamUserGroup]
       # @param team_id [String]
       # @param group_id [String, Integer]
@@ -81,7 +81,7 @@ module RubyLokaliseApi
 
       # Adds users to the given group
       #
-      # @see https://lokalise.co/api2docs/curl/#transition-add-members-to-group-put
+      # @see https://developers.lokalise.com/reference/add-members-to-group
       # @return [RubyLokaliseApi::Resources::TeamUserGroup]
       # @param team_id [String]
       # @param group_id [String, Integer]
@@ -94,7 +94,7 @@ module RubyLokaliseApi
 
       # Removes users from the given group
       #
-      # @see https://lokalise.co/api2docs/curl/#transition-remove-members-from-group-put
+      # @see https://developers.lokalise.com/reference/remove-members-from-group
       # @return [RubyLokaliseApi::Resources::TeamUserGroup]
       # @param team_id [String]
       # @param group_id [String, Integer]

data/lib/ruby_lokalise_api/rest/webhooks.rb

@@ -56,7 +56,7 @@ module RubyLokaliseApi
 
       # Regenerates secret for the given webhook
       #
-      # @see https://lokalise.com/api2docs/curl/#transition-regenerate-a-webhook-secret-patch
+      # @see https://developers.lokalise.com/reference/regenerate-a-webhook-secret
       # @return [Hash]
       # @param project_id [String]
       # @param webhook_id [String, Integer]

data/lib/ruby_lokalise_api/utils/attribute_helpers.rb

@@ -70,7 +70,8 @@ module RubyLokaliseApi
         key ? key.snakecase : key
       end
 
-      # Unify some resources' names (eg, `ProjectComment` and `KeyComment` have the same attributes which are stored under `comment`)
+      # Unify some resources' names (eg, `ProjectComment` and `KeyComment` have the same
+      # attributes which are stored under `comment`)
       #
       # @return [String]
       def unify(name)

data/lib/ruby_lokalise_api/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RubyLokaliseApi
-  VERSION = '6.1.0'
+  VERSION = '7.0.0'
 end

data/lib/ruby_lokalise_api.rb

@@ -43,8 +43,14 @@ module RubyLokaliseApi
       @oauth2_client = nil
     end
 
-    def auth_client(client_id, client_secret)
-      RubyLokaliseApi::OAuth2::Auth.new client_id, client_secret
+    # Initializes a new Auth client to request OAuth 2 tokens
+    #
+    # @return [RubyLokaliseApi::OAuth2::Auth]
+    # @param client_id [String]
+    # @param client_secret [String]
+    # @param params [Hash]
+    def auth_client(client_id, client_secret, params = {})
+      RubyLokaliseApi::OAuth2::Auth.new client_id, client_secret, params
     end
   end
 end

data/ruby-lokalise-api.gemspec

@@ -5,7 +5,7 @@ require File.expand_path('lib/ruby_lokalise_api/version', __dir__)
 Gem::Specification.new do |spec|
   spec.name                  = 'ruby-lokalise-api'
   spec.version               = RubyLokaliseApi::VERSION
-  spec.authors               = ['Ilya Bodrov-Krukowski']
+  spec.authors               = ['Ilya Krukowski']
   spec.email                 = ['golosizpru@gmail.com']
   spec.summary               = 'Ruby interface to the Lokalise API'
   spec.description           = 'Opinionated Ruby client for the Lokalise platform API allowing to work with translations, projects, users and other resources as with Ruby objects.'
@@ -34,6 +34,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec',               '~> 3.6'
   spec.add_development_dependency 'rubocop',             '~> 1.6'
   spec.add_development_dependency 'rubocop-performance', '~> 1.5'
+  spec.add_development_dependency 'rubocop-rake',        '~> 0.6'
   spec.add_development_dependency 'rubocop-rspec',       '~> 2.0'
   spec.add_development_dependency 'simplecov',           '~> 0.16'
   spec.add_development_dependency 'vcr',                 '~> 6.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-lokalise-api
 version: !ruby/object:Gem::Version
-  version: 6.1.0
+  version: 7.0.0
 platform: ruby
 authors:
-- Ilya Bodrov-Krukowski
+- Ilya Krukowski
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-27 00:00:00.000000000 Z
+date: 2022-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -178,6 +178,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -283,8 +297,8 @@ files:
 - lib/ruby_lokalise_api/error.rb
 - lib/ruby_lokalise_api/json_handler.rb
 - lib/ruby_lokalise_api/oauth2/auth.rb
-- lib/ruby_lokalise_api/oauth2/connection.rb
-- lib/ruby_lokalise_api/oauth2/request.rb
+- lib/ruby_lokalise_api/oauth2/refresh.rb
+- lib/ruby_lokalise_api/oauth2/token.rb
 - lib/ruby_lokalise_api/oauth2_client.rb
 - lib/ruby_lokalise_api/request.rb
 - lib/ruby_lokalise_api/resources/base.rb
@@ -359,7 +373,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.17
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: Ruby interface to the Lokalise API

data/lib/ruby_lokalise_api/oauth2/connection.rb

@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-module RubyLokaliseApi
-  module OAuth2
-    module Connection
-      BASE_URL = URI('https://app.lokalise.com/oauth2/')
-
-      def connection
-        Faraday.new(options) { |f| f.adapter Faraday.default_adapter }
-      end
-
-      private
-
-      def options
-        {
-          headers: {
-            accept: 'application/json',
-            user_agent: "ruby-lokalise-api gem/#{RubyLokaliseApi::VERSION}"
-          },
-          url: BASE_URL.to_s
-        }
-      end
-    end
-  end
-end

data/lib/ruby_lokalise_api/oauth2/request.rb

@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-module RubyLokaliseApi
-  module OAuth2
-    module Request
-      include RubyLokaliseApi::BaseRequest
-      include RubyLokaliseApi::OAuth2::Connection
-
-      def post(path, params = {})
-        respond_with connection.post(prepare(path), custom_dump(params))
-      end
-
-      private
-
-      def respond_with(response)
-        body = custom_load response.body
-        status = response.status
-        raise_on_error! status, body
-        body
-      end
-    end
-  end
-end