diff options
author | tyler-ball <tyleraball@gmail.com> | 2014-09-26 16:18:48 -0700 |
---|---|---|
committer | tyler-ball <tyleraball@gmail.com> | 2014-09-26 16:18:48 -0700 |
commit | e3f2e8471cd97340c28b7541ffb0fa7143a33ca4 (patch) | |
tree | 0b6451871dc704ab7988c19ed5f53e5318a7bd5f /lib/chef_zero/chef_data/default_creator.rb | |
parent | 15f4a3e533eefa59412e81c0252af3166541ede0 (diff) | |
download | chef-zero-e3f2e8471cd97340c28b7541ffb0fa7143a33ca4.tar.gz |
Removing 'json' gem dependency, replacing with 'ffi-yajl'tball/chef-zero-yajl-replace-json
Diffstat (limited to 'lib/chef_zero/chef_data/default_creator.rb')
-rw-r--r-- | lib/chef_zero/chef_data/default_creator.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/chef_zero/chef_data/default_creator.rb b/lib/chef_zero/chef_data/default_creator.rb index 078ba8b..60b495a 100644 --- a/lib/chef_zero/chef_data/default_creator.rb +++ b/lib/chef_zero/chef_data/default_creator.rb @@ -237,11 +237,11 @@ module ChefZero when "groups/admins" admins = data.list(path[0..1] + [ 'users' ]).select do |name| - user = JSON.parse(data.get(path[0..1] + [ 'users', name ]), :create_additions => false) + user = FFI_Yajl::Parser.parse(data.get(path[0..1] + [ 'users', name ]), :create_additions => false) user['admin'] end admins += data.list(path[0..1] + [ 'clients' ]).select do |name| - client = JSON.parse(data.get(path[0..1] + [ 'clients', name ]), :create_additions => false) + client = FFI_Yajl::Parser.parse(data.get(path[0..1] + [ 'clients', name ]), :create_additions => false) client['admin'] end admins += @creators[path[0..1]] if @creators[path[0..1]] @@ -351,7 +351,7 @@ module ChefZero # Non-validator clients own themselves. if path.size == 4 && path[0] == 'organizations' && path[2] == 'clients' begin - client = JSON.parse(data.get(path), :create_additions => false) + client = FFI_Yajl::Parser.parse(data.get(path), :create_additions => false) if !client['validator'] owners |= [ path[3] ] end @@ -363,7 +363,7 @@ module ChefZero if @creators[path] @creators[path].each do |creator| begin - client = JSON.parse(data.get(path[0..2] + [ creator ]), :create_additions => false) + client = FFI_Yajl::Parser.parse(data.get(path[0..2] + [ creator ]), :create_additions => false) next if client['validator'] rescue end @@ -409,7 +409,7 @@ module ChefZero def get_container_acl(acl_path) parent_path = AclPath.parent_acl_data_path(acl_path) if parent_path - JSON.parse(data.get(parent_path), :create_additions => false) + FFI_Yajl::Parser.parse(data.get(parent_path), :create_additions => false) else nil end |