annotaterb 4.21.0 → 4.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d35263cf60a69ceabf708e6da1acb1aa7dbb9994028b36726d813a00ef0ec7f0
-  data.tar.gz: f7286ebed8b6b2c2d2c5edb78dbeaa89dc6052619c8631a7d5b299e76c13bd0e
+  metadata.gz: 2be17a236402d5406e2f4d1f68a567bf51de51f924f66591adf9460bfacabe18
+  data.tar.gz: 48743c136f9a195bb1dbaa564bd8047c16411394a991b4c86b57a70844d0e121
 SHA512:
-  metadata.gz: fcd554627a6f477ae5120a98afde43b89f08aa6411ea64e2feba73f752b34499172a8bee267b7cf68f1fcd729a921e90738a6047c7f939239063cc2b935f95f3
-  data.tar.gz: 17ac0370bef28e3275368c7a0f93a74e0863042676656878ea94b69416d2a84ec39214f6368f70ff9c2ad2b45f1714488cb57235a8950fdfef3aa5c2ce9f315f
+  metadata.gz: a203a269dbcf4c42a082a2088c6c38d8c4b97c3bbf9ab760762e3149294fb38dc31799aea2f3ece425504782cd2027187bd161ccf4a9c006aaa7a9a791094311
+  data.tar.gz: 8cc55f09f193f5f428db97afc1270386a06eb8185773cfd339830e1ee8e49631a1f203cced676fdb2f4d7d5c0b690f5aadc9108f63d3de588c019d7585c0011b

data/CHANGELOG.md

@@ -1,5 +1,37 @@
 # Changelog
 
+## [v4.21.0](https://github.com/drwl/annotaterb/tree/v4.21.0) (2026-01-30)
+
+[Full Changelog](https://github.com/drwl/annotaterb/compare/v4.20.0...v4.21.0)
+
+**Implemented enhancements:**
+
+- Displaying database name for multi-database rails projects [\#254](https://github.com/drwl/annotaterb/issues/254)
+
+**Fixed bugs:**
+
+- Yard format broken? [\#212](https://github.com/drwl/annotaterb/issues/212)
+
+**Closed issues:**
+
+- \[dotenv\] Loaded comment gets added to routes annotations [\#288](https://github.com/drwl/annotaterb/issues/288)
+
+**Merged pull requests:**
+
+- Bump version to v4.21.0 [\#306](https://github.com/drwl/annotaterb/pull/306) ([drwl](https://github.com/drwl))
+- Add integration test for ignore\_multi\_database\_name config option [\#305](https://github.com/drwl/annotaterb/pull/305) ([OdenTakashi](https://github.com/OdenTakashi))
+- Include ignore\_multi\_database\_name in generated config [\#304](https://github.com/drwl/annotaterb/pull/304) ([OdenTakashi](https://github.com/OdenTakashi))
+- Add to\_yard and to\_rdoc methods to Annotation classes [\#302](https://github.com/drwl/annotaterb/pull/302) ([k-duho](https://github.com/k-duho))
+- Support customising config path [\#301](https://github.com/drwl/annotaterb/pull/301) ([rience](https://github.com/rience))
+- Bump actions/checkout from 5 to 6 [\#299](https://github.com/drwl/annotaterb/pull/299) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Update Rails generator command in README [\#296](https://github.com/drwl/annotaterb/pull/296) ([EstebanDalelR](https://github.com/EstebanDalelR))
+- chore: remove concurrent-ruby version lock from dummy app [\#284](https://github.com/drwl/annotaterb/pull/284) ([OdenTakashi](https://github.com/OdenTakashi))
+- feat: Add "ignore\_multi\_database\_name" option [\#283](https://github.com/drwl/annotaterb/pull/283) ([t27duck](https://github.com/t27duck))
+- refactor: use existing `database_name` method for cache key [\#282](https://github.com/drwl/annotaterb/pull/282) ([OdenTakashi](https://github.com/OdenTakashi))
+- Support .config directory convention [\#281](https://github.com/drwl/annotaterb/pull/281) ([ngan](https://github.com/ngan))
+- chore: add missing newlines [\#280](https://github.com/drwl/annotaterb/pull/280) ([OdenTakashi](https://github.com/OdenTakashi))
+- Generate changelog for v4.20.0 [\#279](https://github.com/drwl/annotaterb/pull/279) ([drwl](https://github.com/drwl))
+
 ## [v4.20.0](https://github.com/drwl/annotaterb/tree/v4.20.0) (2025-10-20)
 
 [Full Changelog](https://github.com/drwl/annotaterb/compare/v4.19.0...v4.20.0)

data/VERSION

@@ -1 +1 @@
-4.21.0
+4.22.0

data/lib/annotate_rb/model_annotator/annotated_file/generator.rb

@@ -66,7 +66,7 @@ module AnnotateRb
           # Handle empty files where no classes/modules are found
           return [nil, 0] if parsed.starts.empty?
 
-          return parsed.starts.first unless @options[:nested_position]
+          return parsed.starts.first unless @options[:nested_position] && parsed.respond_to?(:type_map)
 
           class_entries = parsed.starts.select { |name, _line| parsed.type_map[name] == :class }
           class_entries.last || parsed.starts.first

data/lib/annotate_rb/model_annotator/annotation_diff_generator.rb

@@ -31,13 +31,13 @@ module AnnotateRb
         new_annotations = @annotation_block.match(HEADER_PATTERN).to_s
 
         current_annotation_columns = if current_annotations.present?
-          current_annotations.scan(COLUMN_PATTERN).sort
+          current_annotations.scan(COLUMN_PATTERN)
         else
           []
         end
 
         new_annotation_columns = if new_annotations.present?
-          new_annotations.scan(COLUMN_PATTERN).sort
+          new_annotations.scan(COLUMN_PATTERN)
         else
           []
         end

data/lib/annotate_rb/model_annotator/model_wrapper.rb

@@ -35,7 +35,11 @@ module AnnotateRb
       end
 
       def connection
-        @klass.connection
+        if @klass.respond_to?(:lease_connection)
+          @klass.lease_connection
+        else
+          @klass.connection
+        end
       end
 
       def database_name
@@ -56,12 +60,12 @@ module AnnotateRb
       end
 
       def table_comments
-        @klass.connection.table_comment(@klass.table_name)
+        connection.table_comment(@klass.table_name)
       end
 
       def has_table_comments?
-        @klass.connection.respond_to?(:table_comment) &&
-          @klass.connection.table_comment(@klass.table_name).present?
+        connection.respond_to?(:table_comment) &&
+          connection.table_comment(@klass.table_name).present?
       end
 
       def column_defaults
@@ -113,21 +117,10 @@ module AnnotateRb
           end
       end
 
-      # TODO: Simplify this conditional
       def is_column_primary_key?(column_name)
-        if primary_key
-          if primary_key.is_a?(Array)
-            # If the model has multiple primary keys, check if this column is one of them
-            if primary_key.collect(&:to_sym).include?(column_name.to_sym)
-              return true
-            end
-          elsif column_name.to_sym == primary_key.to_sym
-            # If model has 1 primary key, check if this column is it
-            return true
-          end
-        end
+        return false unless primary_key
 
-        false
+        Array(primary_key).map(&:to_sym).include?(column_name.to_sym)
       end
 
       def built_attributes
@@ -150,13 +143,13 @@ module AnnotateRb
         table_name = @klass.table_name
         return [] unless table_name
 
-        indexes = @klass.connection.indexes(table_name)
+        indexes = connection.indexes(table_name)
         return indexes if indexes.any? || !@klass.table_name_prefix
 
         # Try to search the table without prefix
         table_name_without_prefix = table_name.to_s.sub(@klass.table_name_prefix.to_s, "")
         begin
-          @klass.connection.indexes(table_name_without_prefix)
+          connection.indexes(table_name_without_prefix)
         rescue ActiveRecord::StatementInvalid => _e
           # Mysql2 adapter behaves differently than Sqlite3 and Postgres adapter.
           # If `table_name_without_prefix` does not exist, Mysql2 will raise,

data/lib/annotate_rb/tasks/annotate_models_migrate.rake

@@ -22,8 +22,11 @@ if defined?(Rails::Application) && Rails.version.split(".").first.to_i >= 6
   end
 end
 
+config = ::AnnotateRb::ConfigLoader.load_config
+
 migration_tasks.each do |task|
   next unless Rake::Task.task_defined?(task)
+  next if config[:skip_on_db_migrate]
 
   Rake::Task[task].enhance do # This block is ran after `task` completes
     task_name = Rake.application.top_level_tasks.last # The name of the task that was run, e.g. "db:migrate"

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: annotaterb
 version: !ruby/object:Gem::Version
-  version: 4.21.0
+  version: 4.22.0
 platform: ruby
 authors:
 - Andrew W. Lee
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-01-30 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -151,7 +150,6 @@ metadata:
   changelog_uri: https://github.com/drwl/annotaterb/blob/main/CHANGELOG.md
   bug_tracker_uri: https://github.com/drwl/annotaterb/issues
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -166,8 +164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key:
+rubygems_version: 4.0.4
 specification_version: 4
 summary: A gem for generating annotations for Rails projects.
 test_files: []