marfa 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3504cdb3e92c11ac7bed0f5b7b3c6814874ab24b
-  data.tar.gz: 84003911a9168ac14f2a3c03a41387a1fc18abf0
+  metadata.gz: c3d5a42f314e9baa5f4a7a0b1f61836c3eb9aed8
+  data.tar.gz: cd3210d2a966c921c7940588d18358d8f91e6a9f
 SHA512:
-  metadata.gz: 5749c05bf7be968db2f54707d1e50e05702f29e81c5eca23e9bc8512673753272cc45f68450d5ffb3c2a97b2361fa807d13c161acd7be8816dcff12fbc36fe23
-  data.tar.gz: 91c4649388e9bf28ac6e9a76a01e4facd5680aa4d6669549298bc69c1aba287da28616f40fd5243eca3921c03b79f2ffeb5d88756642f4453f4c91cda70ddfc5
+  metadata.gz: 81629c24e7a78183c4e913f9623213e4d8e3f965e35dcf6801a66aefbb3438a4767d43500502517a1c278314ef7503b4c667e281871d8b4dde8ac53aa14494cb
+  data.tar.gz: d762340e9ba8850f4956460144d6a844b7cb6002180b18a29026281fb2329656e35fd8ef056397ea2b7df4f8f14462ddcdfee62730b70837be91654e00ebc07a

data/lib/marfa/cache.rb

@@ -12,9 +12,14 @@ module Marfa
     # Write data to cache
     # @example
     #   Marfa.cache.set('key', 'value', 7200)
-    def set(key, value, _time = @config[:expiration_time])
+    def set(key, value, _time = nil)
       return unless @config[:enabled]
-      @redis.set(key, value)
+      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

data/lib/marfa/helpers/controller.rb

@@ -3,6 +3,11 @@ require 'marfa/configuration'
 module Marfa
   module Helpers
     module Controller
+
+      def render_content(path, data)
+        haml :"#{path}", locals: data
+      end
+
       # Rendering cached content
       # @param cache_key [String] key
       # @param path [String] - URL
@@ -10,10 +15,10 @@ module Marfa
       # @example
       #   render_cached_content('some_key', 'path/url', {})
       # @return [String] rendered content
-      def render_cached_content(cache_key, path, data = {})
+      def render_cached_content(cache_key, path, data = {}, cache_time = Marfa.config.cache[:expiration_time])
         return Marfa.cache.get(cache_key) if Marfa.cache.exist?(cache_key)
-        output = haml :"#{path}", locals: data
-        Marfa.cache.set(cache_key, output)
+        output = render_content(path, data)
+        Marfa.cache.set(cache_key, output, cache_time)
         output
       end
 
@@ -24,9 +29,11 @@ module Marfa
       # @example
       #   render_page('index', ['tag1', 'tag2'], {})
       # @return [String] rendered content
-      def render_page(path, tags, data)
-        cache_key = Marfa.cache.create_key('page', path, tags)
+      def render_page(path, tags, data, cache_time = Marfa.config.cache[:expiration_time])
         full_path = 'pages/' + path
+        return render_content(full_path, data) if cache_time == 0
+
+        cache_key = Marfa.cache.create_key('page', path, tags)
         render_cached_content(cache_key, full_path, data)
       end
 
@@ -51,10 +58,12 @@ module Marfa
       # @example
       #   render_block('index/index', ['tag1', 'tag2'])
       # @return [String] rendered block
-      def render_block(path, tags = [], query = {}, class_name = nil)
+      def render_block(path, tags = [], query = {}, class_name = nil, cache_time = Marfa.config.cache[:expiration_time])
         # TODO: Improve caching with parameters
-        content = get_cached_content('block', path, tags)
-        return content unless content.nil?
+        if cache_time > 0
+          content = get_cached_content('block', path, tags)
+          return content unless content.nil?
+        end
 
         classname = class_name || (path.to_class_name + 'Block')
         return unless Object.const_defined?(classname)
@@ -66,9 +75,13 @@ module Marfa
 
         block = Object.const_get(classname).new
         data = block.get_data(attrs)
-        cache_key = Marfa.cache.create_key('block', path, tags)
+
+
         full_path = Marfa.config.block_templates_path + '/' + path
 
+        return render_content(full_path, data) if cache_time == 0
+
+        cache_key = Marfa.cache.create_key('block', path, tags)
         render_cached_content(cache_key, full_path, data)
       end
 
@@ -107,9 +120,13 @@ module Marfa
       # @example
       #   get_html('index/index', ['tag1', 'tag2'], {})
       # @return [String] HTML
-      def get_html(path, tags, data)
-        html = get_cached_content('page', path, tags)
-        html = render_page(path, tags, data) if html.nil?
+      def get_html(path, tags, data, cache_time = Marfa.config.cache[:expiration_time])
+        if cache_time > 0
+          html = get_cached_content('page', path, tags)
+          html = render_page(path, tags, data, cache_time) if html.nil?
+        else
+          html = render_page(path, tags, data, cache_time)
+        end
         html
       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.2.1' unless defined?(Marfa::VERSION)
+  VERSION = '0.2.2' 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.2.1'
+  s.version     = '0.2.2'
   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.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Max Krechetov
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-15 00:00:00.000000000 Z
+date: 2017-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml