annotaterb 4.11.0 → 4.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8ac4fa020d2d3a8980738eea31e2166be78fe5bbdf194b9198fef2d63cc0c08
-  data.tar.gz: 51ee76fd8ff66837b7dd4e9b565e0656e3204203f0a5ea99c990e9611662c2d0
+  metadata.gz: 7adb0604dd67e60d6658add880eeee01a0367c86f9f0088f557fcb6ab42605c6
+  data.tar.gz: faa6374c64ffb979d1690c896cc564c526a6641b2fd79adc8bc922fad2fb25c0
 SHA512:
-  metadata.gz: df8b18d6ed8398fac4768ca5686e318811407e54992711b9712cf4cba51ce5b798087df674ecb9a99d051bc3ab30daee84b4cde27a6eb9881626de9d7b0a6f94
-  data.tar.gz: 8ace009c0f5bcc692661b441dd82e3c673818e7854513baadbe5e3c83c1554dd2b941501fbce5519ef6d29929c2771284efc737de7ece49f434bd90e6cdf8129
+  metadata.gz: 6250eab94f83dd0c3a40d670ad6a151532199d0183f6d13893775094e5581f6bf2513205b04f29034f0c35c8a1e0c34911a964efcb2c3104cfde0c2d6af0c1d0
+  data.tar.gz: 39210bfcf75338adf0a0bc88b31720427ed28b2679abed39ee4aa7b2500b88a170665a330a4f709a6c08f1e9d8e628c553502a4143bf4ea5be5eb96e464ebb61

data/CHANGELOG.md

@@ -1,5 +1,31 @@
 # Changelog
 
+## [v4.12.0](https://github.com/drwl/annotaterb/tree/v4.12.0) (2024-09-15)
+
+[Full Changelog](https://github.com/drwl/annotaterb/compare/v4.11.0...v4.12.0)
+
+**Merged pull requests:**
+
+- Bump version to v4.12.0 [\#151](https://github.com/drwl/annotaterb/pull/151) ([drwl](https://github.com/drwl))
+- Support postgres NULLS NOT DISTINCT clause in unique index [\#148](https://github.com/drwl/annotaterb/pull/148) ([ENewmeration](https://github.com/ENewmeration))
+- Generate changelog for v4.11.0 [\#147](https://github.com/drwl/annotaterb/pull/147) ([drwl](https://github.com/drwl))
+
+## [v4.11.0](https://github.com/drwl/annotaterb/tree/v4.11.0) (2024-08-16)
+
+[Full Changelog](https://github.com/drwl/annotaterb/compare/v4.10.2...v4.11.0)
+
+**Closed issues:**
+
+- Include the length of comments in max\_schema\_info\_width only when the with\_column\_comments option is true. [\#144](https://github.com/drwl/annotaterb/issues/144)
+- Rakefile seems to be loaded twice [\#130](https://github.com/drwl/annotaterb/issues/130)
+
+**Merged pull requests:**
+
+- Bump version to v4.11.0 [\#146](https://github.com/drwl/annotaterb/pull/146) ([drwl](https://github.com/drwl))
+- Include the length of comments in max\_schema\_info\_width only when the with\_comment and with\_column\_comments option is true. [\#145](https://github.com/drwl/annotaterb/pull/145) ([shibaaaa](https://github.com/shibaaaa))
+- Add Ruby 3.3 to CI [\#143](https://github.com/drwl/annotaterb/pull/143) ([drwl](https://github.com/drwl))
+- Generate changelog for v4.10.2 [\#142](https://github.com/drwl/annotaterb/pull/142) ([drwl](https://github.com/drwl))
+
 ## [v4.10.2](https://github.com/drwl/annotaterb/tree/v4.10.2) (2024-07-23)
 
 [Full Changelog](https://github.com/drwl/annotaterb/compare/v4.10.1...v4.10.2)

data/VERSION

@@ -1 +1 @@
-4.11.0
+4.13.0

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

@@ -20,7 +20,7 @@ module AnnotateRb
 
           new_annotation = wrapped_content(@new_annotations)
 
-          _content = @file_content.sub(@parsed_file.annotations, new_annotation)
+          _content = @file_content.sub(@parsed_file.annotations) { new_annotation }
         end
 
         private

data/lib/annotate_rb/model_annotator/file_parser/yml_parser.rb

@@ -40,7 +40,14 @@ module AnnotateRb
         def parse_yml
           # https://docs.ruby-lang.org/en/master/Psych.html#module-Psych-label-Reading+to+Psych-3A-3ANodes-3A-3AStream+structure
           parser = Psych.parser
-          parser.parse(@input)
+          begin
+            parser.parse(@input)
+          rescue Psych::SyntaxError => _e
+            # "Dynamic fixtures with ERB" exist in Rails, and will cause Psych.parser to error
+            # This is a hacky solution to get around this and still have it parse
+            erb_yml = ERB.new(@input).result
+            parser.parse(erb_yml)
+          end
 
           stream = parser.handler.root
 

data/lib/annotate_rb/model_annotator/index_annotation/index_component.rb

@@ -14,6 +14,12 @@ module AnnotateRb
         def to_default
           unique_info = index.unique ? " UNIQUE" : ""
 
+          nulls_not_distinct_info = if index.try(:nulls_not_distinct)
+            " NULLS NOT DISTINCT"
+          else
+            ""
+          end
+
           value = index.try(:where).try(:to_s)
           where_info = if value.present?
             " WHERE #{value}"
@@ -30,10 +36,11 @@ module AnnotateRb
 
           # standard:disable Lint/FormatParameterMismatch
           sprintf(
-            "#  %-#{max_size}.#{max_size}s %s%s%s%s",
+            "#  %-#{max_size}.#{max_size}s %s%s%s%s%s",
             index.name,
             "(#{columns_info.join(",")})",
             unique_info,
+            nulls_not_distinct_info,
             where_info,
             using_info
           ).rstrip
@@ -43,6 +50,12 @@ module AnnotateRb
         def to_markdown
           unique_info = index.unique ? " _unique_" : ""
 
+          nulls_not_distinct_info = if index.try(:nulls_not_distinct)
+            " _nulls_not_distinct_"
+          else
+            ""
+          end
+
           value = index.try(:where).try(:to_s)
           where_info = if value.present?
             " _where_ #{value}"
@@ -58,8 +71,9 @@ module AnnotateRb
           end
 
           details = sprintf(
-            "%s%s%s",
+            "%s%s%s%s",
             unique_info,
+            nulls_not_distinct_info,
             where_info,
             using_info
           ).strip

metadata

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