summaryrefslogtreecommitdiff
path: root/lib/chef_zero/endpoints/group_endpoint.rb
diff options
context:
space:
mode:
authorJohn Keiser <john@johnkeiser.com>2014-09-26 21:11:42 -0700
committerJohn Keiser <john@johnkeiser.com>2014-09-26 21:11:42 -0700
commitea00a7786143fd32f6b1e937ce768100ff0beece (patch)
tree0b6451871dc704ab7988c19ed5f53e5318a7bd5f /lib/chef_zero/endpoints/group_endpoint.rb
parent15f4a3e533eefa59412e81c0252af3166541ede0 (diff)
parente3f2e8471cd97340c28b7541ffb0fa7143a33ca4 (diff)
downloadchef-zero-ea00a7786143fd32f6b1e937ce768100ff0beece.tar.gz
Merge pull request #93 from opscode/tball/chef-zero-yajl-replace-json
Removing 'json' gem dependency, replacing with 'ffi-yajl'
Diffstat (limited to 'lib/chef_zero/endpoints/group_endpoint.rb')
-rw-r--r--lib/chef_zero/endpoints/group_endpoint.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/chef_zero/endpoints/group_endpoint.rb b/lib/chef_zero/endpoints/group_endpoint.rb
index 48f05cd..7404d4d 100644
--- a/lib/chef_zero/endpoints/group_endpoint.rb
+++ b/lib/chef_zero/endpoints/group_endpoint.rb
@@ -1,4 +1,4 @@
-require 'json'
+require 'ffi_yajl'
require 'chef_zero/endpoints/rest_object_endpoint'
require 'chef_zero/chef_data/data_normalizer'
@@ -11,9 +11,9 @@ module ChefZero
end
def populate_defaults(request, response_json)
- group = JSON.parse(response_json, :create_additions => false)
+ group = FFI_Yajl::Parser.parse(response_json, :create_additions => false)
group = ChefData::DataNormalizer.normalize_group(group, request.rest_path[3], request.rest_path[1])
- JSON.pretty_generate(group)
+ FFI_Yajl::Encoder.encode(group, :pretty => true)
end
end
end