annotaterb 4.8.0 → 4.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 255fdc09fbc3848ba6d9306ec84d07c2471491ffbfde2440dc502bc35432a702
-  data.tar.gz: 004c6df59a13ec89bca83190fcb4de77c88435b0a091cd0385e1bc2a1c3f9ae8
+  metadata.gz: ab40ea1034e6f377865be3de919a8df7f32cd6b655def53590b4061389ce518a
+  data.tar.gz: 1cc47f8f90e22930b7267727de068bacda45f0596df6bd15459c9d935e86f1f0
 SHA512:
-  metadata.gz: ff01eaa95eda26cd5a14d30fb93bd2da5cabde3dc2da12cac718c40349a4228963e162162db017461942aa01cffba5ef59ca7c43344c01549a11ee2d6ba189b1
-  data.tar.gz: 4ee46c7c044938e98a883f72daa023ed89f3c2d13548d1986d2353b0f5f034a8eccab3cd8ea4032c80c3d7e3b3f8f093deccc92ef494c81f1c5631be5261d720
+  metadata.gz: fed4abbcf53babf0b3854eacfb85078eb36716e2ddaaefa112e174c28f8a9694137f4fbe5b3e4ac73fc30f7b9786308a6770f62e692e101c676fee7ff3af6801
+  data.tar.gz: b41107dd5b24a83f3c50e890eb24491665aa07253be3bf6e79caec4ab1ee898888ef84192ba691064a158cc4672ccfb7db18416970f61ce0add026a81e9116b9

data/CHANGELOG.md

@@ -1,5 +1,35 @@
 # Changelog
 
+## [v4.9.0](https://github.com/drwl/annotaterb/tree/v4.9.0) (2024-05-29)
+
+[Full Changelog](https://github.com/drwl/annotaterb/compare/v4.8.0...v4.9.0)
+
+**Closed issues:**
+
+- Duplicate content in fixtures when annotating models [\#108](https://github.com/drwl/annotaterb/issues/108)
+- Cannot exclude annotations from serializer specs [\#103](https://github.com/drwl/annotaterb/issues/103)
+
+**Merged pull requests:**
+
+- Bump version to v4.9.0 [\#119](https://github.com/drwl/annotaterb/pull/119) ([drwl](https://github.com/drwl))
+- Add support for `NOT VALID` constraints [\#118](https://github.com/drwl/annotaterb/pull/118) ([gmcabrita](https://github.com/gmcabrita))
+- Generate changelog for v4.8.0 [\#116](https://github.com/drwl/annotaterb/pull/116) ([drwl](https://github.com/drwl))
+
+## [v4.8.0](https://github.com/drwl/annotaterb/tree/v4.8.0) (2024-05-14)
+
+[Full Changelog](https://github.com/drwl/annotaterb/compare/v4.7.1...v4.8.0)
+
+**Closed issues:**
+
+- Nested module models and unexpected annotations [\#106](https://github.com/drwl/annotaterb/issues/106)
+
+**Merged pull requests:**
+
+- Bump version to v4.8.0 [\#115](https://github.com/drwl/annotaterb/pull/115) ([drwl](https://github.com/drwl))
+- Generate changelog for v4.7.1 [\#114](https://github.com/drwl/annotaterb/pull/114) ([drwl](https://github.com/drwl))
+- Support annotating model fixture files [\#110](https://github.com/drwl/annotaterb/pull/110) ([drwl](https://github.com/drwl))
+- Make `exclude_tests` option able to override other exclude options [\#107](https://github.com/drwl/annotaterb/pull/107) ([drwl](https://github.com/drwl))
+
 ## [v4.7.1](https://github.com/drwl/annotaterb/tree/v4.7.1) (2024-05-09)
 
 [Full Changelog](https://github.com/drwl/annotaterb/compare/v4.7.0...v4.7.1)

data/VERSION

@@ -1 +1 @@
-4.8.0
+4.10.0

data/lib/annotate_rb/model_annotator/check_constraint_annotation/annotation_builder.rb

@@ -24,7 +24,13 @@ module AnnotateRb
 
           max_size = check_constraints.map { |check_constraint| check_constraint.name.size }.max + 1
           check_constraints.sort_by(&:name).each do |check_constraint|
-            expression = check_constraint.expression ? "(#{check_constraint.expression.squish})" : nil
+            expression = if check_constraint.expression
+              not_validated = if !check_constraint.validated?
+                "NOT VALID"
+              end
+
+              "(#{check_constraint.expression.squish}) #{not_validated}".squish
+            end
 
             constraint_info += if @options[:format_markdown]
               cc_info_in_markdown(check_constraint.name, expression)

data/lib/annotate_rb/model_annotator/foreign_key_annotation/annotation_builder.rb

@@ -23,14 +23,19 @@ module AnnotateRb
           return "" if foreign_keys.empty?
 
           format_name = lambda do |fk|
-            return fk.options[:column] if fk.name.blank?
+            return fk.column if fk.name.blank?
 
             @options[:show_complete_foreign_keys] ? fk.name : fk.name.gsub(/(?<=^fk_rails_)[0-9a-f]{10}$/, "...")
           end
 
           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}"
+          foreign_keys.sort_by { |fk| [format_name.call(fk), stringify_columns(fk.column)] }.each do |fk|
+            ref_info = if fk.column.is_a?(Array) # Composite foreign key using multiple columns
+              "#{stringify_columns(fk.column)} => #{fk.to_table}#{stringify_columns(fk.primary_key)}"
+            else
+              "#{fk.column} => #{fk.to_table}.#{fk.primary_key}"
+            end
+
             constraints_info = ""
             constraints_info += "ON DELETE => #{fk.on_delete} " if fk.on_delete
             constraints_info += "ON UPDATE => #{fk.on_update} " if fk.on_update
@@ -51,6 +56,13 @@ module AnnotateRb
 
           fk_info
         end
+
+        private
+
+        # The fk columns might be composite keys, so format them into a string for the annotation
+        def stringify_columns(columns)
+          columns.is_a?(Array) ? "[#{columns.join(", ")}]" : columns
+        end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: annotaterb
 version: !ruby/object:Gem::Version
-  version: 4.8.0
+  version: 4.10.0
 platform: ruby
 authors:
 - Andrew W. Lee
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-05-14 00:00:00.000000000 Z
+date: 2024-06-28 00:00:00.000000000 Z
 dependencies: []
 description: Annotates Rails/ActiveRecord Models, routes, fixtures, and others based
   on the database schema.