api_recipes 2.9.0 → 2.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee06dcfdc43e19eeb0e2c101061fcae81cbdcd426911ba44c7b78ead44800e12
-  data.tar.gz: 2a53571c7b048774579c9132b9ef89a52a674ff2818d16e46be0b5ffcf4c1829
+  metadata.gz: c808d9077305dc07cd888f517b57f1522490866a548dc769a3c96c083d24ce27
+  data.tar.gz: 205b4aaaa135b8682f7d7f0d44f471263852e997f2b1791fe60eea4efc0a2ee3
 SHA512:
-  metadata.gz: 5aa6283219f68dad431806374fa7dbba514c3ec05e6c1d0bf9b10b59ce0df41f0cfb617f107067aba90ac3e64e830874e286c5ccfdd0a92d54230fa1f648fbcb
-  data.tar.gz: 34e77a1d6e67185bdbe884a42c8e92de8bc1bd6922f01dbefcd7cbaaf91855ac7f19ec260314cf391c8c011c0174393e994f7500d80d39b36c0a40079b8e208b
+  metadata.gz: 89acbd66ece24f8cd88100eb447c45e3b73c30c9f894b51a5995aa7697f6a76b92bae0b41c117dbc0b38f993876ca8b4efd17f64eaf7ca1ae31e0d04b5544120
+  data.tar.gz: a831d53f7a337cc65ec28d09eb74ca8efa69123cf34ae835776c5414dd58725cc0223e7ee7aa70d0c1dbbebfff924f8d3d8340227ade47f42d7be4e3ffd877dd

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,15 @@
+require 'yaml'
+require 'erb'
+
 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,6 +19,34 @@ 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.warn "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
@@ -31,6 +62,10 @@ module ApiRecipes
       @logger
     end
 
+    def setup
+      ApiRecipes._aprcps_define_global_apis
+    end
+
     private
 
     # @private

data/lib/api_recipes/endpoint.rb

@@ -62,7 +62,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.9.0'.freeze
+  VERSION = '2.10.0'.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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: api_recipes
 version: !ruby/object:Gem::Version
-  version: 2.9.0
+  version: 2.10.0
 platform: ruby
 authors:
 - Alessandro Verlato
@@ -68,7 +68,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.9
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Consume HTTP APIs with style