diff options
| author | John Keiser <john@johnkeiser.com> | 2014-09-26 21:11:42 -0700 |
|---|---|---|
| committer | John Keiser <john@johnkeiser.com> | 2014-09-26 21:11:42 -0700 |
| commit | ea00a7786143fd32f6b1e937ce768100ff0beece (patch) | |
| tree | 0b6451871dc704ab7988c19ed5f53e5318a7bd5f /lib/chef_zero/endpoints/environment_cookbooks_endpoint.rb | |
| parent | 15f4a3e533eefa59412e81c0252af3166541ede0 (diff) | |
| parent | e3f2e8471cd97340c28b7541ffb0fa7143a33ca4 (diff) | |
| download | chef-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/environment_cookbooks_endpoint.rb')
| -rw-r--r-- | lib/chef_zero/endpoints/environment_cookbooks_endpoint.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/chef_zero/endpoints/environment_cookbooks_endpoint.rb b/lib/chef_zero/endpoints/environment_cookbooks_endpoint.rb index c8f129b..166caa3 100644 --- a/lib/chef_zero/endpoints/environment_cookbooks_endpoint.rb +++ b/lib/chef_zero/endpoints/environment_cookbooks_endpoint.rb @@ -1,4 +1,4 @@ -require 'json' +require 'ffi_yajl' require 'chef_zero/endpoints/cookbooks_base' module ChefZero @@ -6,7 +6,7 @@ module ChefZero # /environments/NAME/cookbooks class EnvironmentCookbooksEndpoint < CookbooksBase def get(request) - environment = JSON.parse(get_data(request, request.rest_path[0..3]), :create_additions => false) + environment = FFI_Yajl::Parser.parse(get_data(request, request.rest_path[0..3]), :create_additions => false) constraints = environment['cookbook_versions'] || {} if request.query_params['num_versions'] == 'all' num_versions = nil |