caterer 0.11.1 → 0.11.2

Sign up to get free protection for your applications and to get access to all the features.
@@ -108,7 +108,8 @@ module Caterer
108
108
  data = group.data.merge(member.data)
109
109
 
110
110
  if options[:data]
111
- json = MultiJson.load options[:data], :symbolize_keys => true rescue nil
111
+ # todo: rather than puking if the json is valid, this should create a pretty language
112
+ json = MultiJson.load options[:data], :symbolize_keys => true
112
113
  data = data.merge(json) if json and json.is_a? Hash
113
114
  end
114
115
 
@@ -1,3 +1,3 @@
1
1
  module Caterer
2
- VERSION = "0.11.1"
2
+ VERSION = "0.11.2"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: caterer
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.11.1
4
+ version: 0.11.2
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -273,7 +273,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
273
273
  version: '0'
274
274
  segments:
275
275
  - 0
276
- hash: 4321504824518012860
276
+ hash: 2702261551377672085
277
277
  required_rubygems_version: !ruby/object:Gem::Requirement
278
278
  none: false
279
279
  requirements:
@@ -282,7 +282,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
282
282
  version: '0'
283
283
  segments:
284
284
  - 0
285
- hash: 4321504824518012860
285
+ hash: 2702261551377672085
286
286
  requirements: []
287
287
  rubyforge_project:
288
288
  rubygems_version: 1.8.23