marfa 0.6.1 → 0.6.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/marfa/helpers/http/rest.rb +51 -24
- data/lib/marfa/version.rb +1 -1
- data/marfa.gemspec +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 045e2b47c18372841a03b6199ad064373b066898
|
4
|
+
data.tar.gz: 3003d04b5f147bfcf1aabccb1d17b230275801f2
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 2ef1a10b3be4950a1f20b3103b7f79b0ca56fc555852299f5b9cee986d1ed48b695113f7f3e1111ff262f7374c9175fd70eb99020b144b9706c3c6cc15672f86
|
7
|
+
data.tar.gz: 6939949cacb3aa1249104dc4e115478c8ae0d2f22412edeec1e71f1e8f2d182d914b09508839fe3530e3c25801f19d3d5971a21234940191e8c1a7686313a5bd
|
@@ -13,16 +13,25 @@ module Marfa
|
|
13
13
|
# @example
|
14
14
|
# response = Rest.get(url, headers)
|
15
15
|
# @return response [RestClient::Response]
|
16
|
-
def self.get(url, headers = {})
|
16
|
+
def self.get(url, headers = {}, &block)
|
17
17
|
p "REST GET url = #{url}" if Marfa.config.logging_level > 0
|
18
18
|
p "REST GET headers = #{headers}" if Marfa.config.logging_level > 0
|
19
19
|
|
20
|
-
|
20
|
+
if block.nil?
|
21
|
+
response = RestClient.get(url, headers)
|
21
22
|
|
22
|
-
|
23
|
-
|
23
|
+
p "REST GET code = #{response.code}" if Marfa.config.logging_level > 0
|
24
|
+
p response.body if Marfa.config.logging_level > 1
|
24
25
|
|
25
|
-
|
26
|
+
return response
|
27
|
+
else
|
28
|
+
RestClient.get(url, headers) do |response|
|
29
|
+
p "REST GET code = #{response.code}" if Marfa.config.logging_level > 0
|
30
|
+
p response.body if Marfa.config.logging_level > 1
|
31
|
+
|
32
|
+
block.call(response)
|
33
|
+
end
|
34
|
+
end
|
26
35
|
end
|
27
36
|
|
28
37
|
# HEAD request
|
@@ -31,16 +40,25 @@ module Marfa
|
|
31
40
|
# @example
|
32
41
|
# response = Rest.head(url)
|
33
42
|
# @return response [RestClient::Response]
|
34
|
-
def self.head(url, headers = {})
|
35
|
-
p "REST
|
36
|
-
p "REST
|
43
|
+
def self.head(url, headers = {}, &block)
|
44
|
+
p "REST HEA url = #{url}" if Marfa.config.logging_level > 0
|
45
|
+
p "REST HEA headers = #{headers}" if Marfa.config.logging_level > 0
|
37
46
|
|
38
|
-
|
47
|
+
if block.nil?
|
48
|
+
response = RestClient.head(url, headers)
|
39
49
|
|
40
|
-
|
41
|
-
|
50
|
+
p "REST HEA code = #{response.code}" if Marfa.config.logging_level > 0
|
51
|
+
p response.body if Marfa.config.logging_level > 1
|
52
|
+
|
53
|
+
return response
|
54
|
+
else
|
55
|
+
RestClient.head(url, headers) do |response|
|
56
|
+
p "REST HEA code = #{response.code}" if Marfa.config.logging_level > 0
|
57
|
+
p response.body if Marfa.config.logging_level > 1
|
42
58
|
|
43
|
-
|
59
|
+
block.call(response)
|
60
|
+
end
|
61
|
+
end
|
44
62
|
end
|
45
63
|
|
46
64
|
# POST request
|
@@ -124,23 +142,32 @@ module Marfa
|
|
124
142
|
# @example
|
125
143
|
# Rest.delete(url, payload, headers) do |response|
|
126
144
|
# @return response [RestClient::Response]
|
127
|
-
def self.delete(url, payload, headers = {}, &block)
|
128
|
-
p "REST
|
145
|
+
def self.delete(url, payload = {}, headers = {}, &block)
|
146
|
+
p "REST DEL url = #{url}" if Marfa.config.logging_level > 0
|
129
147
|
if Marfa.config.logging_level > 0
|
130
|
-
p "REST
|
131
|
-
p "REST
|
148
|
+
p "REST DEL headers= #{headers}"
|
149
|
+
p "REST DEL payload= #{payload}"
|
132
150
|
end
|
133
151
|
|
134
|
-
|
135
|
-
|
136
|
-
|
137
|
-
|
138
|
-
headers: headers
|
139
|
-
) do |response|
|
140
|
-
p "REST DELETE code = #{response.code}" if Marfa.config.logging_level > 0
|
152
|
+
if block.nil?
|
153
|
+
response = RestClient.delete(url, headers)
|
154
|
+
|
155
|
+
p "REST DEL code = #{response.code}" if Marfa.config.logging_level > 0
|
141
156
|
p response.body if Marfa.config.logging_level > 1
|
142
157
|
|
143
|
-
|
158
|
+
return response
|
159
|
+
else
|
160
|
+
RestClient::Request.execute(
|
161
|
+
method: :delete,
|
162
|
+
url: url,
|
163
|
+
payload: payload,
|
164
|
+
headers: headers
|
165
|
+
) do |response|
|
166
|
+
p "REST DEL code = #{response.code}" if Marfa.config.logging_level > 0
|
167
|
+
p response.body if Marfa.config.logging_level > 1
|
168
|
+
|
169
|
+
block.call(response)
|
170
|
+
end
|
144
171
|
end
|
145
172
|
end
|
146
173
|
end
|
data/lib/marfa/version.rb
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
# Version constant
|
2
2
|
module Marfa
|
3
3
|
# The version constant for the current version of Marfa
|
4
|
-
VERSION = '0.6.
|
4
|
+
VERSION = '0.6.2'.freeze unless defined?(Marfa::VERSION)
|
5
5
|
|
6
6
|
# The current Marfa version.
|
7
7
|
# @return [String] The version number
|
data/marfa.gemspec
CHANGED
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: marfa
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.6.
|
4
|
+
version: 0.6.2
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Max Krechetov
|
@@ -10,7 +10,7 @@ authors:
|
|
10
10
|
autorequire:
|
11
11
|
bindir: bin
|
12
12
|
cert_chain: []
|
13
|
-
date: 2017-08-
|
13
|
+
date: 2017-08-11 00:00:00.000000000 Z
|
14
14
|
dependencies:
|
15
15
|
- !ruby/object:Gem::Dependency
|
16
16
|
name: haml
|