marfa 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ac683e8c0c1a0d4de81e3d1f54c6b12c37e520d
-  data.tar.gz: b1c6144785b6653c1aa63fdad7f41f7a29f0d5c4
+  metadata.gz: 66e3877d2da115dc46d090bada41ff103f0d591d
+  data.tar.gz: 19fb9b00540dd96495ce15b83a5075b6dc8c4c87
 SHA512:
-  metadata.gz: 6ff955c64e6ad5ff064324645bb853c87a8952ce24dceb69cbb84c80daa514321a3816cb27245ebcf7cf4a54853e67f1f62ad7b7185a6dd912652b4ad2552de8
-  data.tar.gz: 4131e1c511e8a28f327a03d6a4e2603b375dad08c62e802bbdb290b25d3937e13acd10696bc3b06125539b8da131ba5648d1837adc368b047fb125ecb6a20215
+  metadata.gz: 04a42c351d459acdb2866716851308c2d80960a3e1f191a042280309691c199912451055eb1287c5efbcce37840556734c8de648e45949474e3b486b2f0f01da
+  data.tar.gz: 7c5e04ba7e8a2a42bbf1b629dc37520e72c30199c99706e2bd88ebfe977f06ada394a2dd15f8fc6084a72222f56199438d2fa44df5d680a00aa0216175338829

data/lib/marfa/configuration.rb

@@ -55,6 +55,7 @@ module Marfa
       views
       environment
       logging
+      logging_level
       dump_errors
       show_exceptions
     ]

data/lib/marfa/file_templates.rb

@@ -19,6 +19,8 @@ Marfa.configure do |cfg|
   cfg.environment = :development
   # Request logging
   cfg.logging = true
+  # 0 - disabled; 1 - small; 2 - all
+  cfg.logging_level = 0
   # Show error page with backtrace
   cfg.show_exceptions = true
   # log exception backtraces to STDERR

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

@@ -0,0 +1,149 @@
+require 'marfa/configuration'
+
+module Marfa
+  # see Marfa
+  module Helpers
+    # HTTP helpers
+    module HTTP
+      # Helpers to use Rest requests
+      class Rest
+        # GET request
+        # @param url [String] - url
+        # @param headers [Hash] - headers hash
+        # @example
+        #   response = Rest.get(url, headers)
+        # @return response [RestClient::Response]
+        def self.get(url, headers = {})
+          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)
+
+          p "REST GET code = #{response.code}" if Marfa.config.logging_level > 0
+          p response.body if Marfa.config.logging_level > 1
+
+          response
+        end
+
+        # HEAD request
+        # @param url [String] - url
+        # @param headers [Hash] - headers hash
+        # @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
+
+          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
+
+          response
+        end
+
+        # POST request
+        # @param url [String] - url
+        # @param payload [String] - request body
+        # @param headers [Hash] - headers hash
+        # @param block [Proc] - block code to run
+        # @example
+        #   response = Rest.post(url, payload)
+        #   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
+
+          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
+          else
+            RestClient::Request.execute(
+              method: :post,
+              url: url,
+              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
+
+              block.call(response)
+            end
+          end
+        end
+
+        # PUT request
+        # @param url [String] - url
+        # @param payload [String] - request body
+        # @param headers [Hash] - headers hash
+        # @param block [Proc] - block code to run
+        # @example
+        #   response = Rest.put(url, payload)
+        #   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
+
+          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
+          else
+            RestClient::Request.execute(
+              method: :put,
+              url: url,
+              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
+
+              block.call(response)
+            end
+          end
+        end
+
+        # DELETE request
+        # @param url [String] - url
+        # @param payload [String] - request body
+        # @param headers [Hash] - headers hash
+        # @param block [Proc] - block code to run
+        # @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
+          if Marfa.config.logging_level > 0
+            p "REST DELETE headers= #{headers}"
+            p "REST DELETE 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
+            p response.body if Marfa.config.logging_level > 1
+
+            block.call(response)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/marfa/models/api_model.rb

@@ -9,6 +9,8 @@ module Marfa
       # Base model error
       class ModelError < StandardError; end
 
+      include Marfa::Helpers::HTTP
+
       @aliases = {}
 
       # Get data
@@ -45,7 +47,7 @@ module Marfa
           if Marfa.cache.exist?(cache_key)
             result = JSON.parse(Marfa.cache.get(cache_key), symbolize_names: true)
           else
-            response = RestClient.get("#{Marfa.config.api_server}#{path}", { params: params[:query], headers: {} })
+            response = Rest.get("#{Marfa.config.api_server}#{path}", { params: params[:query], headers: {} })
             Marfa.cache.set(cache_key, response.body, params[:cache_time] || 7200)
             result = JSON.parse(response.body, symbolize_names: true)
           end
@@ -72,7 +74,7 @@ module Marfa
           if Marfa.cache.exist?(cache_key)
             result = JSON.parse(Marfa.cache.get(cache_key), symbolize_names: true)
           else
-            response = RestClient.get("#{Marfa.config.api_server}#{path}", { params: params[:query], headers: {} })
+            response = Rest.get("#{Marfa.config.api_server}#{path}", { params: params[:query], headers: {} })
             result[:data] = JSON.parse(response.body, symbolize_names: true)
             result[:data_count] = response.headers[:x_count].to_i unless response.headers[:x_count].nil?
             result[:data_pages] = response.headers[:x_pages].to_i unless response.headers[:x_pages].nil?

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.0'.freeze unless defined?(Marfa::VERSION)
+  VERSION = '0.6.1'.freeze unless defined?(Marfa::VERSION)
 
   # The current Marfa version.
   # @return [String] The version number

data/lib/marfa.rb

@@ -2,6 +2,7 @@ require 'sinatra/base'
 require 'marfa/configuration'
 require 'marfa/cache'
 require 'marfa/version'
+require 'marfa/helpers/http/rest'
 require 'marfa/helpers/controller'
 require 'marfa/helpers/http/vary'
 require 'marfa/helpers/scss'

data/marfa.gemspec

@@ -3,7 +3,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'marfa'
-  s.version     = '0.6.0'
+  s.version     = '0.6.1'
   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.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Max Krechetov
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-21 00:00:00.000000000 Z
+date: 2017-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
@@ -320,6 +320,7 @@ files:
 - lib/marfa/helpers/classes/true_class.rb
 - lib/marfa/helpers/controller.rb
 - lib/marfa/helpers/email.rb
+- lib/marfa/helpers/http/rest.rb
 - lib/marfa/helpers/http/vary.rb
 - lib/marfa/helpers/sass_functions.rb
 - lib/marfa/helpers/scss.rb