From e12810178cebc0c40a90b4aba3976537852b71b4 Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki <drogus@gmail.com>
Date: Thu, 9 Dec 2010 18:04:44 +0100
Subject: Use Array.wrap instead of using ternary
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: José Valim <jose.valim@gmail.com>
---
.../active_record/connection_adapters/abstract/schema_statements.rb | 2 +-
activerecord/lib/active_record/migration.rb | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
(limited to 'activerecord')
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
index 3eb81b0dfa..d4aefada22 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
@@ -443,7 +443,7 @@ module ActiveRecord
end
def assume_migrated_upto_version(version, migrations_paths = ActiveRecord::Migrator.migrations_paths)
- migrations_paths = [migrations_paths] unless migrations_paths.kind_of?(Array)
+ migrations_paths = Array.wrap(migrations_paths)
version = version.to_i
sm_table = quote_table_name(ActiveRecord::Migrator.schema_migrations_table_name)
diff --git a/activerecord/lib/active_record/migration.rb b/activerecord/lib/active_record/migration.rb
index 130b43cc15..ea9950de08 100644
--- a/activerecord/lib/active_record/migration.rb
+++ b/activerecord/lib/active_record/migration.rb
@@ -573,7 +573,7 @@ module ActiveRecord
def migrations_paths
@migrations_paths ||= ['db/migrate']
# just to not break things if someone uses: migration_path = some_string
- @migrations_paths.kind_of?(Array) ? @migrations_paths : [@migrations_paths]
+ Array.wrap(@migrations_paths)
end
def migrations_path
@@ -581,7 +581,7 @@ module ActiveRecord
end
def migrations(paths)
- paths = [paths] unless paths.kind_of?(Array)
+ paths = Array.wrap(paths)
files = Dir[*paths.map { |p| "#{p}/[0-9]*_*.rb" }]
--
cgit v1.2.3