marfa 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66e3877d2da115dc46d090bada41ff103f0d591d
-  data.tar.gz: 19fb9b00540dd96495ce15b83a5075b6dc8c4c87
+  metadata.gz: 045e2b47c18372841a03b6199ad064373b066898
+  data.tar.gz: 3003d04b5f147bfcf1aabccb1d17b230275801f2
 SHA512:
-  metadata.gz: 04a42c351d459acdb2866716851308c2d80960a3e1f191a042280309691c199912451055eb1287c5efbcce37840556734c8de648e45949474e3b486b2f0f01da
-  data.tar.gz: 7c5e04ba7e8a2a42bbf1b629dc37520e72c30199c99706e2bd88ebfe977f06ada394a2dd15f8fc6084a72222f56199438d2fa44df5d680a00aa0216175338829
+  metadata.gz: 2ef1a10b3be4950a1f20b3103b7f79b0ca56fc555852299f5b9cee986d1ed48b695113f7f3e1111ff262f7374c9175fd70eb99020b144b9706c3c6cc15672f86
+  data.tar.gz: 6939949cacb3aa1249104dc4e115478c8ae0d2f22412edeec1e71f1e8f2d182d914b09508839fe3530e3c25801f19d3d5971a21234940191e8c1a7686313a5bd

data/lib/marfa/helpers/http/rest.rb

@@ -13,16 +13,25 @@ module Marfa
         # @example
         #   response = Rest.get(url, headers)
         # @return response [RestClient::Response]
-        def self.get(url, headers = {})
+        def self.get(url, headers = {}, &block)
           p "REST GET url = #{url}" if Marfa.config.logging_level > 0
           p "REST GET headers = #{headers}" if Marfa.config.logging_level > 0
 
-          response = RestClient.get(url, headers)
+          if block.nil?
+            response = RestClient.get(url, headers)
 
-          p "REST GET code = #{response.code}" if Marfa.config.logging_level > 0
-          p response.body if Marfa.config.logging_level > 1
+            p "REST GET code = #{response.code}" if Marfa.config.logging_level > 0
+            p response.body if Marfa.config.logging_level > 1
 
-          response
+            return response
+          else
+            RestClient.get(url, headers) do |response|
+              p "REST GET code = #{response.code}" if Marfa.config.logging_level > 0
+              p response.body if Marfa.config.logging_level > 1
+
+              block.call(response)
+            end
+          end
         end
 
         # HEAD request
@@ -31,16 +40,25 @@ module Marfa
         # @example
         #   response = Rest.head(url)
         # @return response [RestClient::Response]
-        def self.head(url, headers = {})
-          p "REST HEAD url = #{url}" if Marfa.config.logging_level > 0
-          p "REST HEAD headers = #{headers}" if Marfa.config.logging_level > 0
+        def self.head(url, headers = {}, &block)
+          p "REST HEA url = #{url}" if Marfa.config.logging_level > 0
+          p "REST HEA headers = #{headers}" if Marfa.config.logging_level > 0
 
-          response = RestClient.head(url, headers)
+          if block.nil?
+            response = RestClient.head(url, headers)
 
-          p "REST HEAD code  = #{response.code}" if Marfa.config.logging_level > 0
-          p response.body if Marfa.config.logging_level > 1
+            p "REST HEA code  = #{response.code}" if Marfa.config.logging_level > 0
+            p response.body if Marfa.config.logging_level > 1
+
+            return response
+          else
+            RestClient.head(url, headers) do |response|
+              p "REST HEA code  = #{response.code}" if Marfa.config.logging_level > 0
+              p response.body if Marfa.config.logging_level > 1
 
-          response
+              block.call(response)
+            end
+          end
         end
 
         # POST request
@@ -124,23 +142,32 @@ module Marfa
         # @example
         #   Rest.delete(url, payload, headers) do |response|
         # @return response [RestClient::Response]
-        def self.delete(url, payload, headers = {}, &block)
-          p "REST DELETE url    = #{url}" if Marfa.config.logging_level > 0
+        def self.delete(url, payload = {}, headers = {}, &block)
+          p "REST DEL url    = #{url}" if Marfa.config.logging_level > 0
           if Marfa.config.logging_level > 0
-            p "REST DELETE headers= #{headers}"
-            p "REST DELETE payload= #{payload}"
+            p "REST DEL headers= #{headers}"
+            p "REST DEL payload= #{payload}"
           end
 
-          RestClient::Request.execute(
-            method: :delete,
-            url: url,
-            payload: payload,
-            headers: headers
-          ) do |response|
-            p "REST DELETE code   = #{response.code}" if Marfa.config.logging_level > 0
+          if block.nil?
+            response = RestClient.delete(url, headers)
+
+            p "REST DEL code  = #{response.code}" if Marfa.config.logging_level > 0
             p response.body if Marfa.config.logging_level > 1
 
-            block.call(response)
+            return response
+          else
+            RestClient::Request.execute(
+                method: :delete,
+                url: url,
+                payload: payload,
+                headers: headers
+            ) do |response|
+              p "REST DEL code   = #{response.code}" if Marfa.config.logging_level > 0
+              p response.body if Marfa.config.logging_level > 1
+
+              block.call(response)
+            end
           end
         end
       end

data/lib/marfa/version.rb

@@ -1,7 +1,7 @@
 # Version constant
 module Marfa
   # The version constant for the current version of Marfa
-  VERSION = '0.6.1'.freeze unless defined?(Marfa::VERSION)
+  VERSION = '0.6.2'.freeze unless defined?(Marfa::VERSION)
 
   # The current Marfa version.
   # @return [String] The version number

data/marfa.gemspec

@@ -3,7 +3,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'marfa'
-  s.version     = '0.6.1'
+  s.version     = '0.6.2'
   s.required_ruby_version = '>= 2.3.0'
   s.platform    = Gem::Platform::RUBY
   s.date        = Time.now.strftime('%Y-%m-%d')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marfa
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Max Krechetov
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-10 00:00:00.000000000 Z
+date: 2017-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml