trinidad 1.0.4 → 1.0.5

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/History.txt CHANGED
@@ -1,3 +1,7 @@
1
+ == 1.0.5 (2011-01-13)
2
+
3
+ * Fix trailing spaces on arguments. Thank you Windows.
4
+
1
5
  == 1.0.4 (2011-01-11)
2
6
 
3
7
  * Add 'jruby.compat.version' parameter to let jruby-rack loads on 1.9 mode
data/README.rdoc CHANGED
@@ -75,4 +75,4 @@ You can find further information on how to write your own extension in the wiki:
75
75
 
76
76
  == Copyright
77
77
 
78
- Copyright (c) 2010 David Calavera<calavera@apache.org>. See LICENSE for details.
78
+ Copyright (c) 2011 David Calavera<calavera@apache.org>. See LICENSE for details.
data/lib/trinidad.rb CHANGED
@@ -24,5 +24,5 @@ require 'trinidad/rackup_web_app'
24
24
  require 'trinidad/war_web_app'
25
25
 
26
26
  module Trinidad
27
- VERSION = '1.0.4'
27
+ VERSION = '1.0.5'
28
28
  end
@@ -14,12 +14,14 @@ Hash.class_eval do
14
14
  next
15
15
  end
16
16
 
17
- target[key] = hash[key]
17
+ value = hash[key]
18
+ value.strip! if value.respond_to?(:strip!)
19
+ target[key] = value
18
20
  end
19
21
 
20
22
  target
21
23
  end
22
-
24
+
23
25
  def deep_merge!(second)
24
26
  second.each_pair do |k,v|
25
27
  if self[k].is_a?(Hash) and second[k].is_a?(Hash)
metadata CHANGED
@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
5
5
  segments:
6
6
  - 1
7
7
  - 0
8
- - 4
9
- version: 1.0.4
8
+ - 5
9
+ version: 1.0.5
10
10
  platform: ruby
11
11
  authors:
12
12
  - David Calavera
@@ -14,7 +14,7 @@ autorequire:
14
14
  bindir: bin
15
15
  cert_chain: []
16
16
 
17
- date: 2011-01-11 00:00:00 +01:00
17
+ date: 2011-01-14 00:00:00 +01:00
18
18
  default_executable: trinidad
19
19
  dependencies:
20
20
  - !ruby/object:Gem::Dependency