merb-core 1.0.7.1 → 1.0.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
data/lib/merb-core/bootloader.rb
CHANGED
@@ -704,7 +704,7 @@ class Merb::BootLoader::LoadClasses < Merb::BootLoader
|
|
704
704
|
@writer.close
|
705
705
|
|
706
706
|
# master process stores pid to merb.main.pid
|
707
|
-
Merb::Server.store_pid("main")
|
707
|
+
Merb::Server.store_pid("main") if Merb::Config[:daemonize] || Merb::Config[:cluster]
|
708
708
|
|
709
709
|
if Merb::Config[:console_trap]
|
710
710
|
Merb.trap("INT") {}
|
data/lib/merb-core/test.rb
CHANGED
@@ -10,8 +10,6 @@ begin
|
|
10
10
|
require 'webrat/merb'
|
11
11
|
rescue LoadError => e
|
12
12
|
if Merb.testing?
|
13
|
-
Merb.fatal! "Couldn't load Webrat. You should run: sudo gem install webrat", e
|
14
|
-
else
|
15
13
|
Merb.logger.warn! "Couldn't load Webrat, so some features, like `visit' will not " \
|
16
14
|
"be available. Please install webrat if you want these features."
|
17
15
|
end
|
@@ -33,6 +33,8 @@ module Merb
|
|
33
33
|
@__cookie_jar__ ||= Merb::Test::CookieJar.new
|
34
34
|
# Grab the cookie group name
|
35
35
|
jar = env.delete(:jar) || :default
|
36
|
+
# Add the cookies explicitly set by the user
|
37
|
+
@__cookie_jar__.update(jar, uri, env.delete(:cookie)) if env.has_key?(:cookie)
|
36
38
|
# Set the cookie header with the cookies
|
37
39
|
env["HTTP_COOKIE"] = @__cookie_jar__.for(jar, uri)
|
38
40
|
end
|
data/lib/merb-core/version.rb
CHANGED
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: merb-core
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.0.
|
4
|
+
version: 1.0.8
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Ezra Zygmuntowicz
|
@@ -9,7 +9,7 @@ autorequire:
|
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
11
|
|
12
|
-
date:
|
12
|
+
date: 2009-01-16 00:00:00 -08:00
|
13
13
|
default_executable:
|
14
14
|
dependencies:
|
15
15
|
- !ruby/object:Gem::Dependency
|