jackdempsey

diff --git a/lib/merb-core/controller/mixins/controller.rb b/lib/merb-core/controller/mixins/controller.rb
index 8c8078c..2bb0f74 100644
--- a/lib/merb-core/controller/mixins/controller.rb
+++ b/lib/merb-core/controller/mixins/controller.rb
@@ -127,9 +127,15 @@ module Merb
     def redirect(url, opts = {})
       default_redirect_options = { :message => nil, :permanent => false }
       opts = default_redirect_options.merge(opts)
-      if opts[:message]
-        notice = Merb::Request.escape([Marshal.dump(opts[:message])].pack("m"))

jackdempsey

~/git/src/merb-core (messages)$ gd
diff --git a/lib/merb-core/controller/mixins/controller.rb b/lib/merb-core/controller/mixins/controller.rb
index 8c8078c..bb6973d 100644
--- a/lib/merb-core/controller/mixins/controller.rb
+++ b/lib/merb-core/controller/mixins/controller.rb
@@ -127,10 +127,7 @@ module Merb
     def redirect(url, opts = {})
       default_redirect_options = { :message => nil, :permanent => false }
       opts = default_redirect_options.merge(opts)
-      if opts[:message]

jackdempsey

iff --git a/lib/merb-core/controller/mixins/controller.rb b/lib/merb-core/controller/mixins/controller.rb
index 8c8078c..f5cdadc 100644
--- a/lib/merb-core/controller/mixins/controller.rb
+++ b/lib/merb-core/controller/mixins/controller.rb
@@ -127,7 +127,10 @@ module Merb
     def redirect(url, opts = {})
       default_redirect_options = { :message => nil, :permanent => false }
       opts = default_redirect_options.merge(opts)
-      if opts[:message]
+      if opts[:message] || opts[:notice] || opts[:error]

jackdempsey

  # create these manually for now til figure out namespace issue
  r.match('/login').to(:controller => 'merb-auth/sessions', :action =>'create').name(:login)
  r.match('/logout').to(:controller => 'merb-auth/sessions', :action =>'destroy').name(:logout)
  r.match('/signup').to(:controller => 'merb-auth/Users', :action =>'new').name(:signup)

jackdempsey

describe Home, "index action" do
  def get_index() dispatch_to(Home, :index); end
  
  it "should render success" do
    lambda { get_index }.should_not raise_error
  end

jackdempsey

class Home < Application
  def app_status
    repository.adapter.execute("show tables")
    'ok'
  end
end


describe Home, "app_status action" do
  it "should render 'ok' if db is connecting correctly" do

jackdempsey

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

describe UserMailer do
  before do
    @mailer ||= UserMailer.new
  end
  it "should send a signup notification" do
    @mailer.should respond_to(:signup_notification)
  end
end

jackdempsey

/projects/recollectr master$ bin/merb -i
/usr/local/lib/ruby/site_ruby/1.8/rubygems/custom_require.rb:27:in `gem_original_require': no such file to load -- merb-core/vendor/facets/dictionary (LoadError)
	from /usr/local/lib/ruby/site_ruby/1.8/rubygems/custom_require.rb:27:in `require'
	from /Users/jack/projects/recollectr/gems/gems/merb-core-0.9.8/lib/merb-core/controller/mixins/responder.rb:3
	from /Users/jack/projects/recollectr/gems/gems/merb-core-0.9.8/lib/merb-core/controller/merb_controller.rb:13
	from /usr/local/lib/ruby/site_ruby/1.8/rubygems/custom_require.rb:27:in `gem_original_require'
	from /usr/local/lib/ruby/site_ruby/1.8/rubygems/custom_require.rb:27:in `require'
	from /Users/jack/projects/recollectr/gems/gems/merb-core-0.9.8/lib/merb-core/autoload.rb:27
	from /usr/local/lib/ruby/site_ruby/1.8/rubygems/custom_require.rb:27:in `gem_original_require'
	from /usr/local/lib/ruby/site_ruby/1.8/rubygems/custom_require.rb:27:in `require'

jackdempsey

diff --git a/lib/merb-core/controller/mixins/responder.rb b/lib/merb-core/controller/mixins/responder.rb
index 130a4e2..69612eb 100644
--- a/lib/merb-core/controller/mixins/responder.rb
+++ b/lib/merb-core/controller/mixins/responder.rb
@@ -1,6 +1,5 @@
 require 'enumerator'
 require 'merb-core/controller/mime'
-require "merb-core/vendor/facets/dictionary"
 
 module Merb

jackdempsey

1)
NameError in 'Merb::Dispatcher when the Exception action raises renders the default exception template'
uninitialized constant Merb::Test::Rspec::ViewMatchers::HaveXpath::LibXML
./spec/../lib/merb-core/test/matchers/view_matchers.rb:25:in `matches_libxml?'
./spec/../lib/merb-core/test/matchers/view_matchers.rb:8:in `send'
./spec/../lib/merb-core/test/matchers/view_matchers.rb:8:in `matches?'
/Users/jack/git/src/merb-core/spec/public/controller/dispatcher_spec.rb:372:
./lib/merb-core/test/run_specs.rb:123:in `run_specs'
./lib/merb-core/test/run_specs.rb:114:in `fork'
./lib/merb-core/test/run_specs.rb:114:in `run_specs'