marfa 0.7.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 657f0a9d3d85b0b329080c1cb91e86c5a05de998
-  data.tar.gz: e50e17bdf590634901eef9e5429dfd733dee3f1a
+  metadata.gz: 3e60d2144bd63fc9e3bd552836a8269089cbb1a0
+  data.tar.gz: be94416542673b74c5d005f7047505ddf6809319
 SHA512:
-  metadata.gz: 13f178284f4405e9a8a06c9e1bbcbc38ce8fa3d7ed32a6468a5e009fdfb4f6c313648bc004d957c9d6515c41f010fa9c791868d6e94b0c4c8a56636fbff22eab
-  data.tar.gz: e2bc6fef84fdc241a1ae5c2670946d8d319ddd56677363791a9a6d8d810ffe7091b8787c50b2b2994f8dbece31601bc6410f6034449ea469e098d9664f77ed42
+  metadata.gz: 643ada8e6a1c00cce4d6709b5e8823646494f19c0a18e02695b3a4f04c7cd69d57b3d81f515fa803246ac74aba079865c9c251d29688e3da59f52b35134e74e3
+  data.tar.gz: fea2023a9a93e7216f0bd416bfe4e97a3e7800354bccf79ac02402d7381091a2583b4ae577cc2b719b620d7559fae735bceff0c065e28a181b44e59a6521b2b6

data/lib/marfa/controllers/base_controller.rb

@@ -25,7 +25,8 @@ module Marfa
       # Not Found page
       not_found do
         status 404
-        haml :not_found
+        template_engine = Marfa.config.template_engine || :haml
+        render(template_engine, :not_found)
       end
 
       # All methods defined below might be used in child controllers

data/lib/marfa/helpers/classes/array.rb

@@ -2,4 +2,10 @@
 class Array
   # @return [true, false]
   alias blank? empty?
+
+  # Object isn't blank
+  # @return [true, false]
+  def present?
+    !blank?
+  end
 end

data/lib/marfa/helpers/classes/false_class.rb

@@ -4,4 +4,10 @@ class FalseClass
   def blank?
     true
   end
+
+  # Object isn't blank
+  # @return [false]
+  def present?
+    false
+  end
 end

data/lib/marfa/helpers/classes/hash.rb

@@ -1,4 +1,10 @@
 # Hash class extending
 class Hash
   alias blank? empty?
+
+  # Object isn't blank
+  # @return [true, false]
+  def present?
+    !blank?
+  end
 end

data/lib/marfa/helpers/classes/nil_class.rb

@@ -4,4 +4,10 @@ class NilClass
   def blank?
     true
   end
+
+  # Object isn't blank
+  # @return [false]
+  def present?
+    false
+  end
 end

data/lib/marfa/helpers/classes/numeric.rb

@@ -16,4 +16,10 @@ class Numeric
     return true if zero?
     false
   end
+
+  # Object isn't blank
+  # @return [true, false]
+  def present?
+    !blank?
+  end
 end

data/lib/marfa/helpers/classes/object.rb

@@ -7,4 +7,10 @@ class Object
   def blank?
     respond_to?(:empty?) ? !!empty? : !self
   end
+
+  # Object isn't blank
+  # @return [true, false]
+  def present?
+    !blank?
+  end
 end

data/lib/marfa/helpers/classes/string.rb

@@ -55,4 +55,10 @@ class String
   def blank?
     empty? || BLANK_RE.match?(self)
   end
+
+  # Object isn't blank
+  # @return [true, false]
+  def present?
+    !blank?
+  end
 end

data/lib/marfa/helpers/classes/time.rb

@@ -4,4 +4,10 @@ class Time
   def blank?
     false
   end
+
+  # Object isn't blank
+  # @return [true]
+  def present?
+    true
+  end
 end

data/lib/marfa/helpers/classes/true_class.rb

@@ -4,4 +4,10 @@ class TrueClass
   def blank?
     false
   end
+
+  # Object isn't blank
+  # @return [true]
+  def present?
+    true
+  end
 end

data/lib/marfa/helpers/controller.rb

@@ -10,7 +10,8 @@ module Marfa
       #   render_content('some_key', 'path/url', {})
       # @return [String] rendered content
       def render_content(path, data)
-        haml :"#{path}", locals: data
+        template_engine = Marfa.config.template_engine || :haml
+        render(template_engine, :"#{path}", locals: data)
       end
 
       # Rendering cached content
@@ -117,7 +118,8 @@ module Marfa
       # @return [String] HTML
       def render_pagination(data, template = nil)
         template ||= Marfa.config.pagination_template
-        haml :"#{template}", locals: data
+        template_engine = Marfa.config.template_engine || :haml
+        render(template_engine, :"#{template}", locals: data)
       end
 
       # Render block with data from cache, return html

data/lib/marfa/version.rb

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