Changeset 572

Show
Ignore:
Timestamp:
09/08/07 06:43:37 (1 year ago)
Author:
duane.johns..@gmail.com
Message:

Added database yml to Marble. Requires merb_sequel gem.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • apps/marble/trunk/app/controllers/welcome.rb

    r500 r572  
    11class Welcome < Application 
    2   before :check 
    3    
    42  def index 
    5     "counter here: #{@this}" 
    6   end 
    7    
    8   protected 
    9    
    10   def check 
    11     throw :halt, "Test" 
     3    @title = "Welcome" 
     4    render :inline => "#{@title}" 
    125  end 
    136end 

  • apps/marble/trunk/config/dependencies.rb

    r571 r572  
    44$LOAD_PATH.unshift(File.join(MERB_ROOT, "lib")) 
    55 
    6 dependency 'magic_scaffold' 
    7 dependency 'sequel_extra/model_migration' 
    8 dependency 'sequel_extra/mysql_table_columns' 
     6# Need to get merb_sequel from svn, package it, and install it in deps/ before the next line: 
     7dependency "merb_sequel" 
    98 
    10 dependency "merb_sequel" 
     9require 'magic_scaffold' 
     10require 'sequel_extra/model_migration' 
     11require 'sequel_extra/mysql_table_columns' 
    1112 
    1213# We pick up any old-style plugins in deps/plugins as a last-effort