aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2011-02-15 15:35:10 -0800
committerAaron Patterson <aaron.patterson@gmail.com>2011-02-15 15:35:10 -0800
commit8c4c07e4cb3ea00767aa584afac9f7730fe2f7b1 (patch)
tree05565f4208f9e01dad120c3ec9056703739324b4
parent13e72db77063f57c3028a906690d42fb068845bb (diff)
downloadrails-8c4c07e4cb3ea00767aa584afac9f7730fe2f7b1.tar.gz
rails-8c4c07e4cb3ea00767aa584afac9f7730fe2f7b1.tar.bz2
rails-8c4c07e4cb3ea00767aa584afac9f7730fe2f7b1.zip
fixing variable names to reflect reality
-rw-r--r--activerecord/lib/active_record/fixtures.rb22
1 files changed, 11 insertions, 11 deletions
diff --git a/activerecord/lib/active_record/fixtures.rb b/activerecord/lib/active_record/fixtures.rb
index c297901fb0..a5931b2232 100644
--- a/activerecord/lib/active_record/fixtures.rb
+++ b/activerecord/lib/active_record/fixtures.rb
@@ -872,29 +872,29 @@ module ActiveRecord
end
end
- def setup_fixture_accessors(table_names = nil)
- table_names = Array.wrap(table_names || fixture_table_names)
- table_names.each do |table_name|
- table_name = table_name.to_s.tr('./', '_')
+ def setup_fixture_accessors(fixture_names = nil)
+ fixture_names = Array.wrap(fixture_names || fixture_table_names)
+ fixture_names.each do |fixture_name|
+ fixture_name = fixture_name.to_s.tr('./', '_')
- redefine_method(table_name) do |*fixtures|
+ redefine_method(fixture_name) do |*fixtures|
force_reload = fixtures.pop if fixtures.last == true || fixtures.last == :reload
- @fixture_cache[table_name] ||= {}
+ @fixture_cache[fixture_name] ||= {}
instances = fixtures.map do |fixture|
- @fixture_cache[table_name].delete(fixture) if force_reload
+ @fixture_cache[fixture_name].delete(fixture) if force_reload
- if @loaded_fixtures[table_name][fixture.to_s]
- @fixture_cache[table_name][fixture] ||= @loaded_fixtures[table_name][fixture.to_s].find
+ if @loaded_fixtures[fixture_name][fixture.to_s]
+ @fixture_cache[fixture_name][fixture] ||= @loaded_fixtures[fixture_name][fixture.to_s].find
else
- raise StandardError, "No fixture with name '#{fixture}' found for table '#{table_name}'"
+ raise StandardError, "No fixture with name '#{fixture}' found for table '#{fixture_name}'"
end
end
instances.size == 1 ? instances.first : instances
end
- private table_name
+ private fixture_name
end
end