lib/authorization/aasm_roles.rb @@ -122,6 +122,8 @@ 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,7 +268,11 @@ class AuthenticatedGenerator < Rails::Generator::NamedBase puts "- Add an observer to config/environment.rb" puts " config.active_record.observers = :#{file_name}_observer" end - if options[:stateful] + 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] 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 @@ -386,6 +390,8 @@ 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,9 +4,10 @@ class <%= class_name %> < ActiveRecord::Base include Authentication include Authentication::ByPassword include Authentication::ByCookieToken -<% if options[:stateful] -%> +<% if options[:aasm] -%> + include Authorization::AasmRoles +<% elsif 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 cff7cbca33d3d1c10f219a7628539712e62bda93 Codafoo codafoo@gmail.com http://github.com/zachinglis/restful-authentication/commit/2d24dae056f4d2b68c69429ed4395cdd8b02efb2 2d24dae056f4d2b68c69429ed4395cdd8b02efb2 2008-06-03T05:36:17-07:00 2008-06-03T05:36:17-07:00 Add in support for AASM 28aae697675b9ba0eafaf664cd966d367bc34772 Codafoo codafoo@gmail.com