grac 4.3.1 → 4.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 28067fc75dea820ec4be62b98fae9a97d526f3d1ccaf5fbd6aedfdb4b969610d
-  data.tar.gz: 0bd4a5f096e14751ad64d1e14dc603e3c02ccf3bf1d4aef5f7bda30757b443e5
+  metadata.gz: 061003ad2cd97921474d31303c4257061bcc15836c47303149f73519757848cb
+  data.tar.gz: fc62c7fd354b21f7ea929870fbc2f69a0b3c4c7f838f10c4f501c451dba05db9
 SHA512:
-  metadata.gz: df0f0b16ea7d9f9e0ff399b6c0821b5b14eb1a8a742bc0f1a27fe6af7962fae36e2f7d6988443c316fec8d578c7182141b11d934d1e9ad6007b822b600373cc9
-  data.tar.gz: a0533567a6d25acedc0d51634337559be9c35e60f2101ee44306234f54569129564211d0ae4ffba1b95ae3412ddd5739db6e052e8b08614ce93700ef1c6169a7
+  metadata.gz: 9f341acf25ddbf2e17551adfa3c7c75b0b157f06867c1b9f8aa62e141080eff04072598f0419ad1a9eab4c77d7b86934471db240a862e2ff856ccb2ae28d17e5
+  data.tar.gz: 54091341a2859c9a4fa98e8f253e24f7d0b34caa199a8dca476a9397c3934f38cfb31aa5f1db77632534dda5dcbd8d49f60e3baa151dcdfb4349bb6c8d7ca46a

data/lib/grac/client.rb

@@ -21,11 +21,13 @@ module Grac
         params:         options[:params]         || {},
         headers:        {
           'User-Agent'   => "Grac v#{Grac::VERSION}",
-          'Content-Type' => 'application/json;charset=utf-8'
+          'Content-Type' => 'application/json;charset=utf-8',
         }.merge(options[:headers] || {}),
         postprocessing: {},
         middleware:     options[:middleware] || [],
         retry_get_head: options.fetch(:retry_get_head, true),
+        proxy:          options[:proxy],
+        ssl:            options[:ssl],
       }
 
       if options[:postprocessing]
@@ -43,8 +45,8 @@ module Grac
 
       @options.freeze
 
-      [:params, :headers, :postprocessing, :middleware].each do |k|
-        @options[k].freeze
+      [:params, :headers, :postprocessing, :middleware, :proxy, :ssl].each do |k|
+        @options[k]&.freeze
       end
 
       @uri.freeze
@@ -55,6 +57,8 @@ module Grac
                   {
                     headers:    @options[:headers].merge(options[:headers]    || {}),
                     middleware: @options[:middleware] + (options[:middleware] || []),
+                    proxy:      merge_option_hash(options, :proxy),
+                    ssl:        merge_option_hash(options, :ssl),
                   },
                 )
 
@@ -85,12 +89,14 @@ module Grac
     def call(opts, request_uri, method, params, body)
       request_hash = {
         method:         method,
-        params:         params,  # Query params are escaped by Typhoeus
+        params:         params, # Query params are escaped by Typhoeus
         body:           body,
         connecttimeout: opts[:connecttimeout],
         timeout:        opts[:timeout],
         headers:        opts[:headers],
       }
+      apply_proxy_options(request_hash, opts[:proxy])
+      apply_ssl_options(request_hash, opts[:ssl])
 
       request  = ::Typhoeus::Request.new(request_uri, request_hash)
       response = request.run
@@ -244,5 +250,34 @@ module Grac
         CGI::escape(value).gsub('+', '%20')
       end
 
+      def merge_option_hash(options, key)
+        existing = @options[key] || {}
+        new_val  = options[key]
+
+        return existing if new_val == nil
+
+        existing.merge(new_val)
+      end
+
+      # map proxy options from our format to typhoeus format
+      def apply_proxy_options(request_hash, proxy)
+        return if proxy == nil
+
+        request_hash[:proxy]         = proxy[:url]      if proxy[:url] != nil
+        request_hash[:proxyusername] = proxy[:username] if proxy[:username] != nil
+        request_hash[:proxypassword] = proxy[:password] if proxy[:password] != nil
+      end
+
+      # map ssl options from our format to typhoeus format
+      def apply_ssl_options(request_hash, ssl)
+        return if ssl == nil
+
+        request_hash[:ssl_verifypeer] = ssl[:verify_peer] if ssl[:verify_peer] != nil
+        request_hash[:ssl_verifyhost] = ssl[:verify_host] if ssl[:verify_host] != nil
+        request_hash[:sslcert]        = ssl[:cert]        if ssl[:cert] != nil
+        request_hash[:sslkey]         = ssl[:key]         if ssl[:key] != nil
+        request_hash[:cainfo]         = ssl[:ca_info]     if ssl[:ca_info] != nil
+      end
+
   end
 end

data/lib/grac/version.rb

@@ -1,3 +1,7 @@
+# frozen_string_literal: true
+
 module Grac
-  VERSION = "4.3.1"
+
+  VERSION = '4.4.0'
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grac
 version: !ruby/object:Gem::Version
-  version: 4.3.1
+  version: 4.4.0
 platform: ruby
 authors:
 - Tobias Schoknecht