radiant 0.6.9 → 0.7.0

data/app/controllers/admin/snippets_controller.rb

@@ -0,0 +1,2 @@
+class Admin::SnippetsController < Admin::ResourceController
+end

data/app/controllers/admin/users_controller.rb

@@ -0,0 +1,21 @@
+class Admin::UsersController < Admin::ResourceController
+  only_allow_access_to :index, :show, :new, :create, :edit, :update, :remove, :destroy,
+    :when => :admin,
+    :denied_url => { :controller => 'pages', :action => 'index' },
+    :denied_message => 'You must have administrative privileges to perform this action.'
+
+  before_filter :ensure_deletable, :only => [:remove, :destroy]
+  
+  def ensure_deletable
+    if current_user.id.to_s == params[:id].to_s
+      announce_cannot_delete_self
+      redirect_to admin_users_url
+    end
+  end
+  
+  private
+  
+    def announce_cannot_delete_self
+      flash[:error] = 'You cannot delete yourself.'
+    end  
+end

data/app/controllers/admin/welcome_controller.rb

@@ -3,7 +3,7 @@ class Admin::WelcomeController < ApplicationController
   skip_before_filter :verify_authenticity_token
   
   def index
-    redirect_to page_index_url
+    redirect_to admin_pages_url
   end
   
   def login

data/app/controllers/application.rb

@@ -2,6 +2,7 @@ require_dependency 'radiant'
 
 class ApplicationController < ActionController::Base
   include LoginSystem
+  include Radiant::LegacyRoutes
   
   filter_parameter_logging :password, :password_confirmation
   
@@ -10,11 +11,12 @@ class ApplicationController < ActionController::Base
   before_filter :set_current_user
   before_filter :set_javascripts_and_stylesheets
   
-  attr_accessor :config
+  attr_accessor :config, :cache
   
   def initialize
     super
     @config = Radiant::Config
+    @cache = ResponseCache.instance
   end
   
   # helpers to include additional assets from actions or views
@@ -44,7 +46,9 @@ class ApplicationController < ActionController::Base
     end
   
     def set_javascripts_and_stylesheets
-      @stylesheets = %w(admin/main)
-      @javascripts = %w(prototype string effects admin/tabcontrol admin/ruledtable admin/admin)
+      @stylesheets ||= []
+      @stylesheets.concat %w(admin/main)
+      @javascripts ||= []
+      @javascripts.concat %w(prototype string effects admin/tabcontrol admin/ruledtable admin/admin)
     end
 end

data/app/controllers/site_controller.rb

@@ -4,13 +4,6 @@ class SiteController < ApplicationController
   
   no_login_required
   
-  attr_accessor :config, :cache
-  
-  def initialize
-    @config = Radiant::Config
-    @cache = ResponseCache.instance
-  end
-  
   def show_page
     response.headers.delete('Cache-Control')
     

data/app/helpers/admin/extensions_helper.rb

@@ -0,0 +1,2 @@
+module Admin::ExtensionsHelper
+end

data/app/helpers/admin/layouts_helper.rb

@@ -0,0 +1,2 @@
+module Admin::LayoutsHelper
+end

data/app/helpers/admin/pages_helper.rb

@@ -0,0 +1,59 @@
+module Admin::PagesHelper
+  include Admin::NodeHelper
+  include Admin::ReferencesHelper
+  
+  def class_of_page
+    @page.class
+  end
+  
+  def filter
+    @page.parts.first.filter
+  end
+  
+  def meta_errors?
+    !!(@page.errors[:slug] or @page.errors[:breadcrumb])
+  end
+
+  def default_filter_name
+    @page.parts.empty? ? "" : @page.parts[0].filter_id
+  end
+
+  def homepage
+    @homepage ||= Page.find_by_parent_id(nil)
+  end
+
+  def page_edit_javascripts
+    <<-CODE
+    var last_type = "#{@page.class_name}";
+    function load_tag_reference(part) {
+      page_type = $F('page_class_name');
+      popup = $('tag-reference-popup');
+      if(last_type != page_type) {
+        url = "#{admin_reference_path(:id => 'tags')}";
+        params = "class_name=" + page_type;
+        new Effect.Highlight('tag-reference-link-'+ part);
+        req = new Ajax.Request(url, { method: 'get', parameters: params, evalScripts: true });
+      } else {
+         center(popup);
+         Element.toggle(popup);
+      }
+      return false;
+    }
+    var last_filter = "#{default_filter_name}";
+    function load_filter_reference(part) {
+      filter_type = $F("part_" + part + "_filter_id");
+      popup = $('filter-reference-popup');
+      if(last_filter != filter_type) {
+        url = "#{admin_reference_path(:id => 'filters')}";
+        params = "filter_name=" + filter_type;
+        new Effect.Highlight('filter-reference-link-'+ part);
+        req = new Ajax.Request(url, { method: 'get', parameters: params, evalScripts: true });
+      } else {
+        center(popup);
+        Element.toggle(popup);
+      }
+      return false;
+    }
+    CODE
+  end
+end

data/app/helpers/admin/preferences_helper.rb

@@ -0,0 +1,2 @@
+module Admin::PreferencesHelper
+end

data/app/helpers/admin/references_helper.rb

@@ -0,0 +1,42 @@
+module Admin::ReferencesHelper
+  def tag_reference
+    returning String.new do |output|
+      class_of_page.tag_descriptions.sort.each do |tag_name, description|
+        output << render(:partial => "admin/references/tag_reference", 
+            :locals => {:tag_name => tag_name, :description => description})
+      end
+    end
+  end
+  
+  def filter_reference
+    unless filter.blank?
+      if filter.description.blank? 
+        "There is no documentation on this filter." 
+      else
+        filter.description
+      end
+    else
+      "There is no filter on the current page part."
+    end
+  end
+  
+  def _display_name
+    case params[:id]
+    when 'filters'
+      filter ? filter.filter_name : '<none>'
+    when 'tags'
+      class_of_page.display_name
+    end
+  end
+  
+  def filter
+    @filter ||= begin
+      filter_name = params[:filter_name]
+      (filter_name.gsub(" ", "") + "Filter").constantize unless filter_name.blank?
+    end
+  end
+
+  def class_of_page
+    @page_class ||= (params[:class_name] || 'Page').constantize
+  end
+end

data/app/helpers/admin/snippets_helper.rb

@@ -0,0 +1,2 @@
+module Admin::SnippetsHelper
+end

data/app/helpers/admin/users_helper.rb

@@ -0,0 +1,8 @@
+module Admin::UsersHelper
+  def roles(user)
+    roles = []
+    roles << 'Administrator' if user.admin?
+    roles << 'Developer' if user.developer?
+    roles.join(', ')
+  end
+end

data/app/helpers/application_helper.rb

@@ -1,6 +1,7 @@
 module ApplicationHelper
   include LocalTime
   include Admin::RegionsHelper
+  include Radiant::LegacyRoutes
   
   def config
     Radiant::Config
@@ -22,13 +23,12 @@ module ApplicationHelper
     !current_user.nil?
   end
   
-  def save_model_button(model)
-    label = if model.new_record?
-      "Create #{model.class.name}"
-    else
-      'Save Changes'
-    end
-    submit_tag label, :class => 'button'
+  def save_model_button(model, options = {})
+    options[:label] ||= model.new_record? ?
+      "Create #{model.class.name}" : "Save Changes"
+    options[:class] ||= "button"
+
+    submit_tag options.delete(:label), options
   end
   
   def save_model_and_continue_editing_button(model)
@@ -43,7 +43,7 @@ module ApplicationHelper
     elsif plural
       plural
     else
-      Inflector.pluralize(singular)
+      ActiveSupport::Inflector.pluralize(singular)
     end
   end
   
@@ -145,6 +145,10 @@ module ApplicationHelper
     Radiant::AdminUI.instance
   end
   
+  def filter_options_for_select(selected=nil)
+    options_for_select([['<none>', '']] + TextFilter.descendants.map { |s| s.filter_name }.sort, selected)
+  end
+  
   private
   
     def append_image_extension(name)

data/app/models/page.rb

@@ -6,6 +6,7 @@ class Page < ActiveRecord::Base
   
   # Callbacks
   before_save :update_published_at, :update_virtual
+  after_save :save_page_parts
   
   # Associations
   acts_as_tree :order => 'virtual DESC, title ASC'
@@ -45,6 +46,22 @@ class Page < ActiveRecord::Base
   end
   alias_method_chain :layout, :inheritance
   
+  def parts_with_pending(reload = false)
+    @page_parts = nil if reload
+    @page_parts || parts_without_pending(reload)
+  end
+  alias_method_chain :parts, :pending
+  
+  def parts_with_pending=(collection)
+    if collection.all? {|item| item.is_a? PagePart }
+      self.parts_without_pending = collection
+    else
+      self.updated_at_will_change!
+      @page_parts = collection.map { |item| PagePart.new(item) }
+    end
+  end
+  alias_method_chain :parts=, :pending
+  
   def description
     self["description"]
   end
@@ -160,6 +177,10 @@ class Page < ActiveRecord::Base
     end
   end
   
+  def to_xml(options={}, &block)
+    super(options.reverse_merge(:include => :parts), &block)
+  end
+  
   class << self
     def find_by_url(url, live = true)
       root = find_by_parent_id(nil)
@@ -191,7 +212,7 @@ class Page < ActiveRecord::Base
           $1.camelize.constantize if page =~ %r{/([^/]+)\.rb}
         end
       end
-      unless Page.connection.tables.empty? # Haven't bootstrapped yet
+      if ActiveRecord::Base.connection.tables.include?('pages') && Page.column_names.include?('class_name') # Assume that we have bootstrapped
         Page.connection.select_values("SELECT DISTINCT class_name FROM pages WHERE class_name <> '' AND class_name IS NOT NULL").each do |p|
           begin
             p.constantize
@@ -244,7 +265,7 @@ class Page < ActiveRecord::Base
     end
   
     def update_published_at
-      write_attribute(:published_at, Time.now) if published? and !published_at
+      self[:published_at] = Time.now if published? and !published_at
       true
     end
     
@@ -282,5 +303,14 @@ class Page < ActiveRecord::Base
       text = parse(text)
       text = object.filter.filter(text) if object.respond_to? :filter_id
       text
-    end  
+    end
+    
+    def save_page_parts
+      if @page_parts
+        self.parts_without_pending.clear
+        @page_parts.each {|p| self.parts_without_pending << p }
+      end
+      @page_parts = nil
+      true
+    end
 end

data/app/models/page_part.rb

@@ -13,5 +13,9 @@ class PagePart < ActiveRecord::Base
   validates_numericality_of :id, :page_id, :allow_nil => true, :only_integer => true, :message => 'must be a number'
   
   object_id_attr :filter, TextFilter
-  
+
+  def after_initialize
+    self.filter_id ||= Radiant::Config['defaults.page.filter'] if new_record?
+  end
+
 end

data/app/models/radiant/config.rb

@@ -54,14 +54,14 @@ module Radiant
     end
     
     def value=(param)
-      write_attribute :value, param.to_s
+      self[:value] = param.to_s
     end
     
     def value
       if key.ends_with? "?"
-        read_attribute(:value) == "true"
+        self[:value] == "true"
       else
-        read_attribute(:value)
+        self[:value]
       end
     end
   end

data/app/models/response_cache.rb

@@ -1,3 +1,4 @@
+
 class ResponseCache
   include ActionController::Benchmarking::ClassMethods
   
@@ -7,11 +8,12 @@ class ResponseCache
     :default_extension => '.yml',
     :perform_caching => true,
     :logger => ActionController::Base.logger,
-    :use_x_sendfile => false
+    :use_x_sendfile => false,
+    :use_x_accel_redirect => false
   }
   cattr_accessor :defaults
   
-  attr_accessor :directory, :expire_time, :default_extension, :perform_caching, :logger, :use_x_sendfile
+  attr_accessor :directory, :expire_time, :default_extension, :perform_caching, :logger, :use_x_sendfile, :use_x_accel_redirect
   alias :page_cache_directory :directory
   alias :page_cache_extension :default_extension
   private :benchmark, :silence, :page_cache_directory,
@@ -29,12 +31,13 @@ class ResponseCache
   # 
   def initialize(options = {})
     options = options.symbolize_keys.reverse_merge(defaults)
-    self.directory         = options[:directory]
-    self.expire_time       = options[:expire_time]
-    self.default_extension = options[:default_extension]
-    self.perform_caching   = options[:perform_caching]
-    self.logger            = options[:logger]
-    self.use_x_sendfile    = options[:use_x_sendfile]
+    self.directory            = options[:directory]
+    self.expire_time          = options[:expire_time]
+    self.default_extension    = options[:default_extension]
+    self.perform_caching      = options[:perform_caching]
+    self.logger               = options[:logger]
+    self.use_x_sendfile       = options[:use_x_sendfile]
+    self.use_x_accel_redirect = options[:use_x_accel_redirect]
   end
   
   # Caches a response object for path to disk.
@@ -106,6 +109,8 @@ class ResponseCache
         response.headers.merge!(metadata['headers'] || {})
         if client_has_cache?(metadata, request)
           response.headers.merge!('Status' => '304 Not Modified')
+        elsif use_x_accel_redirect
+          response.headers.merge!('X-Accel-Redirect' => "#{file_path}.data")
         elsif use_x_sendfile
           response.headers.merge!('X-Sendfile' => "#{file_path}.data")
         else
@@ -116,10 +121,12 @@ class ResponseCache
     end
 
     def client_has_cache?(metadata, request)
-        return false unless request
-        request_time = Time.httpdate(request.env["HTTP_IF_MODIFIED_SINCE"]) rescue nil
-        response_time = Time.httpdate(metadata['headers']['Last-Modified']) rescue nil
-        return request_time && response_time && response_time <= request_time
+      return false unless request
+      request_time = Time.httpdate(request.env["HTTP_IF_MODIFIED_SINCE"]) rescue nil
+      response_time = Time.httpdate(metadata['headers']['Last-Modified']) rescue nil
+      request_etag = request.env["HTTP_IF_NONE_MATCH"] rescue nil
+      response_etag = metadata['headers']['ETag'] rescue nil
+      (request_time && response_time && response_time <= request_time) || (request_etag && response_etag && request_etag == response_etag)
     end
     
     # Writes a response to disk.
@@ -134,6 +141,7 @@ class ResponseCache
         expires = Time.now + self.expire_time
       end
       response.headers['Last-Modified'] ||= Time.now.httpdate
+      response.headers['ETag'] ||= Digest::SHA1.hexdigest(response.body)
       metadata = {
         'headers' => response.headers,
         'expires' => expires

data/app/models/standard_tags.rb

@@ -1,60 +1,63 @@
 module StandardTags
-  
+
   include Radiant::Taggable
   include LocalTime
-    
+
   class TagError < StandardError; end
-  
+
   desc %{
     Causes the tags referring to a page's attributes to refer to the current page.
+
+    *Usage:*
     
-    *Usage:* 
     <pre><code><r:page>...</r:page></code></pre>
   }
   tag 'page' do |tag|
     tag.locals.page = tag.globals.page
     tag.expand
   end
-  
+
   [:breadcrumb, :slug, :title].each do |method|
-    desc %{ 
+    desc %{
       Renders the @#{method}@ attribute of the current page.
     }
     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.
-    
+
     *Usage:*
+    
     <pre><code><r:children>...</r:children></code></pre>
   }
   tag 'children' do |tag|
     tag.locals.children = tag.locals.page.children
     tag.expand
   end
-  
+
   desc %{
     Renders the total number of children.
   }
   tag 'children:count' do |tag|
-    tag.locals.children.count
+    tag.locals.children.count(children_find_options(tag))
   end
-  
+
   desc %{
     Returns the first child. Inside this tag all page attribute tags are mapped to
     the first child. Takes the same ordering options as @<r:children:each>@.
-    
+
     *Usage:*
+    
     <pre><code><r:children:first>...</r:children:first></code></pre>
   }
   tag 'children:first' do |tag|
@@ -65,12 +68,13 @@ module StandardTags
       tag.expand
     end
   end
-  
+
   desc %{
     Returns the last child. Inside this tag all page attribute tags are mapped to
     the last child. Takes the same ordering options as @<r:children:each>@.
-    
+
     *Usage:*
+    
     <pre><code><r:children:last>...</r:children:last></code></pre>
   }
   tag 'children:last' do |tag|
@@ -81,13 +85,14 @@ module StandardTags
       tag.expand
     end
   end
-  
+
   desc %{
     Cycles through each of the children. Inside this tag all page attribute tags
     are mapped to the current child page.
-    
+
     *Usage:*
-    <pre><code><r:children:each [offset="number"] [limit="number"] [by="attribute"] [order="asc|desc"] 
+    
+    <pre><code><r:children:each [offset="number"] [limit="number"] [by="attribute"] [order="asc|desc"]
      [status="draft|reviewed|published|hidden|all"]>
      ...
     </r:children:each>
@@ -98,20 +103,24 @@ module StandardTags
     result = []
     children = tag.locals.children
     tag.locals.previous_headers = {}
-    children.find(:all, options).each do |item|
+    kids = children.find(:all, options)
+    kids.each_with_index do |item, i|
       tag.locals.child = item
       tag.locals.page = item
+      tag.locals.first_child = i == 0
+      tag.locals.last_child = i == kids.length - 1
       result << tag.expand
-    end 
+    end
     result
   end
-  
+
   desc %{
     Page attribute tags inside of this tag refer to the current child. This is occasionally
     useful if you are inside of another tag (like &lt;r:find&gt;) and need to refer back to the
     current child.
-    
+
     *Usage:*
+    
     <pre><code><r:children:each>
       <r:child>...</r:child>
     </r:children:each>
@@ -122,19 +131,94 @@ module StandardTags
     tag.expand
   end
   
+  desc %{
+    Renders the tag contents only if the current page is the first child in the context of
+    a children:each tag
+    
+    *Usage:*
+    
+    <pre><code><r:children:each>
+      <r:if_first >
+        ...
+      </r:if_first>
+    </r:children:each>
+    </code></pre>
+    
+  }
+  tag 'children:each:if_first' do |tag|
+    tag.expand if tag.locals.first_child
+  end
+
+  
+  desc %{
+    Renders the tag contents unless the current page is the first child in the context of
+    a children:each tag
+    
+    *Usage:*
+    
+    <pre><code><r:children:each>
+      <r:unless_first >
+        ...
+      </r:unless_first>
+    </r:children:each>
+    </code></pre>
+    
+  }
+  tag 'children:each:unless_first' do |tag|
+    tag.expand unless tag.locals.first_child
+  end
+  
+  desc %{
+    Renders the tag contents only if the current page is the last child in the context of
+    a children:each tag
+    
+    *Usage:*
+    
+    <pre><code><r:children:each>
+      <r:if_last >
+        ...
+      </r:if_last>
+    </r:children:each>
+    </code></pre>
+    
+  }
+  tag 'children:each:if_last' do |tag|
+    tag.expand if tag.locals.last_child
+  end
+
+  
+  desc %{
+    Renders the tag contents unless the current page is the last child in the context of
+    a children:each tag
+    
+    *Usage:*
+    
+    <pre><code><r:children:each>
+      <r:unless_last >
+        ...
+      </r:unless_last>
+    </r:children:each>
+    </code></pre>
+    
+  }
+  tag 'children:each:unless_last' do |tag|
+    tag.expand unless tag.locals.last_child
+  end
+  
   desc %{
     Renders the tag contents only if the contents do not match the previous header. This
     is extremely useful for rendering date headers for a list of child pages.
-    
+
     If you would like to use several header blocks you may use the @name@ attribute to
     name the header. When a header is named it will not restart until another header of
     the same name is different.
-    
+
     Using the @restart@ attribute you can cause other named headers to restart when the
     present header changes. Simply specify the names of the other headers in a semicolon
     separated list.
-    
+
     *Usage:*
+    
     <pre><code><r:children:each>
       <r:header [name="header_name"] [restart="name1[;name2;...]"]>
         ...
@@ -157,11 +241,12 @@ module StandardTags
       header
     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|
@@ -169,67 +254,72 @@ module StandardTags
     tag.locals.page = parent
     tag.expand if parent
   end
-  
+
   desc %{
-    Renders the contained elements only if the current contextual page has a parent, i.e. 
+    Renders the contained elements only if the current contextual page has a parent, i.e.
     is not the root page.
-    
+
     *Usage:*
+    
     <pre><code><r:if_parent>...</r:if_parent></code></pre>
   }
   tag "if_parent" do |tag|
     parent = tag.locals.page.parent
     tag.expand if parent
   end
-  
+
   desc %{
-    Renders the contained elements only if the current contextual page has no parent, i.e. 
+    Renders the contained elements only if the current contextual page has no parent, i.e.
     is the root page.
-    
+
     *Usage:*
+    
     <pre><code><r:unless_parent>...</r:unless_parent></code></pre>
   }
   tag "unless_parent" do |tag|
     parent = tag.locals.page.parent
     tag.expand unless parent
   end
-  
+
   desc %{
     Renders the contained elements only if the current contextual page has one or
     more child pages.  The @status@ attribute limits the status of found child pages
     to the given status, the default is @"published"@. @status="all"@ includes all
     non-virtual pages regardless of status.
-    
+
     *Usage:*
+    
     <pre><code><r:if_children [status="published"]>...</r:if_children></code></pre>
   }
   tag "if_children" do |tag|
     children = tag.locals.page.children.count(:conditions => children_find_options(tag)[:conditions])
     tag.expand if children > 0
   end
-  
+
   desc %{
     Renders the contained elements only if the current contextual page has no children.
     The @status@ attribute limits the status of found child pages to the given status,
-    the default is @"published"@. @status="all"@ includes all non-virtual pages 
+    the default is @"published"@. @status="all"@ includes all non-virtual pages
     regardless of status.
-    
+
     *Usage:*
+    
     <pre><code><r:unless_children [status="published"]>...</r:unless_children></code></pre>
   }
   tag "unless_children" do |tag|
     children = tag.locals.page.children.count(:conditions => children_find_options(tag)[:conditions])
     tag.expand unless children > 0
   end
-  
+
   desc %{
     Renders one of the passed values based on a global cycle counter.  Use the @reset@
-    attribute to reset the cycle to the beginning.  Use the @name@ attribute to track 
+    attribute to reset the cycle to the beginning.  Use the @name@ attribute to track
     multiple cycles; the default is @cycle@.
-    
+
     *Usage:*
+    
     <pre><code><r:cycle values="first, second, third" [reset="true|false"] [name="cycle"] /></code></pre>
-  } 
+  }
   tag 'cycle' do |tag|
     raise TagError, "`cycle' tag must contain a `values' attribute." unless tag.attr['values']
     cycle = (tag.globals.cycle ||= {})
@@ -240,8 +330,8 @@ module StandardTags
     cycle[cycle_name] = (current_index + 1) % values.size
     values[current_index]
   end
-  
-  desc %{ 
+
+  desc %{
     Renders the main content of a page. Use the @part@ attribute to select a specific
     page part. By default the @part@ attribute is set to body. Use the @inherit@
     attribute to specify that if a page does not have a content part by that name that
@@ -249,8 +339,9 @@ module StandardTags
     @false@. Use the @contextual@ attribute to force a part inherited from a parent
     part to be evaluated in the context of the child page. By default 'contextual'
     is set to true.
-    
+
     *Usage:*
+    
     <pre><code><r:content [part="part_name"] [inherit="true|false"] [contextual="true|false"] /></code></pre>
   }
   tag 'content' do |tag|
@@ -273,18 +364,19 @@ module StandardTags
     tag.locals.page = part_page unless contextual
     tag.globals.page.render_snippet(part) unless part.nil?
   end
-  
-  desc %{ 
+
+  desc %{
     Renders the containing elements if all of the listed parts exist on a page.
     By default the @part@ attribute is set to @body@, but you may list more than one
-    part by separating them with a comma. Setting the optional @inherit@ to true will 
+    part by separating them with a comma. Setting the optional @inherit@ to true will
     search ancestors independently for each part. By default @inherit@ is set to @false@.
-    
+
     When listing more than one part, you may optionally set the @find@ attribute to @any@
     so that it will render the containing elements if any of the listed parts are found.
     By default the @find@ attribute is set to @all@.
-    
+
     *Usage:*
+    
     <pre><code><r:if_content [part="part_name, other_part"] [inherit="true"] [find="any"]>...</r:if_content></code></pre>
   }
   tag 'if_content' do |tag|
@@ -309,17 +401,18 @@ module StandardTags
     expandable = true if (find == 'any' and one_found)
     tag.expand if expandable
   end
-  
+
   desc %{
-    The opposite of the @if_content@ tag. It renders the contained elements if all of the 
-    specified parts do not exist. Setting the optional @inherit@ to true will search 
+    The opposite of the @if_content@ tag. It renders the contained elements if all of the
+    specified parts do not exist. Setting the optional @inherit@ to true will search
     ancestors independently for each part. By default @inherit@ is set to @false@.
-    
+
     When listing more than one part, you may optionally set the @find@ attribute to @any@
     so that it will not render the containing elements if any of the listed parts are found.
     By default the @find@ attribute is set to @all@.
-    
+
     *Usage:*
+    
     <pre><code><r:unless_content [part="part_name, other_part"] [inherit="false"] [find="any"]>...</r:unless_content></code></pre>
   }
   tag 'unless_content' do |tag|
@@ -345,14 +438,15 @@ module StandardTags
     end
     tag.expand if expandable
   end
-  
-  desc %{  
+
+  desc %{
     Renders the containing elements only if the page's url matches the regular expression
     given in the @matches@ attribute. If the @ignore_case@ attribute is set to false, the
     match is case sensitive. By default, @ignore_case@ is set to true.
-    
+
     *Usage:*
-    <pre><code><r:if_url matches="regexp" [ignore_case="true|false"]>...</if_url></code></pre>
+    
+    <pre><code><r:if_url matches="regexp" [ignore_case="true|false"]>...</r:if_url></code></pre>
   }
   tag 'if_url' do |tag|
     raise TagError.new("`if_url' tag must contain a `matches' attribute.") unless tag.attr.has_key?('matches')
@@ -361,13 +455,14 @@ module StandardTags
        tag.expand
     end
   end
-  
+
   desc %{
     The opposite of the @if_url@ tag.
-    
+
     *Usage:*
-    <pre><code><r:unless_url matches="regexp" [ignore_case="true|false"]>...</unless_url></code></pre>
-  }  
+    
+    <pre><code><r:unless_url matches="regexp" [ignore_case="true|false"]>...</r:unless_url></code></pre>
+  }
   tag 'unless_url' do |tag|
     raise TagError.new("`unless_url' tag must contain a `matches' attribute.") unless tag.attr.has_key?('matches')
     regexp = build_regexp_for(tag, 'matches')
@@ -378,52 +473,56 @@ module StandardTags
 
   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>
-  }  
+    
+    <pre><code><r:if_ancestor_or_self>...</r: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 unless 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 unless the child element is or descends from the current page.
-    
+
     *Usage:*
-    <pre><code><r:unless_ancestor_or_self>...</unless_ancestor_or_self></code></pre>
-  }  
+    
+    <pre><code><r:unless_ancestor_or_self>...</r:unless_ancestor_or_self></code></pre>
+  }
   tag "unless_ancestor_or_self" do |tag|
     tag.expand unless (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>
+    
+    <pre><code><r:if_self>...</r:if_self></code></pre>
   }
   tag "if_self" do |tag|
     tag.expand if tag.locals.page == tag.globals.page
   end
-  
+
   desc %{
     Renders the contained elements unless 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 unless the child element is the current page.
-    
+
     *Usage:*
-    <pre><code><r:unless_self>...</unless_self></code></pre>
+
+    <pre><code><r:unless_self>...</r:unless_self></code></pre>
   }
   tag "unless_self" do |tag|
     tag.expand unless tag.locals.page == tag.globals.page
   end
-  
+
   desc %{
     Renders the name of the author of the current page.
   }
@@ -433,15 +532,16 @@ module StandardTags
       author.name
     end
   end
-  
+
   desc %{
-    Renders the date based on the current page (by default when it was published or created). 
+    Renders the date based on the current page (by default when it was published or created).
     The format attribute uses the same formating codes used by the Ruby @strftime@ function. By
     default it's set to @%A, %B %d, %Y@.  The @for@ attribute selects which date to render.  Valid
     options are @published_at@, @created_at@, @updated_at@, and @now@. @now@ will render the
     current date/time, regardless of the  page.
-    
+
     *Usage:*
+
     <pre><code><r:date [format="%A, %B %d, %Y"] [for="published_at"]/></code></pre>
   }
   tag 'date' do |tag|
@@ -460,10 +560,10 @@ module StandardTags
     else
       page.published_at || page.created_at
     end
-    adjust_time(date).strftime(format) 
+    adjust_time(date).strftime(format)
   end
-  
-  desc %{ 
+
+  desc %{
     Renders a link to the page. When used as a single tag it uses the page's title
     for the link name. When used as a double tag the part in between both tags will
     be used as the link text. The link tag passes all attributes over to the HTML
@@ -471,10 +571,13 @@ module StandardTags
     or @id@ attribute. If the @anchor@ attribute is passed to the tag it will
     append a pound sign (<code>#</code>) followed by the value of the attribute to
     the @href@ attribute of the HTML @a@ tag--effectively making an HTML anchor.
-    
+
     *Usage:*
+
     <pre><code><r:link [anchor="name"] [other attributes...] /></code></pre>
+    
     or
+    
     <pre><code><r:link [anchor="name"] [other attributes...]>link text here</r:link></code></pre>
   }
   tag 'link' do |tag|
@@ -485,14 +588,15 @@ module StandardTags
     text = tag.double? ? tag.expand : tag.render('title')
     %{<a href="#{tag.render('url')}#{anchor}"#{attributes}>#{text}</a>}
   end
-  
+
   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 @>@. The boolean nolinks attribute can be specified to render
     breadcrumbs in plain text, without any links (useful when generating title tag).
-    
-    *Usage:* 
+
+    *Usage:*
+
     <pre><code><r:breadcrumbs [separator="separator_string"] [nolinks="true"] /></code></pre>
   }
   tag 'breadcrumbs' do |tag|
@@ -510,17 +614,19 @@ module StandardTags
     separator = tag.attr['separator'] || ' &gt; '
     breadcrumbs.join(separator)
   end
-  
+
   desc %{
     Renders the snippet specified in the @name@ attribute within the context of a page.
-    
+
     *Usage:*
+
     <pre><code><r:snippet name="snippet_name" /></code></pre>
-    
+
     When used as a double tag, the part in between both tags may be used within the
-    snippet itself, being substituted in place of @<r:yield/>@. 
-    
+    snippet itself, being substituted in place of @<r:yield/>@.
+
     *Usage:*
+
     <pre><code><r:snippet name="snippet_name">Lorem ipsum dolor...</r:snippet></code></pre>
   }
   tag 'snippet' do |tag|
@@ -535,12 +641,13 @@ module StandardTags
       raise TagError.new("`snippet' tag must contain `name' attribute")
     end
   end
-  
-  desc %{ 
-    Used within a snippet as a placeholder for substitution of child content, when 
+
+  desc %{
+    Used within a snippet as a placeholder for substitution of child content, when
     the snippet is called as a double tag.
-    
+
     *Usage (within a snippet):*
+    
     <pre><code>
     <div id="outer">
       <p>before</p>
@@ -548,14 +655,14 @@ module StandardTags
       <p>after</p>
     </div>
     </code></pre>
-    
-    If the above snippet was named "yielding", you could call it from any Page, 
+
+    If the above snippet was named "yielding", you could call it from any Page,
     Layout or Snippet as follows:
-    
+
     <pre><code><r:snippet name="yielding">Content within</r:snippet></code></pre>
-    
+
     Which would output the following:
-    
+
     <pre><code>
     <div id="outer">
       <p>before</p>
@@ -563,35 +670,37 @@ module StandardTags
       <p>after</p>
     </div>
     </code></pre>
-    
+
     When called in the context of a Page or a Layout, @<r:yield/>@ outputs nothing.
   }
   tag 'yield' do |tag|
     tag.locals.yield
   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|
     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
-  
+
   desc %{
     Randomly renders one of the options specified by the @option@ tags.
-    
+
     *Usage:*
+
     <pre><code><r:random>
       <r:option>...</r:option>
       <r:option>...</r:option>
@@ -610,30 +719,33 @@ module StandardTags
     items = tag.locals.random
     items << tag.expand
   end
-  
-  desc %{  
+
+  desc %{
     Nothing inside a set of comment tags is rendered.
-    
+
     *Usage:*
+
     <pre><code><r:comment>...</r:comment></code></pre>
   }
   tag 'comment' do |tag|
   end
-  
-  desc %{  
+
+  desc %{
     Escapes angle brackets, etc. for rendering in an HTML document.
-    
+
     *Usage:*
+
     <pre><code><r:escape_html>...</r:escape_html></code></pre>
   }
   tag "escape_html" do |tag|
     CGI.escapeHTML(tag.expand)
   end
-  
+
   desc %{
     Outputs the published date using the format mandated by RFC 1123. (Ideal for RSS feeds.)
-    
+
     *Usage:*
+
     <pre><code><r:rfc1123_date /></code></pre>
   }
   tag "rfc1123_date" do |tag|
@@ -642,20 +754,21 @@ module StandardTags
       CGI.rfc1123_date(date.to_time)
     end
   end
-  
-  desc %{ 
+
+  desc %{
     Renders a list of links specified in the @urls@ attribute according to three
     states:
-    
+
     * @normal@ specifies the normal state for the link
     * @here@ specifies the state of the link when the url matches the current
        page's URL
     * @selected@ specifies the state of the link when the current page matches
        is a child of the specified url
-    
+
     The @between@ tag specifies what should be inserted in between each of the links.
-    
+
     *Usage:*
+
     <pre><code><r:navigation urls="[Title: url | Title: url | ...]">
       <r:normal><a href="<r:url />"><r:title /></a></r:normal>
       <r:here><strong><r:title /></strong></r:here>
@@ -663,7 +776,7 @@ module StandardTags
       <r:between> | </r:between>
     </r:navigation>
     </code></pre>
-  }    
+  }
   tag 'navigation' do |tag|
     hash = tag.locals.navigation = {}
     tag.expand
@@ -704,48 +817,35 @@ module StandardTags
       hash[symbol]
     end
   end
-  
+
   desc %{
     Renders the containing elements only if Radiant in is development mode.
-    
-    *Usage:* 
+
+    *Usage:*
+
     <pre><code><r:if_dev>...</r:if_dev></code></pre>
   }
   tag 'if_dev' do |tag|
-    config = Radiant::Config
-    request = tag.globals.page.request
-    unless request.nil?
-      if dev_host = config['dev.host']
-        tag.expand if request.host == dev_host
-      else
-        tag.expand if request.host =~ /^dev\./
-      end
-    end
+    tag.expand if dev?(tag.globals.page.request)
   end
-  
+
   desc %{
     The opposite of the @if_dev@ tag.
-    
-    *Usage:* 
+
+    *Usage:*
+
     <pre><code><r:unless_dev>...</r:unless_dev></code></pre>
   }
   tag 'unless_dev' do |tag|
-    config = Radiant::Config
-    request = tag.globals.page.request
-    unless request.nil?
-      if dev_host = config['dev.host']
-        tag.expand unless request.host == dev_host
-      else
-        tag.expand unless request.host =~ /^dev\./
-      end
-    end
+    tag.expand unless dev?(tag.globals.page.request)
   end
-  
+
   desc %{
-    Prints the page's status as a string.  Optional attribute 'downcase' 
+    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|
@@ -753,14 +853,14 @@ module StandardTags
     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"] /> 
+
+    <pre><code> <r:meta [tag="false"] />
      <r:meta>
        <r:description [tag="false"] />
        <r:keywords [tag="false"] />
@@ -775,13 +875,13 @@ module StandardTags
       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|
@@ -797,11 +897,11 @@ module StandardTags
   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)
@@ -809,16 +909,16 @@ module StandardTags
       "<meta name=\"keywords\" content=\"#{keywords}\" />"
     else
       keywords
-    end    
+    end
   end
-  
+
   private
-  
+
     def children_find_options(tag)
       attr = tag.attr.symbolize_keys
-      
+
       options = {}
-      
+
       [:limit, :offset].each do |symbol|
         if number = attr[symbol]
           if number =~ /^\d{1,4}$/
@@ -828,7 +928,7 @@ module StandardTags
           end
         end
       end
-      
+
       by = (attr[:by] || 'published_at').strip
       order = (attr[:order] || 'asc').strip
       order_string = ''
@@ -843,8 +943,8 @@ module StandardTags
         raise TagError.new(%{`order' attribute of `each' tag must be set to either "asc" or "desc"})
       end
       options[:order] = order_string
-      
-      status = (attr[:status] || 'published').downcase
+
+      status = (attr[:status] || ( dev?(tag.globals.page.request) ? 'all' : 'published')).downcase
       unless status == 'all'
         stat = Status[status]
         unless stat.nil?
@@ -857,15 +957,15 @@ module StandardTags
       end
       options
     end
-    
+
     def remove_trailing_slash(string)
       (string =~ %r{^(.*?)/$}) ? $1 : string
     end
-    
+
     def tag_part_name(tag)
       tag.attr['part'] || 'body'
     end
-    
+
     def build_regexp_for(tag, attribute_name)
       ignore_case = tag.attr.has_key?('ignore_case') && tag.attr['ignore_case']=='false' ? nil : true
       begin
@@ -875,11 +975,11 @@ module StandardTags
       end
       regexp
     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
@@ -887,23 +987,28 @@ module StandardTags
         File.expand_path(File.join(base_path, new_path))
       end
     end
-    
+
     def page_found?(page)
       page && !(FileNotFoundPage === page)
     end
-    
+
     def boolean_attr_or_error(tag, attribute_name, default)
       attribute = attr_or_error(tag, :attribute_name => attribute_name, :default => default.to_s, :values => 'true, false')
       (attribute.to_s.downcase == 'true') ? true : false
     end
-    
+
     def attr_or_error(tag, options = {})
       attribute_name = options[:attribute_name].to_s
       default = options[:default]
       values = options[:values].split(',').map!(&:strip)
-      
+
       attribute = (tag.attr[attribute_name] || default).to_s
       raise TagError.new(%{'#{attribute_name}' attribute of #{tag} tag must be one of: #{values.join(',')}}) unless values.include?(attribute)
       return attribute
     end
+
+    def dev?(request)
+      dev_host = Radiant::Config['dev.host']
+      request && ((dev_host && dev_host == request.host) || request.host =~ /^dev\./)
+    end
 end