rayo 0.2.0 → 0.3.0

data/README.rdoc

@@ -74,6 +74,10 @@ You may create generic pages which are rendered for a set of different paths. Fo
 
 === Built-In Tags
 
+==== Hidden pages
+
+If a page shouldn't be listed in children of parent page you may set property <tt>hidden</tt> to <tt>true</tt> in its yml file.
+
 === Filters
 
 == Configuration
@@ -114,7 +118,7 @@ And register it:
 
   c.add_tags MyTags
 
-=== Multidomain applications
+=== Multidomain setup
 
 Sometimes you may want to serve different domains with one application sharing layouts and snippets. Rayo has built-in support for this scenario. All you need is to create subdirectories in pages for different domains and add some lines to <tt>configure</tt> block:
 
@@ -137,10 +141,19 @@ With both lines corresponding directory structure should be:
 
 That's all you need to build multi-domain application.
 
+== Caching
+
+Rayo supports transparent caching of your generated pages in filesystem which is configured by one line, specifying cache directory:
+
+  c.cache_dir = 'your cache directory'
+
+Every page after request are written to corresponding file in cache directory, so next requests will be served from there. And if you configure your web server to search for files in cache directory ruby application will not be touched at all.
+
+For single-domain setups it may be useful to point <tt>cache_dir</tt> to the public location, so it will be served by web-server without additional configuration. 
+
 == Planned features
 
 * Support for sites without I18n
-* Support for different page formats
 * Drop-in tag libary support
 * Support for pages without .yml
 * Generator which creates a set of static pages from content structure

data/lib/rayo/application.rb

@@ -1,4 +1,5 @@
 require 'sinatra/base'
+require 'ftools'
 
 require File.join(File.dirname(__FILE__), 'storage.rb')
 require File.join(File.dirname(__FILE__), 'config.rb')
@@ -20,31 +21,81 @@ class Rayo::Application < Sinatra::Base
     self.class.config
   end
 
-  get '/*' do |path|
-    cfg = config.domain( request.host ) # Config for current host
+  get '/*' do |url|
+    if cfg = config.domain( request.host ) # Config for current host
+      redir, lang, path, format = analyze_path url # Analyze path
 
-    if cfg
-      path = path.split '/' # Split path into segments
+      redirect_to_page( lang || select_language, path, format ) if redir # Redirect if needed
 
-      empty_segments_found = path.reject! {|e| e.empty? } # Clear path and detect empty segments
+      format ||= cfg.default_format # Set default format if needed
 
-      return redirect_to_lang path unless config.languages.include? path.first
-      return redirect '/' + path.join('/') if empty_segments_found
+      cache_page cfg, lang, path, format do
+        storage = create_storage( cfg ) # Page storage
 
-      lang = path.shift # Determine language
+        page = storage.page( lang, path ) # Find page by path
+        page = storage.status_page( lang, path, 404 ) unless page && page.file # Render 404 page if there are no page, or there are no file
 
-      storage = create_storage( cfg ) # Page storage
-      page = storage.page( lang, path ) # Find page by path
-      page = storage.status_page( lang, path, 404 ) unless page && page.file # Render 404 page if there are no page, or there are no file
-
-      [ page[:status], page.render ] # Return page status and content
+        render_page page, format # Render found page with given format
+      end
     else
-      [ 404, "Page not found" ]
+      not_found 'Page not found'
     end
   end
 
   private
 
+  def render_page( page, format )
+    status page[:status] # Set response status
+    body page.render( format ) # Set response body
+
+    content_type format # Set Content-Type header
+    expires page[:expires] if page[:expires] # Set expires header
+  end
+
+  def redirect_to_page( lang, path, format )
+    url = '/' + [ lang || select_language, *path ].join('/')
+    url << '.' + format if format
+
+    redirect url
+  end
+
+  def cache_page( cfg, lang, path, format )
+    return yield unless cfg.cache_dir # Return block result if no cache directory set up
+
+    if path.empty?
+      file_path = File.join( cfg.cache_dir, lang, "index.#{format}" )
+    else
+      file_path = File.join( cfg.cache_dir, lang, path[0..-2], "#{path.last}.#{format}" )
+    end
+
+    if File.exists? file_path # If cached page exists
+      content_type format # Set Content-Type header
+      body File.read( file_path ) # Return its content as a body
+    else
+      yield # Render page
+
+      FileUtils.mkdir_p( File.dirname file_path ) # Create directory
+      File.open( file_path, 'w' ){|f| f.write body } # Write content
+    end
+  end
+
+  def analyze_path( p )
+    path = p.split '/' # Split path into segments
+    redir = path.reject! {|e| e.empty? } # Clear path and detect empty segments
+    redir ||= p[-1..-1] == '/'
+
+    unless path.empty? # If path non-empty
+      if m = path.last.match( /^(.*)\.([^.]+)$/ ) # Detect format
+        format = m[2]
+        path[-1] = m[1]
+      end
+
+      lang = path.shift if config.languages.include? path.first # Detect language
+    end
+
+    [redir || lang.nil?, lang, path, format]
+  end
+
   def create_storage( cfg )
     Rayo::Storage.new( cfg )
   end
@@ -53,8 +104,4 @@ class Rayo::Application < Sinatra::Base
     config.languages.first
   end
 
-  def redirect_to_lang( path )
-    redirect '/' + [ select_language, *path].join('/')
-  end
-
 end

data/lib/rayo/config.rb

@@ -6,19 +6,21 @@ require File.join(File.dirname(__FILE__), 'tags/navigation_tags.rb')
 class Rayo::Config
 
   attr_accessor :content_dir
+  attr_accessor :cache_dir
+
   attr_accessor :languages
   attr_accessor :page_exts
 
+  attr_accessor :default_format
+  attr_accessor :default_domain
+
   def initialize
     @languages = ['en']
     @page_exts = ['.yml']
 
-    @filters = {}
+    @formats = {}
     @domains = []
 
-    # Default filters
-    add_filter('html'){|source| source }
-
     @tagger = Object.new
     @tagger.extend Rayo::Taggable
 
@@ -26,6 +28,9 @@ class Rayo::Config
     add_tags Rayo::Tags::PropertyTags
     add_tags Rayo::Tags::ContentTags
     add_tags Rayo::Tags::NavigationTags
+
+    # Default format
+    @default_format = 'html'
   end
 
   # Add tags defined in module
@@ -35,14 +40,6 @@ class Rayo::Config
     @tagger.extend tag_module
   end
 
-  # Add filter
-  #
-  # @param [String,Symbol] file extension
-  # @param [Proc] filter proc which accepts source and return it in processed form
-  def add_filter( ext, &filter )
-    @filters[".#{ext}"] = filter
-  end
-
   # Add domain
   #
   # @param [String] domain name
@@ -60,22 +57,30 @@ class Rayo::Config
     File.join( @content_dir, content_type.to_s )
   end
 
-  def renderable_exts
-    @filters.keys
+  # Add filter
+  #
+  # @param [String,Symbol] renderable file extension
+  # @param [String,Symbol] requested content format
+  # @param [Proc] filter proc which accepts source and return it in processed form
+  def add_filter( from, to = nil, &filter )
+    format( to ).add_filter( from, &filter )
   end
 
-  def filter( ext )
-    @filters[ ext.to_s ]
+  def format( name = nil )
+    name ||= default_format
+
+    @formats[name.to_s] ||= Rayo::Config::Format.new name
   end
 
   def domain( host )
     if @domains.empty?
       self # No multidomain support
     else
-      @domains.find { |domain| domain.matches? host }
+      @domains.find { |domain| domain.matches? host } || @domains.find { |domain| domain.name == @default_domain }
     end
   end
 
 end
 
 require File.join(File.dirname(__FILE__), 'config/domain.rb')
+require File.join(File.dirname(__FILE__), 'config/format.rb')

data/lib/rayo/config/domain.rb

@@ -4,7 +4,10 @@ class Rayo::Config::Domain
 
   extend Forwardable
 
-  def_delegators :@parent, :create_tagger, :languages, :page_exts, :renderable_exts, :filter
+  def_delegators :@parent, :create_tagger, :languages, :page_exts, :format, :default_format
+
+  attr_reader :name
+  attr_writer :cache_dir
 
   def initialize( parent, name, exp )
     @parent = parent
@@ -24,4 +27,9 @@ class Rayo::Config::Domain
     end
   end
 
+  # Get cache directory for this domain. If it was not set explicitly it'll be global cache_dir with domain name appended
+  def cache_dir
+    @cache_dir || @parent.cache_dir && File.join( @parent.cache_dir, @name )
+  end
+
 end

data/lib/rayo/config/format.rb

@@ -0,0 +1,25 @@
+class Rayo::Config::Format
+
+  attr_reader :name
+  attr_reader :renderable_exts
+
+  def initialize( name )
+    @name = name.to_s
+    @filters = { @name => lambda{|source| source} }
+    @renderable_exts = [ ".#{name}" ]
+  end
+
+  # Add filter
+  #
+  # @param [String,Symbol] renderable file extension
+  # @param [Proc] filter proc which accepts source and return it in processed form
+  def add_filter( from, &filter )
+    @filters[from.to_s] = filter
+    @renderable_exts << ".#{from}" unless @renderable_exts.include? ".#{from}"
+  end
+
+  def filter( from )
+    @filters[from.to_s]
+  end
+
+end

data/lib/rayo/models/page.rb

@@ -13,6 +13,9 @@ class Rayo::Models::Page
     @parent = parent
     @lang = lang
     @path = path
+
+    @parts = {}
+    @layouts = {}
   end
 
   def descendant( relative_path )
@@ -27,6 +30,18 @@ class Rayo::Models::Page
     @children ||= @storage.find_pages( directories, @lang ).map{|name| child( name ) }
   end
 
+  def relative( url )
+    path = url.split '/'
+
+    if path.empty?
+      @storage.root_page( @lang )
+    elsif path.first && path.first.empty?
+      @storage.root_page( @lang ).descendant( path[1..-1] )
+    else
+      descendant( path )
+    end
+  end
+
   def child( slug )
     @children_cache ||= {}
     return @children_cache[ slug ] if @children_cache.include? slug
@@ -45,17 +60,25 @@ class Rayo::Models::Page
     @file ||= @storage.find_page_file( @parent.directories, @lang, @path.last )
   end
 
-  def parts
-    @parts ||= file ? @storage.find_page_parts( file, @lang ) : {}
+  # Get page parts for given format
+  # @param [String,Symbol] part format
+  # @return [List<Rayo::Models::Renderable>] part list
+  def parts( format )
+    @parts[format.to_s] ||= file ? @storage.find_page_parts( file, @lang, format.to_s ) : {}
   end
 
-  def find_part( part_name, inherit = false )
+  # Find page part for given format
+  # @param [String,Symbol] part format
+  # @param [String,Symbol] part name
+  # @param [Boolean] search in super classes
+  # @return [List<Rayo::Models::Renderable>] part list
+  def find_part( format, part_name, inherit = false )
     page = self
-    part = self.parts[part_name]
+    part = self.parts(format)[part_name]
 
     while inherit && !part && page.parent do
       page = page.parent
-      part = page.parts[part_name]
+      part = page.parts(format)[part_name]
     end
 
     part
@@ -84,8 +107,8 @@ class Rayo::Models::Page
     @context
   end
 
-  def layout
-    @layout ||= @storage.layout( @lang, context['layout'] )
+  def layout(format)
+    @layouts[format.to_s] ||= @storage.layout( @lang, context['layout'], format )
   end
 
   def []( key )
@@ -94,8 +117,12 @@ class Rayo::Models::Page
     context[ key ] || params[ key ]
   end
 
-  def render
-    layout.render( parser )
+  def render( format )
+    if l = layout( format )
+      l.render( parser )
+    else
+      "Layout: '#{context['layout']}'' not found with format '#{format}'"
+    end
   end
 
   def parser
@@ -105,7 +132,13 @@ class Rayo::Models::Page
   private
 
   def load_context( filename )
-    YAML::load( Erubis::Eruby.new( @storage.load( filename ) ).result( params ) )
+    cont = @storage.load( filename )
+
+    if cont && !cont.strip.empty?
+      YAML::load( Erubis::Eruby.new( cont ).result( params ) )
+    else
+      {}
+    end
   end
 
 end

data/lib/rayo/models/renderable.rb

@@ -2,11 +2,13 @@ class Rayo::Models::Renderable
 
   attr_reader :storage
   attr_reader :file
+  attr_reader :format
   attr_reader :filter
 
-  def initialize( storage, file, filter )
+  def initialize( storage, file, format, filter )
     @storage = storage
     @file = file
+    @format = format
     @filter = filter
   end
 
@@ -15,7 +17,9 @@ class Rayo::Models::Renderable
   end
 
   def render( parser )
-    filter.call( parser.parse( source ) )
+    parser.context.with_format @format do
+      filter.call( parser.parse( source ) )
+    end
   end
 
 end

data/lib/rayo/storage.rb

@@ -13,12 +13,12 @@ class Rayo::Storage
     @snippets = {}
   end
 
-  def snippet( lang, name )
-    @snippets["#{lang}|#{name}"] ||= find_renderable( :snippets, lang, name.to_s ) || raise( "Snippet '#{name}' not found" )
+  def snippet( lang, name, format )
+    @snippets["#{lang}|#{name}|#{format}"] ||= find_renderable( :snippets, lang, name.to_s, format )
   end
 
-  def layout( lang, name )
-    @layouts["#{lang}|#{name}"] ||= find_renderable( :layouts, lang, name.to_s ) || raise( "Layout '#{name}' not found" )
+  def layout( lang, name, format )
+    @layouts["#{lang}|#{name}|#{format}"] ||= find_renderable( :layouts, lang, name.to_s, format )
   end
 
   # Retrieves root page for specific language
@@ -47,14 +47,14 @@ class Rayo::Storage
     Rayo::Models::StatusPage.new( self, root_page( lang ), path, status )
   end
 
-  def find_renderable( type, lang, name )
-    if file = find_file( [config.directory( type )], lang, name, config.renderable_exts )
-      renderable( file, File.extname( file ) )
+  def find_renderable( type, lang, name, format )
+    if file = find_file( [config.directory( type )], lang, name, config.format( format ).renderable_exts )
+      renderable( file, format, File.extname( file ) )
     end
   end
 
   def find_page_file( dirs, lang, slug )
-    find_file( dirs, lang, slug, config.page_exts )
+    find_file( dirs, lang, slug, config.page_exts, true )
   end
 
   def find_page_dirs( dirs, lang, slug )
@@ -68,28 +68,28 @@ class Rayo::Storage
       elem_name = elems[0]
       elem_lang = elems[1]
 
-      res << elem_name unless elem_name[0..0] == '%' || (dirs == ([ @config.directory :pages ]) && (elem_name == 'index' || elem_name =~ /^\d+$/ )) || (elem_lang && elem_lang != lang)
+      res << elem_name unless ['%','_'].include?( elem_name[0..0] ) || (dirs == ([ @config.directory :pages ]) && (elem_name == 'index')) || (elem_lang && elem_lang != lang)
     end
     res.uniq
   end
 
-  def find_page_parts( page_file, lang )
+  def find_page_parts( page_file, lang, format )
     parts = {}
     page_file_base = File.basename( page_file ).split('.').first
-    glob_files File.dirname( page_file ), lang, page_file_base + '*', config.renderable_exts do |file,base,ext|
+    glob_files File.dirname( page_file ), lang, page_file_base + '*', config.format( format ).renderable_exts do |file,base,ext|
       elems = base.split('.')
 
       if elems.shift == page_file_base # Remove base (slug or variable)
         if elems.size == 0 # There are no part name and language
-          parts[ 'body'   ] ||= renderable( file, ext )
+          parts[ 'body'   ] ||= renderable( file, format, ext )
         elsif elems.size == 1 # There are no language or no part name
           if elems[0] == lang
-            parts[ 'body'   ] ||= renderable( file, ext )
+            parts[ 'body'   ] ||= renderable( file, format, ext )
           else
-            parts[ elems[0] ] ||= renderable( file, ext )
+            parts[ elems[0] ] ||= renderable( file, format, ext )
           end
         else
-          parts[ elems[0] ] ||= renderable( file, ext ) if elems[1] == lang
+          parts[ elems[0] ] ||= renderable( file, format, ext ) if elems[1] == lang
         end
       end
     end
@@ -102,13 +102,13 @@ class Rayo::Storage
 
   private
 
-  def renderable( file, ext )
-    Rayo::Models::Renderable.new( self, file, config.filter( ext ) || raise( "Filter for '#{ext} not found" ) )
+  def renderable( file, format, ext )
+    Rayo::Models::Renderable.new( self, file, format, config.format( format ).filter( ext[1..-1] ) || raise( "Filter for '#{ext} not found" ) )
   end
 
   # Find first file with given name (or variable) and extension from given set
-  def find_file( dirs, lang, name, exts )
-    glob_files( dirs, lang, name, exts ) { |file,base,ext| return file }
+  def find_file( dirs, lang, name, exts, hidden = false )
+    glob_files( dirs, lang, name, exts, hidden ) { |file,base,ext| return file }
     nil
   end
 
@@ -119,11 +119,17 @@ class Rayo::Storage
     results
   end
 
-  def glob_files( dirs, lang, name, exts, &block )
+  def glob_files( dirs, lang, name, exts, hidden = false, &block )
     lang_prefix = "." + lang
 
     glob dirs, name + lang_prefix, //, exts, &block # Search with given name and language
     glob dirs, name, //, exts, &block # Search with given name without language
+
+    if hidden
+      glob dirs, '_' + name + lang_prefix, //, exts, &block # Search hidden with given name and language
+      glob dirs, '_' + name, //, exts, &block # Search hidden with given name without language
+    end
+
     glob dirs, '%*' + lang_prefix, /^%.+\.#{lang}$/, exts, &block # Search with variable and language
     glob dirs, '%*',  /^%.+$/, exts, &block # Search with variable without language
   end

data/lib/rayo/tag_context.rb

@@ -9,6 +9,7 @@ class Rayo::TagContext < Radius::Context
 
     globals.page = @page
     globals.storage = @page.storage
+    globals.config = @page.storage.config
 
     tagger = @page.storage.config.create_tagger
     tagger.methods.each do |name|
@@ -32,4 +33,15 @@ class Rayo::TagContext < Radius::Context
     "<strong class=\"error\">#{text}</strong>"
   end
 
+  def with_format( format )
+    old_format = globals.format
+    globals.format = format
+
+    result = yield
+
+    globals.format = old_format
+
+    result
+  end
+
 end

data/lib/rayo/tags/content_tags.rb

@@ -24,7 +24,7 @@ module Rayo::Tags::ContentTags
       tag.globals.layout_stack ||= [] # Prepare layout stack
       tag.globals.content_stack ||= [] # Prepare content stack
 
-      if layout = tag.globals.storage.layout( tag.globals.page.lang, name )
+      if layout = tag.globals.storage.layout( tag.globals.page.lang, name, tag.globals.format )
         tag.globals.layout_stack << name # Track this layout on the stack
         tag.globals.content_stack << tag.expand # Save contents of inside_layout for later insertion
 
@@ -39,7 +39,7 @@ module Rayo::Tags::ContentTags
 
   tag 'snippet' do |tag|
     snippet_name = tag.attr['name']
-    snippet = tag.globals.storage.snippet( tag.globals.page.lang, snippet_name )
+    snippet = tag.globals.storage.snippet( tag.globals.page.lang, snippet_name, tag.attr['format'] || tag.globals.format )
 
     if snippet
       snippet.render( tag.globals.page.parser )
@@ -48,10 +48,21 @@ module Rayo::Tags::ContentTags
     end
   end
 
+  tag 'with' do |tag|
+    old_format = tag.globals.format
+    tag.globals.format = tag.attr['format']
+
+    result = tag.expand
+
+    tag.globals.format = old_format
+
+    result
+  end
+
   private
 
   def find_part( tag )
-    tag.locals.page.find_part( tag.attr['part'] || 'body', tag.attr['inherit'] == 'true' )
+    tag.locals.page.find_part( tag.attr['format'] || tag.globals.format, tag.attr['part'] || 'body', tag.attr['inherit'] == 'true' )
   end
 
 end

data/lib/rayo/tags/navigation_tags.rb

@@ -3,19 +3,7 @@ module Rayo::Tags::NavigationTags
   include Rayo::Taggable
 
   tag 'find' do |tag|
-    url = tag.attr['url']
-    path = url.split('/')
-
-    if path.first.empty?
-      path.shift
-      page = tag.locals.page.storage.root_page( tag.globals.page.lang )
-    else
-      page = tag.locals.page
-    end
-
-    page = page.descendant( path )
-
-    if page
+    if page = tag.locals.page.relative( tag.attr['url'] )
       tag.locals.page = page
       tag.expand
     else
@@ -24,40 +12,101 @@ module Rayo::Tags::NavigationTags
   end
 
   tag 'children' do |tag|
-    tag.locals.children = tag.locals.page.children
+    children = tag.locals.page.children
+
+    [ tag.attr['level'].to_i - 1, 0 ].max.times do
+      children = children.map{ |p| p.children }.flatten
+    end
+
+    tag.locals.children = children
     tag.expand
   end
 
   tag 'children:count' do |tag|
-    tag.locals.children.size
+    prepare_children( tag ).size
   end
 
   tag 'children:first' do |tag|
-    if first = tag.locals.children.first
+    if first = prepare_children( tag ).first
       tag.locals.page = first
       tag.expand
     end
   end
 
   tag 'children:last' do |tag|
-    if first = tag.locals.children.last
-      tag.locals.page = first
+    if last = prepare_children( tag ).last
+      tag.locals.page = last
       tag.expand
     end
   end
 
   tag 'children:each' do |tag|
-    result = ''
+    result = ""
+    children = prepare_children( tag )
 
-    children = tag.locals.children
     children.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 == children.length - 1
+      tag.locals.last_child = i == children.size - 1
+
+      result << tag.expand
+    end
+    result
+  end
+
+  tag 'related' do |tag|
+    tag.locals.relation = tag.locals.page['relations'][tag.attr['rel']]
+    tag.expand
+  end
+
+  tag 'related:count' do |tag|
+    tag.locals.relation.size
+  end
+
+  tag 'related:first' do |tag|
+    if first = tag.locals.relation.first
+      tag.locals.page = tag.locals.page.relative first
+      tag.expand
+    end
+  end
+
+  tag 'related:last' do |tag|
+    if last = tag.locals.relation.last
+      tag.locals.page = tag.locals.page.relative last
+      tag.expand
+    end
+  end
+
+  tag 'related:each' do |tag|
+    result = ''
+
+    relation = tag.locals.relation
+    relation.each_with_index do |item, i|
+      tag.locals.page = tag.locals.page.relative item
+      tag.locals.first_related = i == 0
+      tag.locals.last_related = i == relation.size - 1
+
       result << tag.expand
     end
     result
   end
 
+  private
+
+  def prepare_children( tag )
+    children = tag.locals.children
+
+    if by = tag.attr['by']
+      if tag.attr['order'] == 'desc'
+        children = children.sort {|a,b| b[by] <=> a[by] }
+      else
+        children = children.sort {|a,b| a[by] <=> b[by] }
+      end
+    end
+
+    children = children[0..(tag.attr['limit'].to_i - 1)] if tag.attr['limit']
+    children
+  end
+
 end

data/lib/rayo/tags/property_tags.rb

@@ -10,6 +10,10 @@ module Rayo::Tags::PropertyTags
     tag.locals.page.context['description']
   end
 
+  tag 'value' do |tag|
+    tag.locals.page[tag.attr['name']]
+  end
+
   tag 'path' do |tag|
     basepath = tag.globals.page.path
     path = tag.locals.page.path
@@ -24,10 +28,16 @@ module Rayo::Tags::PropertyTags
         i = i + 1
       end
 
-      '../' * (basepath.size - i) + path[i..-1].join('/')
+      './' + ('../' * (basepath.size - i)) + path[i..-1].join('/')
     end
   end
 
+  tag 'url' do |tag|
+    u = "/#{tag.locals.page.lang}/#{tag.locals.page.path.join('/')}"
+    u << ".#{tag.globals.format}" if tag.globals.format != tag.globals.config.default_format
+    u
+  end
+
   tag 'link' do |tag|
     "<a href=\"#{send 'tag:path', tag}\">#{tag.single? ? send( 'tag:title', tag ) : tag.expand}</a>"
   end
@@ -41,11 +51,25 @@ module Rayo::Tags::PropertyTags
   end
 
   tag 'date' do |tag|
-    Time.now.strftime(tag.attr['format'] || '%A, %B %d, %Y')
+    date_for( tag ).strftime( tag.attr['format'] || '%A, %B %d, %Y' )
+  end
+
+  tag 'rfc1123_date' do |tag|
+    CGI.rfc1123_date( date_for( tag ) )
   end
 
   private
 
+  def date_for( tag )
+    if tag.attr['for'] == 'now'
+      Time.now
+    elsif tag.attr['for']
+      tag.locals.page[tag.attr['for']]
+    else
+      tag.locals.page['published_at']
+    end
+  end
+
   def if_url( tag )
     tag.locals.page.path =~ Regexp.new( tag.attr['matches'] )
   end

data/lib/rayo/version.rb

@@ -1,7 +1,7 @@
 module Rayo
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 2
+    MINOR = 3
     TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].join('.')

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rayo
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: false
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Alexey Noskov
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-02 00:00:00 +03:00
+date: 2010-11-20 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -54,11 +54,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 19
         segments: 
         - 1
+        - 1
         - 0
-        version: "1.0"
+        version: 1.1.0
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -102,6 +103,7 @@ extra_rdoc_files:
 - MIT-LICENSE
 files: 
 - lib/rayo.rb
+- lib/rayo/config/format.rb
 - lib/rayo/config/domain.rb
 - lib/rayo/storage.rb
 - lib/rayo/application.rb