caboose-cms 0.4.14 → 0.4.15
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml
CHANGED
@@ -1,15 +1,15 @@
|
|
1
1
|
---
|
2
2
|
!binary "U0hBMQ==":
|
3
3
|
metadata.gz: !binary |-
|
4
|
-
|
4
|
+
MWRiZTU5NzZiYWJkMDQ5MDY4ZDg3ODkwZjViYTg5NWJiZmJjMjMzOQ==
|
5
5
|
data.tar.gz: !binary |-
|
6
|
-
|
6
|
+
OWViNmIyYThiMGJhMzRiZjExZmVjNjQ3ODNkNDdlODY0ZDdmYWYzMg==
|
7
7
|
!binary "U0hBNTEy":
|
8
8
|
metadata.gz: !binary |-
|
9
|
-
|
10
|
-
|
11
|
-
|
9
|
+
YWJkODMxNjNlZjliYjBmOTkxNmFlNmM1NzU5YmQ1N2U5Njc5YzE3ODQxNWU3
|
10
|
+
YWE4MzVkNGViMmZjYjZjMmEwZjhkYjkxYzU2MTg5NDA3ZTNiODcxYjBjMjBi
|
11
|
+
MjYxY2QzYmQzZDQ2N2FjNzYwMmIyYjgyZmQ3NWQ2NGE3N2JkNTI=
|
12
12
|
data.tar.gz: !binary |-
|
13
|
-
|
14
|
-
|
15
|
-
|
13
|
+
NDQ5ODEyYjM0MzM2ZTI3OTBiMWM4NjEyODM2MmQ3MGNiNTZiMjVmYjU5Mjdl
|
14
|
+
NDg0MjViYTc0MGY1NWYyNTc4MmU4MmE2ZmU0M2I1MTUyZjhmMmY5Mzc4NDQy
|
15
|
+
ZTVlMzRhNzQ3NGRmZmI2MDk5YWZiMDdjMTQxNDJkOTdjNTMwNGQ=
|
data/app/models/caboose/block.rb
CHANGED
@@ -88,7 +88,7 @@ class Caboose::Block < ActiveRecord::Base
|
|
88
88
|
end
|
89
89
|
end
|
90
90
|
|
91
|
-
def render(block, options)
|
91
|
+
def render(block, options)
|
92
92
|
#Caboose.log("block.render\nself.id = #{self.id}\nblock = #{block}\nblock.full_name = #{block.full_name}\noptions.class = #{options.class}\noptions = #{options}")
|
93
93
|
if block && block.is_a?(String)
|
94
94
|
#Caboose.log("Block #{block} is a string, finding block object... self.id = #{self.id}")
|
@@ -114,25 +114,31 @@ class Caboose::Block < ActiveRecord::Base
|
|
114
114
|
end
|
115
115
|
options2[:block] = block
|
116
116
|
|
117
|
+
view = options2[:view]
|
117
118
|
if block.block_type.use_render_function && block.block_type.render_function
|
118
|
-
str = block.render_from_function(options2)
|
119
|
+
#str = block.render_from_function(options2)
|
120
|
+
|
121
|
+
#locals = OpenStruct.new(options)
|
122
|
+
#locals = OpenStruct.new(options2)
|
123
|
+
#str = ERB.new(block_type.render_function).result(locals.instance_eval { binding })
|
124
|
+
#return erb.result(locals.instance_eval { binding })
|
125
|
+
|
126
|
+
#eval("def render_my_function\n#{block.block_type.render_function}\nend\n\n, :locals => options2)
|
127
|
+
str = view.render(:partial => "caboose/blocks/render_function", :locals => options2)
|
119
128
|
else
|
120
|
-
view = ActionView::Base.new(ActionController::Base.view_paths)
|
129
|
+
#view = ActionView::Base.new(ActionController::Base.view_paths, options2, )
|
130
|
+
#view = ActionView::Base.new(options2[:view].view_renderer, {}, options2[:view].controller)
|
131
|
+
view = options2[:view]
|
121
132
|
begin
|
122
133
|
full_name = block.full_name
|
123
|
-
full_name = "lksdjflskfjslkfjlskdfjlkjsdf" if full_name.nil? || full_name.length == 0
|
124
|
-
|
125
|
-
str = view.render(:partial => "caboose/blocks/#{full_name}", :locals => options2)
|
134
|
+
full_name = "lksdjflskfjslkfjlskdfjlkjsdf" if full_name.nil? || full_name.length == 0
|
135
|
+
str = view.render(:partial => "caboose/blocks/#{full_name}", :locals => options2)
|
126
136
|
rescue ActionView::MissingTemplate
|
127
|
-
begin
|
128
|
-
|
129
|
-
#Caboose.log("Rendering caboose/blocks/#{block.block_type.name}")
|
130
|
-
str = view.render(:partial => "caboose/blocks/#{block.block_type.name}", :locals => options2)
|
137
|
+
begin
|
138
|
+
str = view.render(:partial => "caboose/blocks/#{block.block_type.name}", :locals => options2)
|
131
139
|
rescue ActionView::MissingTemplate
|
132
|
-
begin
|
133
|
-
|
134
|
-
#Caboose.log("Error rendering caboose/blocks/#{block.block_type.field_type}")
|
135
|
-
str = view.render(:partial => "caboose/blocks/#{block.block_type.field_type}", :locals => options2)
|
140
|
+
begin
|
141
|
+
str = view.render(:partial => "caboose/blocks/#{block.block_type.field_type}", :locals => options2)
|
136
142
|
rescue Exception => ex
|
137
143
|
Caboose.log("#{ex.message}\n#{ex.backtrace.join("\n")}")
|
138
144
|
end
|
@@ -0,0 +1 @@
|
|
1
|
+
<%= raw ERB.new(block.block_type.render_function).result(self.instance_eval { binding }) %>
|
data/lib/caboose/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: caboose-cms
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.4.
|
4
|
+
version: 0.4.15
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- William Barry
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2014-06-
|
11
|
+
date: 2014-06-20 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rails
|
@@ -331,6 +331,7 @@ files:
|
|
331
331
|
- app/views/caboose/blocks/_layout_right_sidebar_footer.html.erb
|
332
332
|
- app/views/caboose/blocks/_layout_right_sidebar_header.html.erb
|
333
333
|
- app/views/caboose/blocks/_layout_right_sidebar_sidebar.html.erb
|
334
|
+
- app/views/caboose/blocks/_render_function.html.erb
|
334
335
|
- app/views/caboose/blocks/_richtext.html.erb
|
335
336
|
- app/views/caboose/blocks/_text.html.erb
|
336
337
|
- app/views/caboose/blocks/admin_edit.html.erb
|