caterer 0.7.9 → 0.7.10

data/lib/caterer/command/base.rb

@@ -107,11 +107,11 @@ module Caterer
 
           data = group.data.merge(member.data)
 
-          if json = options[:data]
-            loaded = MultiJson.load json, :symbolize_keys => true rescue nil
-            data.merge(loaded) if loaded and loaded.is_a? Hash
+          if options[:data]
+            json = MultiJson.load options[:data], :symbolize_keys => true rescue nil
+            data = data.merge(json) if json and json.is_a? Hash
           end
-          
+
           data
         end
 

data/lib/caterer/version.rb

@@ -1,3 +1,3 @@
 module Caterer
-  VERSION = "0.7.9"
+  VERSION = "0.7.10"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caterer
 version: !ruby/object:Gem::Version
-  version: 0.7.9
+  version: 0.7.10
   prerelease: 
 platform: ruby
 authors: