lib/chronicle/association_collection_extensions.rb @@ -17,6 +17,7 @@ class ChronicleExtension < Radiant::Extension def activate require 'chronicle/diff' ActiveRecord::Base::VersionsProxyMethods.class_eval { include Chronicle::VersionsProxyMethods } + ActiveRecord::Associations::AssociationCollection.class_eval { include Chronicle::AssociationCollectionExtensions } Version.class_eval { include Chronicle::VersionExtensions } Page.class_eval do include Chronicle::PageExtensions chronicle_extension.rb @@ -1,5 +1,10 @@ module Chronicle::Tags include Radiant::Taggable + def self.included(base) + base.class_eval do + alias_method_chain :children_find_options, :draft_versioning + end + end desc %{ Renders the snippet specified in the @name@ attribute within the context of a page. @@ -39,4 +44,42 @@ module Chronicle::Tags raise StandardTags::TagError.new("`snippet' tag must contain `name' attribute") end end + + desc %{ + Inside this tag all page related tags refer to the page found at the @url@ attribute. + @url@s may be relative or absolute paths. + + *Usage:* + + <pre><code><r:find url="value_to_find">...</r:find></code></pre> + } + tag 'find' do |tag| + url = tag.attr['url'] + raise TagError.new("`find' tag must contain `url' attribute") unless url + + found = Page.find_by_url(absolute_path_for(tag.locals.page.url, url), !dev?(tag.globals.page.request)) + if page_found?(found) + tag.locals.page = found + tag.expand + end + end + + desc %{ + Page attribute tags inside this tag refer to the parent of the current page. + + *Usage:* + + <pre><code><r:parent>...</r:parent></code></pre> + } + tag "parent" do |tag| + parent = tag.locals.page.parent.current + tag.locals.page = parent + tag.expand if parent + end + + def children_find_options_with_draft_versioning(tag) + options = children_find_options_without_draft_versioning(tag) + options.merge!(:current => true) if dev?(tag.globals.page.request) + options + end end lib/chronicle/tags.rb @@ -355,6 +355,30 @@ describe Page do @page = pages(:first) end + describe "<r:children:each />" do + it "should retrieve current versions of children on the dev host" do + @page = pages(:parent) + @page.children.first.update_attributes(:slug => "kid", :status => Status[:draft]) + @page.should render('<r:children:each by="slug"><r:slug /> </r:children:each>').as('kid child-2 child-3 ').on('dev.site.com') + end + end + + describe "<r:find />" do + it "should retrieve current versions of found pages on the dev host" do + @page = pages(:parent) + @page.children.first.update_attributes(:slug => "kid", :status => Status[:draft]) + @page.should render('<r:find url="/parent/kid"><r:slug /></r:find>').as('kid').on('dev.site.com') + end + end + + describe "<r:parent />" do + it "should use the current version of the parent on the dev host" do + @page = pages(:parent) + @page.update_attributes(:slug => "parent-draft", :status => Status[:draft]) + pages(:child).should render('<r:parent><r:slug /></r:parent>').as('parent-draft').on('dev.site.com') + end + end + describe "overriding <r:snippet />" do before :each do snippet = snippets(:first) spec/models/page_spec.rb 2d17724b2919f48f1b02984a0e2ec92e2e60345a Jason Garber jg@jasongarber.com http://github.com/jgarber/radiant-chronicle-extension/commit/e7bdb91e1a2ab9d3ae6c35dc25e3fd9bfdefee84 e7bdb91e1a2ab9d3ae6c35dc25e3fd9bfdefee84 2009-07-14T14:17:09-07:00 2009-07-14T14:17:09-07:00 Make children, parent, and find Radius tags return current versions when in dev mode. c97ff2449983669af034b45d35fdf5e1f98a4da9 Jason Garber jg@jasongarber.com