I've used
Attitudes Through Idioms in class and you could definitely use it as a class text book. Each unit has a story and tons of exercises to practice the 10-15 idioms introduced in that unit. All idioms in a unit are categorized by the language used like, idioms using color (ex. green thumb) or using animals (ex. raining cats and dogs).
It's definitely worth a look....