caterer 0.7.7 → 0.7.8
Sign up to get free protection for your applications and to get access to all the features.
- data/lib/caterer/command/base.rb +6 -3
- data/lib/caterer/config/group.rb +1 -0
- data/lib/caterer/config/member.rb +1 -0
- data/lib/caterer/version.rb +1 -1
- metadata +1 -1
data/lib/caterer/command/base.rb
CHANGED
@@ -104,11 +104,14 @@ module Caterer
|
|
104
104
|
end
|
105
105
|
|
106
106
|
opts[:data] = begin
|
107
|
-
|
107
|
+
|
108
|
+
data = group.data.merge(member.data)
|
109
|
+
|
108
110
|
if json = options[:data]
|
109
|
-
data = MultiJson.load
|
111
|
+
data = data.merge(MultiJson.load(json, :symbolize_keys => true) rescue {})
|
110
112
|
end
|
111
|
-
|
113
|
+
|
114
|
+
data
|
112
115
|
end
|
113
116
|
|
114
117
|
Server.new(@env, opts)
|
data/lib/caterer/config/group.rb
CHANGED
data/lib/caterer/version.rb
CHANGED