marfa 0.4.0 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f14c3d03481a476f3ddfa3a512f24971d74283ec
-  data.tar.gz: f5befde9af61a03573b811198275e8ed4c150b8a
+  metadata.gz: bf0393e4cc01dbc36e6b34ddebe89f9f400e0824
+  data.tar.gz: c7844ca68f4144af82d0358ba888a884e2ae16a4
 SHA512:
-  metadata.gz: 3b42d83c7e4c900257cbb693d0b46b54682983ec67f7c9e2ef00f9bd9aefdaccd1775a575d6d179bfa29b4b401511507eed252cd709c482a6875efc552a8a383
-  data.tar.gz: 69d33f58af93235a556e151c0dcdb36127a69378569cd0012f4853207863da24f01485b262eecf861bc1811028fb6af462b0e54789fa98cfee78a50ec64b4d1c
+  metadata.gz: 40ee5fcaf70cc12dd9376bc412c4a2dfa63279aeda149779b6d76e5ce9d7b8bde14972412d7bf677da767d08fa81f9aa00539f94e3eea9cb844848d1e7d96e5e
+  data.tar.gz: efd735356fd54a436ddacbb8be4388f61b8ffc86a34cea8600dd42f528591bfbe56e502b3432a3c2dae1669cb6e28cb478e81cf8e142f3d7221c49e4b4a2d812

data/lib/marfa/helpers/controller.rb

@@ -3,7 +3,12 @@ require 'marfa/configuration'
 module Marfa
   module Helpers
     module Controller
-
+      # Render content
+      # @param path [String] - URL
+      # @param data [Hash] - options hash
+      # @example
+      #   render_content('some_key', 'path/url', {})
+      # @return [String] rendered content
       def render_content(path, data)
         haml :"#{path}", locals: data
       end
@@ -137,7 +142,6 @@ module Marfa
       # @example
       #   get_html({ path: 'index', tags: ['tag1', 'tag2'], data: {} })
       # @return [String] HTML
-      # def get_html(path, tags, data, cache_time = Marfa.config.cache[:expiration_time])
       def get_html(options)
         cache_time = options[:cache_time] || Marfa.config.cache[:expiration_time]
 
@@ -153,6 +157,15 @@ module Marfa
         html
       end
 
+      # Render pagination panel
+      # @param data [Hash] - pages info data
+      # @param _template [String] - template to render
+      # @return [String] HTML
+      def render_pagination(data, _template=nil)
+        template = _template || Marfa.config.pagination_template
+        haml :"#{template}", locals: data
+      end
+
       alias_method :render_component, :render_block
       alias_method :render_static_component, :render_static_block
     end

data/lib/marfa/models/api_model.rb

@@ -20,6 +20,15 @@ module Marfa
         get_raw_data(params)
       end
 
+      # Get data w/pagination headers x_count / x_pages
+      # @param params [Hash] options hash
+      # @example
+      #   BaseModel.get_data({ path: 'category/list' })
+      # @return [Hash] data from API
+      def self.get_data_with_pagination(params)
+        get_raw_data_with_pagination(params)
+      end
+
       # "Raw" data getting
       # @param params [Hash] - options hash
       # @example
@@ -34,17 +43,43 @@ module Marfa
           result = JSON.parse(response.body, symbolize_names: true)
         rescue => exception
           if [:development, :test].include? Marfa.config.environment
-            p '========== Exception while making request: =========='
-            p "Path: #{Marfa.config.api_server}#{path}"
-            p 'Params:'
-            p params
-            p "#{exception.message} (#{exception.class})"
-            p '=================================================='
+            _log_exception(exception, path, params)
           end
         end
 
         result
       end
+
+      # "Raw" data getting w/pagination headers x_count / x_pages
+      # @param params [Hash] - options hash
+      # @return [Hash]
+      def self.get_raw_data_with_pagination(params)
+        result = {}
+        path = params[:path]
+
+        begin
+          response = RestClient.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?
+        rescue => exception
+          if [:development, :test].include? Marfa.config.environment
+            _log_exception(exception, path, params)
+          end
+        end
+
+        result
+      end
+
+      # Log exceptions to console
+      def self._log_exception(e, path, params)
+        p '========== Exception while making request: =========='
+        p "Path: #{Marfa.config.api_server}#{path}"
+        p 'Params:'
+        p params
+        p "#{e.message} (#{e.class})"
+        p '=================================================='
+      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.4.0' unless defined?(Marfa::VERSION)
+  VERSION = '0.4.3' 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.4.0'
+  s.version     = '0.4.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.4.0
+  version: 0.4.3
 platform: ruby
 authors:
 - Max Krechetov
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-25 00:00:00.000000000 Z
+date: 2017-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml