@@ -20,10 +20,6 @@ class RailsPage < Page
@url || super
end
- def breadcrumb
- title
- end
-
def build_parts_from_hash!(content)
content.each do |k,v|
(part(k) || parts.build(:name => k.to_s)).content = v
app/models/rails_page.rb
@@ -10,7 +10,8 @@ module ShareLayouts::Helper
def assign_attributes!(page, name = @radiant_layout)
page.layout = Layout.find_by_name(name) || page.layout
page.title = @title || @content_for_title || page.title || ''
- page.breadcrumbs = @breadcrumbs || @content_for_breadcrumbs || page.breadcrumbs || ''
+ page.breadcrumb = @breadcrumb || @content_for_breadcrumb || page.breadcrumb || page.title
+ page.breadcrumbs = @breadcrumbs || @content_for_breadcrumbs || nil
page.url = request.path
page.slug = page.url.split("/").last
page.published_at ||= Time.now
lib/share_layouts/helper.rb
@@ -16,9 +16,10 @@ class RailsPageTest < Test::Unit::TestCase
assert_renders "some breadcrumbs", "<r:breadcrumbs />"
end
- def test_breadcrumb_should_equal_title
- @page.title = "My Page"
- assert_equal "My Page", @page.breadcrumb
+ def test_should_use_old_breadcrumbs_tag_if_breadcrumbs_attr_is_nil
+ @page = pages(:rails_page)
+ @page.breadcrumbs = nil
+ assert_renders "Homepage > App page", "<r:breadcrumbs nolinks='true' />"
end
def test_should_build_parts_from_hash
test/unit/rails_page_test.rb
@@ -30,6 +30,7 @@ TEXT
assert_equal({:body => "something", :sidebar => "sidebar"}, extract_captures)
end
+ # testing assignment of layout
def test_should_assign_layout_of_page
assign_attributes!(@page)
assert_equal @page.layout, layouts(:main)
@@ -42,6 +43,7 @@ TEXT
assert_equal previous_layout, @page.layout
end
+ # testing assignment of page.title
def test_should_assign_page_title_from_instance_var
@title = "My title"
assign_attributes!(@page)
@@ -54,18 +56,6 @@ TEXT
assert_equal "My title", @page.title
end
- def test_should_assign_breadcrumbs_from_instance_var
- @breadcrumbs = "bc"
- assign_attributes!(@page)
- assert_equal "bc", @page.breadcrumbs
- end
-
- def test_should_assign_breadcrumbs_from_capture
- @content_for_breadcrumbs = "bc"
- assign_attributes!(@page)
- assert_equal "bc", @page.breadcrumbs
- end
-
def test_should_assign_title_from_existing_page_title_when_not_specified
assign_attributes!(@page)
assert_equal 'New Page', @page.title
@@ -80,25 +70,83 @@ TEXT
assert_equal '', @page.title
end
- def test_should_assign_empty_breadcrumbs_if_missing
+ #testing assignment of page.breadcrumb
+ def test_should_assign_page_breadcrumb_from_instance_var
+ @breadcrumb = "My breadcrumb"
+ assign_attributes!(@page)
+ assert_equal "My breadcrumb", @page.breadcrumb
+ end
+
+ def test_should_assign_page_breadcrumb_from_capture
+ @content_for_breadcrumb = "My breadcrumb"
+ assign_attributes!(@page)
+ assert_equal "My breadcrumb", @page.breadcrumb
+ end
+
+ def test_should_assign_breadcrumb_from_existing_breadcrumb_when_not_specified
+ @page.breadcrumb = "existing breadcrumb"
+ assign_attributes!(@page)
+ assert_equal 'existing breadcrumb', @page.breadcrumb
+ end
+
+ def test_should_assign_breadcrumb_from_title_if_missing
+ @page.title = "Title into BC"
+ @page.breadcrumb = nil
+ assert_nil @breadcrumb
+ assert_nil @content_for_breadcrumb
+ assert_nil @page.breadcrumb
+ assign_attributes!(@page)
+ assert_equal 'Title into BC', @page.breadcrumb
+ end
+
+ def test_should_assign_empty_breadcrumb_if_title_missing_too
+ @page.title = nil
+ assert_nil @title
+ assert_nil @content_for_title
+ assert_nil @page.title
+ @page.breadcrumb = nil
+ assert_nil @breadcrumb
+ assert_nil @content_for_breadcrumb
+ assert_nil @page.breadcrumb
+ assign_attributes!(@page)
+ assert_equal '', @page.breadcrumb
+ end
+
+ # testing assignment of page.breadcrumbs
+ def test_should_assign_breadcrumbs_from_instance_var
+ @breadcrumbs = "bc"
+ assign_attributes!(@page)
+ assert_equal "bc", @page.breadcrumbs
+ end
+
+ def test_should_assign_breadcrumbs_from_capture
+ @content_for_breadcrumbs = "bc"
+ assign_attributes!(@page)
+ assert_equal "bc", @page.breadcrumbs
+ end
+
+ def test_should_leave_breadcrumbs_nil_if_missing
@page.breadcrumbs = nil
assert_nil @breadcrumbs
assert_nil @content_for_breadcrumbs
assert_nil @page.breadcrumbs
assign_attributes!(@page)
- assert_equal '', @page.breadcrumbs
+ assert_equal nil, @page.breadcrumbs
end
+ # testing assigment of page.url
def test_should_assign_url_from_request_path
assign_attributes!(@page)
assert_equal '/some/page/', @page.url
end
+ # testing assigment of page.slug
def test_should_assign_slug_from_request_path
assign_attributes!(@page)
assert_equal 'page', @page.slug
end
+ # testing assignment of page.published_at
def test_should_assign_published_at
assign_attributes!(@page)
assert_not_nil @page.published_at
test/unit/share_layouts_helper_test.rb
edc3650dc0a3d6c69cbd02111c18b93c6920897a
Chris Parrish
chris.parrish-gitmail@swankinnovations.com
http://github.com/radiant/radiant-share-layouts-extension/commit/3302f3f7187b7d22924502e5cca3e57496c262be
3302f3f7187b7d22924502e5cca3e57496c262be
2008-11-17T19:34:50-08:00
2008-11-17T19:34:50-08:00
Fixed bug with breadcrumbs, added/improved support for page.breadcrumb
ShareLayouts::Helper assign_attributes method was wrongly setting
breadcrumbs to page.breadcrumbs OR "" It needed to remain nil
for <r:breadcrumbs> tag to work.
Added capability for handling/assigning page.breadcrumb. Like
page.title, this grants controllers: @breadcrumb, views get:
content_for_breadcrumb, and Radiant users may now use the
Application Page breadcrumb field.
7faade97fa828dadf042fdfebf5f870bd139c1e8
Chris Parrish
chris.parrish-gitmail@swankinnovations.com