@@ -18,3 +18,4 @@ actionmailer_config_DONOTVERSION.rb /coverage /doc/app /doc/plugins +/away .gitignore @@ -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,12 +28,16 @@ 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 @@ -42,7 +46,7 @@ Rails::Generator::Commands::List.class_eval do resource_list = resources.map { |r| r.to_sym.inspect }.join(', ') logger.route "map.resource #{resource_list}" end - def route_name(name, path, options = {}) - logger.route "map.#{name} '#{path}', :controller => '{options[:controller]}', :action => '#{options[:action]}'" + def route_name(name, path, route_options = {}) + logger.route "map.#{name} '#{path}', :controller => '{route_options[:controller]}', :action => '#{route_options[:action]}'" end end generators/lib/insert_routes.rb 628aefd86209aa4633244452d7c2724c9a15e025 Philip (flip) Kromer flip@infochimps.org http://github.com/technoweenie/restful-authentication/commit/3fea18f17c13bbabf01cd362878b834db14d60f9 3fea18f17c13bbabf01cd362878b834db14d60f9 2008-08-12T08:19:07-07:00 2008-08-12T08:19:07-07:00 Incorporated a fix to insert_routes from mainline a32d389c48608a69b1369a7bd8da2e30c1640206 Philip (flip) Kromer flip@infochimps.org