gemfather 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3fd19fbc65ac2d8a724ddd70b7bf59e8bc302c408686d0b13d7aefa4e956ffe0
-  data.tar.gz: da8a25c506d2014ce53e5425acd4bee4edb17b4786a068a155a9f861505522f9
+  metadata.gz: c09582c0dd342839f92c7bbabe5647e5b121d0793f25f954c79167d89bbe8180
+  data.tar.gz: 5545749705cfbd231eb70bdbdb36d5ef83e54e1ddcdb6b10beb7d6ec143752c6
 SHA512:
-  metadata.gz: 4f8c780b469c5b4d9f3845cd60c84a2a451a46078d13beca17732708a7f07930fa9780956a8093c5d163e4acf99319b86174af1c4f58b3661f4a1f321200316b
-  data.tar.gz: 86b72aa259b7235be3bb140c4b0e7da2e4ad119c0195b0197e057efc548a33a41b0f8a128dfd2806d12d6edf7bebda450afd93e068b6e32d0ac2c8a910cf4b4a
+  metadata.gz: 5e4a46929223ebb62e86d18357da79f1fbee5007749e993ef94036dab66e7659246f7adb07f33dfa9a3989cb150f8743ae096baf72d09e9febddf4061266095a
+  data.tar.gz: a8e3766200d26234b91a35834fc4eadbeb5d0c239ced4753e57df9f36e8375088bfaced32a75af780aeb30baa39bac2bb52ca41c7f377030f4ab1bd159384328

data/README.md

@@ -143,3 +143,7 @@ client.find_offers(company_id: 1).page(2).total
 # Получение общего количество элементов на всех страницах в сумме (сначала загрузит все страницы)
 client.find_offers(company_id: 1).page(2).total!
 ```
+
+## Улучшения.
+
+В файле [TODO.md](/TODO.md) вы можете найти известные проблемы, которые можно исправить и идеи для улучшений.

data/gem_template/README.md.tt

@@ -26,13 +26,14 @@ gem '<%= app_name %>'
 
 ```ruby
 <%= app_name_class %>::Client.configure do |config|
-  config.api_endpoint       = 'https://<%= app_name %>.dev/'
-  config.api_user           = 'user'
-  config.api_password       = 'password'
-  config.open_timeout       = 5
-  config.read_timeout       = 5
-  config.user_agent         = 'info for debugging' # default is `Ruby <%= app_name_class %> API Client`
-  config.logger             = Logger.new(STDERR) # по дефолту `Rails.logger` в development окружении, в других - nil
+  config.api_endpoint           = 'https://<%= app_name %>.dev/'
+  config.api_user               = 'user'
+  config.api_password           = 'password'
+  config.open_timeout           = 5
+  config.read_timeout           = 5
+  config.user_agent             = 'info for debugging' # default is `Ruby <%= app_name_class %> API Client`
+  config.logger                 = Logger.new(STDERR) # по дефолту `Rails.logger` в development окружении, в других - nil
+  config.enable_instrumentation = true # под дефолту выключен, включает отправку метрик гему domclick_bigbrother через ActiveSupport::Notifications
 end
 ```
 

data/lib/api_generator/client/config.rb

@@ -10,7 +10,7 @@ module ApiGenerator
       RETRY_INTERVAL = 1
       RETRY_BACKOFF_FACTOR = 1
 
-      # rubocop:disable Metrics/MethodLength
+      # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
       def self.extended(klass)
         klass.extend Dry::Configurable
 
@@ -33,6 +33,7 @@ module ApiGenerator
           setting :retry_interval, RETRY_INTERVAL, reader: true
           setting :retry_backoff_factor, RETRY_BACKOFF_FACTOR, reader: true
           setting :logger, reader: true
+          setting :enable_instrumentation, reader: true
 
           setting :retriable_errors,
                   [
@@ -41,7 +42,7 @@ module ApiGenerator
                   reader: true
         end
       end
-      # rubocop:enable Metrics/MethodLength
+      # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
 
       def check_config
         raise ConfigurationError, 'API endpoint is not configured.' if config.api_endpoint.nil?

data/lib/api_generator/client/connection.rb

@@ -52,8 +52,10 @@ module ApiGenerator
 
       private
 
-      # rubocop:disable Metrics/MethodLength
+      # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
       def connection
+        set_instrumentation_context
+
         @connection ||= Faraday.new(url: self.class.api_endpoint) do |connection|
           setup_auth!(connection)
 
@@ -65,6 +67,7 @@ module ApiGenerator
           setup_error_handling!(connection)
           setup_error_code_middleware!(connection)
           setup_ssl(connection)
+          setup_instrumentation!(connection)
 
           customize_connection!(connection)
 
@@ -74,7 +77,7 @@ module ApiGenerator
           connection.adapter(Faraday.default_adapter)
         end
       end
-      # rubocop:enable Metrics/MethodLength
+      # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
 
       # rubocop:disable Metrics/AbcSize
       def setup_auth!(connection)
@@ -109,6 +112,24 @@ module ApiGenerator
         connection.response(:logger, self.class.logger) if self.class.logger
       end
 
+      def setup_instrumentation!(connection)
+        return unless self.class.enable_instrumentation
+
+        connection.use ApiGenerator::Middleware::Instrumentation,
+                       name: 'gemfather_api_client.requests'
+      end
+
+      def set_instrumentation_context
+        return unless self.class.enable_instrumentation
+
+        action = caller_locations(4, 1)&.first&.label || 'unparsed_method'
+
+        Thread.current[:gemfather_api_client] = {
+          name: self.class.to_s,
+          action: action,
+        }
+      end
+
       def setup_ssl(connection)
         connection.ssl.verify = self.class.ssl_verify
         connection.ssl.ca_file = self.class.ca_file

data/lib/api_generator/middleware/error_handler_middleware.rb

@@ -1,6 +1,12 @@
 module ApiGenerator
   module Middleware
     class ErrorHandlerMiddleware < Faraday::Middleware
+      FARADAY_CONNECTION_ERRORS = [
+        Faraday::TimeoutError,
+        Faraday::ConnectionFailed,
+        Faraday::SSLError,
+      ].freeze
+
       def self.inherited(subclass)
         class << subclass
           attr_accessor :error_namespace
@@ -10,12 +16,6 @@ module ApiGenerator
         super
       end
 
-      FARADAY_CONNECTION_ERRORS = [
-        Faraday::TimeoutError,
-        Faraday::ConnectionFailed,
-        Faraday::SSLError,
-      ].freeze
-
       def call(env)
         @app.call(env)
       rescue *FARADAY_CONNECTION_ERRORS => e

data/lib/api_generator/middleware/instrumentation.rb

@@ -0,0 +1,10 @@
+module ApiGenerator
+  module Middleware
+    class Instrumentation < Faraday::Request::Instrumentation
+      def call(env)
+        env[:gemfather_api_client] = Thread.current[:gemfather_api_client]
+        super(env)
+      end
+    end
+  end
+end

data/lib/api_generator/pagination/relation.rb

@@ -82,7 +82,14 @@ class ApiGenerator::Pagination::Relation
   attr_reader :fetch_block, :config
 
   def data
-    response.try(data_key) || response.dig(*data_key)
+    case data_key
+    when Symbol, String
+      response.public_send(data_key)
+    when Array
+      response.dig(*data_key)
+    else
+      raise ArgumentError, 'Data key should be a symbol, string or array'
+    end
   end
 
   def expand(**options)

data/lib/api_generator/services/gemfather.rb

@@ -10,6 +10,10 @@ module ApiGenerator
       attr_accessor :app_name, :app_name_class, :app_short_name,
                     :app_short_name_class, :author, :email, :version
 
+      def self.source_root
+        File.expand_path('./../../../', __dir__)
+      end
+
       # rubocop:disable Metrics/MethodLength
       desc 'generates API gem', 'generates basic API gem with the provided name'
       def generate_client(app_name)
@@ -32,8 +36,6 @@ module ApiGenerator
 
       private
 
-      private_class_method :source_root
-
       def check_app_name(app_name)
         raise(Thor::Error, 'APP_NAME is not provided') unless app_name
         raise(Thor::Error, "Folder #{app_name} name already exists") if Dir.exist?("./#{app_name}")
@@ -72,10 +74,6 @@ module ApiGenerator
           chmod(file, EXEC_MODE)
         end
       end
-
-      def self.source_root
-        File.expand_path('./../../../', __dir__)
-      end
     end
   end
 end

data/lib/api_generator/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gemfather
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Domclick Ruby Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-03 00:00:00.000000000 Z
+date: 2023-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -31,6 +31,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.11'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.14'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -38,6 +41,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.11'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.14'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -170,6 +176,7 @@ files:
 - lib/api_generator/middleware/error_handler_middleware.rb
 - lib/api_generator/middleware/handle_unsuccessful_request_middleware.rb
 - lib/api_generator/middleware/http_errors.rb
+- lib/api_generator/middleware/instrumentation.rb
 - lib/api_generator/middleware/raise_error_base.rb
 - lib/api_generator/middleware/raise_error_dsl.rb
 - lib/api_generator/models/base.rb
@@ -222,7 +229,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.1.2
 signing_key:
 specification_version: 4
 summary: 'Gemfather: API client generator'