marfa 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83259484f6fc95aecd48284b309768af5290b259
-  data.tar.gz: 91a451bd1eb4f5f02ba0a36155f9c523059c62ab
+  metadata.gz: 8a5b74e48d8e52d1b839ab478b3ff904fa3603d0
+  data.tar.gz: baf352d3dd008c1ae56aa3cc9d8271807b722af8
 SHA512:
-  metadata.gz: c3eff2798e4308cbb5582fc3b0a7556c10e24541ddc27958d7501e6fb6f21aacdf2e330a8ec5863922364b3e0a12d2cba610ea4453d306c22bf7d6f7de658fdc
-  data.tar.gz: 96cb35e219ce11141531d8c7d83c895bf0edaa8ecc9c282197a91dd98c2e1ec6f0190c3a8415f7d10e91bd0b3183a264468eb18042e1377e09445b7abb9670e9
+  metadata.gz: a4417f1b8e6d7604a7bafa514eabce7cd8679614a582193a1ff8a183f9fe6bb2bbad8edbac2616c77c03cc37c632393bfdee3f6750be1d4e1f0be92274e7f23f
+  data.tar.gz: a50ce5b4026964bd194cc0863aa9c58e4d3bd555e459fee5fb39b1e77cc036f63128097bc6dcf42521d0921338f4cffc02b7cf82deb50dcbcc58620229d831c7

data/lib/marfa/controllers/base_controller.rb

@@ -12,7 +12,11 @@ module Marfa
     # base controller
     class BaseController < Sinatra::Base
       before do
-        @device = DeviceDetector.new(request.user_agent).device_type
+        if Marfa.config.device_detector[:enabled]
+          @device = DeviceDetector.new(request.user_agent).device_type
+          @device = Marfa.config.device_detector[:default_device] if @device.nil?
+        end
+
         @css_version = Marfa.css_version
       end
 

data/lib/marfa/file_templates.rb

@@ -27,7 +27,8 @@ Marfa.configure do |cfg|
     host: '',
     port: 0,
     db: 0,
-    expiration_time: 3600
+    expiration_time: 3600,
+    use_device: true # use device name in page, blocks cache
   }
 
   # Static files content path
@@ -48,6 +49,12 @@ Marfa.configure do |cfg|
   # CSRF Protection
   cfg.csrf_enabled = false
 
+  # gem device_detector
+  cfg.device_detector = {
+      enabled: true,
+      default_device: 'smartphone'
+  }
+
   # HTML Compression
   cfg.html_compression_options = {
     enabled: true,

data/lib/marfa/helpers/controller.rb

@@ -30,10 +30,13 @@ module Marfa
       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
 
-        cache_key = Marfa.cache.create_key('page', options[:path], options[:tags])
+        cache_key = Marfa.cache.create_key(kind, options[:path], options[:tags])
         render_cached_content(cache_key, full_path, options[:data])
       end
 
@@ -51,6 +54,17 @@ module Marfa
         nil
       end
 
+      # convert query json to tags
+      # @param query [Hash] - hash of params
+      # @return [Array] of strings key-value or []
+      def query_to_tags(query)
+        result = []
+        if query.is_a? Hash
+          query.each { |key, value| result << "#{key}-#{value}" }
+        end
+        result
+      end
+
       # Render block from cache, return html
       # @param options [Hash] - options hash
       # @example
@@ -61,8 +75,12 @@ module Marfa
         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 > 0
-          content = get_cached_content('block', options[:path], tags)
+          content = get_cached_content(kind, options[:path], tags)
           return content unless content.nil?
         end
 
@@ -80,7 +98,7 @@ module Marfa
 
         return render_content(full_path, data) if cache_time == 0
 
-        cache_key = Marfa.cache.create_key('block', options[:path], tags)
+        cache_key = Marfa.cache.create_key(kind, options[:path], tags)
         render_cached_content(cache_key, full_path, data)
       end
 
@@ -122,7 +140,10 @@ module Marfa
         cache_time = options[:cache_time] || Marfa.config.cache[:expiration_time]
 
         if cache_time > 0
-          html = get_cached_content('page', options[:path], options[:tags])
+          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)

data/lib/marfa/version.rb

@@ -1,7 +1,7 @@
 # Version constant
 module Marfa
   # The version constant for the current version of Marfa
-  VERSION = '0.3.1' unless defined?(Marfa::VERSION)
+  VERSION = '0.3.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.3.1'
+  s.version     = '0.3.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.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Max Krechetov
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-17 00:00:00.000000000 Z
+date: 2017-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml