ruhl 0.9.5 → 0.9.6
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.
- data/VERSION +1 -1
- data/lib/ruhl/engine.rb +5 -6
- data/lib/ruhl/rails.rb +1 -1
- data/ruhl.gemspec +1 -1
- data/spec/html/sidebar.html +9 -7
- data/spec/ruhl_spec.rb +5 -10
- metadata +1 -1
data/VERSION
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
0.9.
|
|
1
|
+
0.9.6
|
data/lib/ruhl/engine.rb
CHANGED
|
@@ -42,14 +42,14 @@ module Ruhl
|
|
|
42
42
|
private
|
|
43
43
|
|
|
44
44
|
def render_with_layout
|
|
45
|
-
|
|
45
|
+
render_nodes Nokogiri::HTML( @layout_source || File.read(@layout) )
|
|
46
46
|
end
|
|
47
47
|
|
|
48
48
|
def render_partial(tag, code)
|
|
49
49
|
file = execute_ruby(tag, code)
|
|
50
50
|
raise PartialNotFoundError.new(file) unless File.exists?(file)
|
|
51
51
|
|
|
52
|
-
|
|
52
|
+
render_nodes Nokogiri::HTML.fragment( File.read(file) )
|
|
53
53
|
end
|
|
54
54
|
|
|
55
55
|
def render_collection(tag, code, actions = nil)
|
|
@@ -79,10 +79,9 @@ module Ruhl
|
|
|
79
79
|
Ruhl::Engine.new(tag.inner_html, :block_object => bo).render(scope)
|
|
80
80
|
end
|
|
81
81
|
|
|
82
|
-
def
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
doc.to_s
|
|
82
|
+
def render_nodes(nodes)
|
|
83
|
+
parse_doc(nodes)
|
|
84
|
+
nodes.to_s
|
|
86
85
|
end
|
|
87
86
|
|
|
88
87
|
def parse_doc(doc)
|
data/lib/ruhl/rails.rb
CHANGED
data/ruhl.gemspec
CHANGED
data/spec/html/sidebar.html
CHANGED
|
@@ -1,7 +1,9 @@
|
|
|
1
|
-
<
|
|
2
|
-
<
|
|
3
|
-
<
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
</
|
|
1
|
+
<div>
|
|
2
|
+
<h3>Real Sidebarlinks</h3>
|
|
3
|
+
<ul>
|
|
4
|
+
<li><a href="#">Real Link 1</a></li>
|
|
5
|
+
<li><a href="#">Real Link 2</a></li>
|
|
6
|
+
<li><a href="#">Real Link 3</a></li>
|
|
7
|
+
<li><a href="#">Real Link 4</a></li>
|
|
8
|
+
</ul>
|
|
9
|
+
</div>
|
data/spec/ruhl_spec.rb
CHANGED
|
@@ -74,16 +74,11 @@ describe Ruhl do
|
|
|
74
74
|
|
|
75
75
|
it "should replace sidebar with partial contents" do
|
|
76
76
|
doc = create_doc
|
|
77
|
-
html
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
<li><a href="#">Real Link 3</a></li>
|
|
83
|
-
<li><a href="#">Real Link 4</a></li>
|
|
84
|
-
</ul>
|
|
85
|
-
</div>}
|
|
86
|
-
doc.xpath('//div[@id="sidebar"]').to_s.should == html
|
|
77
|
+
doc.xpath('/html/body/div/div/div//h3')[0].inner_html.
|
|
78
|
+
should == "Real Sidebarlinks"
|
|
79
|
+
|
|
80
|
+
doc.xpath('/html/body/div/div/div/ul/li//a')[0].inner_html.
|
|
81
|
+
should == "Real Link 1"
|
|
87
82
|
end
|
|
88
83
|
end
|
|
89
84
|
|