acts_as_api 0.3.4 → 0.3.5

data/lib/acts_as_api/config.rb

@@ -12,6 +12,11 @@ module ActsAsApi
       # Default is <tt>[:xml]</tt>      
       attr_accessor_with_default :dasherize_for, [:xml]
       
+      # If true, the root node in json collections will be added
+      # so the response will look like the default Rails 3 json
+      # response
+      attr_accessor_with_default :include_root_in_json_collections, false
+
       # Holds references to formats that need
       # to get added an additional root node
       # with the name of the model.      

data/lib/acts_as_api/rendering.rb

@@ -59,6 +59,10 @@ module ActsAsApi
 
       api_response = api_model.as_api_response(api_template)
 
+      if api_response.is_a?(Array) && api_format.to_sym == :json && ActsAsApi::Config.include_root_in_json_collections
+        api_response = api_response.collect{|f| { api_root_name.singularize => f } }
+      end
+
       if meta_hash or ActsAsApi::Config.add_root_node_for.include? api_format
         api_response = { api_root_name.to_sym =>  api_response}
       end

data/lib/acts_as_api/version.rb

@@ -1,3 +1,3 @@
 module ActsAsApi
-  VERSION = "0.3.4"
+  VERSION = "0.3.5"
 end

data/spec/controllers/users_controller_spec.rb

@@ -138,6 +138,69 @@ describe UsersController, :orm => :active_record do
 
   end
 
+  describe 'Rails 3 default style json responses' do
+
+    before(:each) do
+      @org_include_root_in_json_collections = ActsAsApi::Config.include_root_in_json_collections
+      ActsAsApi::Config.include_root_in_json_collections = true
+    end
+
+    after(:each) do
+      ActsAsApi::Config.include_root_in_json_collections = @org_include_root_in_json_collections
+    end
+
+    describe 'get all users' do
+
+      before(:each) do
+        get :index, :format => 'json', :api_template => :name_only
+      end
+
+      it "should have a root node named users" do
+        response_body_json.should have_key("users")
+      end
+
+      it "should contain all users" do
+        response_body_json["users"].should be_a(Array)
+      end
+
+      it "should contain the specified attributes" do
+        response_body_json["users"].first["user"].should have_key("first_name")
+        response_body_json["users"].first["user"].should have_key("last_name")
+      end
+
+      it "contains the user root nodes" do
+        response_body_json["users"].collect(&:keys).flatten.uniq.should eql(["user"])
+      end
+
+      it "should contain the specified values" do
+        response_body_json["users"].first["user"]["first_name"].should eql("Luke")
+        response_body_json["users"].first["user"]["last_name"].should eql("Skywalker")
+      end
+
+    end
+
+    describe 'get a single user' do
+
+      before(:each) do
+        get :show, :format => 'json', :api_template => :name_only, :id => @luke.id
+      end
+
+      it "should have a root node named user" do
+        response_body_json.should have_key("user")
+      end
+
+      it "should contain the specified attributes" do
+        response_body_json["user"].should have_key("first_name")
+        response_body_json["user"].should have_key("last_name")
+      end
+
+      it "should contain the specified values" do
+        response_body_json["user"]["first_name"].should eql("Luke")
+        response_body_json["user"]["last_name"].should eql("Skywalker")
+      end
+    end
+
+  end
 
   describe 'jsonp responses with callback' do
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: acts_as_api
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 3
-  - 4
-  version: 0.3.4
+  - 5
+  version: 0.3.5
 platform: ruby
 authors: 
 - "Christian B\xC3\xA4uerlein"