api_recipes 2.8.0 → 2.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b8b743f62651355bb59b3d641637d8df6b28a860d5000a3b684758a7d1de5c47
-  data.tar.gz: d2febad009985547a7a148e1b07b193d568b76bd75a2064a9c55257652ce7997
+  metadata.gz: c808d9077305dc07cd888f517b57f1522490866a548dc769a3c96c083d24ce27
+  data.tar.gz: 205b4aaaa135b8682f7d7f0d44f471263852e997f2b1791fe60eea4efc0a2ee3
 SHA512:
-  metadata.gz: 6a4b6882211bbae0c27f546267674e501df253eb9a22303fadf0bbf85dfd26a2ada943f813ae1660164c20e3dae68d3afd61caf132e6e40be04bf1f62e9cfcd4
-  data.tar.gz: e5429acaf4fbcaa1f5e83090d8ede9dcee36253a61b8d17b5e79fb5c4c4178115b677d91ac39e8c145af63dd1813e904834201fddbc930e45e07b3d8df3455b9
+  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/utils.rb

@@ -77,6 +77,37 @@ class Hash
     end
   end
 
+  # Returns a new hash with +self+ and +other_hash+ merged recursively.
+  #
+  #   h1 = { a: true, b: { c: [1, 2, 3] } }
+  #   h2 = { a: false, b: { x: [3, 4, 5] } }
+  #
+  #   h1.deep_merge(h2) # => { a: false, b: { c: [1, 2, 3], x: [3, 4, 5] } }
+  #
+  # Like with Hash#merge in the standard library, a block can be provided
+  # to merge values:
+  #
+  #   h1 = { a: 100, b: 200, c: { c1: 100 } }
+  #   h2 = { b: 250, c: { c1: 200 } }
+  #   h1.deep_merge(h2) { |key, this_val, other_val| this_val + other_val }
+  #   # => { a: 100, b: 450, c: { c1: 300 } }
+  def deep_merge(other_hash, &block)
+    dup.deep_merge!(other_hash, &block)
+  end
+
+  # Same as +deep_merge+, but modifies +self+.
+  def deep_merge!(other_hash, &block)
+    merge!(other_hash) do |key, this_val, other_val|
+      if this_val.is_a?(Hash) && other_val.is_a?(Hash)
+        this_val.deep_merge(other_val, &block)
+      elsif block_given?
+        block.call(key, this_val, other_val)
+      else
+        other_val
+      end
+    end
+  end
+
   # Returns a new hash with all keys converted by the block operation.
   # This includes the keys from the root hash and from all
   # nested hashes and arrays.

data/lib/api_recipes/version.rb

@@ -1,3 +1,3 @@
 module ApiRecipes
-  VERSION = '2.8.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
@@ -117,6 +118,7 @@ module ApiRecipes
     unless @storage
       @storage = {}
     end
+
     @storage
   end
 
@@ -131,11 +133,9 @@ module ApiRecipes
     unless api_name.is_a?(String) || api_name.is_a?(Symbol)
       raise ArgumentError, "no api_name provided. Given: #{api_name.inspect}"
     end
-    unless ApiRecipes.configuration.apis_configs[api_name]
-      ApiRecipes.configuration.apis_configs[api_name] = {}
-    end
+    global_api_configs = _aprcps_global_storage[api_name]&.configs || {}
     if configs
-      ApiRecipes.configuration.apis_configs[api_name].merge(configs) do |_, old_val, new_val|
+      global_api_configs.deep_merge(configs) do |_, old_val, new_val|
         if new_val.nil?
           old_val
         else
@@ -143,7 +143,7 @@ module ApiRecipes
         end
       end
     else
-      ApiRecipes.configuration.apis_configs[api_name]
+      global_api_configs
     end
   end
 end

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: api_recipes
 version: !ruby/object:Gem::Version
-  version: 2.8.0
+  version: 2.10.0
 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