annotaterb 4.10.2 → 4.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5dbaac7f2e0a75991b8d45ab6fdc6cd3de88493e045c9fdc166b86154d99054
-  data.tar.gz: 9902039f9f2a7a19e77201de2a197eb3f015effb9a7b59a108601d4d355227e6
+  metadata.gz: acf04a7f1c6244fa950273cc78bb159e3f25e1e1f8f154ebb5a668152672f28d
+  data.tar.gz: 67466b09b7efa8ad90d2b674228c60b368c475b8809a5af7f0c9c48f1bfa3938
 SHA512:
-  metadata.gz: 4e7d023754cdc71278b597fcd8010deb199c776835953c0bcf39fb5371088cf38b565da58ff6942fc51a88a218512bbe7297aeb9dfe32776fa2fc36ac8b44601
-  data.tar.gz: 4c14de66314768ac83dcbd275e56f8627c5ecd82f10da63595c23bbd31c7a5cdb4318a6075f3f98787edf3a319ed7d22dc260b8b5aa70527de93fb7e62b9d53f
+  metadata.gz: 76fcd6ffe70e014b15a4aab9b8e5f838432281cf7836eb83532a17f3f13c0e70381ea20bcec185efd91816df6eed64ae25d9541403c1aa0e3bb94b7970846f5b
+  data.tar.gz: 311ccf2c9013fe16ee0b70a693f9c1c478b4ab1543b6f8fdc3baf3fb0b4c9f8840e45d98236d2b634b80e3cadc1b33bb77f92a77f118828e92319292a85d8845

data/CHANGELOG.md

@@ -1,5 +1,37 @@
 # Changelog
 
+## [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)
+
+**Closed issues:**
+
+- Composite primary keys are unsupported [\#138](https://github.com/drwl/annotaterb/issues/138)
+
+**Merged pull requests:**
+
+- Bump version to v4.10.2 [\#141](https://github.com/drwl/annotaterb/pull/141) ([drwl](https://github.com/drwl))
+- Fix double-loading of Rakefile [\#140](https://github.com/drwl/annotaterb/pull/140) ([dmke](https://github.com/dmke))
+- Change structure of model annotation builder [\#136](https://github.com/drwl/annotaterb/pull/136) ([drwl](https://github.com/drwl))
+- Refactor model annotation components [\#134](https://github.com/drwl/annotaterb/pull/134) ([drwl](https://github.com/drwl))
+- Generate changelog for v4.10.1 [\#133](https://github.com/drwl/annotaterb/pull/133) ([drwl](https://github.com/drwl))
+
 ## [v4.10.1](https://github.com/drwl/annotaterb/tree/v4.10.1) (2024-07-07)
 
 [Full Changelog](https://github.com/drwl/annotaterb/compare/v4.10.0...v4.10.1)

data/VERSION

@@ -1 +1 @@
-4.10.2
+4.12.0

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

data/lib/annotate_rb/model_annotator/model_wrapper.rb

@@ -128,7 +128,12 @@ module AnnotateRb
       end
 
       def with_comments?
-        @with_comments ||= raw_columns.first.respond_to?(:comment) &&
+        return @with_comments if instance_variable_defined?(:@with_comments)
+
+        @with_comments =
+          @options[:with_comment] &&
+          @options[:with_column_comments] &&
+          raw_columns.first.respond_to?(:comment) &&
           raw_columns.map(&:comment).any? { |comment| !comment.nil? }
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: annotaterb
 version: !ruby/object:Gem::Version
-  version: 4.10.2
+  version: 4.12.0
 platform: ruby
 authors:
 - Andrew W. Lee
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-07-23 00:00:00.000000000 Z
+date: 2024-09-15 00:00:00.000000000 Z
 dependencies: []
 description: Annotates Rails/ActiveRecord Models, routes, fixtures, and others based
   on the database schema.
@@ -136,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.6
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: A gem for generating annotations for Rails projects.