marfa 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3d5a42f314e9baa5f4a7a0b1f61836c3eb9aed8
-  data.tar.gz: cd3210d2a966c921c7940588d18358d8f91e6a9f
+  metadata.gz: c1a41778eb844114cb830fe48aa4c3be812e263d
+  data.tar.gz: a60191698afc032ffcfa2bf242a52353c897744d
 SHA512:
-  metadata.gz: 81629c24e7a78183c4e913f9623213e4d8e3f965e35dcf6801a66aefbb3438a4767d43500502517a1c278314ef7503b4c667e281871d8b4dde8ac53aa14494cb
-  data.tar.gz: d762340e9ba8850f4956460144d6a844b7cb6002180b18a29026281fb2329656e35fd8ef056397ea2b7df4f8f14462ddcdfee62730b70837be91654e00ebc07a
+  metadata.gz: a54094bfc1431e0dd77016f45617fc9218f07d76c35d1ae6866e94ae3ada5d13e1a9572a6dd9dda3d74e9ff3ed0648ae320b70a117095d371b3bb093fec123e0
+  data.tar.gz: 6a56ad0267d509005b5a16f5c36b5f0ed3387199899019c0653012d5d5721bae8b734b3842729084df3b054936213512338eea9f2f2b0dd56f6bf08f060e581a

data/lib/marfa/css_version.rb

@@ -2,6 +2,6 @@
 module Marfa
   # return css version
   def self.css_version
-    @css_version ||= Time.now.to_i.freeze
+    @css_version ||= Time.now.to_i.to_s.freeze
   end
 end

data/lib/marfa/helpers/controller.rb

@@ -23,18 +23,18 @@ module Marfa
       end
 
       # Render page from cache, return html
-      # @param path [String] - URL
-      # @param tags [Array] - tag list
-      # @param data [Hash] - options hash
+      # @param options [Hash] - options hash
       # @example
-      #   render_page('index', ['tag1', 'tag2'], {})
+      #   render_page({ path: 'index', tags: ['tag1', 'tag2'], data: {} })
       # @return [String] rendered content
-      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
+      def render_page(options)
+        cache_time = options[:cache_time] || Marfa.config.cache[:expiration_time]
 
-        cache_key = Marfa.cache.create_key('page', path, tags)
-        render_cached_content(cache_key, full_path, data)
+        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])
+        render_cached_content(cache_key, full_path, options[:data])
       end
 
       # Render page from cache, store to cache, return html
@@ -48,40 +48,39 @@ module Marfa
       def get_cached_content(kind, path, tags = [])
         cache_key = Marfa.cache.create_key(kind, path, tags)
         return Marfa.cache.get(cache_key) if Marfa.cache.exist?(cache_key)
+        nil
       end
 
       # Render block from cache, return html
-      # @param path [String] - URL
-      # @param tags [Array] - tag list
-      # @param query [Hash] - query params
-      # @param class_name [String] - class name to block
+      # @param options [Hash] - options hash
       # @example
-      #   render_block('index/index', ['tag1', 'tag2'])
+      #   render_block({ path: 'index/index', tags: ['tag1', 'tag2'] })
       # @return [String] rendered block
-      def render_block(path, tags = [], query = {}, class_name = nil, cache_time = Marfa.config.cache[:expiration_time])
+      def render_block(options)
         # TODO: Improve caching with parameters
+        cache_time = options[:cache_time] || Marfa.config.cache[:expiration_time]
+        tags = options[:tags] || []
+
         if cache_time > 0
-          content = get_cached_content('block', path, tags)
+          content = get_cached_content('block', options[:path], tags)
           return content unless content.nil?
         end
 
-        classname = class_name || (path.to_class_name + 'Block')
+        classname = options[:class_name] || (options[:path].to_class_name + 'Block')
         return unless Object.const_defined?(classname)
 
         attrs = {
           user_data: @user_data || {},
-          query: query
+          query: options[:query] || {}
         }
 
         block = Object.const_get(classname).new
         data = block.get_data(attrs)
-
-
-        full_path = Marfa.config.block_templates_path + '/' + path
+        full_path = Marfa.config.block_templates_path + '/' + options[:path]
 
         return render_content(full_path, data) if cache_time == 0
 
-        cache_key = Marfa.cache.create_key('block', path, tags)
+        cache_key = Marfa.cache.create_key('block', options[:path], tags)
         render_cached_content(cache_key, full_path, data)
       end
 
@@ -114,18 +113,19 @@ module Marfa
       end
 
       # Get HTML from cache or render new
-      # @param path [String] - URL
-      # @param tags [Array] - tag list
-      # @param data [Hash] - data to render
+      # @param options [Hash] - params
       # @example
-      #   get_html('index/index', ['tag1', 'tag2'], {})
+      #   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(path, tags, data, cache_time = Marfa.config.cache[:expiration_time])
+      def get_html(options)
+        cache_time = options[: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?
+          html = get_cached_content('page', options[:path], options[:tags])
+          html = render_page(options) if html.nil?
         else
-          html = render_page(path, tags, data, cache_time)
+          html = render_page(options)
         end
         html
       end

data/lib/marfa/helpers/email.rb

@@ -7,25 +7,23 @@ module Marfa
     # Provide helpers for Sinatra controllers
     module Email
       # Send email using mailbox config
-      # @param template [String] - path to template file
-      # @param to [String] - email address to send
-      # @param subject [String] - email subject
-      # @param data [Hash] - data to render in template
-      # @param mailbox [Symbol] - mailbox config
+      # @param options [Hash] - params
       # @example:
-      #   send_email('mail', 'user@example.com', :admin, 'Hello', { title: 'Hello!' })
-      def send_email(template, to, mailbox = :default, subject = '', data = {})
+      #   send_email({ template: 'mail', to: 'user@example.com', mailbox: :admin, subject: 'Hello', data: { title: 'Hello!' } })
+      def send_email(options)
+        mailbox = options[:mailbox] || :default
+
         config = Marfa.config.email[mailbox]
         return if config.nil?
 
-        body = haml :"#{template}", locals: data, layout: false
+        body = haml :"#{options[:template]}", locals: options[:data], layout: false
 
         Pony.options = {
           via: :smtp,
           via_options: config
         }
 
-        Pony.mail(to: to, subject: subject, html_body: body)
+        Pony.mail(to: options[:to], subject: options[:subject], html_body: body)
       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.2.2' unless defined?(Marfa::VERSION)
+  VERSION = '0.3.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.2.2'
+  s.version     = '0.3.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.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Max Krechetov
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-17 00:00:00.000000000 Z
+date: 2017-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml