marfa 0.4.7 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16f4e65b65810ba46b1595a5e3f4e83e32dc6c88
-  data.tar.gz: c42bcbe1d65ef595ec533085c94a46450b67e71b
+  metadata.gz: c0759f81941c873aa1735687444f031c919ea122
+  data.tar.gz: 5a395cc867d247b1524bc8447b168296fdb8065a
 SHA512:
-  metadata.gz: e6e590b243253f6e752e511f5b238f7562bfe55dd4dd82fb88c4f7bc6220847319e0964c3d378e6eb88793a42071295dcbb76380cd78c535e2a7e9262e46053b
-  data.tar.gz: 9bc025d0a62bcbd857bea747feb7d2622e85e11f115f5dfb05ce5353c4d7e53f3345639b853f261c0d7bd0269a0949678906eec7401da04bf37bd7227bb3f491
+  metadata.gz: 8f396b685edab492541f969c49cc10e83ae1e9a5685c1c7addee2cd87a311f0c8aa16c9594b3bc44c89e5c36c68bb8d87284c8209bc18a940c397c20c68f1196
+  data.tar.gz: a00519de9f1b9ed6c32c04e3e61391585a6b2c22ed75306750e702d058abc18adef2205cc7850ad3e4df1058e67f35fc0b04a453109d7dbe2d88b00dda2db14c

data/lib/marfa/cache.rb

@@ -14,6 +14,7 @@ module Marfa
     #   Marfa.cache.set('key', 'value', 7200)
     def set(key, value, _time = nil)
       return unless @config[:enabled]
+      return if _time.zero?
       if _time.is_a? Numeric
           @redis.set(key, value, ex: _time) # ex - is seconds
       else

data/lib/marfa/helpers/controller.rb

@@ -167,6 +167,36 @@ module Marfa
         haml :"#{template}", locals: data
       end
 
+      # Render block with data from cache, return html
+      # @param options [Hash] - options hash
+      # @example
+      #   render_block_with_data({ path: 'index/index', tags: ['tag1', 'tag2'] })
+      # @return [String] rendered block
+      def render_block_with_data(options)
+        # TODO: Improve caching with parameters
+        cache_time = options[:cache_time] || Marfa.config.cache[:expiration_time]
+        tags = options[:tags] || []
+
+        kind = 'block'
+        kind += "-#{@device}" if Marfa.config.cache[:use_device]
+        tags += query_to_tags(options[:query])
+
+        if cache_time.positive?
+          content = get_cached_content(kind, options[:path], tags)
+          return content unless content.nil?
+        end
+
+        data = options[:data]
+        data = data.merge(options[:locals]) unless options[:locals].nil?
+
+        full_path = Marfa.config.block_templates_path + '/' + options[:path]
+
+        return render_content(full_path, data) if cache_time.zero?
+
+        cache_key = Marfa.cache.create_key(kind, options[:path], tags)
+        render_cached_content(cache_key, full_path, data)
+      end
+
       alias_method :render_component, :render_block
       alias_method :render_static_component, :render_static_block
     end

data/lib/marfa/models/api_model.rb

@@ -37,10 +37,16 @@ module Marfa
       def self.get_raw_data(params)
         result = {}
         path = params[:path]
+        cache_key = "data_#{path}#{params[:query]}".scan(/\w+/).join('_')
 
         begin
-          response = RestClient.get("#{Marfa.config.api_server}#{path}", { params: params[:query], headers: {} })
-          result = JSON.parse(response.body, symbolize_names: true)
+          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: {} })
+            Marfa.cache.set(cache_key, response.body, params[:cache_time] || 7200)
+            result = JSON.parse(response.body, symbolize_names: true)
+          end
         rescue => exception
           if [:development, :test].include? Marfa.config.environment
             _log_exception(exception, path, params)
@@ -56,17 +62,33 @@ module Marfa
       def self.get_raw_data_with_pagination(params)
         result = {}
         path = params[:path]
+        cache_key = "data_with_pagination_#{path}#{params[:query]}".scan(/\w+/).join('_')
 
         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?
+          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: {} })
+            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?
+            Marfa.cache.set(cache_key, result.to_json, params[:cache_time] || 7200)
+          end
         rescue => exception
           if [:development, :test].include? Marfa.config.environment
             _log_exception(exception, path, params)
           end
         end
+        # 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

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.7' unless defined?(Marfa::VERSION)
+  VERSION = '0.5.0' 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.7'
+  s.version     = '0.5.0'
   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.7
+  version: 0.5.0
 platform: ruby
 authors:
 - Max Krechetov