@@ -11,13 +11,13 @@ Rails::Generator::Commands::Create.class_eval do end end - def route_name(name, path, options = {}) + def route_name(name, path, route_options = {}) sentinel = 'ActionController::Routing::Routes.draw do |map|' - logger.route "map.#{name} '#{path}', :controller => '#{options[:controller]}', :action => '#{options[:action]}'" + logger.route "map.#{name} '#{path}', :controller => '#{route_options[:controller]}', :action => '#{route_options[:action]}'" unless options[:pretend] gsub_file 'config/routes.rb', /(#{Regexp.escape(sentinel)})/mi do |match| - "#{match}\n map.#{name} '#{path}', :controller => '#{options[:controller]}', :action => '#{options[:action]}'" + "#{match}\n map.#{name} '#{path}', :controller => '#{route_options[:controller]}', :action => '#{route_options[:action]}'" end end end @@ -28,13 +28,17 @@ Rails::Generator::Commands::Destroy.class_eval do resource_list = resources.map { |r| r.to_sym.inspect }.join(', ') look_for = "\n map.resource #{resource_list}\n" logger.route "map.resource #{resource_list}" - gsub_file 'config/routes.rb', /(#{look_for})/mi, '' + unless options[:pretend] + gsub_file 'config/routes.rb', /(#{look_for})/mi, '' + end end - def route_name(name, path, options = {}) - look_for = "\n map.#{name} '#{path}', :controller => '#{options[:controller]}', :action => '#{options[:action]}'" - logger.route "map.#{name} '#{path}', :controller => '#{options[:controller]}', :action => '#{options[:action]}'" - gsub_file 'config/routes.rb', /(#{look_for})/mi, '' + def route_name(name, path, route_options = {}) + look_for = "\n map.#{name} '#{path}', :controller => '#{route_options[:controller]}', :action => '#{route_options[:action]}'" + logger.route "map.#{name} '#{path}', :controller => '#{route_options[:controller]}', :action => '#{route_options[:action]}'" + unless options[:pretend] + gsub_file 'config/routes.rb', /(#{look_for})/mi, '' + end end end generators/authenticated/lib/insert_routes.rb 2d24dae056f4d2b68c69429ed4395cdd8b02efb2 Barry Mitchelson barry.mitchelson@gmail.com http://github.com/technoweenie/restful-authentication/commit/309536d3d7d6c8aa1e3ee45df73f9cbfb2cc0e02 309536d3d7d6c8aa1e3ee45df73f9cbfb2cc0e02 2008-06-21T13:06:37-07:00 2008-06-21T13:06:37-07:00 Fixed issue with route generation ignoring --pretend 7c30eefe844f5aa69347a65e24c67b59eada3322 Barry Mitchelson barry.mitchelson@gmail.com