[V7] Rails 3.0 porting

rebased #346.