api_recipes 2.6.1 → 2.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8a4b8c1642a323a4a72f8303de3fbe408d15fab5a5f127fb5c2ad3fcb0f543a
-  data.tar.gz: 2f24944c94c92e02224629c25a9c1da052c902d86abb8649d7faeb02e2111046
+  metadata.gz: c9d0a5a4530af3af22b9b22c091002d316e1bf7065c612d1d74f18f3aa62e37d
+  data.tar.gz: 5d322a843fa2db9cceb97cd9733b482ce17626342ad519ea036c0c821efe0d8b
 SHA512:
-  metadata.gz: 445c2a2154979454088bb64e32c3e648d5cc779a184d6ae9079fed286913e66d7fec703d41d2de15f268aa386bc174230ce7ed2b5e5fa20a8bb2d9d8b16d92c0
-  data.tar.gz: d22528bfcf3acbb9a0ebd8e3aa3826eb52985f3a081a1b71abcf29291d8958922c6a76be302b1fcad6fc45b1ca614008812050793ca19d6dec9400c73db390a9
+  metadata.gz: 6ee0d8d0c2e4c52aafa513c8619f92c1ec6b5425cf06911fc48d8d18562855cd4d0aabe96bf68985323663bdb4cb461e56b353c06431e2430a3ef9d51ecd6021
+  data.tar.gz: 4ef8593a855dd30fd21ee97642dcc5d832f7ec34218393131d1fe6758af1dbe4a8e5ad8d76f3612d289ef6e85d02a7640a65490f6b7dc103d0e32f43fbed2409

data/lib/api_recipes.rb

@@ -32,13 +32,13 @@ module ApiRecipes
 
         define_method api_name do
           configs = ApiRecipes._aprcps_merge_apis_configs(api_name, configs.deep_symbolize_keys)
-          api = Api.new(api_name, configs)
+          api = Api.new(api_name, configs, self)
           ApiRecipes.copy_global_authorizations_to_api api
           api
         end
         define_singleton_method api_name do
           configs = ApiRecipes._aprcps_merge_apis_configs(api_name, configs.deep_symbolize_keys)
-          api = Api.new(api_name, configs)
+          api = Api.new(api_name, configs, self)
           ApiRecipes.copy_global_authorizations_to_api api
           api
         end
@@ -58,6 +58,7 @@ module ApiRecipes
     unless @configuration
       @configuration = Configuration.new
     end
+
     @configuration
   end
 
@@ -105,7 +106,7 @@ module ApiRecipes
   def self._aprcps_define_global_apis
     configuration.apis_configs.each do |api_name, api_configs|
       api_name = api_name.to_sym
-      _aprcps_global_storage[api_name] = Api.new api_name, api_configs
+      _aprcps_global_storage[api_name] = Api.new api_name, api_configs, self
       define_singleton_method api_name do
         _aprcps_global_storage[api_name]
       end
@@ -116,6 +117,7 @@ module ApiRecipes
     unless @storage
       @storage = {}
     end
+
     @storage
   end
 
@@ -130,11 +132,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
@@ -142,7 +142,7 @@ module ApiRecipes
         end
       end
     else
-      ApiRecipes.configuration.apis_configs[api_name]
+      global_api_configs
     end
   end
 end

data/lib/api_recipes/api.rb

@@ -2,13 +2,14 @@ module ApiRecipes
   class Api
 
     attr_accessor :name, :configs, :authorization, :basic_auth
-    attr_reader :base_configs
+    attr_reader :base_configs, :object
 
-    BASE_CONFIGS_KEYS = [:protocol, :host, :port, :api_version, :timeout, :on_bad_code]
+    BASE_CONFIGS_KEYS = [:protocol, :host, :port, :api_version, :timeout, :on_bad_code, :verify_with]
 
-    def initialize(name, configs)
+    def initialize(name, configs, object)
       @name = name
       @configs = ApiRecipes::Settings::DEFAULT.merge configs
+      @object = object
 
       # Generate   some_api.some_endpoint  methods
       # e.g.  github.users

data/lib/api_recipes/endpoint.rb

@@ -3,6 +3,8 @@ module ApiRecipes
 
     attr_reader :api, :name, :params, :route, :children
 
+    FORWARDABLE_PARAMS = %i[verify_with].freeze
+
     def initialize(api: nil, name: nil, path: nil, params: {}, request_params: [], &block)
       @api = api
       @name = name
@@ -52,6 +54,8 @@ module ApiRecipes
       # puts "generating children of #{@name}: #{children.inspect}"
       if children
         children.each do |ep_name, pars|
+          pars = forwardable_params.merge(pars) if pars
+          # TODO: Merge pars with params
           # puts "Creating Endpoint '#{@name}' child '#{ep_name}' passing path #{build_path}"
           define_singleton_method ep_name do |*request_params, &block|
             Endpoint.new api: @api, name: ep_name, path: build_path, params: pars, request_params: request_params, &block
@@ -89,7 +93,6 @@ module ApiRecipes
       end
       # Merge DEFAULT_ROUTE_ATTRIBUTES with Api base_configs
       # Then merge the result with provided attributes
-
       @params = Settings::DEFAULT_ROUTE_ATTRIBUTES.inject({}) do |out, key_val|
         new_val = @api.base_configs[key_val.first]
         out[key_val.first] = new_val.nil? ? key_val.last : new_val
@@ -126,5 +129,9 @@ module ApiRecipes
     def required_params_for_path
       absolute_path.scan(/:(\w+)/).flatten.map { |p| p.to_sym }
     end
+
+    def forwardable_params
+      params.select { |k, v| FORWARDABLE_PARAMS.include? k }
+    end
   end
 end

data/lib/api_recipes/exceptions.rb

@@ -40,8 +40,16 @@ module ApiRecipes
   end
 
   class ResponseCodeNotAsExpected < Exception
-    def initialize(path, expected_code = nil, response_code = nil, response_body = nil)
-      message = "response code for request on route '#{path}' has returned #{response_code}, but #{expected_code} was expected\n\nResponse body:\n #{response_body}"
+
+    attr_reader :path, :expected_code, :response
+
+    def initialize(path, expected_code = nil, response = nil, message: nil)
+      @path = path
+      @expected_code = expected_code
+      @response = response
+      unless message
+        message = "response code for request on route '#{@path}' has returned '#{@response.code}', but '#{@expected_code}' was expected\n\nResponse body:\n #{@response.body}"
+      end
       super(message)
     end
   end

data/lib/api_recipes/response.rb

@@ -11,6 +11,7 @@ module ApiRecipes
     def data
       return @data unless @data.nil?
 
+      # TODO: rescue nil?
       @data = @original_response.parse
     end
 

data/lib/api_recipes/route.rb

@@ -43,31 +43,40 @@ module ApiRecipes
 
     def build_url_from_path
       attrs = {
-          scheme: settings[:protocol],
+          scheme: settings[:protocol].to_s,
           host: settings[:host],
           port: port,
-          path: URI.escape(path)
+          path: path
       }
-      URI::Generic.build attrs
+      URI::Generic.build2 attrs
     end
 
     def check_response_code
-      # If :ok_code property is present, check the response code
       ok_code = false
       code = @response.code
-      if expected_code = attributes[:ok_code]
-        # If the code does not match, apply the requested strategy
-        ok_code = true if code == expected_code
+      message = nil
+
+      verify_with = attributes[:verify_with]
+      if verify_with && @api.object.respond_to?(verify_with, true )
+        ok_code = @api.object.send verify_with, @response
+        message = "response for request on route '#{path}' was not valid. Verified with #{@api.object}##{verify_with}.\n\nResponse body:\n #{@response.body}"
       else
-        # Default: 200 <= OK < 300
-        ok_code = true if (code >= 200 && code < 300)
-        expected_code = '200 <= CODE < 300'
+        # If :ok_code property is present, check the response code
+        if expected_code = attributes[:ok_code]
+          # If the code does not match, apply the requested strategy
+          ok_code = true if code == expected_code
+        else
+          # Default: 200 <= OK < 300
+          ok_code = true if @response.status.success?
+          expected_code = '200 <= CODE < 300'
+        end
       end
+
       unless ok_code
         case attributes[:on_bad_code].to_s
         when 'ignore'
         when 'raise'
-          raise ResponseCodeNotAsExpected.new(path, expected_code, code, @response.body)
+          raise ResponseCodeNotAsExpected.new(path, expected_code, @response, message: message)
         end
       end
     end
@@ -81,12 +90,12 @@ module ApiRecipes
     end
 
     def port
-      settings[:port] || case settings[:protocol]
-                         when 'http'
-                           80
-                         when 'https'
-                           443
-                         end
+      settings[:port].to_s || case settings[:protocol].to_s
+                              when 'http'
+                                '80'
+                              when 'https'
+                                '443'
+                              end
     end
 
     def prepare_request

data/lib/api_recipes/settings.rb

@@ -9,7 +9,8 @@ module ApiRecipes
         base_url: nil,
         timeout: 3,
         on_bad_code: 'raise',
-        endpoints: {}
+        endpoints: {},
+        verify_with: nil
     }
 
     DEFAULT_ROUTE_ATTRIBUTES = {
@@ -18,7 +19,8 @@ module ApiRecipes
         path: nil,
         ok_code: nil,
         timeout: DEFAULT[:timeout],
-        on_bad_code: DEFAULT[:on_bad_code]
+        on_bad_code: DEFAULT[:on_bad_code],
+        verify_with: DEFAULT[:verify_with]
     }
 
     AVAILABLE_PARAMS_ENCODINGS = %w(form params json body)

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.6.1'.freeze
+  VERSION = '2.8.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: api_recipes
 version: !ruby/object:Gem::Version
-  version: 2.6.1
+  version: 2.8.1
 platform: ruby
 authors:
 - Alessandro Verlato
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-27 00:00:00.000000000 Z
+date: 2021-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http