From 101a8fa5f8cbf0f981ca984a279fb9838c79a751 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Valim?= Date: Tue, 2 Feb 2010 10:24:31 +0100 Subject: Ensure that attr_reader methods in generators are protected. --- railties/lib/rails/generators/migration.rb | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'railties/lib/rails') diff --git a/railties/lib/rails/generators/migration.rb b/railties/lib/rails/generators/migration.rb index 957d695d3a..8a8c899cc1 100644 --- a/railties/lib/rails/generators/migration.rb +++ b/railties/lib/rails/generators/migration.rb @@ -6,10 +6,11 @@ module Rails # module Migration def self.included(base) #:nodoc: - base.extend ClassMethods - base.send :attr_reader, :migration_number, - :migration_file_name, - :migration_class_name + base.class_eval do + extend ClassMethods + readers = lambda { attr_reader :migration_number, :migration_file_name, :migration_class_name } + respond_to?(:no_tasks) ? no_tasks(&readers) : readers.call + end end module ClassMethods @@ -28,10 +29,6 @@ module Rails end def next_migration_number(dirname) #:nodoc: - orm = Rails.configuration.generators.options[:rails][:orm] - require "generators/#{orm}" - "#{orm.to_s.camelize}::Generators::Base".constantize.next_migration_number(dirname) - rescue raise NotImplementedError end end -- cgit v1.2.3