radiant 0.6.4 → 0.6.5

data/app/helpers/admin/node_helper.rb

@@ -1,5 +1,5 @@
 module Admin::NodeHelper
-  
+
   def render_node(page, locals = {})
     @current_node = page
     locals.reverse_merge!(:level => 0, :simple => false).merge!(:page => page)
@@ -13,24 +13,27 @@ module Admin::NodeHelper
   def expanded_rows
     unless @expanded_rows
       @expanded_rows = case
-      when row_string = (cookies['expanded_rows'] || []).first
-        row_string.split(',').map { |x| Integer(x) rescue nil }.compact
+      when rows = cookies[:expanded_rows]
+        rows.split(',').map { |x| Integer(x) rescue nil }.compact
       else
         []
       end
-      (@expanded_rows << homepage.id).uniq if homepage
+
+      if homepage and !@expanded_rows.include?(homepage.id)
+        @expanded_rows << homepage.id
+      end
     end
     @expanded_rows
   end
-  
+
   def expanded
     show_all? || expanded_rows.include?(@current_node.id)
   end
-  
+
   def padding_left(level)
     (level * 22) + 4
   end
-  
+
   def children_class
     unless @current_node.children.empty?
       if expanded
@@ -42,30 +45,30 @@ module Admin::NodeHelper
       " no-children"
     end
   end
-  
+
   def virtual_class
     @current_node.virtual? ? " virtual": ""
   end
-  
+
   def expander
     unless @current_node.children.empty?
-      image((expanded ? "collapse" : "expand"), 
-            :class => "expander", :alt => 'toggle children', 
+      image((expanded ? "collapse" : "expand"),
+            :class => "expander", :alt => 'toggle children',
             :title => '')
     else
       ""
     end
   end
-  
+
   def icon
     icon_name = @current_node.virtual? ? 'virtual-page' : 'page'
     image(icon_name, :class => "icon", :alt => 'page-icon', :title => '')
   end
-  
+
   def node_title
     %{<span class="title">#{ @current_node.title }</span>}
   end
-  
+
   def page_type
     display_name = @current_node.class.display_name
     if display_name == 'Page'
@@ -74,11 +77,11 @@ module Admin::NodeHelper
       %{<small class="info">(#{ display_name })</small>}
     end
   end
-  
+
   def spinner
-    image('spinner.gif', 
-            :class => 'busy', :id => "busy-#{@current_node.id}", 
-            :alt => "",  :title => "", 
+    image('spinner.gif',
+            :class => 'busy', :id => "busy-#{@current_node.id}",
+            :alt => "",  :title => "",
             :style => 'display: none;')
   end
 end

data/app/helpers/application_helper.rb

@@ -41,17 +41,15 @@ module ApplicationHelper
       singular
     elsif plural
       plural
-    elsif Object.const_defined?("Inflector")
-      Inflector.pluralize(singular)
     else
-      singular + "s"
+      Inflector.pluralize(singular)
     end
   end
   
   def links_for_navigation
     tabs = admin.tabs
     links = tabs.map do |tab|
-      nav_link_to(tab.name, tab.url) if tab.shown_for?(current_user)
+      nav_link_to(tab.name, File.join(request.relative_url_root, tab.url)) if tab.shown_for?(current_user)
     end.compact
     links.join(separator)
   end
@@ -61,7 +59,7 @@ module ApplicationHelper
   end
   
   def current_url?(options)
-    url = case
+    url = case options
     when Hash
       url_for options
     else
@@ -76,7 +74,6 @@ module ApplicationHelper
   end
   
   def nav_link_to(name, options)
-    logger.debug 'options are: ' + options.to_s
     if current_url?(options)
       %{<strong>#{ link_to name, options }</strong>}
     else
@@ -93,13 +90,7 @@ module ApplicationHelper
   end
   
   def focus(field_name)
-    %{
-    <script type="text/javascript">
-    // <![CDATA[
-      Field.activate('#{field_name}');
-    // ]]>
-    </script>
-    }
+    javascript_tag "Field.activate('#{field_name}');"
   end
   
   def updated_stamp(model)

data/app/models/layout.rb

@@ -5,8 +5,8 @@ class Layout < ActiveRecord::Base
 
   # Associations
   has_many :pages
-  belongs_to :created_by, :class_name => 'User', :foreign_key => 'created_by'
-  belongs_to :updated_by, :class_name => 'User', :foreign_key => 'updated_by'
+  belongs_to :created_by, :class_name => 'User'
+  belongs_to :updated_by, :class_name => 'User'
 
   # Validations
   validates_presence_of :name, :message => 'required'

data/app/models/page.rb

@@ -10,9 +10,9 @@ class Page < ActiveRecord::Base
   # Associations
   acts_as_tree :order => 'virtual DESC, title ASC'
   has_many :parts, :class_name => 'PagePart', :order => 'id', :dependent => :destroy
-  belongs_to :_layout, :class_name => 'Layout', :foreign_key => 'layout_id'
-  belongs_to :created_by, :class_name => 'User', :foreign_key => 'created_by'
-  belongs_to :updated_by, :class_name => 'User', :foreign_key => 'updated_by'
+  belongs_to :layout
+  belongs_to :created_by, :class_name => 'User'
+  belongs_to :updated_by, :class_name => 'User'
   
   # Validations
   validates_presence_of :title, :slug, :breadcrumb, :status_id, :message => 'required'
@@ -36,13 +36,22 @@ class Page < ActiveRecord::Base
   
   set_inheritance_column :class_name
   
-  def layout
-    unless _layout
+  def layout_with_inheritance
+    unless layout_without_inheritance
       parent.layout if parent?
     else
-      _layout
+      layout_without_inheritance
     end
   end
+  alias_method_chain :layout, :inheritance
+  
+  def description
+    self["description"]
+  end
+  
+  def description=(value)
+    self["description"] = value
+  end
   
   def cache?
     true
@@ -73,7 +82,7 @@ class Page < ActiveRecord::Base
   end
   
   def inherits_part?(name)
-    !has_part?(name) && self.ancestors.any? {|page| page.has_part?(name)}
+    !has_part?(name) && self.ancestors.any? { |page| page.has_part?(name) }
   end
     
   def published?
@@ -87,10 +96,6 @@ class Page < ActiveRecord::Base
     self.status_id = value.id
   end
   
-  def virtual
-    !(read_attribute('virtual').to_s =~ /^(false|f|0|)$/)
-  end
-  
   def url
     if parent?
       parent.child_url(self)
@@ -148,9 +153,9 @@ class Page < ActiveRecord::Base
         return found if found
       end
       file_not_found_types = [FileNotFoundPage] + FileNotFoundPage.descendants
-      condition = (['class_name = ?']*file_not_found_types.length).join(' or ')
-      file_not_found_names = file_not_found_types.map {|x| x.name}.uniq
-      children.find(:first, :conditions => [condition]+file_not_found_names)
+      condition = (['class_name = ?'] * file_not_found_types.length).join(' or ')
+      file_not_found_names = file_not_found_types.map { |x| x.name }.uniq
+      children.find(:first, :conditions => [condition] + file_not_found_names)
     end
   end
   
@@ -221,15 +226,15 @@ class Page < ActiveRecord::Base
     end
   
     def update_published_at
-      write_attribute('published_at', Time.now) if (status_id.to_i == Status[:published].id) and published_at.nil?
+      write_attribute(:published_at, Time.now) if published? and !published_at
       true
     end
     
     def update_virtual
-      if self.class != Page.descendant_class(class_name)
-        write_attribute('virtual', Page.descendant_class(class_name).new.virtual?)
+      unless self.class == Page.descendant_class(class_name)
+        self.virtual = Page.descendant_class(class_name).new.virtual?
       else
-        write_attribute('virtual', virtual?)
+        self.virtual = virtual?
       end
       true
     end
@@ -246,7 +251,7 @@ class Page < ActiveRecord::Base
       unless @parser and @context
         @context = PageContext.new(self)
         @parser = Radius::Parser.new(@context, :tag_prefix => 'r')
-      end
+      end
       @parser
     end
     
@@ -259,8 +264,7 @@ class Page < ActiveRecord::Base
       text = parse(text)
       text = object.filter.filter(text) if object.respond_to? :filter_id
       text
-    end
-  
+    end  
 end
 
 Page.load_subclasses

data/app/models/page_context.rb

@@ -4,10 +4,8 @@ class PageContext < Radius::Context
   
   def initialize(page)
     super()
-    
     @page = page
     globals.page = @page
-    
     page.tags.each do |name|
       define_tag(name) { |tag_binding| page.render_tag(name, tag_binding) }
     end
@@ -19,7 +17,7 @@ class PageContext < Radius::Context
     set_process_variables(locals.page)
     super
   rescue Exception => e
-    raise e if testing?
+    raise e if raise_errors?
     @tag_binding_stack.pop unless @tag_binding_stack.last == binding
     render_error_message(e.message)
   end
@@ -41,8 +39,8 @@ class PageContext < Radius::Context
       page.response ||= @page.response
     end
     
-    def testing?
-      RAILS_ENV == 'test'
+    def raise_errors?
+      RAILS_ENV != 'production'
     end
     
 end

data/app/models/response_cache.rb

@@ -55,22 +55,22 @@ class ResponseCache
     response
   end
   
-  # Returns true if a response is cached at the specified path.
+  # Returns metadata for path.
   def read_metadata(path)
     path = clean(path)
     name = "#{page_cache_path(path)}.yml"
     if File.exists?(name) and not File.directory?(name)
-      content = File.open(name,"rb") { |f| f.read }
-      metadata = YAML::load(content)
-      if(metadata['expires']  >= Time.now)
-        return metadata
-      end
-    end
-  rescue
+      content = File.open(name, "rb") { |f| f.read }
+      metadata = YAML::load(content)
+      metadata if metadata['expires'] >= Time.now
+    end
+  rescue
     nil
   end
+  
+  # Returns true if a response is cached at the specified path.
   def response_cached?(path)
-    !!read_metadata(path)
+    perform_caching && !!read_metadata(path)
   end
     
   # Expires the cached response for the specified path.
@@ -92,12 +92,6 @@ class ResponseCache
   end
   
   private
-    # Construct the filename for the file in the cache directory for path    
-    # This DOES NOT include the extension
-    def page_cache_file(path)
-      name = ((path.empty? || path == "/") ? "/index" : URI.unescape(path))
-    end
-    
     # Ensures that path begins with a slash and remove extra slashes.
     def clean(path)
       path = path.gsub(%r{/+}, '/')
@@ -105,7 +99,6 @@ class ResponseCache
       "/#{$1}"
     end
 
-    
     # Reads a cached response from disk and updates a response object.
     def read_response(path, response, request)
       file_path = page_cache_path(path)
@@ -148,12 +141,11 @@ class ResponseCache
       cache_page(metadata, response.body, path)
     end
 
-    def page_cache_path(path)
-      root_dir = File.expand_path(page_cache_directory)
-      cache_path = File.expand_path(File.join(root_dir,path), root_dir)
-      if(cache_path.index(root_dir) == 0)
-        cache_path
-      end
+    def page_cache_path(path)
+      path = (path.empty? || path == "/") ? "/_site-root" : URI.unescape(path)
+      root_dir = File.expand_path(page_cache_directory)
+      cache_path = File.expand_path(File.join(root_dir, path), root_dir)
+      cache_path if cache_path.index(root_dir) == 0
     end
 
     def expire_page(path)
@@ -163,20 +155,20 @@ class ResponseCache
         benchmark "Expired page: #{path}" do
           File.delete("#{path}.yml") if File.exists?("#{path}.yml")
           File.delete("#{path}.data") if File.exists?("#{path}.data")
-        end
+        end
       end
     end
 
     def cache_page(metadata, content, path)
       return unless perform_caching
 
-      if path = page_cache_path(path)
+      if path = page_cache_path(path)
         benchmark "Cached page: #{path}" do
-          FileUtils.makedirs(File.dirname(path))
+          FileUtils.makedirs(File.dirname(path))
           #dont want yml without data
-          File.open("#{path}.data", "wb+") { |f| f.write(content) }
+          File.open("#{path}.data", "wb+") { |f| f.write(content) }
           File.open("#{path}.yml", "wb+") { |f| f.write(metadata) }
-        end
+        end
       end
     end
 end

data/app/models/snippet.rb

@@ -4,8 +4,8 @@ class Snippet < ActiveRecord::Base
   order_by 'name'
   
   # Associations
-  belongs_to :created_by, :class_name => 'User', :foreign_key => 'created_by'
-  belongs_to :updated_by, :class_name => 'User', :foreign_key => 'updated_by'
+  belongs_to :created_by, :class_name => 'User'
+  belongs_to :updated_by, :class_name => 'User'
 
   # Validations
   validates_presence_of :name, :message => 'required'

data/app/models/standard_tags.rb

@@ -16,15 +16,22 @@ module StandardTags
     tag.expand
   end
   
-  [:breadcrumb, :slug, :title, :url].each do |method|
+  [:breadcrumb, :slug, :title].each do |method|
     desc %{ 
       Renders the @#{method}@ attribute of the current page.
     }
-    tag(method.to_s) do |tag|
+    tag method.to_s do |tag|
       tag.locals.page.send(method)
     end
   end
   
+  desc %{
+    Renders the @url@ attribute of the current page.
+  }
+  tag 'url' do |tag|
+    relative_url_for(tag.locals.page.url, tag.globals.page.request)
+  end
+  
   desc %{
     Gives access to a page's children.
     
@@ -100,8 +107,9 @@ module StandardTags
   end
   
   desc %{
-    Page attribute tags inside of this tag refer to the current child. Not needed in
-    most cases.
+    Page attribute tags inside of this tag refer to the current child. This is occasionally
+    useful if you are inside of another tag (like <r:find>) and need to refer back to the
+    current child.
     
     *Usage:*
     <pre><code><r:children:each>
@@ -261,12 +269,9 @@ module StandardTags
       end
     end
     contextual = boolean_attr['contextual', true]
-    if inherit and contextual
-      part = part_page.part(part_name)
-      page.render_snippet(part) unless part.nil?
-    else
-      part_page.render_part(part_name)
-    end
+    part = part_page.part(part_name)
+    tag.locals.page = part_page unless contextual
+    tag.globals.page.render_snippet(part) unless part.nil?
   end
   
   desc %{ 
@@ -327,6 +332,30 @@ module StandardTags
         tag.expand
     end
   end
+
+  desc %{
+    Renders the contained elements if the current contextual page is either the actual page or one of its parents.
+    
+    This is typically used inside another tag (like &lt;r:children:each&gt;) to add conditional mark-up if the child element is or descends from the current page.
+    
+    *Usage:*
+    <pre><code><r:if_ancestor_or_self>...</if_ancestor_or_self></code></pre>
+  }  
+  tag "if_ancestor_or_self" do |tag|
+    tag.expand if (tag.globals.page.ancestors + [tag.globals.page]).include?(tag.locals.page)
+  end
+  
+  desc %{
+    Renders the contained elements if the current contextual page is also the actual page.
+    
+    This is typically used inside another tag (like &lt;r:children:each&gt;) to add conditional mark-up if the child element is the current page.
+    
+    *Usage:*
+    <pre><code><r:if_self>...</if_self></code></pre>
+  }
+  tag "if_self" do |tag|
+    tag.expand if tag.locals.page == tag.globals.page
+  end
   
   desc %{
     Renders the name of the author of the current page.
@@ -393,16 +422,23 @@ module StandardTags
   desc %{
     Renders a trail of breadcrumbs to the current page. The separator attribute
     specifies the HTML fragment that is inserted between each of the breadcrumbs. By
-    default it is set to @>@.
+    default it is set to @>@. The boolean nolinks attribute can be specified to render
+    breadcrumbs in plain text, without any links (useful when generating title tag).
     
     *Usage:* 
-    <pre><code><r:breadcrumbs [separator="separator_string"] /></code></pre>
+    <pre><code><r:breadcrumbs [separator="separator_string"] [nolinks="true"] /></code></pre>
   }
   tag 'breadcrumbs' do |tag|
     page = tag.locals.page
     breadcrumbs = [page.breadcrumb]
+    nolinks = (tag.attr['nolinks'] == 'true')
     page.ancestors.each do |ancestor|
-      breadcrumbs.unshift %{<a href="#{ancestor.url}">#{ancestor.breadcrumb}</a>}
+      tag.locals.page = ancestor
+      if nolinks
+        breadcrumbs.unshift tag.render('breadcrumb')
+      else
+        breadcrumbs.unshift %{<a href="#{tag.render('url')}">#{tag.render('breadcrumb')}</a>}
+      end
     end
     separator = tag.attr['separator'] || ' &gt; '
     breadcrumbs.join(separator)
@@ -425,23 +461,22 @@ module StandardTags
       raise 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.
+    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|
-    if url = tag.attr['url']
-      if found = Page.find_by_url(tag.attr['url'])
-        unless FileNotFoundPage === found
-          tag.locals.page = found
-          tag.expand
-        end
-      end
-    else
-      raise TagError.new("`find' tag must contain `url' attribute")
+    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))
+    if page_found?(found)
+      tag.locals.page = found
+      tag.expand
     end
   end
   
@@ -547,7 +582,7 @@ module StandardTags
       end
     end
     between = hash.has_key?(:between) ? hash[:between].call : ' '
-    result.join(between)
+    result.reject { |i| i.blank? }.join(between)
   end
   [:normal, :here, :selected, :between].each do |symbol|
     tag "navigation:#{symbol}" do |tag|
@@ -598,6 +633,77 @@ module StandardTags
     end
   end
   
+  desc %{
+    Prints the page's status as a string.  Optional attribute 'downcase' 
+    will cause the status to be all lowercase.
+    
+    *Usage:*
+    <pre><code><r:status [downcase='true'] /></code></pre>
+  }
+  tag 'status' do |tag|
+    status = tag.globals.page.status.name
+    return status.downcase if tag.attr['downcase']
+    status
+  end
+  
+  desc %{
+    The namespace for 'meta' attributes.  If used as a singleton tag, both the description
+    and keywords fields will be output as &lt;meta /&gt; tags unless the attribute 'tag' is set to 'false'.
+    
+    *Usage*:
+    
+    <pre><code> <r:meta [tag="false"] /> 
+     <r:meta>
+       <r:description [tag="false"] />
+       <r:keywords [tag="false"] />
+     </r:meta>
+    </code></pre>
+  }
+  tag 'meta' do |tag|
+    if tag.double?
+      tag.expand
+    else
+      tag.render('description', tag.attr) +
+      tag.render('keywords', tag.attr)
+    end
+  end
+  
+  desc %{
+    Emits the page description field in a meta tag, unless attribute
+    'tag' is set to 'false'.
+    
+    *Usage*:
+    
+    <pre><code> <r:meta:description [tag="false"] /> </code></pre>
+  }
+  tag 'meta:description' do |tag|
+    show_tag = tag.attr['tag'] != 'false' || false
+    description = CGI.escapeHTML(tag.locals.page.description)
+    if show_tag
+      "<meta name=\"description\" content=\"#{description}\" />"
+    else
+      description
+    end
+  end
+
+  desc %{
+    Emits the page keywords field in a meta tag, unless attribute
+    'tag' is set to 'false'.
+    
+    *Usage*:
+    
+    <pre><code> <r:meta:keywords [tag="false"] /> </code></pre>
+  }  
+  tag 'meta:keywords' do |tag|
+    show_tag = tag.attr['tag'] != 'false' || false
+    keywords = CGI.escapeHTML(tag.locals.page.keywords)
+    if show_tag
+      "<meta name=\"keywords\" content=\"#{keywords}\" />"
+    else
+      keywords
+    end    
+  end
+  
   private
   
     def children_find_options(tag)
@@ -660,5 +766,21 @@ module StandardTags
         raise TagError.new("Malformed regular expression in `#{attribute_name}' argument of `#{tag.name}' tag: #{e.message}")
       end
       regexp
-    end   
+    end
+    
+    def relative_url_for(url, request)
+      File.join(request.relative_url_root, url)
+    end
+    
+    def absolute_path_for(base_path, new_path)
+      if new_path.first == '/'
+        new_path
+      else
+        File.expand_path(File.join(base_path, new_path))
+      end
+    end
+    
+    def page_found?(page)
+      page && !(FileNotFoundPage === page)
+    end
 end