chef-server-api 0.9.14.beta.1 → 0.9.14.rc.1

data/app/controllers/application.rb

@@ -22,7 +22,7 @@
 require "chef/mixin/checksum"
 require "chef/cookbook_loader"
 require "mixlib/authentication/signatureverification"
-require "chef/json"
+require 'chef/json_compat'
 
 class Application < Merb::Controller
 
@@ -119,13 +119,18 @@ class Application < Merb::Controller
     available_recipes
   end
 
-  # Use Chef's JSON conversion library for sending JSON instead of the
-  # default Merb, which calls obj.to_json. Fixes CHEF-1292/PL-538.
+  # Fix CHEF-1292/PL-538; cause Merb to pass the max nesting constant into
+  # obj.to_json, which it calls by default based on the original request's 
+  # accept headers and the type passed into Merb::Controller.display
+  #--
+  # TODO: tim, 2010-11-24: would be nice to instead have Merb call 
+  # Chef::JSONCompat.to_json, instead of obj.to_json, but changing that
+  # behavior is convoluted in Merb. This override is assuming that
+  # Merb is eventually calling obj.to_json, which takes the :max_nesting
+  # option.
   override! :display
   def display(obj)
-    super(obj, nil, {:max_nesting => Chef::JSON::JSON_MAX_NESTING})
-    #super.display(Chef::JSON.to_json(obj))
-    #Chef::JSON.to_json(obj)
+    super(obj, nil, {:max_nesting => Chef::JSONCompat::JSON_MAX_NESTING})
   end
 
 end

data/config/init.rb

@@ -38,6 +38,7 @@ require 'chef/data_bag_item'
 require 'chef/cookbook_version'
 require 'chef/sandbox'
 require 'chef/checksum'
+require 'chef/monkey_patches/regexp'
 
 require 'mixlib/authentication'
 

data/config/router.rb

@@ -122,7 +122,7 @@ Merb::Router.prepare do
             begin
               # Call Chef's JSON utility instead of the default in Merb, 
               # JSON.parse.
-              jobj = Chef::JSON.from_json(raw_post)
+              jobj = Chef::JSONCompat.from_json(raw_post)
               jobj = jobj.to_mash if jobj.is_a?(Hash)
             rescue JSON::ParserError
               jobj = Mash.new

data/lib/chef-server-api/version.rb

@@ -1,3 +1,3 @@
 module ChefServerApi
-  VERSION = '0.9.14.beta.1'
+  VERSION = '0.9.14.rc.1'
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: chef-server-api
 version: !ruby/object:Gem::Version 
-  hash: 62196289
+  hash: 15424247
   prerelease: true
   segments: 
   - 0
   - 9
   - 14
-  - beta
+  - rc
   - 1
-  version: 0.9.14.beta.1
+  version: 0.9.14.rc.1
 platform: ruby
 authors: 
 - Opscode
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-09 00:00:00 -08:00
+date: 2011-02-25 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency