rails_lens 0.10.0 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f010a15d0d3afdf64754e866cac571fcb1c91e4bd3981c8aa9bdece8d30f85a
-  data.tar.gz: 11e8b6ad7da6461bdc846952151537d3495d67cd812cd9f7e4b3ca40dbc37fbb
+  metadata.gz: d3be7f4e3942405ae7fcd4d50998f62db251786490ebf01cf71637dd3715783a
+  data.tar.gz: 712440cb4e800e14b4c10739228144bcbf8308a79fb3b73593df8ccbb7e52b67
 SHA512:
-  metadata.gz: 22963fce37978c1a4157d9c1ffe236a3ca41c0a97d8b492a832729b467c91923810cc70126c4717c17cbbac9596dfbcd620a34cdb482092b34a8692a37351c23
-  data.tar.gz: 4c5bd10154b4d44b4dfda08ec21ebcd3632b6a740e7a9d28ddd7d5a35289fec248fcf76b61bc19db8a53f548691a5597df326bda48f25ad0cc200c94468f94bf
+  metadata.gz: 3bcbf3d18443edeb680ab8fa4fd7a3be4c4d95dcf47566c421fb8d0f57ff63deb7ec42d4bf8298154a77093d1b1385213c476a61d5b1b0c37ff2f33a2e867e9f
+  data.tar.gz: 1af1394845cc4c6db4e15b2004379100f959b073abee2efab52d77ce3c88ada3939e61e74f458f1e36e4eedd92bb93ef2b3fbb2b30c2ad972584bcaebb2553d2

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## [0.10.1](https://github.com/seuros/rails_lens/compare/rails_lens/v0.10.0...rails_lens/v0.10.1) (2026-10-15)
+
+
+### Bug Fixes
+
+* keep the WHERE clause of partial indexes in annotations ([#50](https://github.com/seuros/rails_lens/issues/50)) ([351476e](https://github.com/seuros/rails_lens/commit/351476e03d98e5fb0c506cf7c63e13680230a804))
+* pluralize model/file counts in CLI and rake output ([#47](https://github.com/seuros/rails_lens/issues/47)) ([d870c6c](https://github.com/seuros/rails_lens/commit/d870c6c5128177a6324bc2db17f32be1538e73da))
+
 ## [0.10.0](https://github.com/seuros/rails_lens/compare/rails_lens/v0.5.4...rails_lens/v0.10.0) (2026-08-10)
 
 

data/lib/rails_lens/analyzers/inheritance.rb

@@ -162,11 +162,10 @@ module RailsLens
                     else
                       []
                     end
-            if types.any?
-              "{ name = \"#{reflection.name}\", type_col = \"#{reflection.foreign_type}\", id_col = \"#{reflection.foreign_key}\", types = #{TomlFormat.quoted_array(types)} }"
-            else
-              "{ name = \"#{reflection.name}\", type_col = \"#{reflection.foreign_type}\", id_col = \"#{reflection.foreign_key}\" }"
-            end
+            fields = "name = \"#{reflection.name}\", type_col = \"#{reflection.foreign_type}\", " \
+                     "id_col = \"#{reflection.foreign_key}\""
+            fields += ", types = #{TomlFormat.quoted_array(types)}" if types.any?
+            "{ #{fields} }"
           end
           lines << "references = [#{refs.join(', ')}]"
         end

data/lib/rails_lens/analyzers/notes.rb

@@ -222,7 +222,8 @@ module RailsLens
         end
 
         # Check for STI without index
-        if model_class.inheritance_column && column_exists?(model_class.inheritance_column) && !has_index?(model_class.inheritance_column)
+        if model_class.inheritance_column && column_exists?(model_class.inheritance_column) &&
+           !has_index?(model_class.inheritance_column)
           notes << NoteCodes.note(model_class.inheritance_column, NoteCodes::STI_INDEX)
         end
 
@@ -327,7 +328,8 @@ module RailsLens
       def associations_needing_counter_cache
         belongs_to_associations.select do |association|
           # Check if the inverse association exists and is commonly counted
-          inverse = association.klass.reflect_on_association(association.inverse_of&.name || model_class.name.underscore.pluralize)
+          inverse_name = association.inverse_of&.name || model_class.name.underscore.pluralize
+          inverse = association.klass.reflect_on_association(inverse_name)
           inverse && inverse.macro == :has_many && !association.options[:counter_cache]
         rescue NameError => e
           RailsLens.logger.debug { "Failed to check counter cache for association: #{e.message}" }

data/lib/rails_lens/cli.rb

@@ -21,7 +21,8 @@ module RailsLens
     desc 'annotate', 'Annotate Rails models with schema information'
     option :models, type: :array, desc: 'Specific models to annotate'
     option :include_abstract, type: :boolean, desc: 'Include abstract classes'
-    option :include_database_objects, type: :boolean, default: true, desc: 'Include database objects (functions, etc.) in abstract classes'
+    option :include_database_objects, type: :boolean, default: true,
+                                      desc: 'Include database objects (functions, etc.) in abstract classes'
     option :position, type: :string, enum: %w[before after top bottom], desc: 'Annotation position'
     option :routes, type: :boolean, desc: 'Annotate controller routes'
     option :mailers, type: :boolean, desc: 'Annotate mailer methods'

data/lib/rails_lens/commands.rb

@@ -14,8 +14,8 @@ module RailsLens
     def annotate_models(options = {})
       results = Schema::AnnotationManager.annotate_all(options)
 
-      output.say "Annotated #{results[:annotated].length} models", :green
-      report_skipped_and_failed(results, 'models')
+      output.say "Annotated #{count_of(results[:annotated], 'model')}", :green
+      report_skipped_and_failed(results, 'model')
 
       # Also annotate database-level objects (functions, etc.)
       if options[:include_database_objects]
@@ -29,32 +29,33 @@ module RailsLens
     def annotate_database_objects(options = {})
       results = Schema::DatabaseAnnotator.annotate_all(options)
 
-      output.say "Annotated #{results[:annotated].length} abstract base classes with database objects", :green
-      report_skipped_and_failed(results, 'abstract classes')
+      output.say "Annotated #{count_of(results[:annotated], 'abstract base class')} with database objects", :green
+      report_skipped_and_failed(results, 'abstract class')
 
       results
     end
 
     def annotate_routes(options = {})
-      annotate_files(Route::Annotator.new(dry_run: options[:dry_run]), 'controller files with routes', options)
+      annotate_files(Route::Annotator.new(dry_run: options[:dry_run]), 'controller file', options,
+                     suffix: 'with routes')
     end
 
     def annotate_mailers(options = {})
-      annotate_files(Mailer::Annotator.new(dry_run: options[:dry_run]), 'mailer files', options)
+      annotate_files(Mailer::Annotator.new(dry_run: options[:dry_run]), 'mailer file', options)
     end
 
     def remove_models(options = {})
       results = Schema::AnnotationManager.remove_all(options)
-      output.say "Removed annotations from #{results[:removed].length} models", :green
+      output.say "Removed annotations from #{count_of(results[:removed], 'model')}", :green
       results
     end
 
     def remove_routes(options = {})
-      remove_files(Route::Annotator.new(dry_run: options[:dry_run]), 'route', 'controller files')
+      remove_files(Route::Annotator.new(dry_run: options[:dry_run]), 'route', 'controller file')
     end
 
     def remove_mailers(options = {})
-      remove_files(Mailer::Annotator.new(dry_run: options[:dry_run]), 'mailer', 'mailer files')
+      remove_files(Mailer::Annotator.new(dry_run: options[:dry_run]), 'mailer', 'mailer file')
     end
 
     def generate_erd(options = {})
@@ -195,27 +196,33 @@ module RailsLens
 
     private
 
+    # "1 model" / "0 models" — count plus the correctly inflected noun.
+    def count_of(countable, singular)
+      count = countable.respond_to?(:length) ? countable.length : countable
+      "#{count} #{singular.pluralize(count)}"
+    end
+
     # Report skipped/failed counts for a model-annotation results hash.
     def report_skipped_and_failed(results, noun)
-      output.say "Skipped #{results[:skipped].length} #{noun}", :yellow if results[:skipped].any?
+      output.say "Skipped #{count_of(results[:skipped], noun)}", :yellow if results[:skipped].any?
       return unless results[:failed].any?
 
-      output.say "Failed to annotate #{results[:failed].length} #{noun}:", :red
+      output.say "Failed to annotate #{count_of(results[:failed], noun)}:", :red
       results[:failed].each do |failure|
         output.say "  - #{failure[:model]}: #{failure[:error]}", :red
       end
     end
 
-    def annotate_files(annotator, label, options)
+    def annotate_files(annotator, singular, options, suffix: nil)
       changed_files = annotator.annotate_all
-      output.say "Annotated #{changed_files.length} #{label}", :green
+      output.say ["Annotated #{count_of(changed_files, singular)}", suffix].compact.join(' '), :green
       changed_files.each { |file| output.say "  - #{file}", :blue } if options[:verbose] && changed_files.any?
       { changed_files: changed_files }
     end
 
-    def remove_files(annotator, kind, target)
+    def remove_files(annotator, kind, singular)
       changed_files = annotator.remove_all
-      output.say "Removed #{kind} annotations from #{changed_files.length} #{target}", :green
+      output.say "Removed #{kind} annotations from #{count_of(changed_files, singular)}", :green
       { changed_files: changed_files }
     end
 
@@ -255,8 +262,10 @@ module RailsLens
               # Use RailsLens directly if available
               if defined?(RailsLens)
                 results = RailsLens::Schema::AnnotationManager.annotate_all
-                puts "Rails Lens: Annotated \#{results[:annotated].length} models"
-                puts "Rails Lens: Skipped \#{results[:skipped].length} models" if results[:skipped].any?
+                annotated = results[:annotated].length
+                skipped = results[:skipped].length
+                puts "Rails Lens: Annotated \#{annotated} \#{'model'.pluralize(annotated)}"
+                puts "Rails Lens: Skipped \#{skipped} \#{'model'.pluralize(skipped)}" if skipped.positive?
               else
                 # Fallback to CLI
                 system('bundle exec rails_lens annotate --quiet')

data/lib/rails_lens/model_detector.rb

@@ -32,7 +32,9 @@ module RailsLens
       end
 
       def sti_child_models
-        concrete_models.select { |model| model.superclass != ActiveRecord::Base && concrete_models.include?(model.superclass) }
+        concrete_models.select do |model|
+          model.superclass != ActiveRecord::Base && concrete_models.include?(model.superclass)
+        end
       end
 
       def view_backed_models
@@ -96,7 +98,6 @@ module RailsLens
         false # If we can't check, assume it's not a view
       end
 
-      # rubocop:disable Naming/PredicateMethod
       def check_postgresql_view(connection, table_name)
         # Handle schema-qualified table names (e.g., 'audit.audit_logs')
         if table_name.include?('.')
@@ -153,7 +154,6 @@ module RailsLens
         SQL
         result.rows.any?
       end
-      # rubocop:enable Naming/PredicateMethod
 
       def eager_load_models
         # Zeitwerk is always available in Rails 7+

data/lib/rails_lens/providers/extension_notes_provider.rb

@@ -9,7 +9,8 @@ module RailsLens
 
       def applicable?(model_class)
         # Only applicable to tables, not views
-        RailsLens.config.extensions[:enabled] && model_has_table?(model_class) && !ModelDetector.view_exists?(model_class)
+        RailsLens.config.extensions[:enabled] && model_has_table?(model_class) &&
+          !ModelDetector.view_exists?(model_class)
       end
 
       def process(model_class, connection = nil)

data/lib/rails_lens/schema/adapters/base.rb

@@ -337,6 +337,7 @@ module RailsLens
             attrs << "columns = #{TomlFormat.quoted_array(Array(index.columns))}"
             attrs << 'unique = true' if index.unique
             attrs << "type = \"#{index.type}\"" if index.respond_to?(:type) && index.type
+            attrs << "where = \"#{index.where}\"" if index.respond_to?(:where) && index.where
             line += attrs.join(', ')
             line += ' }'
             line += ',' if i < indexes.length - 1

data/lib/rails_lens/schema/adapters/database_info.rb

@@ -62,9 +62,13 @@ module RailsLens
         def database_encoding
           case adapter_name
           when 'PostgreSQL'
-            connection.select_value('SELECT pg_encoding_to_char(encoding) FROM pg_database WHERE datname = current_database()')
+            connection.select_value(
+              'SELECT pg_encoding_to_char(encoding) FROM pg_database WHERE datname = current_database()'
+            )
           when 'Mysql2'
-            connection.select_value('SELECT DEFAULT_CHARACTER_SET_NAME FROM information_schema.SCHEMATA WHERE SCHEMA_NAME = DATABASE()')
+            connection.select_value(
+              'SELECT DEFAULT_CHARACTER_SET_NAME FROM information_schema.SCHEMATA WHERE SCHEMA_NAME = DATABASE()'
+            )
           end
         rescue StandardError
           nil
@@ -75,7 +79,9 @@ module RailsLens
           when 'PostgreSQL'
             connection.select_value('SELECT datcollate FROM pg_database WHERE datname = current_database()')
           when 'Mysql2'
-            connection.select_value('SELECT DEFAULT_COLLATION_NAME FROM information_schema.SCHEMATA WHERE SCHEMA_NAME = DATABASE()')
+            connection.select_value(
+              'SELECT DEFAULT_COLLATION_NAME FROM information_schema.SCHEMATA WHERE SCHEMA_NAME = DATABASE()'
+            )
           end
         rescue StandardError
           nil

data/lib/rails_lens/tasks/annotate.rake

@@ -11,16 +11,20 @@ namespace :rails_lens do
 
     results = RailsLens::Schema::AnnotationManager.annotate_all(options)
 
-    if results[:by_source]&.any?
-      results[:by_source].each do |source_name, count|
-        puts "Annotated #{count} #{source_name} models"
+    # Only report sources that actually produced annotations; a registered source with
+    # nothing to annotate is noise, not news.
+    annotated_by_source = (results[:by_source] || {}).select { |_source_name, count| count.positive? }
+
+    if annotated_by_source.any?
+      annotated_by_source.each do |source_name, count|
+        puts "Annotated #{count} #{source_name} #{'model'.pluralize(count)}"
       end
     else
-      puts "Annotated #{results[:annotated].length} models"
+      puts "Annotated #{results[:annotated].length} #{'model'.pluralize(results[:annotated].length)}"
     end
-    puts "Skipped #{results[:skipped].length} models" if results[:skipped].any?
+    puts "Skipped #{results[:skipped].length} #{'model'.pluralize(results[:skipped].length)}" if results[:skipped].any?
     if results[:failed].any?
-      puts "Failed to annotate #{results[:failed].length} models:"
+      puts "Failed to annotate #{results[:failed].length} #{'model'.pluralize(results[:failed].length)}:"
       results[:failed].each do |failure|
         puts "  - #{failure[:model]}: #{failure[:error]}"
       end
@@ -38,16 +42,20 @@ namespace :rails_lens do
 
     results = RailsLens::Schema::AnnotationManager.remove_all
 
-    if results[:by_source]&.any?
-      results[:by_source].each do |source_name, count|
-        puts "Removed annotations from #{count} #{source_name} models" if count.positive?
+    removed_by_source = (results[:by_source] || {}).select { |_source_name, count| count.positive? }
+
+    if removed_by_source.any?
+      removed_by_source.each do |source_name, count|
+        puts "Removed annotations from #{count} #{source_name} #{'model'.pluralize(count)}"
       end
     elsif results[:removed].any?
-      puts "Removed annotations from #{results[:removed].length} models"
+      puts "Removed annotations from #{results[:removed].length} #{'model'.pluralize(results[:removed].length)}"
+    end
+    if results[:skipped].any?
+      puts "Skipped #{results[:skipped].length} #{'model'.pluralize(results[:skipped].length)} (no annotations)"
     end
-    puts "Skipped #{results[:skipped].length} models (no annotations)" if results[:skipped].any?
     if results[:failed].any?
-      puts "Failed to remove annotations from #{results[:failed].length} models:"
+      puts "Failed to remove annotations from #{results[:failed].length} #{'model'.pluralize(results[:failed].length)}:"
       results[:failed].each do |failure|
         puts "  - #{failure[:model]}: #{failure[:error]}"
       end

data/lib/rails_lens/tasks/mailers.rake

@@ -9,7 +9,7 @@ namespace :rails_lens do
       annotator = RailsLens::Mailer::Annotator.new
       changed_files = annotator.annotate_all
 
-      puts "Annotated #{changed_files.length} mailer files with mailer information"
+      puts "Annotated #{changed_files.length} #{'mailer file'.pluralize(changed_files.length)} with mailer information"
       changed_files.each { |file| puts "  - #{file}" }
     end
 
@@ -20,7 +20,7 @@ namespace :rails_lens do
       annotator = RailsLens::Mailer::Annotator.new
       changed_files = annotator.remove_all
 
-      puts "Removed mailer annotations from #{changed_files.length} mailer files"
+      puts "Removed mailer annotations from #{changed_files.length} #{'mailer file'.pluralize(changed_files.length)}"
       changed_files.each { |file| puts "  - #{file}" }
     end
   end

data/lib/rails_lens/tasks/routes.rake

@@ -9,7 +9,8 @@ namespace :rails_lens do
       annotator = RailsLens::Route::Annotator.new
       changed_files = annotator.annotate_all
 
-      puts "Annotated #{changed_files.length} controller files with route information"
+      puts "Annotated #{changed_files.length} #{'controller file'.pluralize(changed_files.length)} " \
+           'with route information'
       changed_files.each { |file| puts "  - #{file}" }
     end
 
@@ -20,7 +21,7 @@ namespace :rails_lens do
       annotator = RailsLens::Route::Annotator.new
       changed_files = annotator.remove_all
 
-      puts "Removed route annotations from #{changed_files.length} controller files"
+      puts "Removed route annotations from #{changed_files.length} #{'controller file'.pluralize(changed_files.length)}"
       changed_files.each { |file| puts "  - #{file}" }
     end
   end

data/lib/rails_lens/tasks/schema.rake

@@ -20,14 +20,16 @@ namespace :rails_lens do
       results = RailsLens.annotate_models(options)
 
       if results[:annotated].any?
-        puts "Annotated #{results[:annotated].length} models"
+        puts "Annotated #{results[:annotated].length} #{'model'.pluralize(results[:annotated].length)}"
         puts '(including abstract classes)' if options[:include_abstract]
       end
 
-      puts "\nSkipped #{results[:skipped].length} models (no changes needed)" if results[:skipped].any?
+      if results[:skipped].any?
+        puts "\nSkipped #{results[:skipped].length} #{'model'.pluralize(results[:skipped].length)} (no changes needed)"
+      end
 
       if results[:failed].any?
-        puts "\nFailed to annotate #{results[:failed].length} models:"
+        puts "\nFailed to annotate #{results[:failed].length} #{'model'.pluralize(results[:failed].length)}:"
         results[:failed].each do |failure|
           puts "  ✗ #{failure[:model]}: #{failure[:error]}"
         end
@@ -42,14 +44,17 @@ namespace :rails_lens do
       results = RailsLens.remove_annotations
 
       if results[:removed].any?
-        puts "Removed annotations from #{results[:removed].length} models:"
+        puts "Removed annotations from #{results[:removed].length} #{'model'.pluralize(results[:removed].length)}:"
         results[:removed].each { |model| puts "  ✓ #{model}" }
       end
 
-      puts "\nSkipped #{results[:skipped].length} models (no annotations found)" if results[:skipped].any?
+      if results[:skipped].any?
+        puts "\nSkipped #{results[:skipped].length} #{'model'.pluralize(results[:skipped].length)} " \
+             '(no annotations found)'
+      end
 
       if results[:failed].any?
-        puts "\nFailed to process #{results[:failed].length} models:"
+        puts "\nFailed to process #{results[:failed].length} #{'model'.pluralize(results[:failed].length)}:"
         results[:failed].each do |failure|
           puts "  ✗ #{failure[:model]}: #{failure[:error]}"
         end

data/lib/rails_lens/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RailsLens
-  VERSION = '0.10.0'
+  VERSION = '0.10.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_lens
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.1
 platform: ruby
 authors:
 - Abdelkader Boudih