Backport the JSON parsing fix to the 1.6 series

chef · Feb 10, 2014 · d759b0a · d759b0a
1 parent f758030
commit d759b0a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# 1.6.3
+- Backport JSON file parsing
+
 # 1.5.5
 
 - Fix issue with - in term (name:a-b)

diff --git a/lib/chef_zero/cookbook_data.rb b/lib/chef_zero/cookbook_data.rb
@@ -73,8 +73,8 @@ def initialize(cookbook)
         end
       end
 
-      def from_json(filepath)
-        self.merge!(JSON.parse(File.read(filepath)))
+      def from_json(json)
+        self.merge!(JSON.parse(json))
       end
 
       private