summaryrefslogtreecommitdiff
path: root/lib/chef/resource_collection.rb
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2014-08-09 10:04:58 -0700
committerLamont Granquist <lamont@scriptkiddie.org>2014-08-09 10:04:58 -0700
commitadbb0fa85cc45b93ba91dc3019094b312cafb35c (patch)
tree3641e4a23139497a2bd6c3f29af00acad1427beb /lib/chef/resource_collection.rb
parent54db1bedbc0a8d00e3b1fc12c50658f1d48b7a6e (diff)
downloadchef-adbb0fa85cc45b93ba91dc3019094b312cafb35c.tar.gz
remove #to_json Monkeypatching
Diffstat (limited to 'lib/chef/resource_collection.rb')
-rw-r--r--lib/chef/resource_collection.rb10
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/chef/resource_collection.rb b/lib/chef/resource_collection.rb
index a528a18aed..e22e6ce026 100644
--- a/lib/chef/resource_collection.rb
+++ b/lib/chef/resource_collection.rb
@@ -158,7 +158,6 @@ class Chef
# compat.
alias_method :resources, :find
-
# Returns true if +query_object+ is a valid string for looking up a
# resource, or raises InvalidResourceSpecification if not.
# === Arguments
@@ -189,16 +188,19 @@ class Chef
end
# Serialize this object as a hash
- def to_json(*a)
+ def to_hash
instance_vars = Hash.new
self.instance_variables.each do |iv|
instance_vars[iv] = self.instance_variable_get(iv)
end
- results = {
+ {
'json_class' => self.class.name,
'instance_vars' => instance_vars
}
- results.to_json(*a)
+ end
+
+ def to_json(*a)
+ ::Chef::JSONCompat.to_json(to_hash, *a)
end
def self.json_create(o)