Changeset 931

Show
Ignore:
Timestamp:
11/10/07 19:54:09 (1 year ago)
Author:
iv..@gweezlebur.com
Message:

Merki: Upgrade to latest SVN trunk Merb, so generators work

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • apps/merki/trunk/Rakefile

    r930 r931  
    88MERB_ENV = ENV['MERB_ENV'] if ENV['MERB_ENV'] 
    99 
    10 if File.directory?( File.join(File.dirname(__FILE__), "framework")) 
    11   $:.unshift('framework') 
    12   require File.join(File.dirname(__FILE__), "framework/merb") 
    13 else   
    14   require 'merb' 
    15 end 
     10require File.dirname(__FILE__)+'/config/boot.rb' 
    1611require MERB_FRAMEWORK_ROOT+'/tasks' 
    1712MERB_ROOT = File.dirname(__FILE__) 

  • apps/merki/trunk/app/views/layout/application.html.erb

    r930 r931  
    11<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> 
    2 <html xmlns="http://www.w3.org/1999/xhtml"> 
     2<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-us" lang="en-us"> 
    33  <head> 
    44    <title>Fresh Merb App</title> 
    5     <meta http-equiv="content-type" content="text/html; charset=iso-8859-1" /> 
     5    <meta http-equiv="content-type" content="text/html; charset=utf-8" /> 
    66    <link rel="stylesheet" href="/stylesheets/master.css" type="text/css" media="screen" charset="utf-8"> 
    77  </head> 

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

    r930 r931  
    2929# These are some examples of how you might specify dependencies. 
    3030#  
    31 # dependencies "RedCloth", "merb-form-helpers" 
     31# dependencies "RedCloth", "merb_helpers" 
    3232# OR 
    3333# dependency "RedCloth", "> 3.0" 

  • apps/merki/trunk/config/merb.yml

    r930 r931  
    2222# A secret key is required when using the 'cookie' session store (default),  
    2323# change this value to something unique to your application and keep it private 
    24 :session_secret_key: /USERS/IVEY/CODE/MERKI9255 
     24:session_secret_key: MERKI4711 
    2525 
    2626# Uncomment to use the merb upload progress. The 'path match' will be treated as 

  • apps/merki/trunk/spec/spec_helper.rb

    r930 r931  
    11require File.join(File.dirname(__FILE__), "..", 'config', 'boot') 
    2  
     2MERB_ENV="test" 
    33$TESTING=true 
    44 
    …… 
    88require 'merb/test/rspec' 
    99 
     10 
     11DataMapper::Base.auto_migrate! 
    1012### METHODS BELOW THIS LINE SHOULD BE EXTRACTED TO MERB ITSELF