@@ -122,8 +122,6 @@ To use: @--skip-migration@ will skip the user migration, and @--skip-routes@ will skip resource generation -- both useful if you've already run this generator. -* --aasm: Works the same as stateful but uses the updated aasm gem - * --rspec: Generate RSpec tests and Stories in place of standard rails tests. This requires the "RSpec and Rspec-on-rails plugins":http://rspec.info/ README @@ -268,11 +268,7 @@ class AuthenticatedGenerator < Rails::Generator::NamedBase puts "- Add an observer to config/environment.rb" puts " config.active_record.observers = :#{file_name}_observer" end - if options[:aasm] - puts "- Install the acts_as_state_machine gem:" - puts " sudo gem sources -a http://gems.github.com (If you haven't already)" - puts " sudo gem install rubyist-aasm" - elsif options[:stateful] + if options[:stateful] puts "- Install the acts_as_state_machine plugin:" puts " svn export http://elitists.textdriven.com/svn/plugins/acts_as_state_machine/trunk vendor/plugins/acts_as_state_machine" end @@ -390,8 +386,6 @@ protected "Generate signup 'activation code' confirmation via email") { |v| options[:include_activation] = true } opt.on("--stateful", "Use acts_as_state_machine. Assumes --include-activation") { |v| options[:include_activation] = options[:stateful] = true } - opt.on("--aasm", - "Use (gem) aasm. Assumes --include-activation") { |v| options[:include_activation] = options[:stateful] = options[:aasm] = true } opt.on("--rspec", "Force rspec mode (checks for RAILS_ROOT/spec by default)") { |v| options[:rspec] = true } opt.on("--no-rspec", generators/authenticated/authenticated_generator.rb @@ -4,10 +4,9 @@ class <%= class_name %> < ActiveRecord::Base include Authentication include Authentication::ByPassword include Authentication::ByCookieToken -<% if options[:aasm] -%> - include Authorization::AasmRoles -<% elsif options[:stateful] -%> +<% if options[:stateful] -%> include Authorization::StatefulRoles<% end %> + validates_presence_of :login validates_length_of :login, :within => 3..40 validates_uniqueness_of :login, :case_sensitive => false generators/authenticated/templates/model.rb lib/authorization/aasm_roles.rb 2d24dae056f4d2b68c69429ed4395cdd8b02efb2 Daniel Haran chebuctonian@mgmail.com http://github.com/danielharan/restful-authentication/commit/c9ada94c39f3fd59cc7edb74ce5e6a6be239ce80 c9ada94c39f3fd59cc7edb74ce5e6a6be239ce80 2008-06-15T08:17:44-07:00 2008-06-15T08:17:44-07:00 Revert "Add in support for AASM" This reverts commit 2d24dae056f4d2b68c69429ed4395cdd8b02efb2. dc6807dd5c79c6f7c0c82fad856c6f8de83ac5c0 Daniel Haran chebuctonian@mgmail.com