rb-net_http-client 1.0.8 → 1.0.9
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/client/client.rb +6 -1
- data/lib/client/schema.rb +6 -0
- data/lib/core/core.rb +12 -16
- data/lib/core/utilities.rb +17 -0
- data/lib/request/request.rb +5 -1
- data/lib/request/schema.rb +6 -0
- data/lib/version.rb +1 -1
- data/spec/unit/client/ext_spec.rb +3 -3
- data/spec/unit/core/core_spec.rb +13 -16
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 6d55326eb0acbf27e9b701970c6454d99ca776adb6cfd3b47bdc314fa9a487c2
|
4
|
+
data.tar.gz: 6da96962de6db3697ab09a34f0b9f5130a378a1ef5686b5ceb99952665b5b7bd
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 598b5c8bbd716f0c57d901db69392593cb6ad2ec9469eb7d51748bb6db72ce425cd297367cca4bc1a0ad6004b38bad478cdf87c8e8d65aea6e7300866cccb566
|
7
|
+
data.tar.gz: 7fcf8f7272059c15be3a116e5dab90a4b64951696b44ef2df7e5e380f43d6afe11fee2340fbb036d828eb627ce3f3d34b3f4f763ed5a8575d02fe31194491310
|
data/lib/client/client.rb
CHANGED
@@ -32,7 +32,12 @@ module NetHTTP
|
|
32
32
|
|
33
33
|
def initialize(opts = {})
|
34
34
|
send('logger=', opts[:logger])
|
35
|
-
Core.schema_validation(opts, NetHTTP::Client::Schema
|
35
|
+
schema_results = Core.schema_validation(opts, NetHTTP::Client::Schema) unless opts[:enforce_schema_validation] == false
|
36
|
+
unless schema_results.nil?
|
37
|
+
logger.debug("NetHTTP::Client::SchemaError -> #{schema_results}")
|
38
|
+
raise NetHTTP::Client::SchemaError.new(schema_results.to_s)
|
39
|
+
end
|
40
|
+
|
36
41
|
send('uri=', opts)
|
37
42
|
send('client=', opts)
|
38
43
|
end
|
data/lib/client/schema.rb
CHANGED
data/lib/core/core.rb
CHANGED
@@ -15,23 +15,19 @@ module NetHTTP
|
|
15
15
|
logger
|
16
16
|
end
|
17
17
|
|
18
|
-
def self.schema_validation(opts, schema
|
19
|
-
|
20
|
-
|
21
|
-
return
|
22
|
-
|
23
|
-
|
24
|
-
logger.debug("NetHTTP::Core::SchemaValidationError - #{schema_name} input validation failed due to => #{results.messages}")
|
25
|
-
raise("NetHTTP::Core::SchemaValidationError - #{schema_name} input validation failed due to => #{results.messages}")
|
26
|
-
rescue RuntimeError => error
|
27
|
-
logger.debug("NetHTTP::Core::SchemaValidationError - Dry::Validation::Schema input validation failed due to => #{results.messages}")
|
28
|
-
raise("NetHTTP::Core::SchemaValidationError - Dry::Validation::Schema input validation failed due to => #{results.messages}")
|
29
|
-
end
|
30
|
-
rescue RuntimeError => error
|
31
|
-
logger.debug(error)
|
32
|
-
logger.debug("NetHTTP::Core::SchemaValidationError - Dry::Validation::Schema input validation failed.")
|
33
|
-
raise error
|
18
|
+
def self.schema_validation(opts, schema)
|
19
|
+
results = schema.call(opts)
|
20
|
+
if results.success?
|
21
|
+
return nil
|
22
|
+
else
|
23
|
+
return results.messages
|
34
24
|
end
|
35
25
|
end
|
36
26
|
end
|
27
|
+
|
28
|
+
class SchemaError < StandardError
|
29
|
+
def initialize(msg)
|
30
|
+
super(msg)
|
31
|
+
end
|
32
|
+
end
|
37
33
|
end
|
data/lib/core/utilities.rb
CHANGED
@@ -144,6 +144,23 @@ module NetHTTP
|
|
144
144
|
opts[:object]
|
145
145
|
end
|
146
146
|
|
147
|
+
# Recursive function to remove nil and empty values (including [] and {} from Array or Hash nested objects.
|
148
|
+
def self.scrub_obj(obj)
|
149
|
+
case obj
|
150
|
+
when Array
|
151
|
+
return obj.map { |item| scrub_obj(item) }
|
152
|
+
when Hash
|
153
|
+
new_hash = {}
|
154
|
+
obj.compact.each do |key, value|
|
155
|
+
new_hash[key] = scrub_obj(value) unless value.empty?
|
156
|
+
end
|
157
|
+
|
158
|
+
return new_hash
|
159
|
+
end
|
160
|
+
|
161
|
+
obj
|
162
|
+
end
|
163
|
+
|
147
164
|
# Convert JSON doc to a Ruby Hash.
|
148
165
|
def self.json_2_hash(json_doc, type = 'symbol', logger = nil)
|
149
166
|
msg = "Invalid 'type' => #{type}. Use either 'string' or 'symbol' (default)."
|
data/lib/request/request.rb
CHANGED
@@ -135,7 +135,11 @@ module NetHTTP
|
|
135
135
|
end
|
136
136
|
|
137
137
|
def request_opts(opts)
|
138
|
-
Core.schema_validation(opts, NetHTTP::Request::Schema
|
138
|
+
schema_results = Core.schema_validation(opts, NetHTTP::Request::Schema) unless opts[:enforce_schema_validation] == false
|
139
|
+
unless schema_results.nil?
|
140
|
+
logger.debug("NetHTTP::Request::SchemaError -> #{schema_results}")
|
141
|
+
raise NetHTTP::Request::SchemaError.new(schema_results.to_s)
|
142
|
+
end
|
139
143
|
|
140
144
|
request_method = opts[:method] ||= 'post'
|
141
145
|
request_uri = Core::Utilities.parse_uri(opts[:uri] || opts[:url] || uri)
|
data/lib/request/schema.rb
CHANGED
data/lib/version.rb
CHANGED
@@ -19,7 +19,7 @@ describe 'NetHTTP::Client ext' do
|
|
19
19
|
uri: 'https://jsonplaceholder.typicode.com/posts',
|
20
20
|
proxy_uri: ''
|
21
21
|
)
|
22
|
-
}.to raise_error(
|
22
|
+
}.to raise_error(NetHTTP::Client::SchemaError)
|
23
23
|
end
|
24
24
|
|
25
25
|
it 'returns a valid NetHTTP client instance with proxy_uri -> nil' do
|
@@ -28,7 +28,7 @@ describe 'NetHTTP::Client ext' do
|
|
28
28
|
uri: 'https://jsonplaceholder.typicode.com/posts',
|
29
29
|
proxy_uri: nil
|
30
30
|
)
|
31
|
-
}.to raise_error(
|
31
|
+
}.to raise_error(NetHTTP::Client::SchemaError)
|
32
32
|
end
|
33
33
|
|
34
34
|
it 'returns a valid NetHTTP client instance with proxy_uri -> INVALID' do
|
@@ -37,7 +37,7 @@ describe 'NetHTTP::Client ext' do
|
|
37
37
|
uri: 'https://jsonplaceholder.typicode.com/posts',
|
38
38
|
proxy_uri: 12345
|
39
39
|
)
|
40
|
-
}.to raise_error(
|
40
|
+
}.to raise_error(NetHTTP::Client::SchemaError)
|
41
41
|
end
|
42
42
|
|
43
43
|
it 'returns a valid NetHTTP client instance' do
|
data/spec/unit/core/core_spec.rb
CHANGED
@@ -10,26 +10,24 @@ describe 'NetHTTP::Core' do
|
|
10
10
|
{
|
11
11
|
uri: 'https://www.google.com'
|
12
12
|
},
|
13
|
-
NetHTTP::Client::Schema
|
14
|
-
logger
|
13
|
+
NetHTTP::Client::Schema
|
15
14
|
)
|
16
15
|
|
17
16
|
expect(results).to eq(nil)
|
18
17
|
end
|
19
18
|
|
20
|
-
it 'failed schema_validation' do
|
21
|
-
|
19
|
+
# it 'failed schema_validation' do
|
20
|
+
# logger = NetHTTP::Core.get_logger
|
22
21
|
|
23
|
-
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
end
|
22
|
+
# expect {
|
23
|
+
# NetHTTP::Core.schema_validation(
|
24
|
+
# {
|
25
|
+
# uri: nil
|
26
|
+
# },
|
27
|
+
# NetHTTP::Client::Schema
|
28
|
+
# )
|
29
|
+
# }.to raise_error(NetHTTP::Client::SchemaError)
|
30
|
+
# end
|
33
31
|
|
34
32
|
it 'failed schema_validation -> invalid schema' do
|
35
33
|
logger = NetHTTP::Core.get_logger
|
@@ -39,8 +37,7 @@ describe 'NetHTTP::Core' do
|
|
39
37
|
{
|
40
38
|
uri: 'https://www.google.com'
|
41
39
|
},
|
42
|
-
'Invalid::Schema'
|
43
|
-
logger
|
40
|
+
'Invalid::Schema'
|
44
41
|
)
|
45
42
|
}.to raise_error(NoMethodError, "undefined method `call' for \"Invalid::Schema\":String")
|
46
43
|
end
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: rb-net_http-client
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.0.
|
4
|
+
version: 1.0.9
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Ryan Bostian
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2019-04-
|
11
|
+
date: 2019-04-16 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: activesupport
|