annotate 2.7.1 → 2.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e6c2484a81d38c69c86e48305ae0a1b8724e5b1
-  data.tar.gz: 7463f0ee24a0023b105dc5e48fc9eec49559de0e
+  metadata.gz: 365398d9352685a831b09fe60f460131a0fbe2ab
+  data.tar.gz: ba3fce8c6c97125af42c90310adac5272c6ef78c
 SHA512:
-  metadata.gz: d4dd08320d2fa1b85c21afdeb1fd5daa4ec6cd39877d70a0681b04ce7453f6fd204da258b0a9d20fe22d4eb4649d44c086383a20db3fe4c6b183ac35a8e1171c
-  data.tar.gz: 25101a0b978d74579bd47e2dba28a3b89fc738fe19966c50a78aaa43543748c5cd523ff7c7be3b708caa80925092a553a28f4dc6b55b6e91547d9ec5fdbb810f
+  metadata.gz: 2f219cec844284bd213ca826a12553b862a9ec6dcfb2ccc271a2821576989dba630e5ad86951ab2fba2d6df02b77c5468b6f1a9b60ff14cf71b23c90779e9a78
+  data.tar.gz: 9fdc058f6de547f0e3fa13f0b7ddaa931b4be5ad9ba4e041fb95002b6d9bd46631d0f3df5c1428e71774b089f7899d1e3332b5af00f0db8d1fe56dc249044bc3

data/CHANGELOG.rdoc

@@ -1,3 +1,6 @@
+== 2.7.2
+See https://github.com/ctran/annotate_models/releases/tag/v2.7.2
+
 == 2.7.1
 See https://github.com/ctran/annotate_models/releases/tag/v2.7.1
 

data/README.rdoc

@@ -2,9 +2,10 @@
 
 {<img src="https://badge.fury.io/rb/annotate.svg" alt="Gem Version" />}[http://badge.fury.io/rb/annotate]
 {<img src="https://img.shields.io/gem/dt/annotate.svg?style=flat" />}[https://rubygems.org/gems/annotate]
-{<img src="https://travis-ci.org/ctran/annotate_models.png" />}[https://travis-ci.org/ctran/annotate_models]
+{<img src="https://travis-ci.org/ctran/annotate_models.svg?branch=develop" />}[https://travis-ci.org/ctran/annotate_models]
 {<img src="https://coveralls.io/repos/ctran/annotate_models/badge.svg?branch=develop" />}[https://coveralls.io/r/ctran/annotate_models?branch=develop]
 {<img src="https://codeclimate.com/github/ctran/annotate_models/badges/gpa.svg" />}[https://codeclimate.com/github/ctran/annotate_models]
+{<img src="http://inch-ci.org/github/ctran/annotate_models.svg?branch=develop" alt="Inline docs" />}[http://inch-ci.org/github/ctran/annotate_models]
 {<img src="https://gemnasium.com/ctran/annotate_models.png" />}[https://gemnasium.com/ctran/annotate_models]
 
 Add a comment summarizing the current schema to the top or bottom of each of
@@ -58,7 +59,7 @@ Into Gemfile from rubygems.org:
 
 Into Gemfile from Github:
 
-    gem 'annotate', github: 'ctran/annotate_models'
+    gem 'annotate', git: 'https://github.com/ctran/annotate_models.git'
 
 Into environment gems from rubygems.org:
 
@@ -66,7 +67,7 @@ Into environment gems from rubygems.org:
 
 Into environment gems from Github checkout:
 
-    git clone git://github.com/ctran/annotate_models.git annotate_models
+    git clone https://github.com/ctran/annotate_models.git annotate_models
     cd annotate_models
     rake build
     gem install pkg/annotate-*.gem
@@ -184,7 +185,7 @@ you can do so with a simple environment variable, instead of editing the
         -i, --show-indexes               List the table's database indexes in the annotation
         -k, --show-foreign-keys          List the table's foreign key constraints in the annotation
         -s, --simple-indexes             Concat the column's related indexes in the annotation
-            --model-dir dir              Annotate model files stored in dir rather than app/models, separate multiple dirs with comas
+            --model-dir dir              Annotate model files stored in dir rather than app/models, separate multiple dirs with commas
             --ignore-model-subdirects    Ignore subdirectories of the models directory
             --sort                       Sort columns alphabetically, rather than in creation order
         -R, --require path               Additional file to require before loading models, may be used multiple times

data/annotate.gemspec

@@ -4,36 +4,45 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'annotate/version'
 
 Gem::Specification.new do |s|
-  s.name = "annotate"
+  s.name = 'annotate'
   s.version = Annotate.version
 
   s.required_ruby_version = '>= 1.9.3'
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Alex Chaffee", "Cuong Tran", "Marcos Piccinini", "Turadg Aleahmad", "Jon Frisby"]
-  s.description = "Annotates Rails/ActiveRecord Models, routes, fixtures, and others based on the database schema."
-  s.email = ["alex@stinky.com", "cuong.tran@gmail.com", "x@nofxx.com", "turadg@aleahmad.net", "jon@cloudability.com"]
-  s.executables = ["annotate"]
-  s.extra_rdoc_files = ["README.rdoc", "CHANGELOG.rdoc", "TODO.rdoc"]
-  s.files = ["AUTHORS.rdoc", "CHANGELOG.rdoc", "LICENSE.txt", "README.rdoc", "TODO.rdoc", "annotate.gemspec", "bin/annotate", "lib/annotate.rb", "lib/annotate/active_record_patch.rb", "lib/annotate/annotate_models.rb", "lib/annotate/annotate_routes.rb", "lib/annotate/tasks.rb", "lib/annotate/version.rb", "lib/generators/annotate/USAGE", "lib/generators/annotate/install_generator.rb", "lib/generators/annotate/templates/auto_annotate_models.rake", "lib/tasks/annotate_models.rake", "lib/tasks/annotate_routes.rake", "lib/tasks/migrate.rake"]
-  s.homepage = "http://github.com/ctran/annotate_models"
-  s.licenses = ["Ruby"]
-  s.require_paths = ["lib"]
-  s.rubyforge_project = "annotate"
-  s.rubygems_version = "2.1.11"
-  s.summary = "Annotates Rails Models, routes, fixtures, and others based on the database schema."
+  s.required_rubygems_version = Gem::Requirement.new('>= 0') if s.respond_to? :required_rubygems_version=
+  s.authors = ['Alex Chaffee', 'Cuong Tran', 'Marcos Piccinini', 'Turadg Aleahmad', 'Jon Frisby']
+  s.description = 'Annotates Rails/ActiveRecord Models, routes, fixtures, and others based on the database schema.'
+  s.email = ['alex@stinky.com', 'cuong.tran@gmail.com', 'x@nofxx.com', 'turadg@aleahmad.net', 'jon@cloudability.com']
+  s.executables = ['annotate']
+  s.extra_rdoc_files = ['README.rdoc', 'CHANGELOG.rdoc', 'TODO.rdoc']
+  s.files = [
+    'AUTHORS.rdoc',
+    'CHANGELOG.rdoc',
+    'LICENSE.txt',
+    'README.rdoc',
+    'TODO.rdoc',
+    'annotate.gemspec',
+    'bin/annotate',
+    'lib/annotate.rb',
+    'lib/annotate/active_record_patch.rb',
+    'lib/annotate/annotate_models.rb',
+    'lib/annotate/annotate_routes.rb',
+    'lib/annotate/tasks.rb',
+    'lib/annotate/version.rb',
+    'lib/generators/annotate/USAGE',
+    'lib/generators/annotate/install_generator.rb',
+    'lib/generators/annotate/templates/auto_annotate_models.rake',
+    'lib/tasks/annotate_models.rake',
+    'lib/tasks/annotate_routes.rake',
+    'lib/tasks/annotate_models_migrate.rake'
+  ]
+  s.homepage = 'http://github.com/ctran/annotate_models'
+  s.licenses = ['Ruby']
+  s.require_paths = ['lib']
+  s.rubyforge_project = 'annotate'
+  s.rubygems_version = '2.1.11'
+  s.summary = 'Annotates Rails Models, routes, fixtures, and others based on the database schema.'
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 4
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rake>, [">= 10.4", "< 12.0"])
-      s.add_runtime_dependency(%q<activerecord>, [">= 3.2", "< 6.0"])
-    else
-      s.add_dependency(%q<rake>, [">= 10.4", "< 12.0"])
-      s.add_dependency(%q<activerecord>, [">= 3.2", "< 6.0"])
-    end
-  else
-    s.add_dependency(%q<rake>, [">= 0.8.7"])
-    s.add_dependency(%q<activerecord>, [">= 3.2", "< 6.0"])
-  end
+  s.specification_version = 4 if s.respond_to? :specification_version
+  s.add_runtime_dependency(%q<rake>, ['>= 10.4', '< 13.0'])
+  s.add_runtime_dependency(%q<activerecord>, ['>= 3.2', '< 6.0'])
 end

data/bin/annotate

@@ -8,11 +8,11 @@ require 'rubygems'
 begin
   require 'bundler'
   Bundler.setup
-rescue Exception
+rescue StandardError
 end
 
 here = File.expand_path(File.dirname __FILE__)
-$:<< "#{here}/../lib"
+$LOAD_PATH << "#{here}/../lib"
 
 require 'optparse'
 require 'annotate'
@@ -33,7 +33,7 @@ OptionParser.new do |opts|
           'Place the annotations at the top (before) or the bottom (after) of the model/test/fixture/factory/route/serializer file(s)') do |p|
     ENV['position'] = p
     %w(position_in_class position_in_factory position_in_fixture position_in_test position_in_routes position_in_serializer).each do |key|
-      ENV[key] = p unless (has_set_position[key])
+      ENV[key] = p unless has_set_position[key]
     end
   end
 
@@ -90,12 +90,11 @@ OptionParser.new do |opts|
     ENV['routes'] = 'true'
   end
 
-  opts.on('-aa', '--active-admin', 'Annotate active_admin models') do |p|
-    ENV['active_admin'] = p
+  opts.on('-aa', '--active-admin', 'Annotate active_admin models') do
+    ENV['active_admin'] = 'true'
   end
 
-  opts.on('-v', '--version',
-          'Show the current version of this gem') do
+  opts.on('-v', '--version', 'Show the current version of this gem') do
     puts "annotate v#{Annotate.version}"; exit
   end
 
@@ -119,12 +118,12 @@ OptionParser.new do |opts|
   end
 
   opts.on('--model-dir dir',
-          "Annotate model files stored in dir rather than app/models, separate multiple dirs with comas") do |dir|
+          "Annotate model files stored in dir rather than app/models, separate multiple dirs with commas") do |dir|
     ENV['model_dir'] = dir
   end
 
   opts.on('--root-dir dir',
-          "Annotate files stored within root dir projects, separate multiple dirs with comas") do |dir|
+          "Annotate files stored within root dir projects, separate multiple dirs with commas") do |dir|
     ENV['root_dir'] = dir
   end
 
@@ -181,17 +180,22 @@ OptionParser.new do |opts|
     ENV['ignore_routes'] = regex
   end
 
-  opts.on('--hide-limit-column-types VALUES', "don't show limit for given column types, separated by comas (i.e., `integer,boolean,text`)") do |values|
+  opts.on('--hide-limit-column-types VALUES', "don't show limit for given column types, separated by commas (i.e., `integer,boolean,text`)") do |values|
     ENV['hide_limit_column_types'] = "#{values}"
   end
 
+  opts.on('--hide-default-column-types VALUES', "don't show default for given column types, separated by commas (i.e., `json,jsonb,hstore`)") do |values|
+    ENV['hide_default_column_types'] = "#{values}"
+  end
+
   opts.on('--ignore-unknown-models', "don't display warnings for bad model files") do |values|
     ENV['ignore_unknown_models'] = 'true'
   end
-
 end.parse!
 
-options = Annotate.setup_options({is_rake: ENV['is_rake'] && !ENV['is_rake'].empty?})
+options = Annotate.setup_options(
+  is_rake: ENV['is_rake'] && !ENV['is_rake'].empty?
+)
 Annotate.eager_load(options)
 
 AnnotateModels.send(target_action, options) if Annotate.include_models?

data/lib/annotate.rb

@@ -1,3 +1,5 @@
+# rubocop:disable  Metrics/ModuleLength
+
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'annotate/version'
 require 'annotate/annotate_models'
@@ -7,7 +9,7 @@ begin
   # ActiveSupport 3.x...
   require 'active_support/hash_with_indifferent_access'
   require 'active_support/core_ext/object/blank'
-rescue Exception
+rescue StandardError
   # ActiveSupport 2.x...
   require 'active_support/core_ext/hash/indifferent_access'
   require 'active_support/core_ext/blank'
@@ -29,16 +31,22 @@ module Annotate
     :exclude_fixtures, :exclude_factories, :ignore_model_sub_dir,
     :format_bare, :format_rdoc, :format_markdown, :sort, :force, :trace,
     :timestamp, :exclude_serializers, :classified_sort, :show_foreign_keys,
-    :exclude_scaffolds, :exclude_controllers, :exclude_helpers, :ignore_unknown_models
+    :exclude_scaffolds, :exclude_controllers, :exclude_helpers,
+    :exclude_sti_subclasses, :ignore_unknown_models
   ].freeze
   OTHER_OPTIONS = [
-    :ignore_columns, :skip_on_db_migrate, :wrapper_open, :wrapper_close, :wrapper, :routes,
-    :hide_limit_column_types, :ignore_routes, :active_admin
+    :ignore_columns, :skip_on_db_migrate, :wrapper_open, :wrapper_close,
+    :wrapper, :routes, :hide_limit_column_types, :hide_default_column_types,
+    :ignore_routes, :active_admin
   ].freeze
   PATH_OPTIONS = [
     :require, :model_dir, :root_dir
   ].freeze
 
+  def self.all_options
+    [POSITION_OPTIONS, FLAG_OPTIONS, PATH_OPTIONS, OTHER_OPTIONS]
+  end
+
   ##
   # Set default values that can be overridden via environment variables.
   #
@@ -48,13 +56,13 @@ module Annotate
 
     options = HashWithIndifferentAccess.new(options)
 
-    [POSITION_OPTIONS, FLAG_OPTIONS, PATH_OPTIONS, OTHER_OPTIONS].flatten.each do |key|
+    all_options.flatten.each do |key|
       if options.key?(key)
         default_value = if options[key].is_a?(Array)
                           options[key].join(',')
                         else
                           options[key]
-        end
+                        end
       end
 
       default_value = ENV[key.to_s] unless ENV[key.to_s].blank?
@@ -80,7 +88,6 @@ module Annotate
     end
 
     options[:model_dir] = ['app/models'] if options[:model_dir].empty?
-    options[:root_dir] = [''] if options[:root_dir].empty?
 
     options[:wrapper_open] ||= options[:wrapper]
     options[:wrapper_close] ||= options[:wrapper]
@@ -94,9 +101,7 @@ module Annotate
   end
 
   def self.reset_options
-    [POSITION_OPTIONS, FLAG_OPTIONS, PATH_OPTIONS, OTHER_OPTIONS].flatten.each do |key|
-      ENV[key.to_s] = nil
-    end
+    all_options.flatten.each { |key| ENV[key.to_s] = nil }
   end
 
   def self.skip_on_migration?
@@ -123,18 +128,21 @@ module Annotate
     return if loaded_tasks
     self.loaded_tasks = true
 
-    Dir[File.join(File.dirname(__FILE__), 'tasks', '**/*.rake')].each { |rake| load rake }
+    Dir[File.join(File.dirname(__FILE__), 'tasks', '**/*.rake')].each do |rake|
+      load rake
+    end
   end
 
   def self.load_requires(options)
-    options[:require].each { |path| require path } if options[:require].count > 0
+    options[:require].count > 0 &&
+      options[:require].each { |path| require path }
   end
 
   def self.eager_load(options)
     load_requires(options)
     require 'annotate/active_record_patch'
 
-    if defined?(Rails)
+    if defined?(Rails::Application)
       if Rails.version.split('.').first.to_i < 3
         Rails.configuration.eager_load_paths.each do |load_path|
           matcher = /\A#{Regexp.escape(load_path)}(.*)\.rb\Z/
@@ -158,7 +166,7 @@ module Annotate
   def self.bootstrap_rake
     begin
       require 'rake/dsl_definition'
-    rescue Exception => e
+    rescue StandardError => e
       # We might just be on an old version of Rake...
       puts e.message
       exit e.status_code

data/lib/annotate/annotate_models.rb

@@ -1,67 +1,69 @@
+# rubocop:disable  Metrics/ModuleLength
+
 require 'bigdecimal'
 
 module AnnotateModels
   TRUE_RE = /^(true|t|yes|y|1)$/i
 
   # Annotate Models plugin use this header
-  COMPAT_PREFIX    = "== Schema Info"
-  COMPAT_PREFIX_MD = "## Schema Info"
-  PREFIX           = "== Schema Information"
-  PREFIX_MD        = "## Schema Information"
-  END_MARK         = "== Schema Information End"
+  COMPAT_PREFIX    = '== Schema Info'.freeze
+  COMPAT_PREFIX_MD = '## Schema Info'.freeze
+  PREFIX           = '== Schema Information'.freeze
+  PREFIX_MD        = '## Schema Information'.freeze
+  END_MARK         = '== Schema Information End'.freeze
 
-  MATCHED_TYPES = %w(test fixture factory serializer scaffold controller helper)
+  MATCHED_TYPES = %w(test fixture factory serializer scaffold controller helper).freeze
 
   # File.join for windows reverse bar compat?
   # I dont use windows, can`t test
-  UNIT_TEST_DIR         = File.join("test", "unit")
-  MODEL_TEST_DIR        = File.join("test", "models") # since rails 4.0
-  SPEC_MODEL_DIR        = File.join("spec", "models")
-  FIXTURE_TEST_DIR      = File.join("test", "fixtures")
-  FIXTURE_SPEC_DIR      = File.join("spec", "fixtures")
+  UNIT_TEST_DIR         = File.join('test', "unit")
+  MODEL_TEST_DIR        = File.join('test', "models") # since rails 4.0
+  SPEC_MODEL_DIR        = File.join('spec', "models")
+  FIXTURE_TEST_DIR      = File.join('test', "fixtures")
+  FIXTURE_SPEC_DIR      = File.join('spec', "fixtures")
 
   # Other test files
-  CONTROLLER_TEST_DIR   = File.join("test", "controllers")
-  CONTROLLER_SPEC_DIR   = File.join("spec", "controllers")
-  REQUEST_SPEC_DIR      = File.join("spec", "requests")
-  ROUTING_SPEC_DIR      = File.join("spec", "routing")
+  CONTROLLER_TEST_DIR   = File.join('test', "controllers")
+  CONTROLLER_SPEC_DIR   = File.join('spec', "controllers")
+  REQUEST_SPEC_DIR      = File.join('spec', "requests")
+  ROUTING_SPEC_DIR      = File.join('spec', "routing")
 
   # Object Daddy http://github.com/flogic/object_daddy/tree/master
-  EXEMPLARS_TEST_DIR    = File.join("test", "exemplars")
-  EXEMPLARS_SPEC_DIR    = File.join("spec", "exemplars")
+  EXEMPLARS_TEST_DIR    = File.join('test', "exemplars")
+  EXEMPLARS_SPEC_DIR    = File.join('spec', "exemplars")
 
   # Machinist http://github.com/notahat/machinist
-  BLUEPRINTS_TEST_DIR   = File.join("test", "blueprints")
-  BLUEPRINTS_SPEC_DIR   = File.join("spec", "blueprints")
+  BLUEPRINTS_TEST_DIR   = File.join('test', "blueprints")
+  BLUEPRINTS_SPEC_DIR   = File.join('spec', "blueprints")
 
   # Factory Girl http://github.com/thoughtbot/factory_girl
-  FACTORY_GIRL_TEST_DIR = File.join("test", "factories")
-  FACTORY_GIRL_SPEC_DIR = File.join("spec", "factories")
+  FACTORY_GIRL_TEST_DIR = File.join('test', "factories")
+  FACTORY_GIRL_SPEC_DIR = File.join('spec', "factories")
 
   # Fabrication https://github.com/paulelliott/fabrication.git
-  FABRICATORS_TEST_DIR  = File.join("test", "fabricators")
-  FABRICATORS_SPEC_DIR  = File.join("spec", "fabricators")
+  FABRICATORS_TEST_DIR  = File.join('test', "fabricators")
+  FABRICATORS_SPEC_DIR  = File.join('spec', "fabricators")
 
   # Serializers https://github.com/rails-api/active_model_serializers
-  SERIALIZERS_DIR       = File.join("app",  "serializers")
-  SERIALIZERS_TEST_DIR  = File.join("test", "serializers")
-  SERIALIZERS_SPEC_DIR  = File.join("spec", "serializers")
+  SERIALIZERS_DIR       = File.join('app',  "serializers")
+  SERIALIZERS_TEST_DIR  = File.join('test', "serializers")
+  SERIALIZERS_SPEC_DIR  = File.join('spec', "serializers")
 
   # Controller files
-  CONTROLLER_DIR        = File.join("app", "controllers")
+  CONTROLLER_DIR        = File.join('app', "controllers")
 
   # Active admin registry files
-  ACTIVEADMIN_DIR        = File.join("app", "admin")
+  ACTIVEADMIN_DIR        = File.join('app', "admin")
 
   # Helper files
-  HELPER_DIR            = File.join("app", "helpers")
+  HELPER_DIR            = File.join('app', "helpers")
 
   # Don't show limit (#) on these column types
   # Example: show "integer" instead of "integer(4)"
-  NO_LIMIT_COL_TYPES = %w(integer boolean)
+  NO_LIMIT_COL_TYPES = %w(integer boolean).freeze
 
   # Don't show default value for these column types
-  NO_DEFAULT_COL_TYPES = %w(json jsonb)
+  NO_DEFAULT_COL_TYPES = %w(json jsonb hstore).freeze
 
   class << self
     def annotate_pattern(options = {})
@@ -78,86 +80,92 @@ module AnnotateModels
     attr_writer :model_dir
 
     def root_dir
-      @root_dir.is_a?(Array) ? @root_dir : [@root_dir || '']
+      if @root_dir.blank?
+        ['']
+      elsif @root_dir.is_a?(String)
+        @root_dir.split(',')
+      else
+        @root_dir
+      end
     end
 
     attr_writer :root_dir
 
     def test_files(root_directory)
       [
-          File.join(root_directory, UNIT_TEST_DIR,  "%MODEL_NAME%_test.rb"),
-          File.join(root_directory, MODEL_TEST_DIR,  "%MODEL_NAME%_test.rb"),
-          File.join(root_directory, SPEC_MODEL_DIR, "%MODEL_NAME%_spec.rb")
+        File.join(root_directory, UNIT_TEST_DIR,  "%MODEL_NAME%_test.rb"),
+        File.join(root_directory, MODEL_TEST_DIR,  "%MODEL_NAME%_test.rb"),
+        File.join(root_directory, SPEC_MODEL_DIR, "%MODEL_NAME%_spec.rb")
       ]
     end
 
     def fixture_files(root_directory)
       [
-          File.join(root_directory, FIXTURE_TEST_DIR, "%TABLE_NAME%.yml"),
-          File.join(root_directory, FIXTURE_SPEC_DIR, "%TABLE_NAME%.yml"),
-          File.join(root_directory, FIXTURE_TEST_DIR, "%PLURALIZED_MODEL_NAME%.yml"),
-          File.join(root_directory, FIXTURE_SPEC_DIR, "%PLURALIZED_MODEL_NAME%.yml")
+        File.join(root_directory, FIXTURE_TEST_DIR, "%TABLE_NAME%.yml"),
+        File.join(root_directory, FIXTURE_SPEC_DIR, "%TABLE_NAME%.yml"),
+        File.join(root_directory, FIXTURE_TEST_DIR, "%PLURALIZED_MODEL_NAME%.yml"),
+        File.join(root_directory, FIXTURE_SPEC_DIR, "%PLURALIZED_MODEL_NAME%.yml")
       ]
     end
 
     def scaffold_files(root_directory)
       [
-          File.join(root_directory, CONTROLLER_TEST_DIR, "%PLURALIZED_MODEL_NAME%_controller_test.rb"),
-          File.join(root_directory, CONTROLLER_SPEC_DIR, "%PLURALIZED_MODEL_NAME%_controller_spec.rb"),
-          File.join(root_directory, REQUEST_SPEC_DIR,    "%PLURALIZED_MODEL_NAME%_spec.rb"),
-          File.join(root_directory, ROUTING_SPEC_DIR,    "%PLURALIZED_MODEL_NAME%_routing_spec.rb")
+        File.join(root_directory, CONTROLLER_TEST_DIR, "%PLURALIZED_MODEL_NAME%_controller_test.rb"),
+        File.join(root_directory, CONTROLLER_SPEC_DIR, "%PLURALIZED_MODEL_NAME%_controller_spec.rb"),
+        File.join(root_directory, REQUEST_SPEC_DIR,    "%PLURALIZED_MODEL_NAME%_spec.rb"),
+        File.join(root_directory, ROUTING_SPEC_DIR,    "%PLURALIZED_MODEL_NAME%_routing_spec.rb")
       ]
     end
 
     def factory_files(root_directory)
       [
-          File.join(root_directory, EXEMPLARS_TEST_DIR,     "%MODEL_NAME%_exemplar.rb"),
-          File.join(root_directory, EXEMPLARS_SPEC_DIR,     "%MODEL_NAME%_exemplar.rb"),
-          File.join(root_directory, BLUEPRINTS_TEST_DIR,    "%MODEL_NAME%_blueprint.rb"),
-          File.join(root_directory, BLUEPRINTS_SPEC_DIR,    "%MODEL_NAME%_blueprint.rb"),
-          File.join(root_directory, FACTORY_GIRL_TEST_DIR,  "%MODEL_NAME%_factory.rb"),    # (old style)
-          File.join(root_directory, FACTORY_GIRL_SPEC_DIR,  "%MODEL_NAME%_factory.rb"),    # (old style)
-          File.join(root_directory, FACTORY_GIRL_TEST_DIR,  "%TABLE_NAME%.rb"),            # (new style)
-          File.join(root_directory, FACTORY_GIRL_SPEC_DIR,  "%TABLE_NAME%.rb"),            # (new style)
-          File.join(root_directory, FABRICATORS_TEST_DIR,   "%MODEL_NAME%_fabricator.rb"),
-          File.join(root_directory, FABRICATORS_SPEC_DIR,   "%MODEL_NAME%_fabricator.rb")
+        File.join(root_directory, EXEMPLARS_TEST_DIR,     "%MODEL_NAME%_exemplar.rb"),
+        File.join(root_directory, EXEMPLARS_SPEC_DIR,     "%MODEL_NAME%_exemplar.rb"),
+        File.join(root_directory, BLUEPRINTS_TEST_DIR,    "%MODEL_NAME%_blueprint.rb"),
+        File.join(root_directory, BLUEPRINTS_SPEC_DIR,    "%MODEL_NAME%_blueprint.rb"),
+        File.join(root_directory, FACTORY_GIRL_TEST_DIR,  "%MODEL_NAME%_factory.rb"),    # (old style)
+        File.join(root_directory, FACTORY_GIRL_SPEC_DIR,  "%MODEL_NAME%_factory.rb"),    # (old style)
+        File.join(root_directory, FACTORY_GIRL_TEST_DIR,  "%TABLE_NAME%.rb"),            # (new style)
+        File.join(root_directory, FACTORY_GIRL_SPEC_DIR,  "%TABLE_NAME%.rb"),            # (new style)
+        File.join(root_directory, FABRICATORS_TEST_DIR,   "%MODEL_NAME%_fabricator.rb"),
+        File.join(root_directory, FABRICATORS_SPEC_DIR,   "%MODEL_NAME%_fabricator.rb")
       ]
     end
 
     def serialize_files(root_directory)
       [
-          File.join(root_directory, SERIALIZERS_DIR,       "%MODEL_NAME%_serializer.rb"),
-          File.join(root_directory, SERIALIZERS_TEST_DIR,  "%MODEL_NAME%_serializer_spec.rb"),
-          File.join(root_directory, SERIALIZERS_SPEC_DIR,  "%MODEL_NAME%_serializer_spec.rb")
+        File.join(root_directory, SERIALIZERS_DIR,       "%MODEL_NAME%_serializer.rb"),
+        File.join(root_directory, SERIALIZERS_TEST_DIR,  "%MODEL_NAME%_serializer_spec.rb"),
+        File.join(root_directory, SERIALIZERS_SPEC_DIR,  "%MODEL_NAME%_serializer_spec.rb")
       ]
     end
 
     def files_by_pattern(root_directory, pattern_type)
       case pattern_type
-        when 'test'       then test_files(root_directory)
-        when 'fixture'    then fixture_files(root_directory)
-        when 'scaffold'   then scaffold_files(root_directory)
-        when 'factory'    then factory_files(root_directory)
-        when 'serializer' then serialize_files(root_directory)
-        when 'controller'
-          [File.join(root_directory, CONTROLLER_DIR, "%PLURALIZED_MODEL_NAME%_controller.rb")]
-        when 'admin'
-          [File.join(root_directory, ACTIVEADMIN_DIR, "%MODEL_NAME%.rb")]
-        when 'helper'
-          [File.join(root_directory, HELPER_DIR, "%PLURALIZED_MODEL_NAME%_helper.rb")]
-        else
-          []
+      when 'test'       then test_files(root_directory)
+      when 'fixture'    then fixture_files(root_directory)
+      when 'scaffold'   then scaffold_files(root_directory)
+      when 'factory'    then factory_files(root_directory)
+      when 'serializer' then serialize_files(root_directory)
+      when 'controller'
+        [File.join(root_directory, CONTROLLER_DIR, "%PLURALIZED_MODEL_NAME%_controller.rb")]
+      when 'admin'
+        [File.join(root_directory, ACTIVEADMIN_DIR, "%MODEL_NAME%.rb")]
+      when 'helper'
+        [File.join(root_directory, HELPER_DIR, "%PLURALIZED_MODEL_NAME%_helper.rb")]
+      else
+        []
       end
     end
 
-    def get_patterns(pattern_types=[])
+    def get_patterns(pattern_types = [])
       current_patterns = []
       root_dir.each do |root_directory|
         Array(pattern_types).each do |pattern_type|
           current_patterns += files_by_pattern(root_directory, pattern_type)
         end
       end
-      current_patterns.map{ |p| p.sub(/^[\/]*/, '') }
+      current_patterns.map { |p| p.sub(/^[\/]*/, '') }
     end
 
     # Simple quoting for the default column value
@@ -166,10 +174,10 @@ module AnnotateModels
       when NilClass                 then 'NULL'
       when TrueClass                then 'TRUE'
       when FalseClass               then 'FALSE'
-      when Float, Fixnum, Bignum    then value.to_s
+      when Float, Integer           then value.to_s
         # BigDecimals need to be output in a non-normalized form and quoted.
       when BigDecimal               then value.to_s('F')
-      when Array                    then value.map {|v| quote(v)}
+      when Array                    then value.map { |v| quote(v) }
       else
         value.inspect
       end
@@ -179,31 +187,38 @@ module AnnotateModels
       quote(klass.column_defaults[column.name])
     end
 
+    def retrieve_indexes_from_table(klass)
+      table_name = klass.table_name
+      return [] unless table_name
+
+      indexes = klass.connection.indexes(table_name)
+      return indexes if indexes.any? || !klass.table_name_prefix
+
+      # Try to search the table without prefix
+      table_name.to_s.slice!(klass.table_name_prefix)
+      klass.connection.indexes(table_name)
+    end
+
     # Use the column information in an ActiveRecord class
     # to create a comment block containing a line for
     # each column. The line contains the column name,
     # the type (and length), and any optional attributes
     def get_schema_info(klass, header, options = {})
       info = "# #{header}\n"
-      info<< "#\n"
-      if options[:format_markdown]
-        info<< "# Table name: `#{klass.table_name}`\n"
-        info<< "#\n"
-        info<< "# ### Columns\n"
-      else
-        info<< "# Table name: #{klass.table_name}\n"
-      end
-      info<< "#\n"
+      info << get_schema_header_text(klass, options)
 
       max_size = klass.column_names.map(&:size).max || 0
+      with_comment = options[:with_comment] && klass.columns.first.respond_to?(:comment)
+      max_size = klass.columns.map{|col| col.name.size + col.comment.size }.max || 0 if with_comment
+      max_size += 2 if with_comment
       max_size += options[:format_rdoc] ? 5 : 1
       md_names_overhead = 6
       md_type_allowance = 18
       bare_type_allowance = 16
 
       if options[:format_markdown]
-        info<< sprintf( "# %-#{max_size + md_names_overhead}.#{max_size + md_names_overhead}s | %-#{md_type_allowance}.#{md_type_allowance}s | %s\n", 'Name', 'Type', 'Attributes' )
-        info<< "# #{ '-' * ( max_size + md_names_overhead ) } | #{'-' * md_type_allowance} | #{ '-' * 27 }\n"
+        info << sprintf( "# %-#{max_size + md_names_overhead}.#{max_size + md_names_overhead}s | %-#{md_type_allowance}.#{md_type_allowance}s | %s\n", 'Name', 'Type', 'Attributes' )
+        info << "# #{ '-' * ( max_size + md_names_overhead ) } | #{'-' * md_type_allowance} | #{ '-' * 27 }\n"
       end
 
       cols = if ignore_columns = options[:ignore_columns]
@@ -218,9 +233,9 @@ module AnnotateModels
       cols = classified_sort(cols) if options[:classified_sort]
       cols.each do |col|
         col_type = (col.type || col.sql_type).to_s
-
         attrs = []
-        attrs << "default(#{schema_default(klass, col)})" unless col.default.nil? || NO_DEFAULT_COL_TYPES.include?(col_type)
+        attrs << "default(#{schema_default(klass, col)})" unless col.default.nil? || hide_default?(col_type, options)
+        attrs << 'unsigned' if col.respond_to?(:unsigned?) && col.unsigned?
         attrs << 'not null' unless col.null
         attrs << 'primary key' if klass.primary_key && (klass.primary_key.is_a?(Array) ? klass.primary_key.collect(&:to_sym).include?(col.name.to_sym) : col.name.to_sym == klass.primary_key.to_sym)
 
@@ -250,23 +265,28 @@ module AnnotateModels
         # Check if the column has indices and print "indexed" if true
         # If the index includes another column, print it too.
         if options[:simple_indexes] && klass.table_exists?# Check out if this column is indexed
-          indices = klass.connection.indexes(klass.table_name)
+          indices = retrieve_indexes_from_table(klass)
           if indices = indices.select { |ind| ind.columns.include? col.name }
             indices.sort_by(&:name).each do |ind|
+              next if ind.columns.is_a?(String)
               ind = ind.columns.reject! { |i| i == col.name }
               attrs << (ind.empty? ? "indexed" : "indexed => [#{ind.join(", ")}]")
             end
           end
         end
-
+        col_name = if with_comment
+                     "#{col.name}(#{col.comment})"
+                   else
+                     col.name
+                   end
         if options[:format_rdoc]
-          info << sprintf("# %-#{max_size}.#{max_size}s<tt>%s</tt>", "*#{col.name}*::", attrs.unshift(col_type).join(", ")).rstrip + "\n"
+          info << sprintf("# %-#{max_size}.#{max_size}s<tt>%s</tt>", "*#{col_name}*::", attrs.unshift(col_type).join(", ")).rstrip + "\n"
         elsif options[:format_markdown]
-          name_remainder = max_size - col.name.length
+          name_remainder = max_size - col_name.length
           type_remainder = (md_type_allowance - 2) - col_type.length
-          info << (sprintf("# **`%s`**%#{name_remainder}s | `%s`%#{type_remainder}s | `%s`", col.name, " ", col_type, " ", attrs.join(", ").rstrip)).gsub('``', '  ').rstrip + "\n"
+          info << (sprintf("# **`%s`**%#{name_remainder}s | `%s`%#{type_remainder}s | `%s`", col_name, " ", col_type, " ", attrs.join(", ").rstrip)).gsub('``', '  ').rstrip + "\n"
         else
-          info << sprintf("#  %-#{max_size}.#{max_size}s:%-#{bare_type_allowance}.#{bare_type_allowance}s %s", col.name, col_type, attrs.join(", ")).rstrip + "\n"
+          info << sprintf("#  %-#{max_size}.#{max_size}s:%-#{bare_type_allowance}.#{bare_type_allowance}s %s", col_name, col_type, attrs.join(", ")).rstrip + "\n"
         end
       end
 
@@ -278,6 +298,23 @@ module AnnotateModels
         info << get_foreign_key_info(klass, options)
       end
 
+      info << get_schema_footer_text(klass, options)
+    end
+
+    def get_schema_header_text(klass, options = {})
+      info = "#\n"
+      if options[:format_markdown]
+        info << "# Table name: `#{klass.table_name}`\n"
+        info << "#\n"
+        info << "# ### Columns\n"
+      else
+        info << "# Table name: #{klass.table_name}\n"
+      end
+      info << "#\n"
+    end
+
+    def get_schema_footer_text(_klass, options = {})
+      info = ''
       if options[:format_rdoc]
         info << "#--\n"
         info << "# #{END_MARK}\n"
@@ -287,23 +324,23 @@ module AnnotateModels
       end
     end
 
-    def get_index_info(klass, options={})
-      if options[:format_markdown]
-        index_info = "#\n# ### Indexes\n#\n"
-      else
-        index_info = "#\n# Indexes\n#\n"
-      end
+    def get_index_info(klass, options = {})
+      index_info = if options[:format_markdown]
+                     "#\n# ### Indexes\n#\n"
+                   else
+                     "#\n# Indexes\n#\n"
+                   end
 
-      indexes = klass.connection.indexes(klass.table_name)
+      indexes = retrieve_indexes_from_table(klass)
       return '' if indexes.empty?
 
       max_size = indexes.collect{|index| index.name.size}.max + 1
       indexes.sort_by(&:name).each do |index|
-        if options[:format_markdown]
-          index_info << sprintf("# * `%s`%s:\n#     * **`%s`**\n", index.name, index.unique ? " (_unique_)" : "", index.columns.join("`**\n#     * **`"))
-        else
-          index_info << sprintf("#  %-#{max_size}.#{max_size}s %s %s", index.name, "(#{index.columns.join(",")})", index.unique ? "UNIQUE" : "").rstrip + "\n"
-        end
+        index_info << if options[:format_markdown]
+                        sprintf("# * `%s`%s:\n#     * **`%s`**\n", index.name, index.unique ? " (_unique_)" : "", Array(index.columns).join("`**\n#     * **`"))
+                      else
+                        sprintf("#  %-#{max_size}.#{max_size}s %s %s", index.name, "(#{Array(index.columns).join(",")})", index.unique ? "UNIQUE" : "").rstrip + "\n"
+                      end
       end
 
       index_info
@@ -320,12 +357,23 @@ module AnnotateModels
       excludes.include?(col_type)
     end
 
-    def get_foreign_key_info(klass, options={})
-      if options[:format_markdown]
-        fk_info = "#\n# ### Foreign Keys\n#\n"
-      else
-        fk_info = "#\n# Foreign Keys\n#\n"
-      end
+    def hide_default?(col_type, options)
+      excludes =
+        if options[:hide_default_column_types].blank?
+          NO_DEFAULT_COL_TYPES
+        else
+          options[:hide_default_column_types].split(',')
+        end
+
+      excludes.include?(col_type)
+    end
+
+    def get_foreign_key_info(klass, options = {})
+      fk_info = if options[:format_markdown]
+                  "#\n# ### Foreign Keys\n#\n"
+                else
+                  "#\n# Foreign Keys\n#\n"
+                end
 
       return '' unless klass.connection.respond_to?(:supports_foreign_keys?) &&
         klass.connection.supports_foreign_keys? && klass.connection.respond_to?(:foreign_keys)
@@ -333,27 +381,30 @@ module AnnotateModels
       foreign_keys = klass.connection.foreign_keys(klass.table_name)
       return '' if foreign_keys.empty?
 
-      max_size = foreign_keys.collect{|fk| fk.name.size}.max + 1
-      foreign_keys.sort_by(&:name).each do |fk|
+      format_name = ->(fk) { options[:show_complete_foreign_keys] ? fk.name : fk.name.gsub(/(?<=^fk_rails_)[0-9a-f]{10}$/, '...') }
+
+      max_size = foreign_keys.map(&format_name).map(&:size).max + 1
+      foreign_keys.sort_by {|fk| [format_name.call(fk), fk.column]}.each do |fk|
         ref_info = "#{fk.column} => #{fk.to_table}.#{fk.primary_key}"
         constraints_info = ''
         constraints_info += "ON DELETE => #{fk.on_delete} " if fk.on_delete
         constraints_info += "ON UPDATE => #{fk.on_update} " if fk.on_update
         constraints_info.strip!
-        if options[:format_markdown]
-          fk_info << sprintf("# * `%s`%s:\n#     * **`%s`**\n", fk.name, constraints_info.blank? ? '' : " (_#{constraints_info}_)", ref_info)
-        else
-          fk_info << sprintf("#  %-#{max_size}.#{max_size}s %s %s", fk.name, "(#{ref_info})", constraints_info).rstrip + "\n"
-        end
+
+        fk_info << if options[:format_markdown]
+                     sprintf("# * `%s`%s:\n#     * **`%s`**\n", format_name.call(fk), constraints_info.blank? ? '' : " (_#{constraints_info}_)", ref_info)
+                   else
+                     sprintf("#  %-#{max_size}.#{max_size}s %s %s", format_name.call(fk), "(#{ref_info})", constraints_info).rstrip + "\n"
+                   end
       end
 
       fk_info
     end
 
     # Add a schema block to a file. If the file already contains
-    # a schema info block (a comment starting with "== Schema Information"), check if it
-    # matches the block that is already there. If so, leave it be. If not, remove the old
-    # info block and write a new one.
+    # a schema info block (a comment starting with "== Schema Information"),
+    # check if it matches the block that is already there. If so, leave it be.
+    # If not, remove the old info block and write a new one.
     #
     # == Returns:
     # true or false depending on whether the file was modified.
@@ -363,7 +414,7 @@ module AnnotateModels
     #  :position_in_*<Symbol>:: where to place the annotated section in fixture or model file,
     #                           :before, :top, :after or :bottom. Default is :before.
     #
-    def annotate_one_file(file_name, info_block, position, options={})
+    def annotate_one_file(file_name, info_block, position, options = {})
       if File.exist?(file_name)
         old_content = File.read(file_name)
         return false if old_content =~ /# -\*- SkipSchemaAnnotations.*\n/
@@ -377,8 +428,8 @@ module AnnotateModels
         old_columns = old_header && old_header.scan(column_pattern).sort
         new_columns = new_header && new_header.scan(column_pattern).sort
 
-        magic_comment_matcher= Regexp.new(/(^#\s*encoding:.*\n)|(^# coding:.*\n)|(^# -\*- coding:.*\n)|(^# -\*- encoding\s?:.*\n)|(^#\s*frozen_string_literal:.+\n)|(^# -\*- frozen_string_literal\s*:.+-\*-\n)/)
-        magic_comments= old_content.scan(magic_comment_matcher).flatten.compact
+        magic_comment_matcher = Regexp.new(/(^#\s*encoding:.*\n)|(^# coding:.*\n)|(^# -\*- coding:.*\n)|(^# -\*- encoding\s?:.*\n)|(^#\s*frozen_string_literal:.+\n)|(^# -\*- frozen_string_literal\s*:.+-\*-\n)/)
+        magic_comments = old_content.scan(magic_comment_matcher).flatten.compact
 
         if old_columns == new_columns && !options[:force]
           return false
@@ -399,11 +450,11 @@ module AnnotateModels
             old_content.sub!(magic_comment_matcher, '')
             old_content.sub!(annotate_pattern(options), '')
 
-            if %w(after bottom).include?(options[position].to_s)
-              new_content = magic_comments.join + (old_content.rstrip + "\n\n" + wrapped_info_block)
-            else
-              new_content = magic_comments.join + wrapped_info_block + "\n" + old_content
-            end
+            new_content = if %w(after bottom).include?(options[position].to_s)
+                            magic_comments.join + (old_content.rstrip + "\n\n" + wrapped_info_block)
+                          else
+                            magic_comments.join + wrapped_info_block + "\n" + old_content
+                          end
           end
 
           File.open(file_name, 'wb') { |f| f.puts new_content }
@@ -414,10 +465,10 @@ module AnnotateModels
       end
     end
 
-    def remove_annotation_of_file(file_name, options={})
+    def remove_annotation_of_file(file_name, options = {})
       if File.exist?(file_name)
         content = File.read(file_name)
-        wrapper_open = options[:wrapper_open] ? "# #{options[:wrapper_open]}\n" : ""
+        wrapper_open = options[:wrapper_open] ? "# #{options[:wrapper_open]}\n" : ''
         content.sub!(/(#{wrapper_open})?#{annotate_pattern(options)}/, '')
 
         File.open(file_name, 'wb') { |f| f.puts content }
@@ -453,11 +504,12 @@ module AnnotateModels
     #  :exclude_scaffolds<Symbol>:: whether to skip modification of scaffold files
     #  :exclude_controllers<Symbol>:: whether to skip modification of controller files
     #  :exclude_helpers<Symbol>:: whether to skip modification of helper files
+    #  :exclude_sti_subclasses<Symbol>:: whether to skip modification of files for STI subclasses
     #
     # == Returns:
     # an array of file names that were annotated.
     #
-    def annotate(klass, file, header, options={})
+    def annotate(klass, file, header, options = {})
       begin
         klass.reset_column_information
         info = get_schema_info(klass, header, options)
@@ -480,17 +532,16 @@ module AnnotateModels
             position_key = 'position_in_class'.to_sym
           end
 
-          unless options[exclusion_key]
-            self.get_patterns(key).
-              map { |f| resolve_filename(f, model_name, table_name) }.
-              each { |f|
-                if annotate_one_file(f, info, position_key, options_with_position(options, position_key))
-                  annotated << f
-                end
-              }
-          end
+          next if options[exclusion_key]
+          get_patterns(key)
+            .map { |f| resolve_filename(f, model_name, table_name) }
+            .each do |f|
+              if annotate_one_file(f, info, position_key, options_with_position(options, position_key))
+                annotated << f
+              end
+            end
         end
-      rescue Exception => e
+      rescue StandardError => e
         puts "Unable to annotate #{file}: #{e.message}"
         puts "\t" + e.backtrace.join("\n\t") if options[:trace]
       end
@@ -509,8 +560,8 @@ module AnnotateModels
     # in the model_dir directory.
     def get_model_files(options)
       models = []
-      if !options[:is_rake]
-        models = ARGV.dup.reject{|m| m.match(/^(.*)=/)}
+      unless options[:is_rake]
+        models = ARGV.dup.reject { |m| m.match(/^(.*)=/) }
       end
 
       if models.empty?
@@ -561,21 +612,18 @@ module AnnotateModels
 
     # Retrieve loaded model class by path to the file where it's supposed to be defined.
     def get_loaded_model(model_path)
-      begin
-        ActiveSupport::Inflector.constantize(ActiveSupport::Inflector.camelize(model_path))
-      rescue
-        # Revert to the old way but it is not really robust
-        ObjectSpace.each_object(::Class).
-          select do |c|
-            Class === c &&    # note: we use === to avoid a bug in activesupport 2.3.14 OptionMerger vs. is_a?
-            c.ancestors.respond_to?(:include?) &&  # to fix FactoryGirl bug, see https://github.com/ctran/annotate_models/pull/82
-            c.ancestors.include?(ActiveRecord::Base)
-          end.
-          detect { |c| ActiveSupport::Inflector.underscore(c.to_s) == model_path }
-      end
-    end
-
-    def parse_options(options={})
+      ActiveSupport::Inflector.constantize(ActiveSupport::Inflector.camelize(model_path))
+    rescue
+      # Revert to the old way but it is not really robust
+      ObjectSpace.each_object(::Class)
+                 .select do |c|
+                    Class === c && # note: we use === to avoid a bug in activesupport 2.3.14 OptionMerger vs. is_a?
+                      c.ancestors.respond_to?(:include?) && # to fix FactoryGirl bug, see https://github.com/ctran/annotate_models/pull/82
+                      c.ancestors.include?(ActiveRecord::Base)
+                  end.detect { |c| ActiveSupport::Inflector.underscore(c.to_s) == model_path }
+    end
+
+    def parse_options(options = {})
       self.model_dir = options[:model_dir] if options[:model_dir]
       self.root_dir = options[:root_dir] if options[:root_dir]
     end
@@ -584,7 +632,7 @@ module AnnotateModels
     # ActiveRecord models. If we can find the class, and
     # if its a subclass of ActiveRecord::Base,
     # then pass it to the associated block
-    def do_annotations(options={})
+    def do_annotations(options = {})
       parse_options(options)
 
       header = options[:format_markdown] ? PREFIX_MD.dup : PREFIX.dup
@@ -609,21 +657,25 @@ module AnnotateModels
       begin
         return false if /# -\*- SkipSchemaAnnotations.*/ =~ (File.exist?(file) ? File.read(file) : '')
         klass = get_model_class(file)
-        if klass && klass < ActiveRecord::Base && !klass.abstract_class? && klass.table_exists?
-          annotated.concat(annotate(klass, file, header, options))
-        end
+        do_annotate = klass &&
+          klass < ActiveRecord::Base &&
+          (!options[:exclude_sti_subclasses] || !(klass.superclass < ActiveRecord::Base && klass.table_name == klass.superclass.table_name)) &&
+          !klass.abstract_class? &&
+          klass.table_exists?
+
+        annotated.concat(annotate(klass, file, header, options)) if do_annotate
       rescue BadModelFileError => e
         unless options[:ignore_unknown_models]
           puts "Unable to annotate #{file}: #{e.message}"
           puts "\t" + e.backtrace.join("\n\t") if options[:trace]
         end
-      rescue Exception => e
+      rescue StandardError => e
         puts "Unable to annotate #{file}: #{e.message}"
         puts "\t" + e.backtrace.join("\n\t") if options[:trace]
       end
     end
 
-    def remove_annotations(options={})
+    def remove_annotations(options = {})
       parse_options(options)
 
       deannotated = []
@@ -638,9 +690,9 @@ module AnnotateModels
             model_file_name = file
             deannotated_klass = true if remove_annotation_of_file(model_file_name, options)
 
-            get_patterns(matched_types(options)).
-              map { |f| resolve_filename(f, model_name, table_name) }.
-              each do |f|
+            get_patterns(matched_types(options))
+              .map { |f| resolve_filename(f, model_name, table_name) }
+              .each do |f|
                 if File.exist?(f)
                   remove_annotation_of_file(f, options)
                   deannotated_klass = true
@@ -648,7 +700,7 @@ module AnnotateModels
               end
           end
           deannotated << klass if deannotated_klass
-        rescue Exception => e
+        rescue StandardError => e
           puts "Unable to deannotate #{File.join(file)}: #{e.message}"
           puts "\t" + e.backtrace.join("\n\t") if options[:trace]
         end
@@ -657,10 +709,10 @@ module AnnotateModels
     end
 
     def resolve_filename(filename_template, model_name, table_name)
-      filename_template.
-          gsub('%MODEL_NAME%', model_name).
-          gsub('%PLURALIZED_MODEL_NAME%', model_name.pluralize).
-          gsub('%TABLE_NAME%', table_name || model_name.pluralize)
+      filename_template
+        .gsub('%MODEL_NAME%', model_name)
+        .gsub('%PLURALIZED_MODEL_NAME%', model_name.pluralize)
+        .gsub('%TABLE_NAME%', table_name || model_name.pluralize)
     end
 
     def classified_sort(cols)
@@ -674,20 +726,21 @@ module AnnotateModels
           id = c
         elsif c.name.eql?('created_at') || c.name.eql?('updated_at')
           timestamps << c
-        elsif c.name[-3,3].eql?('_id')
+        elsif c.name[-3, 3].eql?('_id')
           associations << c
         else
           rest_cols << c
         end
       end
-      [rest_cols, timestamps, associations].each {|a| a.sort_by!(&:name) }
+      [rest_cols, timestamps, associations].each { |a| a.sort_by!(&:name) }
 
-      return ([id] << rest_cols << timestamps << associations).flatten.compact
+      ([id] << rest_cols << timestamps << associations).flatten.compact
     end
 
     # Ignore warnings for the duration of the block ()
     def silence_warnings
-      old_verbose, $VERBOSE = $VERBOSE, nil
+      old_verbose = $VERBOSE
+      $VERBOSE = nil
       yield
     ensure
       $VERBOSE = old_verbose