Changeset 1312 for apps

Show
Ignore:
Timestamp:
01/15/08 14:03:32 (10 months ago)
Author:
has.s..@gmail.com
Message:

Upgrade to be compatible with 0.5.*

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • apps/benchmark/Rakefile

    r973 r1312  
    66require 'rubygems' 
    77 
    8 MERB_ENV = ENV['MERB_ENV'] if ENV['MERB_ENV'] 
     8Merb.environment = ENV['Merb.environment'] if ENV['Merb.environment'] 
    99 
    10 require File.dirname(__FILE__)+'/config/boot.rb' 
    11 require MERB_FRAMEWORK_ROOT+'/tasks' 
    12 MERB_ROOT = File.dirname(__FILE__) 
     10require File.dirname(__FILE__) + '/config/boot.rb' 
     11require Merb.framework_root + '/tasks' 
     12Merb.root = File.dirname(__FILE__) 
    1313include FileUtils 
    1414 

  • apps/benchmark/config/dependencies.rb

    r1025 r1312  
    11# Make the app's "gems" directory a place where gems are loaded from 
    22Gem.clear_paths 
    3 Gem.path.unshift(MERB_ROOT / "gems") 
     3Gem.path.unshift(Merb.root / "gems") 
    44 
    55# Make the app's "lib" directory a place where ruby files get "require"d from 
    6 $LOAD_PATH.unshift(MERB_ROOT / "lib") 
     6$LOAD_PATH.unshift(Merb.root / "lib") 
    77 
    88### Merb doesn't come with database support by default.  You need 
    …… 
    3737# dependencies "RedCloth" => "> 3.0", "ruby-aes-cext" => "= 1.0" 
    3838 
    39 Merb::Server.after_app_loads do 
     39Merb::BootLoader.after_app_loads do 
    4040  ### Add dependencies here that must load after the application loads: 
    4141 

  • apps/benchmark/config/merb_init.rb

    r1025 r1312  
    55# Your app's dependencies, including your database layer (if any) are defined 
    66# in config/dependencies.rb 
    7 require File.join(MERB_ROOT, 'config', 'dependencies') 
     7require File.join(Merb.root, 'config', 'dependencies') 
    88 
    99# Here's where your controllers, helpers, and models, etc. get loaded.  If you 
    …… 
    1111# around this file. 
    1212puts "Loading Application..." 
    13 Merb::Server.load_application 
     13Merb::BootLoader.load_application 
    1414 
    1515# Load environment-specific configuration 
    16 require File.join(MERB_ROOT, 'config', 'environments', MERB_ENV) 
     16require File.join(Merb.root, 'config', 'environments', Merb.environment) 

  • apps/benchmark/spec/spec_helper.rb

    r973 r1312  
    1 MERB_ENV="test" 
     1Merb.environment="test" 
    22$TESTING=true 
    33require File.join(File.dirname(__FILE__), "..", 'config', 'boot') 
    4 require File.join(MERB_ROOT, 'config', 'merb_init') 
     4require File.join(Merb.root, 'config', 'merb_init') 
    55 
    66require 'merb/test/helper'