merb-core 1.0.7.1 → 1.0.8

data/lib/merb-core/bootloader.rb

@@ -704,7 +704,7 @@ class Merb::BootLoader::LoadClasses < Merb::BootLoader
         @writer.close
 
         # master process stores pid to merb.main.pid
-        Merb::Server.store_pid("main")
+        Merb::Server.store_pid("main") if Merb::Config[:daemonize] || Merb::Config[:cluster]
 
         if Merb::Config[:console_trap]
           Merb.trap("INT") {}

data/lib/merb-core/rack/middleware.rb

@@ -11,7 +11,7 @@ module Merb
       # @overridable
       # :api: plugin
       def deferred?(env)
-        @app.deferred?(env)
+        @app.deferred?(env) if @app.respond_to?(:deferred?)
       end
   
       # @overridable

data/lib/merb-core/test.rb

@@ -10,8 +10,6 @@ begin
   require 'webrat/merb'
 rescue LoadError => e
   if Merb.testing?
-    Merb.fatal! "Couldn't load Webrat. You should run: sudo gem install webrat", e
-  else
     Merb.logger.warn! "Couldn't load Webrat, so some features, like `visit' will not " \
                       "be available. Please install webrat if you want these features."
   end

data/lib/merb-core/test/helpers/request_helper.rb

@@ -33,6 +33,8 @@ module Merb
           @__cookie_jar__ ||= Merb::Test::CookieJar.new
           # Grab the cookie group name
           jar = env.delete(:jar) || :default
+          # Add the cookies explicitly set by the user
+          @__cookie_jar__.update(jar, uri, env.delete(:cookie)) if env.has_key?(:cookie)
           # Set the cookie header with the cookies
           env["HTTP_COOKIE"] = @__cookie_jar__.for(jar, uri)
         end

data/lib/merb-core/version.rb

@@ -1,4 +1,4 @@
 module Merb
-  VERSION = '1.0.7.1' unless defined?(Merb::VERSION)
-  DM_VERSION = '0.9.8' unless defined?(Merb::DM_VERSION)
+  VERSION = '1.0.8' unless defined?(Merb::VERSION)
+  DM_VERSION = '0.9.9' unless defined?(Merb::DM_VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb-core
 version: !ruby/object:Gem::Version 
-  version: 1.0.7.1
+  version: 1.0.8
 platform: ruby
 authors: 
 - Ezra Zygmuntowicz
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-31 00:00:00 -08:00
+date: 2009-01-16 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency