fmrest 0.2.4 → 0.2.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: b3b6d6aed0ef181daf2e8a254809704f09f65e6720f29adad829d028b7429322
4
- data.tar.gz: 7d7007ff6968884ebb293e99ef901706d70a3c95721a893443cb16c9e69ac7da
3
+ metadata.gz: 94e1ce81a3885335a688e70f79e7935f665d7adfe8bd3cf51e928bad034b7088
4
+ data.tar.gz: 2d36da690cde5b41876ac4602c5ad132cbce8b40de3de31f4c20deff6262e6d5
5
5
  SHA512:
6
- metadata.gz: dd2ffd6cf2f3622b5efff65925dc5a73e3380a8270f0a6650898385620b144e2c8f7199d5512f1cce500bd973ca70e13440b5d219a6abeccb5c28b684b6a190f
7
- data.tar.gz: ad43d73a77f18dc138b90400fc9b8213f61bce9b8659a7c84ba3c5cedeb00fcd2fca900a461125ef859263548dbf570f263b8212a698a990ab97adedffb6aff9
6
+ metadata.gz: 73d6df260561597bc4dc72f46bb2085f4bcff3593904ff1b327b7d5e3ec541d8b6c180e59f20045b36f0ea92d01045170a561447f07a7aad97816fd062a8390d
7
+ data.tar.gz: b91f6693d3c399a8a8b0d56d3ef114c1f188f44c89201ad60d4814fb6da7db8ebd7b928467f4fb14188a0667b6e8115eb16c288aebaf734708c3c72e40634b4d
@@ -36,10 +36,13 @@ module FmRest
36
36
  raise FmRest::ContainerFieldError, "Container URL is not HTTP (#{container_field_url})"
37
37
  end
38
38
 
39
+ ssl_options = base_connection && base_connection.ssl && base_connection.ssl.to_hash
40
+ proxy_options = base_connection && base_connection.proxy && base_connection.proxy.to_hash
41
+
39
42
  conn =
40
43
  Faraday.new(nil,
41
- ssl: base_connection ? base_connection.ssl.to_hash : FmRest.default_connection_settings[:ssl],
42
- proxy: base_connection ? base_connection.proxy.to_hash : FmRest.default_connection_settings[:proxy]
44
+ ssl: ssl_options || FmRest.default_connection_settings[:ssl],
45
+ proxy: proxy_options || FmRest.default_connection_settings[:proxy]
43
46
  )
44
47
 
45
48
  # Requesting the container URL with no cookie set will respond with a
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module FmRest
4
- VERSION = "0.2.4"
4
+ VERSION = "0.2.5"
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: fmrest
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.4
4
+ version: 0.2.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - Pedro Carbajal
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2019-09-07 00:00:00.000000000 Z
11
+ date: 2019-09-10 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: faraday