aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2012-01-14 11:35:57 -0200
committerCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2012-01-14 17:31:55 -0200
commit2f632f53919d2b44dbb2cfaadabed2310319f005 (patch)
tree97d62a55521409e19bbadc16a526d0d355e544d7
parentf4b1dcdbcfe525efd0eb3ff047bbddca353d47b1 (diff)
downloadrails-2f632f53919d2b44dbb2cfaadabed2310319f005.tar.gz
rails-2f632f53919d2b44dbb2cfaadabed2310319f005.tar.bz2
rails-2f632f53919d2b44dbb2cfaadabed2310319f005.zip
Extract index and uniq index options to constants
-rw-r--r--railties/lib/rails/generators/generated_attribute.rb11
1 files changed, 7 insertions, 4 deletions
diff --git a/railties/lib/rails/generators/generated_attribute.rb b/railties/lib/rails/generators/generated_attribute.rb
index 61479b9068..b95f677275 100644
--- a/railties/lib/rails/generators/generated_attribute.rb
+++ b/railties/lib/rails/generators/generated_attribute.rb
@@ -5,6 +5,9 @@ require 'active_support/core_ext/object/blank'
module Rails
module Generators
class GeneratedAttribute
+ INDEX_OPTIONS = %w(index uniq)
+ UNIQ_INDEX_OPTIONS = %w(uniq)
+
attr_accessor :name, :type
attr_reader :attr_options
@@ -15,7 +18,7 @@ module Rails
# if user provided "name:index" instead of "name:string:index"
# type should be set blank so GeneratedAttribute's constructor
# could set it to :string
- has_index, type = type, nil if %w(index uniq).include?(type)
+ has_index, type = type, nil if UNIQ_INDEX_OPTIONS.include?(type)
type, attr_options = *parse_type_and_options(type)
new(name, type, has_index, attr_options)
@@ -40,8 +43,8 @@ module Rails
def initialize(name, type=nil, index_type=false, attr_options={})
@name = name
@type = (type.presence || :string).to_sym
- @has_index = %w(index uniq).include?(index_type)
- @has_uniq_index = %w(uniq).include?(index_type)
+ @has_index = INDEX_OPTIONS.include?(index_type)
+ @has_uniq_index = UNIQ_INDEX_OPTIONS.include?(index_type)
@attr_options = attr_options
end
@@ -84,7 +87,7 @@ module Rails
end
def reference?
- self.type.in?([:references, :belongs_to])
+ self.type.in?(:references, :belongs_to)
end
def has_index?