Merge pull request #8 from blackxored/small-fixes

Fixes the build and upgrades the locked gems

Gemfile.lock

@@ -2,7 +2,7 @@ PATH
   remote: .
   specs:
     grape-active_model_serializers (0.1.0)
-      active_model_serializers (~> 0.8.0)
+      active_model_serializers (>= 0.8.1)
       grape (~> 0.3)
 
 GEM
@@ -24,11 +24,11 @@ GEM
       i18n (= 0.6.1)
       multi_json (~> 1.0)
     arel (3.0.2)
-    backports (2.6.7)
+    backports (3.3.3)
     builder (3.0.4)
     descendants_tracker (0.0.1)
     diff-lcs (1.1.3)
-    grape (0.4.1)
+    grape (0.5.0)
       activesupport
       builder
       hashie (>= 1.2.0)
@@ -41,7 +41,7 @@ GEM
     hashie (2.0.5)
     i18n (0.6.1)
     multi_json (1.7.3)
-    multi_xml (0.5.3)
+    multi_xml (0.5.4)
     rack (1.5.2)
     rack-accept (0.4.5)
       rack (>= 0.4)
@@ -59,8 +59,8 @@ GEM
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.12.2)
     tzinfo (0.3.37)
-    virtus (0.5.4)
-      backports (~> 2.6.1)
+    virtus (0.5.5)
+      backports (~> 3.3)
       descendants_tracker (~> 0.0.1)
 
 PLATFORMS

spec/grape_ams_spec.rb

@@ -28,8 +28,8 @@ describe Grape::ActiveModelSerializers do
   end
 
   it "should respond with proper content-type" do
-    subject.get("/home/users", :serializer => "user") do
-      {user: {first_name: "JR", last_name: "HE"}}
+    subject.get("/home/users", :serializer => UserSerializer) do
+      User.new
     end
     get("/home/users")
     last_response.headers["Content-Type"].should == "application/json"