marfa 0.6.3 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f7d23a5e3139ce9b6c97cd6b873983dcf1dae66b
-  data.tar.gz: 59e301cb6d1fbab42e76cdf469f3fa5fee964de7
+  metadata.gz: 657f0a9d3d85b0b329080c1cb91e86c5a05de998
+  data.tar.gz: e50e17bdf590634901eef9e5429dfd733dee3f1a
 SHA512:
-  metadata.gz: 53b8fabbe731e6c228e2d983f6d9de9872768ddb30f9fedc4d6ab34a176248fbcc55acec283c067bc998c31ffe464f6346c5dc97c609008886c3b9f57737b4ba
-  data.tar.gz: a58ad7c49933132e23ac1c5c555208426668a68a99031a520d197c88f654e1ab9300f52547399fe252dc02a6a8b41a1cd0dd0a6e180e06b07e96da576009e956
+  metadata.gz: 13f178284f4405e9a8a06c9e1bbcbc38ce8fa3d7ed32a6468a5e009fdfb4f6c313648bc004d957c9d6515c41f010fa9c791868d6e94b0c4c8a56636fbff22eab
+  data.tar.gz: e2bc6fef84fdc241a1ae5c2670946d8d319ddd56677363791a9a6d8d810ffe7091b8787c50b2b2994f8dbece31601bc6410f6034449ea469e098d9664f77ed42

data/lib/marfa/cache.rb

@@ -12,15 +12,15 @@ module Marfa
     # Write data to cache
     # @example
     #   Marfa.cache.set('key', 'value', 7200)
-    def set(key, value, _time = nil)
+    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
+      return if time.zero?
+
+      if time.is_a? Numeric
+        @redis.set(key, value, ex: time) # ex - is seconds
       else
         @redis.set(key, value) #infinite
       end
-
     end
 
     # Get data from cache
@@ -67,18 +67,18 @@ module Marfa
     # @example
     #   Marfa.cache.create_key('block', 'offer/list', ['tag1', 'tag2'])
     # @return [String] key
-    def create_key(kind, path, tags = [])
-      kind + '_' + path.tr('/', '_') + '__' + tags.join('_')
-    end
+    # def create_key(kind, path, tags = [])
+    #   kind + '_' + path.tr('/', '_') + '__' + tags.join('_')
+    # end
 
     # Create key for json urls
     # @param path [String] path
     # @example
     #   Marfa.cache.create_json_key('/get_list.json')
     # @return [String] key
-    def create_json_key(path)
-      path.gsub(%r{[/.]}, '_')
-    end
+    # def create_json_key(path)
+    #   path.gsub(%r{[/.]}, '_')
+    # end
   end
 
   def self.cache

data/lib/marfa/helpers/controller.rb

@@ -33,41 +33,32 @@ module Marfa
       #   render_page({ path: 'index', tags: ['tag1', 'tag2'], data: {} })
       # @return [String] rendered content
       def render_page(options)
-        cache_time = options[:cache_time] || Marfa.config.cache[:expiration_time]
-
-        kind = 'page'
-        kind += "-#{@device}" if Marfa.config.cache[:use_device]
-
         full_path = 'pages/' + options[:path]
-        return render_content(full_path, options[:data]) if cache_time == 0
+        return render_content(full_path, options[:data]) if options[:cache_page].blank? || options[:cache_key].blank?
 
-        cache_key = Marfa.cache.create_key(kind, options[:path], options[:tags])
-        render_cached_content(cache_key, full_path, options[:data])
+        render_cached_content(options[:cache_key], full_path, options[:data])
       end
 
       # Render page from cache, store to cache, return html
-      # @param kind [String] - kind (block, page)
-      # @param path [String] - URL
-      # @param tags [Array] - tag list
+      # @param cache_key [String] - cache key
       # @example
       #   get_cached_content('page', 'index/index', ['tag1', 'tag2'])
       # @return [String] data from cache
       # @return [Nil]
-      def get_cached_content(kind, path, tags = [])
-        cache_key = Marfa.cache.create_key(kind, path, tags)
+      def get_cached_content(cache_key)
         return Marfa.cache.get(cache_key) if Marfa.cache.exist?(cache_key)
         nil
       end
 
       # convert query json to tags
       # @param query [Hash] - hash of params
-      # @return [Array] of strings key-value or []
+      # @return [String]
       def query_to_tags(query)
         result = []
         if query.is_a? Hash
           query.each { |key, value| result << "#{key}-#{value}" }
         end
-        result
+        result.join('_')
       end
 
       # Render block from cache, return html
@@ -76,54 +67,36 @@ module Marfa
       #   render_block({ path: 'index/index', tags: ['tag1', 'tag2'] })
       # @return [String] rendered block
       def render_block(options)
-        # TODO: Improve caching with parameters
-        cache_time = options[:cache_time] || Marfa.config.cache[:expiration_time]
-        tags = options[:tags] || []
+        cache_block = options[:cache_block]
 
-        kind = 'block'
-        kind += "-#{@device}" if Marfa.config.cache[:use_device]
-        tags += query_to_tags(options[:query])
-
-        if cache_time > 0
-          content = get_cached_content(kind, options[:path], tags)
+        if cache_block
+          content = get_cached_content(options[:cache_key])
           return content unless content.nil?
         end
 
-        classname = options[:class_name] || (options[:path].to_class_name + 'Block')
-        return unless Object.const_defined?(classname)
+        model_name = options[:model]
+        return unless Object.const_defined?(model_name)
 
-        attrs = {
-          user_data: @user_data || {},
-          query: options[:query] || {},
-          locals: options[:locals] || {}
-        }
+        model = Object.const_get(model_name)
+        return unless model.respond_to? options[:method].to_sym
 
-        block = Object.const_get(classname).new
-        data = block.get_data(attrs)
+        data = model.send(options[:method].to_sym, options[:params])
         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 == 0
+        return render_content(full_path, data) unless cache_block
 
-        cache_key = Marfa.cache.create_key(kind, options[:path], tags)
-        render_cached_content(cache_key, full_path, data)
+        render_cached_content(options[:cache_key], full_path, data)
       end
 
       # Render block from cache, return html without class eval
-      # @param path [String] - URL
-      # @param data [Hash] - data to render
-      # @example
-      #   render_static_block('index/index', ['tag1', 'tag2'])
+      # @param options [Hash] - params
       # @return [String] rendered block
-      def render_static_block(path, data = {})
-        content = get_cached_content('block', path)
-        return content unless content.nil?
-
-        cache_key = Marfa.cache.create_key('block', path)
-        full_path = Marfa.config.block_templates_path + '/' + path
-
-        render_cached_content(cache_key, full_path, data)
+      def render_static_block(options)
+        return get_cached_content(options[:cache_key]) unless options[:cache_block].blank?
+        full_path = "#{Marfa.config.block_templates_path}/#{options[:path]}"
+        render_cached_content(options[:cache_key], full_path, options[:data])
       end
 
       # Generate CSRF token
@@ -138,32 +111,12 @@ module Marfa
         Rack::Csrf.csrf_tag(env)
       end
 
-      # Get HTML from cache or render new
-      # @param options [Hash] - params
-      # @example
-      #   get_html({ path: 'index', tags: ['tag1', 'tag2'], data: {} })
-      # @return [String] HTML
-      def get_html(options)
-        cache_time = options[:cache_time] || Marfa.config.cache[:expiration_time]
-
-        if cache_time > 0
-          kind = 'page'
-          kind += "-#{@device}" if Marfa.config.cache[:use_device]
-
-          html = get_cached_content(kind, options[:path], options[:tags])
-          html = render_page(options) if html.nil?
-        else
-          html = render_page(options)
-        end
-        html
-      end
-
       # Render pagination panel
       # @param data [Hash] - pages info data
-      # @param _template [String] - template to render
+      # @param template [String] - template to render
       # @return [String] HTML
-      def render_pagination(data, _template=nil)
-        template = _template || Marfa.config.pagination_template
+      def render_pagination(data, template = nil)
+        template ||= Marfa.config.pagination_template
         haml :"#{template}", locals: data
       end
 
@@ -173,16 +126,11 @@ module Marfa
       #   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])
+        cache_block = options[:cache_block]
 
-        if cache_time.positive?
-          content = get_cached_content(kind, options[:path], tags)
+        # tags += query_to_tags(options[:query])
+        if cache_block
+          content = get_cached_content(options[:cache_key])
           return content unless content.nil?
         end
 
@@ -191,10 +139,9 @@ module Marfa
 
         full_path = Marfa.config.block_templates_path + '/' + options[:path]
 
-        return render_content(full_path, data) if cache_time.zero?
+        return render_content(full_path, data) unless cache_block
 
-        cache_key = Marfa.cache.create_key(kind, options[:path], tags)
-        render_cached_content(cache_key, full_path, data)
+        render_cached_content(options[:cache_key], full_path, data)
       end
 
       alias_method :render_component, :render_block

data/lib/marfa/models/api_model.rb

@@ -1,5 +1,6 @@
 require 'rest-client'
 require 'json'
+require 'marfa/configuration'
 
 module Marfa
   # Extend Models
@@ -37,56 +38,59 @@ module Marfa
       #   self.get_raw_data({ path: 'category/list' })
       # @return [Hash]
       def self.get_raw_data(params)
-        params[:query] = params[:query].delete_if { |k, v| v.nil? } unless params[:query].nil?
-        result = {}
+        params[:query] = params[:query].delete_if { |_, v| v.nil? } unless params[:query].nil?
         path = params[:path]
-        cache_key = "data_#{path}#{params[:query]}".scan(/[a-zA-Zа-яА-Я0-9]+/).join('_')
-        cache_key = params[:cache_key] unless params[:cache_key].nil?
+        cache_key = params[:cache_key]
 
         begin
-          if Marfa.cache.exist?(cache_key)
-            result = JSON.parse(Marfa.cache.get(cache_key), symbolize_names: true)
-          else
-            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
+          # don't need cache
+          return _get_request_result(params) if params[:cache_data].blank? || params[:cache_key].blank?
+
+          # cached data exists
+          return JSON.parse(Marfa.cache.get(cache_key), symbolize_names: true) if Marfa.cache.exist?(cache_key)
+
+          # get result and set to cache
+          result = _get_request_result(params)
+          Marfa.cache.set(cache_key, result.to_json, params[:cache_time] || Marfa.config.cache[:expiration_time])
+
+          return result
+
         rescue => exception
           if [:development, :test].include? Marfa.config.environment
             _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)
-        params[:query] = params[:query].delete_if { |k, v| v.nil? } unless params[:query].nil?
-        result = {}
+        params[:query] = params[:query].delete_if { |_, v| v.nil? } unless params[:query].nil?
         path = params[:path]
-        cache_key = "data_with_pagination_#{path}#{params[:query]}".scan(/[a-zA-Zа-яА-Я0-9]+/).join('_')
-        cache_key = params[:cache_key] unless params[:cache_key].nil?
+        cache_key = params[:cache_key]
 
         begin
-          if Marfa.cache.exist?(cache_key)
-            result = JSON.parse(Marfa.cache.get(cache_key), symbolize_names: true)
-          else
-            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?
-            Marfa.cache.set(cache_key, result.to_json, params[:cache_time] || 7200)
-          end
+          # don't need cache
+          return _get_request_result_with_headers(params) if params[:cache_data].blank? || params[:cache_key].blank?
+
+          # cached data exists
+          return JSON.parse(Marfa.cache.get(cache_key), symbolize_names: true) if Marfa.cache.exist?(cache_key)
+
+          result = _get_request_result_with_headers(params)
+          Marfa.cache.set(cache_key, result.to_json, params[:cache_time] || Marfa.config.cache[:expiration_time])
+
+          return result
+
         rescue => exception
           if [:development, :test].include? Marfa.config.environment
             _log_exception(exception, path, params)
           end
         end
 
-        result
+        {}
       end
 
       # Log exceptions to console
@@ -98,6 +102,30 @@ module Marfa
         p "#{e.message} (#{e.class})"
         p '=================================================='
       end
+
+      # request result without headers
+      # @return [Hash]
+      def self._get_request_result(params)
+        response = Rest.get("#{Marfa.config.api_server}#{params[:path]}", { params: params[:query], headers: {} })
+        JSON.parse(response.body, symbolize_names: true)
+      end
+
+      # request result with headers
+      # @return [Hash]
+      def self._get_request_result_with_headers(params)
+        result = {}
+
+        thread = Thread.new do
+          response = Rest.get("#{Marfa.config.api_server}#{params[: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?
+        end
+
+        thread.join
+
+        result
+      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.3'.freeze unless defined?(Marfa::VERSION)
+  VERSION = '0.7.0'.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.3'
+  s.version     = '0.7.0'
   s.required_ruby_version = '>= 2.3.0'
   s.platform    = Gem::Platform::RUBY
   s.date        = Time.now.strftime('%Y-%m-%d')

data/spec/cache_spec.rb

@@ -34,17 +34,17 @@ describe Marfa::Cache do
     expect(@cache.exist?(@key)).to eql false
   end
 
-  it 'checks_create_cache_key' do
-    kind = 'block'
-    path = 'offer/list'
-    tags = %w(offers cities)
-    cache_key = @cache.create_key(kind, path, tags)
-    expect(cache_key.length).to satisfy { |len| len > 20 }
-  end
-
-  it 'checks_create_json_cache_key' do
-    path = 'offer/list.json'
-    cache_key = @cache.create_json_key(path)
-    expect(cache_key.length).to eql path.length
-  end
+  # it 'checks_create_cache_key' do
+  #   kind = 'block'
+  #   path = 'offer/list'
+  #   tags = %w(offers cities)
+  #   cache_key = @cache.create_key(kind, path, tags)
+  #   expect(cache_key.length).to satisfy { |len| len > 20 }
+  # end
+
+  # it 'checks_create_json_cache_key' do
+  #   path = 'offer/list.json'
+  #   cache_key = @cache.create_json_key(path)
+  #   expect(cache_key.length).to eql path.length
+  # end
 end

metadata

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