Fixed issue #548

Applied changes from b8b98d6, dropped tests for Procs not available in rails 3.0.x.

rake test:
~
Finished tests in 0.523861s, 286.3355 tests/s, 356.9649 assertions/s.

150 tests, 187 assertions, 0 failures, 0 errors, 0 skips