Changeset 437

Show
Ignore:
Timestamp:
08/29/07 09:38:10 (1 year ago)
Author:
bo..@topfunky.com
Message:

Documentation for using non-ERB template handlers such as Haml.
Fixed comment about setting up memcached sessions.
Added autogenerated 'cache' directory to the :clean task.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/History.txt

    r429 r437  
    33* app/ subdirectory of dist/ moved to root. 
    44* Removed 'merb_' from most framework filenames. 
    5 * Fixed bug where image_tag would prepend /images/ to urls starting with http:// or https://. 
     5* Fixed bug where image_tag would prepend /images/ to urls starting with  
     6  http:// or https://. 
    67* benchmarking added to exceptions. 
    78* Added a more flexible routes system that allows routing based on any request 
    89  environment variable.  Regular expressions now form base of all routes. 
     10* Non-erb template engines must be activated explicitly. List the name of the  
     11  engine in merb_init.rb: Merb::Template::Haml 
    912 
    1013See also: 

  • trunk/Rakefile

    r433 r437  
    1919CLEAN.include ['**/.*.sw?', '*.gem', '.config'] 
    2020 
    21 setup_clean [ "pkg", "lib/*.bundle", "*.gem", "doc", ".config", 'coverage'] 
     21setup_clean [ "pkg", "lib/*.bundle", "*.gem", "doc", ".config", 'coverage', "cache"] 
    2222 
    2323 

  • trunk/app_generators/merb/templates/conf/merb.yml

    r427 r437  
    1717# Turn on memcached sessions. 
    1818# Requires these lines in merb_init.rb (and a running memcached server): 
    19 #   require 'memcache_util' 
     19#   require 'memcache' 
    2020#   CACHE = MemCache.new('127.0.0.1:11211', { :namespace => 'my_app' }) 
    2121# :mem_cache_session: true 

  • trunk/lib/merb/mixins/render.rb

    r434 r437  
    2222    end 
    2323 
    24     # universal render method. Template handlers are registered 
     24    # Universal render method. Template handlers are registered 
    2525    # by template extension. So you can use the same render method 
    2626    # for any kind of template that implements an adapter module. 
    27     # out of the box Merb support Erubis, Haml, Markaby and Builder templates 
    28     # 
    29     # Erubis template ext:  .herb .jerb .erb 
     27    # 
     28    # Out of the box Merb supports Erubis. In addition, Haml, Markaby  
     29    # and Builder templates are built in, but you must activate them in 
     30    # merb_init.rb by listing the name of the template engine you  
     31    # want to use: 
     32    # 
     33    #   Merb::Template::Haml 
     34    # 
     35    # Erubis template ext:  .herb .jerb .erb .rhtml 
    3036    # Markaby template ext: .mab 
    3137    # Builder template ext: .rxml .builder .xerb  
    3238    # Haml template ext: .haml 
     39    # 
     40    # In addition, you can identify the type of output with an  
     41    # extension in the middle of the filename. Erubis is capable of  
     42    # rendering any kind of text output, not just HTML. 
     43    # 
     44    #  index.html.erb update.js.erb feed.xml.erb 
    3345    # 
    3446    # Examples: