michaelklishin

1)
ArgumentError in 'Merb::Controller callable actions should dispatch to callable actions'
Status should be of type Fixnum or known Symbol, was Symbol with value ok
/Users/antares/dev/opensource/merb/merb-core/spec/public/controller/../../../lib/merb-core/controller/merb_controller.rb:223:in `status='
/Users/antares/dev/opensource/merb/merb-core/spec/public/controller/controllers/base.rb:25:in `index'
/Users/antares/dev/opensource/merb/merb-core/spec/public/controller/../../../lib/merb-core/controller/abstract_controller.rb:269:in `send'
/Users/antares/dev/opensource/merb/merb-core/spec/public/controller/../../../lib/merb-core/controller/abstract_controller.rb:269:in `_call_action'
/Users/antares/dev/opensource/merb/merb-core/spec/public/controller/../../../lib/merb-core/controller/abstract_controller.rb:249:in `_dispatch'
/Users/antares/dev/opensource/merb/merb-core/spec/public/controller/../../../lib/merb-core/controller/merb_controller.rb:200:in `_dispatch'
/Users/antares/dev/opensource/merb/merb

michaelklishin

commit 6697034331fca5a7277207d21bbbe3cd4a091584
Author: Michael S. Klishin <michael@novemberain.com>
Date:   Thu Aug 7 18:17:24 2008 +0300

    More verbose exception when status value is invalid.

diff --git a/lib/merb-core/controller/merb_controller.rb b/lib/merb-core/controller/merb_controller.rb
index f0db22a..f7e0005 100644
--- a/lib/merb-core/controller/merb_controller.rb
+++ b/lib/merb-core/controller/merb_controller.rb

michaelklishin

git log --pretty='format:%an' --no-merges | ruby -e 'puts STDIN.read.split("\n").uniq.join("\n")' | wc -l

michaelklishin

load File.dirname(__FILE__) / "form" / "helpers.rb"
load File.dirname(__FILE__) / "form" / "builder.rb"

class Merb::Controller
  class_inheritable_accessor :_form_class
  include Merb::Helpers::Form
end

Merb::BootLoader.after_app_loads do
  class Merb::Controller

michaelklishin

namespace :db do
  
  task :merb_start do
    Merb.start :adapter => 'runner', :environment => ENV['MERB_ENV'] || 'development', :log_file => Merb::Config[:log_file]
  end
  
  desc "Migrate the database through scripts in schema/migrations. Target specific version with VERSION=x"
  task :migrate => :merb_start do
    config = Merb::Orms::ActiveRecord.configurations[Merb.environment.to_sym]
    ActiveRecord::Base.establish_connection(config)

michaelklishin

module Middleware
  class ETag < ::Merb::Rack::Middleware
    def call(env)
      status, headers, body = @app.call(env)

      if tag?(status, headers, env)
        sha1 = Digest::SHA1.hexdigest(body)
        Merb.logger.info! "Set ETag to #{sha1}"
        headers['ETag'] = sha1
      end

michaelklishin

require File.join(File.dirname(__FILE__), "..", "..", "spec_helper")

describe Merb::Rack::Application do
  before(:each) do
    @app = Merb::Rack::Application.new
  end
  
  it 'is callable' do
    @app.should respond_to(:call)
  end

michaelklishin

antares|merb/render-deferred)> merb -a mongrel -X off
merb -a mongrel -X off
================================================================================
Mon Aug 18 15:53:58 +0300 2008
Mon Aug 18 15:54:04 +0300 2008
================================================================================
Mon Aug 18 15:54:05 +0300 2008
Mon Aug 18 15:54:11 +0300 2008
================================================================================
Mon Aug 18 15:54:11 +0300 2008

michaelklishin

                   Results |
----------------------------
old_parse            5.244 |
new_parse            5.114 |
rack_parse           3.182 |

michaelklishin

************************************************************************
Number of items: 1001
                                      Results |
-----------------------------------------------
each with external memo                13.921 |
for i in x with external memo          14.571 |
inject                                 17.290 |
************************************************************************
Number of items: 101
                                      Results |