diff options
author | Rafael França <rafaelmfranca@gmail.com> | 2018-12-10 17:38:47 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-12-10 17:38:47 -0500 |
commit | b3108275064353390848056bf097809743dcdf21 (patch) | |
tree | 0b7e1eac9ffb2cf2871b91f600cff765c33b28a0 /railties/lib/rails/generators/generated_attribute.rb | |
parent | 10457475b9fe2ae9dc4e7f932fd6e561416c3881 (diff) | |
parent | 3b7a4d3d75329d499d817c3fbeb75caefe9691ce (diff) | |
download | rails-b3108275064353390848056bf097809743dcdf21.tar.gz rails-b3108275064353390848056bf097809743dcdf21.tar.bz2 rails-b3108275064353390848056bf097809743dcdf21.zip |
Merge pull request #34666 from vinistock/upgrade_rubocop_and_fix_offenses
Upgrade Rubocop to 0.61.1 and fix offenses
Diffstat (limited to 'railties/lib/rails/generators/generated_attribute.rb')
-rw-r--r-- | railties/lib/rails/generators/generated_attribute.rb | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/railties/lib/rails/generators/generated_attribute.rb b/railties/lib/rails/generators/generated_attribute.rb index 3f20f5a718..a8f7729fd3 100644 --- a/railties/lib/rails/generators/generated_attribute.rb +++ b/railties/lib/rails/generators/generated_attribute.rb @@ -39,23 +39,23 @@ module Rails private - # parse possible attribute options like :limit for string/text/binary/integer, :precision/:scale for decimals or :polymorphic for references/belongs_to - # when declaring options curly brackets should be used - def parse_type_and_options(type) - case type - when /(string|text|binary|integer)\{(\d+)\}/ - return $1, limit: $2.to_i - when /decimal\{(\d+)[,.-](\d+)\}/ - return :decimal, precision: $1.to_i, scale: $2.to_i - when /(references|belongs_to)\{(.+)\}/ - type = $1 - provided_options = $2.split(/[,.-]/) - options = Hash[provided_options.map { |opt| [opt.to_sym, true] }] - return type, options - else - return type, {} + # parse possible attribute options like :limit for string/text/binary/integer, :precision/:scale for decimals or :polymorphic for references/belongs_to + # when declaring options curly brackets should be used + def parse_type_and_options(type) + case type + when /(string|text|binary|integer)\{(\d+)\}/ + return $1, limit: $2.to_i + when /decimal\{(\d+)[,.-](\d+)\}/ + return :decimal, precision: $1.to_i, scale: $2.to_i + when /(references|belongs_to)\{(.+)\}/ + type = $1 + provided_options = $2.split(/[,.-]/) + options = Hash[provided_options.map { |opt| [opt.to_sym, true] }] + return type, options + else + return type, {} + end end - end end def initialize(name, type = nil, index_type = false, attr_options = {}) |