api_recipes 2.8.1 → 2.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9d0a5a4530af3af22b9b22c091002d316e1bf7065c612d1d74f18f3aa62e37d
-  data.tar.gz: 5d322a843fa2db9cceb97cd9733b482ce17626342ad519ea036c0c821efe0d8b
+  metadata.gz: 3c1d3c91651ea71c01c7ae5368076aa3b693422eedfd373b5206f6072b396df3
+  data.tar.gz: 19a3ab41ca84d22efc0bb33918665bb3a67444c6ce070f53267519ca23334616
 SHA512:
-  metadata.gz: 6ee0d8d0c2e4c52aafa513c8619f92c1ec6b5425cf06911fc48d8d18562855cd4d0aabe96bf68985323663bdb4cb461e56b353c06431e2430a3ef9d51ecd6021
-  data.tar.gz: 4ef8593a855dd30fd21ee97642dcc5d832f7ec34218393131d1fe6758af1dbe4a8e5ad8d76f3612d289ef6e85d02a7640a65490f6b7dc103d0e32f43fbed2409
+  metadata.gz: 3cc0d5bd301ba17b76b1a19b4f0a7d99edef92953117e9f6c4a3b76c245e08b638b4f01b133b7429058de9236c3bc07900e94f7bb72ab8a75ddeb5ae31171f78
+  data.tar.gz: 15407e45843f2e83351c8559b129b33019797b25f568364dac2dc0c5ad0c90e952f9b60132354e9d3c65a464970d5296af962c8a8f45e07f10fe727dc245d25e

data/lib/api_recipes/api.rb

@@ -4,7 +4,7 @@ module ApiRecipes
     attr_accessor :name, :configs, :authorization, :basic_auth
     attr_reader :base_configs, :object
 
-    BASE_CONFIGS_KEYS = [:protocol, :host, :port, :api_version, :timeout, :on_bad_code, :verify_with]
+    BASE_CONFIGS_KEYS = [:protocol, :host, :port, :api_version, :timeout, :on_bad_code, :mime_type, :verify_with]
 
     def initialize(name, configs, object)
       @name = name

data/lib/api_recipes/configuration.rb

@@ -1,12 +1,16 @@
+require 'yaml'
+require 'erb'
+require 'logger'
+
 module ApiRecipes
   class Configuration
 
-    attr_accessor :log_to, :log_level, :print_urls
+    attr_accessor :log_to, :log_level, :print_urls, :apis_files_paths
 
     def apis_configs=(configs = {})
       raise ArgumentError, 'apis_configs must be an Hash' unless configs.is_a? Hash
+
       @apis_configs = configs.deep_symbolize_keys
-      ApiRecipes._aprcps_define_global_apis
     end
 
     def apis_configs
@@ -16,13 +20,41 @@ module ApiRecipes
       @apis_configs
     end
 
+    def apis_files_paths=(paths = [])
+      raise ArgumentError, 'apis_files_paths must be an Array' unless paths.is_a? Array
+
+      @apis_files_paths = paths
+      @apis_files_paths.each do |file_path|
+        template = ERB.new File.read File.expand_path(file_path)
+        data = begin
+                 YAML.load(template.result(binding), aliases: true)
+               rescue ArgumentError
+                 YAML.load(template.result binding)
+               end.deep_symbolize_keys
+        # Merge file contents into apis_configs
+        data.each do |api, params|
+          if apis_configs[api]
+            logger.debug "File at #{file_path} overrides config for '#{api}' API"
+          end
+          apis_configs[api] = params
+        end
+      end
+    end
+
+    def apis_files_paths
+      unless @apis_files_paths
+        @apis_files_paths = []
+      end
+      @apis_files_paths
+    end
+
     def logger=(logger)
       @logger = logger
     end
 
     def logger
       unless @logger
-        log = ::Logger.new(log_to)
+        log = ::Logger.new(log_to || STDOUT)
         log.level    = normalize_log_level
         log.progname = 'ApiRecipes'
         @logger = log
@@ -31,6 +63,10 @@ module ApiRecipes
       @logger
     end
 
+    def setup
+      ApiRecipes._aprcps_define_global_apis
+    end
+
     private
 
     # @private
@@ -42,7 +78,7 @@ module ApiRecipes
       when :error, ::Logger::ERROR, 'error' then ::Logger::ERROR
       when :fatal, ::Logger::FATAL, 'fatal' then ::Logger::FATAL
       else
-        Logger::ERROR
+        ENV['LOG_LEVEL'] || Logger::DEBUG
       end
     end
   end

data/lib/api_recipes/endpoint.rb

@@ -32,7 +32,12 @@ module ApiRecipes
     end
 
     def url
-      @route.url
+      if @route
+        @route.url
+      else
+        ApiRecipes.logger.debug "No route configured for '#{api.name}#{absolute_path}': Is option 'route: no' present?"
+        nil
+      end
     end
 
     private
@@ -62,7 +67,6 @@ module ApiRecipes
           end
         end
       end
-      # Route.new(api: @api, endpoint: self, name: route_name, attributes: route_attrs, req_pars: request_params).start_request &block
     end
 
     def ensure_route_does_not_clash(route_name)

data/lib/api_recipes/response.rb

@@ -12,7 +12,7 @@ module ApiRecipes
       return @data unless @data.nil?
 
       # TODO: rescue nil?
-      @data = @original_response.parse
+      @data = @original_response.parse @attributes[:mime_type]
     end
 
     # Forward method calls to 'original' Response class

data/lib/api_recipes/route.rb

@@ -16,7 +16,7 @@ module ApiRecipes
     end
 
     def fill(object)
-      data = @response.parse
+      data = @response.parse @attributes[:mime_type]
       if block_given?
         tap do
           try_to_fill object, data

data/lib/api_recipes/settings.rb

@@ -10,7 +10,8 @@ module ApiRecipes
         timeout: 3,
         on_bad_code: 'raise',
         endpoints: {},
-        verify_with: nil
+        verify_with: nil,
+        mime_type: nil
     }
 
     DEFAULT_ROUTE_ATTRIBUTES = {
@@ -20,6 +21,7 @@ module ApiRecipes
         ok_code: nil,
         timeout: DEFAULT[:timeout],
         on_bad_code: DEFAULT[:on_bad_code],
+        mime_type: DEFAULT[:mime_type],
         verify_with: DEFAULT[:verify_with]
     }
 

data/lib/api_recipes/version.rb

@@ -1,3 +1,3 @@
 module ApiRecipes
-  VERSION = '2.8.1'.freeze
+  VERSION = '2.10.1'.freeze
 end

data/lib/api_recipes.rb

@@ -65,6 +65,7 @@ module ApiRecipes
   def self.configure
     if block_given?
       yield(configuration)
+      configuration.setup
     else
       configuration
     end
@@ -145,6 +146,10 @@ module ApiRecipes
       global_api_configs
     end
   end
+
+  def self.logger
+    configuration.logger
+  end
 end
 
 # Monkey-patch URI so it can accept dashed hostnames like "web-service-1"

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: api_recipes
 version: !ruby/object:Gem::Version
-  version: 2.8.1
+  version: 2.10.1
 platform: ruby
 authors:
 - Alessandro Verlato
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-02 00:00:00.000000000 Z
+date: 2022-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.4.1
+        version: '4.4'
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.4'
+    - - "<="
       - !ruby/object:Gem::Version
-        version: 4.4.1
+        version: '5.1'
 description:
 email:
 - averlato@gmail.com
@@ -55,14 +61,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Consume HTTP APIs with style