Lighthouse has a new layout. Prefer the old one? Return to the old layout, and switch back any time from the link at the top of each page.

This project is archived and is in readonly mode.

Changeset [01db5ded54b0e3a2ea80d28e4841d40fcec23cdf] by rick

Revision 01db5ded54b0e3a2ea80d28e4841d40fcec23cdf, committed by Repository · June 29th, 2008 @ 08:13 PM

Merge branch 'state_machine'

Some big changes:

  • Added some redundant requires so active_support/inflecto can be loaded

without the rest of ActiveSupport.

  • Disabled callbacks and validations until they are added and tested.
  • Converted specs back to tests, using ActiveSupport::TestCase and the new

#test helper.

  • As an experiment, I imported Scott Barron's awesome AASM gem into

ActiveModel. I added multiple state machine support and vastly improved

the API (no more aasm_* prefixes). All the old tests pass. If this bothers

people, I have no problems removing this and contributing the changes back to

AASM. I just feel like AMo is a better spot for all these 'modelish' features.

http://github.com/rails/rails/co...

22 changed files

  • A activemodel/lib/active_model/core.rb
  • A activemodel/lib/active_model/state_machine.rb
  • A activemodel/lib/active_model/state_machine/event.rb
  • A activemodel/lib/active_model/state_machine/machine.rb
  • A activemodel/lib/active_model/state_machine/state.rb
  • A activemodel/lib/active_model/state_machine/state_transition.rb
  • A activemodel/test/observing_test.rb
  • A activemodel/test/state_machine/event_test.rb
  • A activemodel/test/state_machine/machine_test.rb
  • A activemodel/test/state_machine/state_test.rb
  • A activemodel/test/state_machine/state_transition_test.rb
  • A activemodel/test/state_machine_test.rb
  • A activemodel/test/test_helper.rb
  • R activemodel/spec/observing_spec.rb
  • R activemodel/spec/spec_helper.rb
  • M activemodel/Rakefile
  • M activemodel/lib/active_model.rb
  • M activemodel/lib/active_model/base.rb
  • M activemodel/lib/active_model/callbacks.rb
  • M activemodel/lib/active_model/observing.rb
  • M activemodel/lib/active_model/validations.rb
  • M activesupport/lib/active_support/inflector.rb