@@ -1,3 +1,8 @@ +* 0.03 - 04/28/2008 + - Added :only_if_logged_in? key since logged_in? can't be tested via :if (scoping) + - Added generator option --library-only to allow for "safe" library updating + - Documented and enabled --skip-migration option + * 0.02 - 04/25/2008 - Fixed documentation problems (require_foo instead of authorize_foo leftovers) - Correctly failing users who aren't logged in for all conditions CHANGELOG @@ -23,6 +23,10 @@ To begin using restful-authorization, run: where role is your intended Role model name and user is the name of your User model in restful_authentication. +The generator takes two additional options: + --skip-migration only skips the migration + --library_only only regenerates the library + Syntax ====== @@ -75,6 +79,10 @@ Individual authorization requirements can be limited via a number of keys: * Restrict only the create and new actions :only => [:create, :new] + * Restrict only the create and new actions for users who are logged_in? + These will continue to be accessible to users who aren't logged_in? + :only_if_logged_in? => [:create, :new] + * Restrict all actions except index and show :except => [:index, :show] README @@ -1,6 +1,8 @@ require( File.join( File.dirname(__FILE__), "../authorized_generator_helpers" )) class AuthorizedGenerator < Rails::Generator::NamedBase + default_options :library_only => false, + :skip_migration => false include AuthorizedGeneratorHelpers @@ -23,15 +25,19 @@ class AuthorizedGenerator < Rails::Generator::NamedBase def manifest record do |m| - modify_or_add_user_fixtures(m) - add_roles_and_join_table_fixtures(m) + unless options[:library_only] + modify_or_add_user_fixtures(m) + add_roles_and_join_table_fixtures(m) - add_method_to_user_model(m) + add_method_to_user_model(m) + + add_role_model(m) + add_dependencies_to_application_rb + add_migration(m) unless options[:skip_migration] + end - add_role_model(m) - add_dependencies_to_application_rb add_authorized_system(m) - add_migration(m) unless options[:skip_migration] + end end @@ -145,4 +151,13 @@ EOF "Usage: #{$0} authorized RoleModelName [TargetUserModelName]" end + + def add_options!(opt) + opt.separator '' + opt.separator 'Options:' + opt.on("--skip-migration", + "Don't generate a migration file for this model") { |v| options[:skip_migration] = v } + opt.on("--library-only", + "Only regenerates the library file") { |v| options[:library_only] = true } + end end \ No newline at end of file generators/authorized/authorized_generator.rb @@ -28,10 +28,11 @@ module AuthorizedSystem # # Valid options # - # * :only - authorization is only required for these actions - # * :except - authorization is required for all other actions - # * :if - a Proc or a string to evaluate; the authorization is required if it returns true - # * :unless - the inverse of :if + # * :only - authorization is only required for these actions + # * :only_if_logged_in? - authorization is only required for these actions if the user is logged_in? + # * :except - authorization is required for all other actions + # * :if - a Proc or a string to evaluate; the authorization is required if it returns true + # * :unless - the inverse of :if # # * :redirect_url - takes a named route as a symbol (:new_example_path), string "/example/new", # or hash { :controller => "example", :action => "new" } @@ -48,7 +49,7 @@ module AuthorizedSystem # given status. If no :render_url is specified, it renders a blank page with the status code given. # def require_authorization(type, values, options = {}) - options.assert_valid_keys(:if, :unless, :only, :except, :redirect_url, :render_url, :status) + options.assert_valid_keys(:if, :unless, :only, :only_if_logged_in?, :except, :redirect_url, :render_url, :status) # only declare the before filter once unless @before_filter_declared ||= false @@ -95,6 +96,10 @@ module AuthorizedSystem options = requirement[:options] # handle the restriction keys associated with this requirement + if options.has_key?(:only_if_logged_in?) + next unless (options[:only_if_logged_in?].include?( (params[:action]||"index").to_sym) and <%= users_name %>) + end + if options.has_key?(:only) next unless options[:only].include?( (params[:action]||"index").to_sym) end generators/authorized/templates/authorized_system.rb.erb 3ff1d85fb8615755b041cdf835452f9b4be1ffe9 Jonathan Barket jbarket@jonathan-barkets-macbook-pro.local http://github.com/jbarket/restful-authorization/commit/f8bf32a831eb66bcfb7f38d3e139c7ccb1443353 f8bf32a831eb66bcfb7f38d3e139c7ccb1443353 2008-04-28T12:25:48-07:00 2008-04-28T12:25:48-07:00 Added :only_if_logged_in? and a few generator options 94d601a3c04efe7be1c3164e047543f69c521e09 Jonathan Barket jbarket@jonathan-barkets-macbook-pro.local