@@ -20,8 +20,8 @@ class MessagesController < ApplicationController end end respond_to do |wants| - wants.json { render :json => @messages.to_json(:methods => [:user_first_name, :user_last_name]) } - wants.xml { render :xml => @messages.to_xml(:methods => [:user_first_name, :user_last_name]) } + wants.json { render :json => @messages.to_json(Message.default_serialization_options) } + wants.xml { render :xml => @messages.to_xml(Message.default_serialization_options) } end end @@ -29,8 +29,8 @@ class MessagesController < ApplicationController @message = current_user.messages.build(params[:message] && params[:message].merge(:kind => 'message')) respond_to do |wants| if @message.save - wants.json { render :json => @message.to_json(:methods => [:user_first_name, :user_last_name]) } - wants.xml { render :xml => @message.to_xml(:methods => [:user_first_name, :user_last_name]) } + wants.json { render :json => @message.to_json(Message.default_serialization_options) } + wants.xml { render :xml => @message.to_xml(Message.default_serialization_options) } else wants.json { render :json => @message.errors.full_messages } wants.xml { render :xml => @message.errors } app/controllers/messages_controller.rb @@ -9,8 +9,8 @@ class UsersController < ApplicationController order_by email end respond_to do |wants| - wants.json { render :json => @users.to_json(:only => [:id, :email, :first_name, :last_name]) } - wants.xml { render :xml => @users.to_xml(:only => [:id, :email, :first_name, :last_name]) } + wants.json { render :json => @users.to_json(User.default_serialization_options) } + wants.xml { render :xml => @users.to_xml(User.default_serialization_options) } end end @@ -20,8 +20,8 @@ class UsersController < ApplicationController respond_to do |wants| if @user.save self.current_user = @user - wants.json { render :json => @user.to_json(:only => [:id, :email, :first_name, :last_name]) } - wants.xml { render :xml => @user.to_xml(:only => [:id, :email, :first_name, :last_name]) } + wants.json { render :json => @user.to_json(User.default_serialization_options) } + wants.xml { render :xml => @user.to_xml(User.default_serialization_options) } else wants.json { render :json => @user.errors.full_messages } wants.xml { render :xml => @user.errors } @@ -36,8 +36,8 @@ class UsersController < ApplicationController order_by email end respond_to do |wants| - wants.json { render :json => @users.to_json(:only => [:id, :email, :first_name, :last_name]) } - wants.xml { render :xml => @users.to_xml(:only => [:id, :email, :first_name, :last_name]) } + wants.json { render :json => @users.to_json(User.default_serialization_options) } + wants.xml { render :xml => @users.to_xml(User.default_serialization_options) } end end app/controllers/users_controller.rb @@ -8,4 +8,8 @@ class Message < ActiveRecord::Base delegate :first_name, :last_name, :to => :user, :prefix => true, :allow_nil => true + def self.default_serialization_options + {:methods => [:user_first_name, :user_last_name]} + end + end app/models/message.rb @@ -16,6 +16,10 @@ class User < ActiveRecord::Base named_scope :stale, proc { { :conditions => ['last_activity_at < ? AND logged_in = ?', Flak.stale_timeout_in_minutes.to_i.minutes.ago, true] } } + def self.default_serialization_options + {:only => [:id, :email, :first_name, :last_name]} + end + def self.authenticate(options) options ||= {} return nil if options[:email].blank? || options[:password].blank? app/models/user.rb @@ -8,13 +8,13 @@ class MessagesControllerTest < ActionController::TestCase user = Factory(:user) login_as(user) post :create, :message => Factory.attributes_for(:message) - assert JSON.parse(@response.body)['message']['id'], user.messages.last.id + assert_equal @response.body, user.messages.last.to_json(Message.default_serialization_options) end should "return errors on failure" do login_as(Factory(:user)) post :create - assert_same_elements JSON.parse(@response.body), Message.create.errors.full_messages + assert_same_elements @response.body, Message.create.errors.full_messages.to_json end end @@ -24,7 +24,7 @@ class MessagesControllerTest < ActionController::TestCase messages = [Factory(:login_message), Factory(:stale_logout_message), Factory(:message)] get :index assert_response :success - assert_same_elements JSON.parse(@response.body).map{|j| j['message']['id']}, Message.all.map(&:id) + assert_same_elements @response.body, Message.all.to_json(Message.default_serialization_options) end context "when limiting responses" do @@ -40,22 +40,22 @@ class MessagesControllerTest < ActionController::TestCase should "return messages after the given id in chronological order" do get :index, :after_id => @messages[1].id assert_response :success - assert_equal [@messages[2], @messages[3], @user.messages.last].map(&:id), - JSON.parse(@response.body).map{|j|j['message']['id']} + assert_equal Message.all(:conditions => ['id > ?', @messages[1].id], :order => 'created_at').to_json(Message.default_serialization_options), + @response.body end should "return messages before the given id in reverse chronological order" do get :index, :before_id => @messages[2].id assert_response :success - assert_equal [@messages[1].id, @messages[0].id], - JSON.parse(@response.body).map{|j|j['message']['id']} + assert_equal Message.all(:conditions => ['id < ?', @messages[2].id], :order => 'created_at desc').to_json(Message.default_serialization_options), + @response.body end - should "only return the kind of message specified" do + should "only return the kind of message specified in reverse chronological order" do get :index, :kind => "message" assert_response :success - assert_same_elements @messages.map(&:id), - JSON.parse(@response.body).map{|j|j['message']['id']} + assert_same_elements Message.find_all_by_kind('message', :order => 'created_at desc').to_json(Message.default_serialization_options), + @response.body end end end test/functional/messages_controller_test.rb @@ -7,13 +7,13 @@ class UsersControllerTest < ActionController::TestCase should "return the id of the new user on success" do post :create, :key => Flak.signup_key, :user => Factory.attributes_for(:user) assert_response :success - assert JSON.parse(@response.body)["user"]["id"], "The id of the new user was not returned on success" + assert_equal @response.body, User.last.to_json(User.default_serialization_options) end should "return errors on failure" do post :create, :key => Flak.signup_key assert_response :success - assert_same_elements JSON.parse(@response.body), User.create.errors.full_messages + assert_same_elements @response.body, User.create.errors.full_messages.to_json end end @@ -40,10 +40,8 @@ class UsersControllerTest < ActionController::TestCase @active_user = Factory(:active_user) get :current assert_response :success - body = JSON.parse(@response.body).sort_by{|r| r['user']['id'] } - assert_equal user.id, body.first['user']['id'] - assert_equal @active_user.id, body.last['user']['id'] - assert !body.any?{|r| r['user']['id'] == @logged_out_user.id } + assert_equal User.find_all_by_logged_in(true).to_json(User.default_serialization_options), + @response.body end end test/functional/users_controller_test.rb bf91cdf520a98a16551ba487eb0263b75bbca8a3 Nathan Sutton nate@sevenwire.com http://github.com/sevenwire/flak/commit/6712cc8adf4fb1d0f4bd2a00c491ed8c5658a56d 6712cc8adf4fb1d0f4bd2a00c491ed8c5658a56d 2009-11-02T20:47:50-08:00 2009-11-02T20:47:50-08:00 Adding default serialization options 84e568b700a1bddbd4c03cb3e7f22b85f3f9edcc Nathan Sutton nate@sevenwire.com