marfa 0.3.2 → 0.3.3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/marfa/helpers/controller.rb +2 -0
- data/lib/marfa/version.rb +1 -1
- data/marfa.gemspec +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 06f81303b1ce133d6f968b07f63f06ce79b2a7f5
|
|
4
|
+
data.tar.gz: 823b23e24e5a5593ce02b3a4364caa8caeaae1c2
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 17641058e03e35b7a25e1ce076991c5e16e405a71f10e7af52e20f0b3387bbefd5ce4cc1e1d473558dbdd0026e714ea9bb12f36d67abc44703d9d3ca0f790971
|
|
7
|
+
data.tar.gz: ff805dadf363ac08ca12447d5cffcce0b627516dc804babbf4dc6121246c8c18b0ef5fd75f08c13bebfd6c76c5fbc542281307b21f6133a32eb27a0d20f3c6a1
|
|
@@ -94,6 +94,8 @@ module Marfa
|
|
|
94
94
|
|
|
95
95
|
block = Object.const_get(classname).new
|
|
96
96
|
data = block.get_data(attrs)
|
|
97
|
+
data = data.merge(options[:locals]) unless options[:locals].nil?
|
|
98
|
+
|
|
97
99
|
full_path = Marfa.config.block_templates_path + '/' + options[:path]
|
|
98
100
|
|
|
99
101
|
return render_content(full_path, data) if cache_time == 0
|
data/lib/marfa/version.rb
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
# Version constant
|
|
2
2
|
module Marfa
|
|
3
3
|
# The version constant for the current version of Marfa
|
|
4
|
-
VERSION = '0.3.
|
|
4
|
+
VERSION = '0.3.3' unless defined?(Marfa::VERSION)
|
|
5
5
|
|
|
6
6
|
# The current Marfa version.
|
|
7
7
|
# @return [String] The version number
|
data/marfa.gemspec
CHANGED