marfa 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 045e2b47c18372841a03b6199ad064373b066898
-  data.tar.gz: 3003d04b5f147bfcf1aabccb1d17b230275801f2
+  metadata.gz: f7d23a5e3139ce9b6c97cd6b873983dcf1dae66b
+  data.tar.gz: 59e301cb6d1fbab42e76cdf469f3fa5fee964de7
 SHA512:
-  metadata.gz: 2ef1a10b3be4950a1f20b3103b7f79b0ca56fc555852299f5b9cee986d1ed48b695113f7f3e1111ff262f7374c9175fd70eb99020b144b9706c3c6cc15672f86
-  data.tar.gz: 6939949cacb3aa1249104dc4e115478c8ae0d2f22412edeec1e71f1e8f2d182d914b09508839fe3530e3c25801f19d3d5971a21234940191e8c1a7686313a5bd
+  metadata.gz: 53b8fabbe731e6c228e2d983f6d9de9872768ddb30f9fedc4d6ab34a176248fbcc55acec283c067bc998c31ffe464f6346c5dc97c609008886c3b9f57737b4ba
+  data.tar.gz: a58ad7c49933132e23ac1c5c555208426668a68a99031a520d197c88f654e1ab9300f52547399fe252dc02a6a8b41a1cd0dd0a6e180e06b07e96da576009e956

data/lib/marfa/configuration.rb

@@ -2,6 +2,8 @@ require 'ostruct'
 require 'marfa/controllers/base_controller'
 require 'marfa/controllers/css_controller'
 require 'htmlcompressor'
+require 'logger'
+
 
 module Marfa
   # Configuration
@@ -16,6 +18,7 @@ module Marfa
     _configure_settings(Marfa::Controllers::BaseController)
     _configure_settings(Marfa::Controllers::CssController) if Marfa.config.use_css_build
     _configure_ext_modules(Marfa::Controllers::BaseController)
+    _configure_logger
   end
 
   # Configure Marfa in block
@@ -47,6 +50,12 @@ module Marfa
     end
   end
 
+  def self._configure_logger
+    $logger = Logger.new(STDOUT)
+    $logger.level = Marfa.config.logging_level
+    $logger.datetime_format = Marfa.config.logging_datetime_format
+  end
+
   # Default settings fields for apps
   def self._default_settings
     @_default_settings = %w[

data/lib/marfa/file_templates.rb

@@ -19,8 +19,10 @@ Marfa.configure do |cfg|
   cfg.environment = :development
   # Request logging
   cfg.logging = true
-  # 0 - disabled; 1 - small; 2 - all
-  cfg.logging_level = 0
+  # Logging level see Logger
+  cfg.logging_level = Logger::INFO
+  # Logging format time
+  cfg.logging_datetime_format = '%d/%b/%Y:%H:%M:%S %z'
   # Show error page with backtrace
   cfg.show_exceptions = true
   # log exception backtraces to STDERR

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

@@ -14,21 +14,15 @@ module Marfa
         #   response = Rest.get(url, headers)
         # @return response [RestClient::Response]
         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
+          _log_head('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
-
-            return response
+            _log_body('GET', response.code, response.body)
+            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
-
+              _log_body('GET', response.code, response.body)
               block.call(response)
             end
           end
@@ -41,21 +35,15 @@ module Marfa
         #   response = Rest.head(url)
         # @return response [RestClient::Response]
         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
+          _log_head('HEA', url, headers)
 
           if block.nil?
             response = RestClient.head(url, headers)
-
-            p "REST HEA code  = #{response.code}" if Marfa.config.logging_level > 0
-            p response.body if Marfa.config.logging_level > 1
-
-            return response
+            _log_body('HEA', response.code, response.body)
+            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
-
+              _log_body('HEA', response.code, response.body)
               block.call(response)
             end
           end
@@ -71,18 +59,13 @@ module Marfa
         #   Rest.post(url, payload) do |response|
         # @return response [RestClient::Response]
         def self.post (url, payload, headers={}, &block)
-          p "REST POST url = #{url}" if Marfa.config.logging_level > 0
-
-          if Marfa.config.logging_level > 0
-            p "REST POST headers= #{headers}"
-            p "REST POST payload= #{payload}"
-          end
+          _log_head('POS', url, headers, payload)
 
           if block.nil?
             response = RestClient.post(url, payload, headers)
-            p "REST POST code = #{response.code}" if Marfa.config.logging_level > 0
-            p response.body if Marfa.config.logging_level > 1
-            return response
+            _log_body('POS', response.code, response.body)
+
+            response
           else
             RestClient::Request.execute(
               method: :post,
@@ -90,9 +73,7 @@ module Marfa
               payload: payload,
               headers: headers
             ) do |response|
-              p "REST POST code  = #{response.code}" if Marfa.config.logging_level > 0
-              p response.body if Marfa.config.logging_level > 1
-
+              _log_body('POS', response.code, response.body)
               block.call(response)
             end
           end
@@ -108,17 +89,12 @@ module Marfa
         #   Rest.put(url, payload) do |response|
         # @return response [RestClient::Response]
         def self.put(url, payload, headers = {}, &block)
-          p "REST PUT url  = #{url}" if Marfa.config.logging_level > 0
-          if Marfa.config.logging_level > 0
-            p "REST PUT headers= #{headers}"
-            p "REST PUT payload= #{payload}"
-          end
+          _log_head('PUT', url, headers, payload)
 
           if block.nil?
             response = RestClient.put(url, payload, headers)
-            p "REST PUT code   = #{response.code}" if Marfa.config.logging_level > 0
-            p response.body if Marfa.config.logging_level > 1
-            return response
+            _log_body('PUT', response.code, response.body)
+            response
           else
             RestClient::Request.execute(
               method: :put,
@@ -126,9 +102,7 @@ module Marfa
               payload: payload,
               headers: headers
             ) do |response|
-              p "REST PUT code   = #{response.code}" if Marfa.config.logging_level > 0
-              p response.body if Marfa.config.logging_level > 1
-
+              _log_body('PUT', response.code, response.body)
               block.call(response)
             end
           end
@@ -143,34 +117,56 @@ module Marfa
         #   Rest.delete(url, payload, headers) do |response|
         # @return response [RestClient::Response]
         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 DEL headers= #{headers}"
-            p "REST DEL payload= #{payload}"
-          end
+          _log_head('DEL', url, headers, payload)
 
           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
-
-            return response
+            _log_body('DEL', response.code, response.body)
+            response
           else
             RestClient::Request.execute(
-                method: :delete,
-                url: url,
-                payload: payload,
-                headers: headers
+              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
-
+              _log_body('DEL', response.code, response.body)
               block.call(response)
             end
           end
         end
+
+        # logging head of request
+        # @param type [String] - type of request
+        # @param url [String] - url
+        # @param headers [Hash] - headers hash
+        # @param payload [Hash] - payload
+        # @example
+        #   _log_head(type, url, headers, payload)
+        def self._log_head(type, url, headers, payload = nil)
+          return if $logger.nil?
+          $logger.info("REST #{type} url     = #{url}")
+          $logger.info("REST #{type} headers = #{headers}")
+          $logger.info("REST #{type} payload = #{payload}") unless payload.nil?
+        end
+
+        # logging body response of request
+        # @param type [String] - type of request
+        # @param code [String] - http code response
+        # @param body [String] - response body
+        # @example
+        #   _log_body(type, response.code, response.body)
+        def self._log_body(type, code, body)
+          return if $logger.nil?
+          if code == 200
+            $logger.info("REST #{type} code    = #{code}")
+            $logger.debug("REST #{type} body    = #{body}")
+          else
+            $logger.error("REST #{type} code    = #{code}")
+            $logger.error("REST #{type} body    = #{body}")
+          end
+        end
       end
     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.2'.freeze unless defined?(Marfa::VERSION)
+  VERSION = '0.6.3'.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.2'
+  s.version     = '0.6.3'
   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.2
+  version: 0.6.3
 platform: ruby
 authors:
 - Max Krechetov
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-11 00:00:00.000000000 Z
+date: 2017-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml