caterer 0.7.8 → 0.7.9
Sign up to get free protection for your applications and to get access to all the features.
- data/lib/caterer/command/base.rb +3 -2
- data/lib/caterer/version.rb +1 -1
- metadata +1 -1
data/lib/caterer/command/base.rb
CHANGED
@@ -108,9 +108,10 @@ module Caterer
|
|
108
108
|
data = group.data.merge(member.data)
|
109
109
|
|
110
110
|
if json = options[:data]
|
111
|
-
|
111
|
+
loaded = MultiJson.load json, :symbolize_keys => true rescue nil
|
112
|
+
data.merge(loaded) if loaded and loaded.is_a? Hash
|
112
113
|
end
|
113
|
-
|
114
|
+
|
114
115
|
data
|
115
116
|
end
|
116
117
|
|
data/lib/caterer/version.rb
CHANGED