Changeset 1315

Show
Ignore:
Timestamp:
01/16/08 15:02:57 (9 months ago)
Author:
jon.egil.stra..@gmail.com
Message:

Updated to 0.5.2

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • mrblog/trunk/Rakefile

    r1203 r1315  
    66require 'rubygems' 
    77 
    8 MERB_ENV = ENV['MERB_ENV'] if ENV['MERB_ENV'] 
     8Merb.environment = ENV['MERB_ENV'] if ENV['MERB_ENV'] 
    99$RAKE_ENV = true 
    1010 
    1111require File.dirname(__FILE__)+'/config/boot.rb' 
    12 require MERB_FRAMEWORK_ROOT+'/tasks' 
    13 MERB_ROOT = File.dirname(__FILE__) 
     12require Merb.framework_root + '/tasks' 
     13Merb.root = File.dirname(__FILE__) 
    1414include FileUtils 
    1515 

  • mrblog/trunk/app/controllers/blog.rb

    r1305 r1315  
    3333                          :body => params[:comment_body]) 
    3434    @comments = @post.comments.reload 
    35     render_js 'comment' 
     35    render_js 'comments' 
    3636  end 
    3737   
    …… 
    4040    @post.comments.destroy params[:id] 
    4141    @comments = @post.comments.reload 
    42     render_js 'comment' 
     42    render_js 'comments' 
    4343  end 
    4444 

  • mrblog/trunk/app/controllers/files.rb

    r1280 r1315  
    1616    puts "------------------------------------------ Files#upload ------------------------------------------" 
    1717    # move 
    18     destination = MERB_ROOT + "/public/uploads/#{params[:file][:filename]}" 
     18    destination = Merb.root + "/public/uploads/#{params[:file][:filename]}" 
    1919    FileUtils.mv(params[:file][:tempfile].path, destination) 
    2020    render 

  • mrblog/trunk/app/views/blog/comments.js.erb

    r1305 r1315  
    1 $('comments').update(<%=js partial(:comments) %>); 
     1$('comments').update(<%=js partial(:comments, :format =>  :html) %>); 
    22$('comment-form').remove(); 

  • mrblog/trunk/config/boot.rb

    r1203 r1315  
    11frozen_framework_path = File.join(File.dirname(__FILE__), "..", "framework") 
    22 
    3 unless defined?(MERB_FRAMEWORK_ROOT) 
     3unless defined?(Merb::framework_root) 
    44  if File.directory?(frozen_framework_path) 
    55    $:.unshift frozen_framework_path 

  • mrblog/trunk/config/dependencies.rb

    r1203 r1315  
    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 
    …… 
    4242#require 'merbful_authentication' #merbful_authentication is The Merb Way, update to it 
    4343 
    44 Merb::Server.after_app_loads do 
     44Merb::BootLoader.after_app_loads do 
    4545  ### Add dependencies here that must load after the application loads: 
    4646 

  • mrblog/trunk/config/merb_init.rb

    r1294 r1315  
    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) 
     16environment_config = File.join(Merb.root, 'config', 'environments', Merb.environment + '.rb') 
     17require environment_config if File.exist?(environment_config) 
    1718 
    18 # Pastet from merb_init in trunk-version 
     19# Pasted from merb_init in trunk-version 
    1920module MrBlog 
    2021  PER_PAGE = 10 

  • mrblog/trunk/spec/spec_helper.rb

    r1272 r1315  
    1 MERB_ENV="test" 
    2 $TESTING=true 
     1Merb.environment = "test" 
     2$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' 

  • mrblog/trunk/test/test_helper.rb

    r1203 r1315  
    55require 'rubygems' 
    66require 'test/unit' 
    7 require File.join(MERB_ROOT, 'config', 'merb_init') 
     7require File.join(Merb.root, 'config', 'merb_init') 
    88 
    99require 'merb/test/helper'