merb 0.5.3 → 0.9.2

data/SVN_REVISION

@@ -1 +0,0 @@
-1334

data/app_generators/merb/USAGE

@@ -1,5 +0,0 @@
-Description:
-  
-  
-Usage:
-  

data/app_generators/merb/merb_generator.rb

@@ -1,108 +0,0 @@
-class MerbGenerator < RubiGen::Base
-  DEFAULT_SHEBANG = File.join(Config::CONFIG['bindir'],
-                              Config::CONFIG['ruby_install_name']) unless defined? DEFAULT_SHEBANG
-  
-  default_options   :shebang => DEFAULT_SHEBANG
-  
-  attr_reader :name
-  
-  def initialize(runtime_args, runtime_options = {})
-    super
-    usage if args.empty?
-    @name = args.shift
-    @destination_root = File.expand_path(@name)
-    extract_options
-  end
-
-  def manifest
-    script_options     = { :chmod => 0755, :shebang => options[:shebang] == DEFAULT_SHEBANG ? nil : options[:shebang] }
-
-    record do |m|
-      # Ensure appropriate folder(s) exists
-      m.directory ''
-      BASEDIRS.each { |path| m.directory path }
-      
-      # copy skeleton
-      m.file_copy_each %w( Rakefile )
-      m.file_copy_each %w( application.rb exceptions.rb ), "app/controllers"
-      m.file_copy_each %w( global_helper.rb ), "app/helpers"
-      m.file_copy_each %w( application.html.erb ), "app/parts/views/layout"      
-      m.file_copy_each %w( application.html.erb application.text.erb ), "app/mailers/views/layout"
-      m.file_copy_each %w( application.html.erb ), "app/views/layout"
-      m.file_copy_each %w( internal_server_error.html.erb not_found.html.erb not_acceptable.html.erb ), "app/views/exceptions"
-      m.file_copy_each %w( merb.jpg ), "public/images"
-      m.file_copy_each %w( master.css ), "public/stylesheets"
-      m.file_copy_each %w( merb.fcgi ), "public"
-      m.file_copy_each %w( boot.rb merb_init.rb router.rb upload.conf dependencies.rb), "config"
-      m.file_copy_each %w( development.rb production.rb test.rb ), "config/environments"
-      m.file_copy_each %w( spec_helper.rb ), "spec"
-      m.file_copy_each %w( test_helper.rb), "test"
-
-      # build default config
-      m.template "config/merb.yml", "config/merb.yml", :assigns => {:key => "#{@name.upcase}#{rand(9999)}"}
-      
-      # build scripts
-      %w( stop_merb generate destroy ).each do |file|
-        m.file     "script/#{file}",        "script/#{file}", script_options
-        m.template "script/win_script.cmd", "script/#{file}.cmd", :assigns => { :filename => file } if windows
-      end
-    end
-  end
-  
-  def windows
-    (RUBY_PLATFORM =~ /dos|win32|cygwin/i) || (RUBY_PLATFORM =~ /(:?mswin|mingw)/)
-  end
-  
-  protected
-    def banner
-      <<-EOS
-Creates a Merb application stub.
-
-USAGE: #{spec.name} -g path"
-EOS
-    end
-
-    def add_options!(opts)
-      # opts.separator ''
-      # opts.separator 'Options:'
-      # # For each option below, place the default
-      # # at the top of the file next to "default_options"
-      # opts.on("-r", "--ruby=path", String,
-      #        "Path to the Ruby binary of your choice (otherwise scripts use env, dispatchers current path).",
-      #        "Default: #{DEFAULT_SHEBANG}") { |options[:shebang]| }
-      # opts.on("-v", "--version", "Show the #{File.basename($0)} version number and quit.")
-    end
-    
-    def extract_options
-      # for each option, extract it into a local variable (and create an "attr_reader :author" at the top)
-      # Templates can access these value via the attr_reader-generated methods, but not the
-      # raw instance variable value.
-      # @author = options[:author]
-    end
-
-    # Installation skeleton.  Intermediate directories are automatically
-    # created so don't sweat their absence here.
-    BASEDIRS = %w(
-      app/controllers
-      app/models
-      app/helpers
-      app/mailers/helpers
-      app/mailers/views/layout
-      app/parts/helpers
-      app/parts/views/layout
-      app/views/layout
-      app/views/exceptions
-      config/environments
-      lib
-      log
-      public/images
-      public/javascripts
-      public/stylesheets
-      script
-      spec/models
-      spec/controllers
-      test/unit
-      gems
-    )
-    
-end

data/app_generators/merb/templates/Rakefile

@@ -1,124 +0,0 @@
-require 'rubygems'
-Gem.clear_paths
-Gem.path.unshift(File.join(File.dirname(__FILE__), "gems"))
-
-require 'rake'
-require 'rake/rdoctask'
-require 'rake/testtask'
-require 'spec/rake/spectask'
-require 'fileutils'
-
-require File.dirname(__FILE__)+'/config/boot.rb'
-require Merb::framework_root+'/tasks'
-include FileUtils
-
-# Set these before any dependencies load
-# otherwise the ORM may connect to the wrong env
-Merb.root = File.dirname(__FILE__)
-Merb.environment = ENV['MERB_ENV'] if ENV['MERB_ENV']
-
-# Get Merb plugins and dependencies
-require File.dirname(__FILE__)+'/config/dependencies.rb'
-Merb::Plugins.rakefiles.each {|r| require r } 
-
-#desc "Packages up Merb."
-#task :default => [:package]
-
-desc "load merb_init.rb"
-task :merb_init do
-  # deprecated - here for BC
-  Rake::Task['merb_env'].invoke
-end
-
-task :uninstall => [:clean] do
-  sh %{sudo gem uninstall #{NAME}}
-end
-
-desc 'Run unit tests'
-Rake::TestTask.new('test_unit') do |t|
-  t.libs << 'test'
-  t.pattern = 'test/unit/*_test.rb'
-  t.verbose = true
-end
-
-desc 'Run functional tests'
-Rake::TestTask.new('test_functional') do |t|
-  t.libs << 'test'
-  t.pattern = 'test/functional/*_test.rb'
-  t.verbose = true
-end
-
-desc 'Run all tests'
-Rake::TestTask.new('test') do |t|
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = true
-end
-
-desc "Run all specs"
-Spec::Rake::SpecTask.new('specs') do |t|
-  t.spec_opts = ["--format", "specdoc", "--colour"]
-  t.spec_files = Dir['spec/**/*_spec.rb'].sort
-end
-
-desc "Run all model specs"
-Spec::Rake::SpecTask.new('model_specs') do |t|
-  t.spec_opts = ["--format", "specdoc", "--colour"]
-  t.spec_files = Dir['spec/models/**/*_spec.rb'].sort
-end
-
-desc "Run all controller specs"
-Spec::Rake::SpecTask.new('controller_specs') do |t|
-  t.spec_opts = ["--format", "specdoc", "--colour"]
-  t.spec_files = Dir['spec/controllers/**/*_spec.rb'].sort
-end
-
-desc "Run a specific spec with TASK=xxxx"
-Spec::Rake::SpecTask.new('spec') do |t|
-  t.spec_opts = ["--format", "specdoc", "--colour"]
-  t.libs = ['lib', 'server/lib' ]
-  t.spec_files = ["spec/merb/#{ENV['TASK']}_spec.rb"]
-end
-
-desc "Run all specs output html"
-Spec::Rake::SpecTask.new('specs_html') do |t|
-  t.spec_opts = ["--format", "html"]
-  t.libs = ['lib', 'server/lib' ]
-  t.spec_files = Dir['spec/**/*_spec.rb'].sort
-end
-
-desc "RCov"
-Spec::Rake::SpecTask.new('rcov') do |t|
-  t.spec_opts = ["--format", "specdoc", "--colour"]
-  t.spec_files = Dir['spec/**/*_spec.rb'].sort
-  t.libs = ['lib', 'server/lib' ]
-  t.rcov = true
-end
-
-desc 'Run all tests, specs and finish with rcov'
-task :aok do
-  sh %{rake rcov}
-  sh %{rake spec}
-end
-
-unless Gem.cache.search("haml").empty?
-  namespace :haml do
-    desc "Compiles all sass files into CSS"
-    task :compile_sass do
-      gem 'haml'
-      require 'sass'
-      puts "*** Updating stylesheets"
-      Sass::Plugin.update_stylesheets
-      puts "*** Done"      
-    end
-  end
-end
-
-##############################################################################
-# SVN
-##############################################################################
-
-desc "Add new files to subversion"
-task :svn_add do
-   system "svn status | grep '^\?' | sed -e 's/? *//' | sed -e 's/ /\ /g' | xargs svn add"
-end

data/app_generators/merb/templates/app/controllers/application.rb

@@ -1,3 +0,0 @@
-# all your other controllers should inherit from this one to share code.
-class Application < Merb::Controller
-end  

data/app_generators/merb/templates/app/controllers/exceptions.rb

@@ -1,13 +0,0 @@
-class Exceptions < Application
-  
-  # handle NotFound exceptions (404)
-  def not_found
-    render :format => :html
-  end
-
-  # handle NotAcceptable exceptions (406)
-  def not_acceptable
-    render :format => :html
-  end
-
-end

data/app_generators/merb/templates/app/helpers/global_helper.rb

@@ -1,5 +0,0 @@
-module Merb
-  module GlobalHelper
-    # helpers defined here available to all views.  
-  end
-end    

data/app_generators/merb/templates/app/mailers/views/layout/application.html.erb

@@ -1 +0,0 @@
-<%= catch_content :layout %>

data/app_generators/merb/templates/app/mailers/views/layout/application.text.erb

@@ -1 +0,0 @@
-<%= catch_content :layout %>

data/app_generators/merb/templates/app/parts/views/layout/application.html.erb

@@ -1 +0,0 @@
-<%= catch_content :layout %>

data/app_generators/merb/templates/app/views/exceptions/internal_server_error.html.erb

@@ -1,216 +0,0 @@
-<html>
-<head>
-	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
-	<title><%= @exception.name.humanize %></title>
-	<style type="text/css" media="screen">
-		body {
-			font-family:arial;
-			font-size:11px;
-		}
-		h1 {
-			font-size:48px;
-			letter-spacing:-4px;
-			margin:0;
-			line-height:36px;
-			color:#333;
-		}
-			h1 sup {
-				font-size: 0.5em;
-			}
-			h1 sup.error_500, h1 sup.error_400 {
-				color:#990E05;
-			}
-			h1 sup.error_100, h1 sup.error_200 {
-				color:#00BF10;
-			}
-			h1 sup.error_300 {
-				/* pretty sure you cant 'see' status 300 
-				errors but if you could I think they 
-				would be blue */
-				color:#1B2099;
-			}
-		h2 {
-			font-size:36px;
-			letter-spacing:-3px;
-			margin:0;
-			line-height:28px;
-			color:#444;
-		}
-		a, a:visited {
-			color:#00BF10;
-		}
-		.internalError {
-			width:800px;
-			margin:50px auto;
-		}
-		.header {
-			border-bottom:10px solid #333;
-			margin-bottom:1px;
-			background-image: url("data:image/gif;base64,R0lGODlhAwADAIAAAP///8zMzCH5BAAAAAAALAAAAAADAAMAAAIEBHIJBQA7");
-			padding:20px;
-		}
-		table.trace {
-			width:100%;
-			font-family:courier, monospace;
-			letter-spacing:-1px;
-			border-collapse: collapse;
-			border-spacing:0;
-		}
-		table.trace tr td{
-			padding:0;
-			height:26px;
-			font-size:13px;
-			vertical-align:middle;
-		}
-		table.trace tr.file{
-			border-top:2px solid #fff;
-			background-color:#F3F3F3;
-		}
-		table.trace tr.source {
-			background-color:#F8F8F8;
-			display:none;
-		}
-		table.trace .open tr.source {
-			display:table-row;
-		}
-			table.trace tr.file td.expand {
-				width:23px;
-				background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABcAAAAXCAIAAABvSEP3AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAdVJREFUeNqMVL+TwUAYxaRIOlEhlZHGDAUzzOQ61+AqXMV1lJSU7q/QRqm8KFUcJTNn5qJkaPyoKKVz7y4mF8na5Kt29tt9+/Z97/u81+vVQ4r9frdarS6Xi7ETDIZisRjxMGPfmk4niNPpZE+xLAugbPaZ53nzvtfMBe/3+/3dbuehBrAKhZdUKkVAWa9Xsiybv0CPZDJZLr/qa5/BwgwRjYqOKIvFYjQa/aNommZh0Ww2K5UqzwfoQOPxaLPZ3FAmk0+7lplMpt1u53J5OpBOR0eZEE9wHJfP5zud93g88QhluwWbjW+5VOmKBgKBer3eaDTDYeGBQF8+x7rqIYoiPgixWJazpA6HA+MSxRArkUgMh0M409g8Ho8+9wYxxCqVSq1W26EDHGM2m4HOHQrEc38f/Yn7cLmlIRhBENzcx8cVRZnPZ/YUep2BWkjTIfA+PKVpZAXR5QxsjiqCKvGEqqp443w+0dvy17swqD0HB3S73V5PpkNg1qBqt8kwGCjmPkinM0QJbIoEa7U6UG6ToVgs4V9G2g0ESoP5Aoi7KYX5oCgf8IKbkvn9/mr1LRQKESamzgJy0g0tSZIuB3nuGqRU9Vv9C4sKkUhEkp4soxvxI8AAhWrrtXa3X8EAAAAASUVORK5CYII=);
-				background-position:top left;
-				background-repeat:no-repeat;
-			}
-			table.trace .open tr.file td.expand {
-				width:19px;
-				background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABcAAAB1CAIAAAAqdO2mAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAXZJREFUeNrslK1ywkAUhcMOBomEOiSdqLxEBJX0NaijOsjyHGGmCGyQQYaiiiw4gktkcOmZbpsuuzQ/M5XnqJ2d3S/n3nM3rTzPLUP7/Tt0+pLcGQwG3W53OLyHzPMtjYL7q9UqSRLrD4E1Gj1orCvKYuFHUWTVkOM44/HjDcp8/lL4r6NerzeZPMm1KFw0QkDn83m5fP2lHA4fNQvRtNvtjsfDd0WzmSfb2e/fdTqdOvdh/HLJZLOn0+d2HJ+KRGzbdl23EpFlmed5cp2maRzHQq1lvQ5KMi6EUZBGfup6E1pTfd+vrGW7jbQ2C9hTt9BpqNyIWaAwAy6xg2eBz5iRC/NomiZhGN5sqmnkauo0BUGgVQoBjQ80oCACgNQdZHfTYBkF2mxCtWWAqunWpahxIDUt3QYUxIFQpJHyIWpXjinabKbbwItMHT+NyjchrP8QKaSQQgoppJBCCimkkEIKKaSQQgoppJBCCimkkEIKKaSo+hRgAEFD17X08O2NAAAAAElFTkSuQmCC);
-				background-position:top left;
-				background-repeat:no-repeat;				
-			}
-			table.trace tr.source td.collapse {
-				width:19px;
-				background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABcAAAB1CAIAAAAqdO2mAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAVxJREFUeNrs0zFygkAUBmBlUkgJHdABlQwVkVJKKUxBYWbkALTxMJwhltyDFkss03IF8pudIcwaDaDl/6pd2P327b7d+eHwMXs4lNkzggoVKlSoUKFChQoVKlSoUKFChQoVKlSoUKFChQqVEYqm6ft9+qiSJEkYho7jTlcw2fd9NOI4nq4gEdFwXXe1Cqco63VkWVbXRTqLhTpOwQRpF7quR1E0TgGhqvLKUFCyoQqG/rks3O6kZKW/eRFpevOCoGTXVTcMQ5EyxyDEkML1c5RzuZOICIyXqn7JBVez6282MWrx731HOv2qB8Hri2lamNk0DfpVVdV1Peodappmmua8bdvzuc7zfNprzrLMth1FnGh/X8MjCAIQv/cFz/+65PcDh7rbvYv2ZUfdj+PxsyzLgVl0hKwgTqeqKApx2LeOc7t98zyv/1FWOgvx9RPii23bmL9cetJ8Ed8CDAC6aFW8bCzFhwAAAABJRU5ErkJggg==);
-				background-position:bottom left;
-				background-repeat:no-repeat;	
-				background-color:#6F706F;			
-			}
-			table.trace tr td.path {
-				padding-left:10px;
-			}
-			table.trace tr td.code {
-				padding-left:35px;
-				white-space: pre;
-				line-height:9px;
-				padding-bottom:10px;				
-			}
-				table.trace tr td.code em {
-					font-weight:bold;
-					color:#00BF10;
-				}
-				table.trace tr td.code a {
-				  width: 20px;
-				  float: left;
-				}
-				table.trace tr td.code .more {
-					color:#666;
-				}
-			table.trace tr td.line {
-				width:30px;
-				text-align:right;
-				padding-right:4px;
-			}
-		.footer {
-			margin-top:5px;
-			font-size:11px;
-			color:#444;
-			text-align:right;
-		}
-	</style>
-</head>
-<body>
-	<div class="internalError">
-		
-		<div class="header">
-			<h1><%= @exception.name.humanize %> <sup class="error_<%= @exception.class::STATUS %>"><%= @exception.class::STATUS %></sup></h1>
-			<% if show_details = ::Merb::Config[:exception_details] -%>
-				<h2><%== @exception.message %></h2>
-			<% else -%>
-				<h2>Sorry about that...</h2>
-			<% end -%>
-			<h3>Parameters</h3>
-			<ul>
-			<% controller.params[:original_params].each do |param, value| %>
-				<li><strong><%= param %>:</strong> <%= value.inspect %></li>
-			<% end %>
-			<%= "<li>None</li>" if controller.params[:original_params].empty? %>
-			</ul>
-			
-			<h3>Session</h3>
-			<ul>
-			<% controller.params[:original_session].each do |param, value| %>
-				<li><strong><%= param %>:</strong> <%= value.inspect %></li>
-			<% end %>
-			<%= "<li>None</li>" if controller.params[:original_session].empty? %>			
-			</ul>
-			
-			<h3>Cookies</h3>
-			<ul>
-			<% controller.params[:original_cookies].each do |param, value| %>
-				<li><strong><%= param %>:</strong> <%= value.inspect %></li>
-			<% end %>
-			<%= "<li>None</li>" if controller.params[:original_cookies].empty? %>			
-			</ul>			
-		</div>
-		
-	<% if show_details %>
-		<table class="trace">
-			<% @exception.backtrace.each_with_index do |line, index| %>
-				<tbody class="close">
-					<tr class="file">
-						<td class="expand">
-						</td>
-						<td class="path">
-							<%= (line.match(/^([^:]+)/)[1] rescue 'unknown').sub(/\/((opt|usr)\/local\/lib\/(ruby\/)?(gems\/)?(1.8\/)?(gems\/)?|.+\/app\/)/, '') %>
-							<% unless line.match(/\.erb:/) %>
-                in "<strong><%= line.match(/:in `(.+)'$/)[1] rescue '?' %></strong>"
-              <% else %>
-                (<strong>ERB Template</strong>)
-              <% end %>
-						</td>
-						<td class="line">
-							<a href="txmt://open?url=file://<%=file = (line.match(/^([^:]+)/)[1] rescue 'unknown')%>&amp;line=<%= lineno = line.match(/:([0-9]+):/)[1] rescue '?' %>"><%=lineno%></a>&nbsp;
-						</td> 
-					</tr>
-					<tr class="source">
-						<td class="collapse">
-						</td>
-						<td class="code" colspan="2"><% (__caller_lines__(file, lineno, 5) rescue []).each do |llineno, lcode, lcurrent| %>
-<a href="txmt://open?url=file://<%=file%>&amp;line=<%=llineno%>"><%= llineno %></a><%='<em>' if llineno==lineno.to_i %><%= lcode.size > 90 ? CGI.escapeHTML(lcode[0..90])+'<span class="more">......</span>' : CGI.escapeHTML(lcode) %><%='</em>' if llineno==lineno.to_i %>
-<% end %>
-
-</td>
-					</tr>
-				</tbody>
-			<% end %>
-		</table>
-		<script type="text/javascript" charset="utf-8">
-			// swop the open & closed classes
-			els = document.getElementsByTagName('td');
-			for(i=0; i<els.length; i++){
-				if(els[i].className=='expand' || els[i].className=='collapse'){
-					els[i].onclick = function(e){
-						tbody = this.parentNode.parentNode;
-						if(tbody.className=='open'){
-							tbody.className='closed';
-						}else{
-							tbody.className='open';
-						}
-					}
-				}
-			}
-		</script>
-	<% end %>
-	<div class="footer">
-		lots of love, from <a href="#">merb</a>
-	</div>
-	</div>
-</body>
-</html>