radiant 0.6.3 → 0.6.4

data/app/models/page_context.rb

@@ -14,9 +14,13 @@ class PageContext < Radius::Context
   end
  
   def render_tag(name, attributes = {}, &block)
+    binding = @tag_binding_stack.last
+    locals = binding ? binding.locals : globals
+    set_process_variables(locals.page)
     super
   rescue Exception => e
     raise e if testing?
+    @tag_binding_stack.pop unless @tag_binding_stack.last == binding
     render_error_message(e.message)
   end
   
@@ -32,6 +36,11 @@ class PageContext < Radius::Context
       "<div><strong>#{message}</strong></div>"
     end
     
+    def set_process_variables(page)
+      page.request ||= @page.request
+      page.response ||= @page.response
+    end
+    
     def testing?
       RAILS_ENV == 'test'
     end

data/app/models/radiant/config.rb

@@ -23,7 +23,9 @@ module Radiant
   # defaults.page.parts   :: a comma separated list of default page parts
   # defaults.page.status  :: a string representation of the default page status
   # dev.host              :: the hostname where draft pages are viewable
-  #
+  # local.timezone        :: the timezone offset (using a String or integer
+  #                          from http://api.rubyonrails.org/classes/TimeZone.html) 
+  #                          used to correct displayed times 
   class Config < ActiveRecord::Base
     set_table_name "config"
 
@@ -48,7 +50,7 @@ module Radiant
 
       def to_hash
         Hash[ *find(:all).map { |pair| [pair.key, pair.value] }.flatten ]
-      end
+      end      
     end
     
     def value=(param)

data/app/models/response_cache.rb

@@ -148,29 +148,35 @@ class ResponseCache
       cache_page(metadata, response.body, path)
     end
 
-    def page_cache_path(path)
-      page_cache_directory + page_cache_file(path)
+    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
     end
 
     def expire_page(path)
       return unless perform_caching
 
-      path = page_cache_path(path)
-      benchmark "Expired page: #{path}" do
-        File.delete("#{path}.yml") if File.exists?("#{path}.yml")
-        File.delete("#{path}.data") if File.exists?("#{path}.data")
+      if path = page_cache_path(path)
+        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
 
     def cache_page(metadata, content, path)
       return unless perform_caching
 
-      path = page_cache_path(path)
-      benchmark "Cached page: #{path}" do
-        FileUtils.makedirs(File.dirname(path))
-        #dont want yml without data
-        File.open("#{path}.data", "wb+") { |f| f.write(content) }
-        File.open("#{path}.yml", "wb+") { |f| f.write(metadata) }
+      if path = page_cache_path(path)
+        benchmark "Cached page: #{path}" do
+          FileUtils.makedirs(File.dirname(path))
+          #dont want yml without data
+          File.open("#{path}.data", "wb+") { |f| f.write(content) }
+          File.open("#{path}.yml", "wb+") { |f| f.write(metadata) }
+        end
       end
     end
 end

data/app/models/standard_tags.rb

@@ -1,33 +1,34 @@
 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:* 
     <pre><code><r:page>...</r:page></code></pre>
   }
   tag 'page' do |tag|
-    tag.locals.page = tag.globals.actual_page || tag.globals.page
+    tag.locals.page = tag.globals.page
     tag.expand
   end
   
   [:breadcrumb, :slug, :title, :url].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 %{  
+  end
+  
+  desc %{
     Gives access to a page's children.
     
-    *Usage:* 
+    *Usage:*
     <pre><code><r:children>...</r:children></code></pre>
   }
   tag 'children' do |tag|
@@ -42,7 +43,7 @@ module StandardTags
     tag.locals.children.count
   end
   
-  desc %{  
+  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>@.
     
@@ -74,10 +75,10 @@ module StandardTags
     end
   end
   
-  desc %{ 
+  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"] 
      [status="draft|reviewed|published|hidden|all"]>
@@ -112,19 +113,19 @@ module StandardTags
     tag.locals.page = tag.locals.child
     tag.expand
   end
-
-  desc %{  
+  
+  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;...]"]>
@@ -148,8 +149,7 @@ module StandardTags
       header
     end
   end
-
-
+  
   desc %{
     Page attribute tags inside this tag refer to the parent of the current page.
     
@@ -162,7 +162,7 @@ module StandardTags
     tag.expand if parent
   end
   
-  desc %{    
+  desc %{
     Renders the contained elements only if the current contextual page has a parent, i.e. 
     is not the root page.
     
@@ -174,10 +174,10 @@ module StandardTags
     tag.expand if parent
   end
   
-  desc %{    
+  desc %{
     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>
   }
@@ -186,11 +186,39 @@ module StandardTags
     tag.expand unless parent
   end
   
-  desc %{ 
+  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 
+    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 
     multiple cycles; the default is @cycle@.
-   
+    
     *Usage:*
     <pre><code><r:cycle values="first, second, third" [reset="true|false"] [name="cycle"] /></code></pre>
   } 
@@ -213,7 +241,7 @@ 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>
   }
@@ -243,7 +271,7 @@ module StandardTags
   
   desc %{ 
     Renders the containing elements only if the part exists on a page. By default the
-    @part@ attribute is set @body@.
+    @part@ attribute is set to @body@.
     
     *Usage:*
     <pre><code><r:if_content [part="part_name"]>...</r:if_content></code></pre>
@@ -258,7 +286,7 @@ module StandardTags
   
   desc %{
     The opposite of the @if_content@ tag.
-   
+    
     *Usage:*
     <pre><code><r:unless_content [part="part_name"]>...</r:unless_content></code></pre>
   }
@@ -274,7 +302,7 @@ module StandardTags
     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>
   }
@@ -288,7 +316,7 @@ module StandardTags
   
   desc %{
     The opposite of the @if_url@ tag.
-   
+    
     *Usage:*
     <pre><code><r:unless_url matches="regexp" [ignore_case="true|false"]>...</unless_url></code></pre>
   }  
@@ -299,8 +327,8 @@ module StandardTags
         tag.expand
     end
   end
-      
-  desc %{ 
+  
+  desc %{
     Renders the name of the author of the current page.
   }
   tag 'author' do |tag|
@@ -310,14 +338,14 @@ module StandardTags
     end
   end
   
-  desc %{ 
+  desc %{
     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:*  
+    
+    *Usage:*
     <pre><code><r:date [format="%A, %B %d, %Y"] [for="published_at"]/></code></pre>
   }
   tag 'date' do |tag|
@@ -336,7 +364,7 @@ module StandardTags
     else
       page.published_at || page.created_at
     end
-    date.strftime(format) 
+    adjust_time(date).strftime(format) 
   end
   
   desc %{ 
@@ -347,7 +375,7 @@ 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
@@ -361,7 +389,7 @@ 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
@@ -379,8 +407,8 @@ module StandardTags
     separator = tag.attr['separator'] || ' &gt; '
     breadcrumbs.join(separator)
   end
-
-  desc %{     
+  
+  desc %{
     Renders the snippet specified in the @name@ attribute within the context of a page.
     
     *Usage:*
@@ -389,9 +417,7 @@ module StandardTags
   tag 'snippet' do |tag|
     if name = tag.attr['name']
       if snippet = Snippet.find_by_name(name.strip)
-        page = tag.locals.page
-        global_page = tag.globals.actual_page || tag.globals.page
-        page.render_snippet(snippet, global_page)
+        tag.globals.page.render_snippet(snippet)
       else
         raise TagError.new('snippet not found')
       end
@@ -412,23 +438,23 @@ module StandardTags
         unless FileNotFoundPage === found
           tag.locals.page = found
           tag.expand
-	end
+        end
       end
     else
       raise TagError.new("`find' tag must contain `url' attribute")
     end
   end
   
-  desc %{       
+  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>
       ...
     <r:random>
-    </code></pre>    
+    </code></pre>
   }
   tag 'random' do |tag|
     tag.locals.random = []
@@ -536,11 +562,47 @@ module StandardTags
     end
   end
   
+  desc %{
+    Renders the containing elements only if Radiant in is development mode.
+    
+    *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
+  end
+  
+  desc %{
+    The opposite of the @if_dev@ tag.
+    
+    *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
+  end
+  
   private
   
     def children_find_options(tag)
       attr = tag.attr.symbolize_keys
-    
+      
       options = {}
       
       [:limit, :offset].each do |symbol|
@@ -597,7 +659,6 @@ module StandardTags
       rescue RegexpError => e
         raise TagError.new("Malformed regular expression in `#{attribute_name}' argument of `#{tag.name}' tag: #{e.message}")
       end
-      return regexp
-    end
-  
+      regexp
+    end   
 end