Updating things.

Author: Michael Bleigh

Gemfile

@@ -2,8 +2,7 @@ gem 'rack'
 gem 'rack-mount'
 gem 'rack-jsonp'
 
-gem 'json'
-gem 'multi_json'
+gem 'activesupport', '>= 3.0.0.rc2'
 
 group :test do
   gem 'rspec', '>= 2.0.0.beta.19'

Gemfile.lock

@@ -1,5 +1,6 @@
 GEM
   specs:
+    activesupport (3.0.0.rc2)
     builder (2.1.2)
     cucumber (0.8.5)
       builder (~> 2.1.2)
@@ -10,9 +11,7 @@ GEM
     diff-lcs (1.1.2)
     gherkin (2.1.5)
       trollop (~> 1.16.2)
-    json (1.4.3)
     json_pure (1.4.3)
-    multi_json (0.0.4)
     rack (1.2.1)
     rack-jsonp (1.0.0)
     rack-mount (0.6.9)
@@ -34,9 +33,8 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  activesupport (>= 3.0.0.rc2)
   cucumber (>= 0.8.5)
-  json
-  multi_json
   rack
   rack-jsonp
   rack-mount

README.rdoc

@@ -1,3 +1,5 @@
+= UNDER CONSTRUCTION. DO NOT USE
+
 = Grape
 
 Grape is a REST-like API micro-framework for Ruby. It is built to complement existing web application frameworks such as Rails and Sinatra by providing a simple DSL to easily provide APIs. It has built-in support for common conventions such as multiple formats, subdomain/prefix restriction, and versioning.

lib/grape/middleware/formatter.rb

@@ -1,5 +1,5 @@
 require 'grape/middleware/base'
-require 'multi_json'
+require 'active_support/json'
 
 module Grape
   module Middleware
@@ -50,7 +50,7 @@ def format_from_header
       def after
         status, headers, bodies = *@app_response
         bodies.map! do |body|
-          MultiJson.encode(body)
+          ActiveSupport::JSON.encode(body)
         end
         [status, headers, bodies]
       end

spec/grape/middleware/formatter_spec.rb

@@ -10,7 +10,7 @@
     it 'should look at the bodies for possibly serializable data' do
       @body = {"abc" => "def"}
       status, headers, bodies = *subject.call({'PATH_INFO' => '/somewhere'})
-      bodies.first.should == MultiJson.encode(@body)
+      bodies.first.should == ActiveSupport::JSON.encode(@body)
     end
   end