merb-core 0.9.7 → 0.9.8

data/spec/private/config/environment_spec.rb

@@ -1,13 +0,0 @@
-require File.dirname(__FILE__) + '/spec_helper'
-
-describe Merb::Config do
-  it "should apply environment from the command line option --environment" do
-    Merb.start %w( --environment performance_testing )
-    Merb.environment.should == "performance_testing"
-  end
-
-  it "should apply environment from the command line option -e" do
-    Merb.start %w( -e selenium )
-    Merb.environment.should == "selenium"
-  end  
-end

data/spec/private/config/merb_spec.rb

@@ -1,34 +0,0 @@
-require File.dirname(__FILE__) + '/spec_helper'
-
-describe Merb, '#orm' do
-  it "it should be :none by default" do
-    Merb.orm.should == :none
-  end
-
-  it "should be changeable" do
-    Merb.orm = :datamapper
-    Merb.orm.should == :datamapper
-  end
-end
-
-describe Merb, '#test_framework' do
-  it "it should be :rspec by default" do
-    Merb.test_framework.should == :rspec
-  end
-
-  it "should be changeable" do
-    Merb.test_framework = :test_unit
-    Merb.test_framework.should == :test_unit
-  end
-end
-
-describe Merb, '#template_engine' do
-  it "it should be :erb by default" do
-    Merb.template_engine.should == :erb
-  end
-
-  it "should be changeable" do
-    Merb.template_engine = :haml
-    Merb.template_engine.should == :haml
-  end
-end

data/spec/private/config/spec_helper.rb

@@ -1 +0,0 @@
-require File.join(File.dirname(__FILE__), "..", "..", "spec_helper")

data/spec/private/core_ext/kernel_spec.rb

@@ -1,159 +0,0 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-
-describe "Kernel#require" do
-  before do
-    @logger = StringIO.new
-    Merb.logger = Merb::Logger.new(@logger)
-  end
-
-  it "should be able to require and throw a useful error message" do
-    Kernel.stub!(:require).with("redcloth").and_raise(LoadError)
-    Merb.logger.should_receive(:error!).with("foo")
-    Kernel.rescue_require("redcloth", "foo")
-  end
-end
-
-
-
-describe "Kernel#caller" do
-  it "should be able to determine caller info" do
-    __caller_info__.should be_kind_of(Array)
-  end
-
-  it "should be able to get caller lines" do
-    i = 0
-    __caller_lines__(__caller_info__[0], __caller_info__[1], 4) { i += 1 }
-    i.should == 9
-  end
-end
-
-
-
-describe "Kernel#extract_options_from_args!" do
-  it "should extract options from args" do
-    args = ["foo", "bar", {:baz => :bar}]
-    Kernel.extract_options_from_args!(args).should == {:baz => :bar}
-    args.should == ["foo", "bar"]
-  end
-end
-
-
-
-describe "Kernel#debugger" do
-  it "should throw a useful error if there's no debugger" do
-    Merb.logger.should_receive(:info!).with "\n***** Debugger requested, but was not " +
-      "available: Start server with --debugger " +
-      "to enable *****\n"
-    Kernel.debugger
-  end
-end
-
-
-describe "Kernel#load_dependency" do
-  before :each do
-
-  end
-
-  it "DOES NOT add dependency to the list" do
-    lambda {
-      begin
-        load_dependency("rspec", ">= 1.1.2")
-      rescue LoadError => e
-        # some people may have no RSpec gem
-      end
-    }.should_not change(Merb::BootLoader::Dependencies.dependencies, :size)
-  end
-
-  it "DOES NOT defer load to boot loader run and requires it right away" do
-    self.should_receive(:require)
-
-    begin
-      load_dependency("rspec", ">= 1.1.2")
-    rescue LoadError => e
-      # some people may have no RSpec gem
-    end
-  end
-
-  it "logs on events using info level" do
-    self.should_receive(:require)
-    Merb.logger.should_receive(:info!)
-
-    begin
-      load_dependency("rspec", ">= 1.1.2")
-    rescue LoadError => e
-      # some people may have no RSpec gem
-    end
-  end
-end
-
-
-
-describe "Kernel#dependencies" do
-  it "deferres load of dependencies given as String" do
-    self.should_receive(:dependency).with("hpricot").and_return(true)
-
-    begin
-      dependencies("hpricot")
-    rescue LoadError => e
-      # sanity check, should never happen
-    end
-  end
-
-  it "deferres load of dependencies given as Array" do
-    self.should_receive(:dependency).with("hpricot").and_return(true)
-    self.should_receive(:dependency).with("rake").and_return(true)
-
-    begin
-      dependencies("hpricot", "rake")
-    rescue LoadError => e
-      # sanity check, should never happen
-    end
-  end
-
-  it "deferres load of dependencies given as Hash" do
-    self.should_receive(:dependency).with("hpricot", "0.6").and_return(true)
-    self.should_receive(:dependency).with("rake", "0.8.1").and_return(true)
-
-    begin
-      dependencies("hpricot" => "0.6", "rake" => "0.8.1")
-    rescue LoadError => e
-      # sanity check, should never happen
-    end
-  end
-end
-
-
-
-describe "Kernel#load_dependencies" do
-  it "loads dependencies given as String immediately" do
-    self.should_receive(:load_dependency).with("hpricot").and_return(true)
-
-    begin
-      load_dependencies("hpricot")
-    rescue LoadError => e
-      # sanity check, should never happen
-    end
-  end
-
-  it "loads dependencies given as Array immediately" do
-    self.should_receive(:load_dependency).with("hpricot").and_return(true)
-    self.should_receive(:load_dependency).with("rake").and_return(true)
-
-    begin
-      load_dependencies("hpricot", "rake")
-    rescue LoadError => e
-      # sanity check, should never happen
-    end
-  end
-
-  it "loads dependencies given as Hash immediately" do
-    self.should_receive(:load_dependency).with("hpricot", "0.6").and_return(true)
-    self.should_receive(:load_dependency).with("rake", "0.8.1").and_return(true)
-
-    begin
-      load_dependencies("hpricot" => "0.6", "rake" => "0.8.1")
-    rescue LoadError => e
-      # sanity check, should never happen
-    end
-  end
-end

data/spec/private/dispatch/bootloader_spec.rb

@@ -1,24 +0,0 @@
-require File.dirname(__FILE__) + '/spec_helper'
-
-describe Merb::BootLoader::RackUpApplication do
-
-  it "should default to rack config (rack.rb)" do
-    options = {:merb_root => File.dirname(__FILE__) / 'fixture'}
-    Merb::Config.setup(options)
-    app = Merb::BootLoader::RackUpApplication.run
-    app.class.should == Merb::Rack::Static
-  end
-
-  it "should use rackup config that we specified" do
-    options = {:rackup => File.dirname(__FILE__) / 'fixture' / 'config' / 'black_hole.rb'}
-    Merb::Config.setup(options)
-    app = Merb::BootLoader::RackUpApplication.run
-    app.class.should == Rack::Adapter::BlackHole
-
-    env = Rack::MockRequest.env_for("/black_hole")
-    status, header, body = app.call(env)
-    status.should == 200
-    header.should == { "Content-Type" => "text/plain" }
-    body.should == ""
-  end
-end

data/spec/private/dispatch/fixture/app/controllers/application.rb

@@ -1,4 +0,0 @@
-
-
-class Application < Merb::Controller
-end

data/spec/private/dispatch/fixture/app/controllers/exceptions.rb

@@ -1,25 +0,0 @@
-class Exceptions < Application
-
-  attr_reader :handler 
-  
-  # handle NotFound exceptions (404)
-  
-   def not_found
-     @handler = :not_found
-     render :format => :html
-   end
- 
-   # handle NotAcceptable exceptions (406)
-   
-   def not_acceptable
-     @handler = :not_acceptable
-     render "Handled by: not_acceptable"
-   end
- 
-  # # Any client error (400 series)
-  def client_error
-    @handler = :client_error
-    render "Handled by: client_error"
-  end
-
-end

data/spec/private/dispatch/fixture/app/controllers/foo.rb

@@ -1,19 +0,0 @@
-class Foo < Application
-
-  def index
-    "index"
-  end
-
-  def bar
-    render
-  end
-
-  def raise_conflict
-    raise Conflict
-  end
-  
-  def raise_not_acceptable
-    raise NotAcceptable
-  end
-  
-end  

data/spec/private/dispatch/fixture/app/helpers/global_helpers.rb

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

data/spec/private/dispatch/fixture/app/views/exeptions/client_error.html.erb

@@ -1,37 +0,0 @@
-<div id="container">
-  <div id="header-container">
-    <img src="/images/merb.jpg">
-    <!-- <h1>Mongrel + Erb</h1> -->
-    <h2>pocket rocket web framework</h2>
-    <hr />
-  </div>
-
-  <div id="left-container">
-    <h3>Exception:</h3>
-    <p><%= params[:exception] %></p>
-  </div>
-
-  <div id="main-container">
-    <h3>Why am I seeing this page?</h3>
-    <p>
-      An unexpected "client error" has occurred.  That means something in your request 
-      was not allowed, but the server does not have any more specific information.
-    </p> 
-    
-    <h3>Where can I find help?</h3>
-    <p>If you have any questions or if you can't figure something out, please take a
-      look at our <a href="http://merb.devjavu.com/"> project development page</a> or,
-      feel free to come chat at irc.freenode.net, channel #merb.</p>
-
-    <h3>How do I edit this page?</h3>
-    <p>You can change what people see when this happens byy editing <tt>app/views/exceptions/not_found.html.erb</tt>.</p> 
-  
-  </div>
-
-  <div id="footer-container">
-    <hr />
-    <div class="left"></div>
-    <div class="right">&copy; 2008 the merb dev team</div>
-    <p>&nbsp;</p>
-  </div>
-</div>

data/spec/private/dispatch/fixture/app/views/exeptions/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 %></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 %> <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>
-			<% params[:original_params].each do |param, value| %>
-				<li><strong><%= param %>:</strong> <%= value.inspect %></li>
-			<% end %>
-			<%= "<li>None</li>" if params[:original_params].empty? %>
-			</ul>
-			
-			<h3>Session</h3>
-			<ul>
-			<% params[:original_session].each do |param, value| %>
-				<li><strong><%= param %>:</strong> <%= value.inspect %></li>
-			<% end %>
-			<%= "<li>None</li>" if params[:original_session].empty? %>			
-			</ul>
-			
-			<h3>Cookies</h3>
-			<ul>
-			<% params[:original_cookies].each do |param, value| %>
-				<li><strong><%= param %>:</strong> <%= value.inspect %></li>
-			<% end %>
-			<%= "<li>None</li>" if 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 ? Erubis::XmlHelper.html_escape(lcode[0..90])+'<span class="more">......</span>' : Erubis::XmlHelper.html_escape(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>